Import Upstream version 0.69.0

[hcoop/debian/courier-authlib.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 54dbbc6..3dc2df3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl
-dnl Copyright 1998 - 2015 Double Precision, Inc.  See COPYING for
+dnl Copyright 1998 - 2018 Double Precision, Inc.  See COPYING for
 dnl distribution information.
 
 AC_PREREQ(2.63)
-AC_INIT([courier-authlib],[0.66.4],[courier-users@lists.sourceforge.net])
+AC_INIT([courier-authlib],[0.69.0],[courier-users@lists.sourceforge.net])
 
 AC_CONFIG_SRCDIR([courierauth.h])
 
@@ -18,6 +18,7 @@ LPATH="$PATH:/usr/local/bin"
 dnl Checks for programs.
 AC_PROG_AWK
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
@@ -68,9 +69,11 @@ AC_SUBST(PASSWD)
 if test "$GCC" = "yes"
 then
        CFLAGS="$CFLAGS -Wall"
+       CXXFLAGS="$CXXFLAGS -Wall"
 fi
 
 CFLAGS="$CFLAGS -Ilibs -I${srcdir}/libs"
+CXXFLAGS="$CXXFLAGS -Ilibs -I${srcdir}/libs"
 
 AC_MSG_CHECKING(whether -lm is needed for floor)
 AC_TRY_LINK_FUNC(floor,
@@ -123,15 +126,7 @@ fi
 LIBS="$saveLIBS"
 AC_SUBST(NETLIBS)
 
-save_LIBS="$LIBS"
-LIBS="-lcourier-unicode"
-AC_LINK_IFELSE(
-[AC_LANG_PROGRAM([
-#include <courier-unicode.h>
-],[
-       unicode_default_chset();
-])],[:],[AC_MSG_ERROR([The Courier Unicode Library 1.2 appears not to be installed. You may need to install a separate development subpackage, in addition to the main package])])
-LIBS="$save_LIBS"
+AX_COURIER_UNICODE_VERSION
 
 dnl #########################################################################
 
@@ -526,6 +521,7 @@ else
        LIBS="$saveLIBS"
        HAVE_AUTHPGSQL=1
        CFLAGS="$PGSQL_CFLAGS $CFLAGS"
+       CXXFLAGS="$PGSQL_CFLAGS $CXXFLAGS"
        LIBAUTHPGSQL="libauthpgsql.la"
 fi
 
@@ -602,6 +598,7 @@ else
        LIBS="$saveLIBS"
        HAVE_AUTHMYSQL=1
        CFLAGS="$MYSQL_CFLAGS $CFLAGS"
+       CXXFLAGS="$MYSQL_CFLAGS $CXXFLAGS"
 fi
 AC_SUBST(LIBAUTHMYSQL)
 AC_SUBST(MYSQL_LIBS)
@@ -661,6 +658,7 @@ else
        LIBS="$saveLIBS"
        HAVE_AUTHSQLITE=1
        CFLAGS="$SQLITE_CFLAGS $CFLAGS"
+       CXXFLAGS="$SQLITE_CXXFLAGS $CFLAGS"
        LIBAUTHSQLITE="libauthsqlite.la"
 
 fi
@@ -737,6 +735,8 @@ saveLIBS="$LIBS"
 LIBS="$CRYPTLIBS $LIBS"
 AC_CHECK_FUNC(crypt, AC_DEFINE_UNQUOTED(HAVE_CRYPT, 1,
                     [ Whether we have the crypt() function ]))
+AC_CHECK_FUNC(bcrypt, AC_DEFINE_UNQUOTED(HAVE_BCRYPT, 1,
+                    [ Whether we have the bcrypt() function ]))
 LIBS="$saveLIBS"
 AC_CACHE_CHECK([for crypt() prototype],userdb_cv_NEED_CRYPT_PROTOTYPE,