X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.in;h=7288b848a9e6c27509b673f0aed6967a9551679a;hb=65232b9dece9dcd0115c715f173586c8da02ff76;hp=05db1af1523b6da143bb1f39913246016a778271;hpb=3bd0d42fcb5f9fcf84b8a7a968f2719bed2f8b4a;p=netatalk.git

diff --git a/configure.in b/configure.in
index 05db1af1..7288b848 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.37.2.7 2006-09-07 05:02:20 didg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.37.2.10 2008-12-22 21:18:13 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -380,19 +380,6 @@ dnl Check for CNID database backends
 bdb_required=no
 AC_NETATALK_CNID([bdb_required=yes],[bdb_required=no])
 
-dnl Check for Berkeley DB library
-if test "x$bdb_required" = "xyes"; then
-	AC_PATH_BDB(, [
-		AC_MSG_RESULT([])
-		AC_MSG_RESULT([Make sure you have the required Berkeley DB libraries AND headers installed.])
-		AC_MSG_RESULT([You can download the latest version from http://www.sleepycat.com.])
-		AC_MSG_RESULT([If you have installed BDB in a non standard location use the])
-		AC_MSG_RESULT([--with-bdb=/path/to/bdb configure option and make sure])
-		AC_MSG_RESULT([your linker is configured to check for libraries there.])
-		AC_MSG_ERROR([Berkeley DB library required but not found!])
-	])
-fi
-
 dnl Check for quota support
 AC_CHECK_QUOTA
 
@@ -919,9 +906,30 @@ if test x"$this_os" = "xtru64"; then
 	sysv_style=tru64
 fi
 
-dnl -- look for openssl
+dnl -- check for libgcrypt, if found enables DHX UAM
+AM_PATH_LIBGCRYPT([1:1.2.3],[neta_cv_compile_dhx2=yes
+			neta_cv_have_libgcrypt=yes
+			AC_MSG_NOTICE([Enabling DHX2 UAM])
+			AC_DEFINE(HAVE_LIBGCRYPT, 1, [Define if the DHX2 modules should be built with libgcrypt])
+			AC_DEFINE(UAM_DHX2, 1, [Define if the DHX2 UAM modules should be compiled])
+			])
+
+dnl -- look for openssl, if found enables DHX UAM and Randnum UAM
 AC_PATH_SSL
 
+dnl Check for Berkeley DB library
+if test "x$bdb_required" = "xyes"; then
+	AC_PATH_BDB(, [
+		AC_MSG_RESULT([])
+		AC_MSG_RESULT([Make sure you have the required Berkeley DB libraries AND headers installed.])
+		AC_MSG_RESULT([You can download the latest version from http://www.sleepycat.com.])
+		AC_MSG_RESULT([If you have installed BDB in a non standard location use the])
+		AC_MSG_RESULT([--with-bdb=/path/to/bdb configure option and make sure])
+		AC_MSG_RESULT([your linker is configured to check for libraries there.])
+		AC_MSG_ERROR([Berkeley DB library required but not found!])
+	])
+fi
+
 dnl -- check for crypt
 AC_CRYPT
 
@@ -931,7 +939,7 @@ AC_MSG_CHECKING([whether the PGP UAM should be build])
 AC_ARG_ENABLE(pgp-uam,
 	[  --enable-pgp-uam        enable build of PGP UAM module],[
 	if test "$enableval" = "yes"; then 
-		if test "$compile_ssl" = "yes"; then 
+		if test "x$neta_cv_have_openssl" = "xyes"; then 
 			AC_DEFINE(UAM_PGP, 1, [Define if the PGP UAM module should be compiled])
 			compile_pgp=yes
 			AC_MSG_RESULT([yes])
@@ -1005,12 +1013,17 @@ AC_SUBST(OVERWRITE_CONFIG)
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
 AM_CONDITIONAL(COMPILE_A2BOOT, test x$compile_a2boot = xyes)
-AM_CONDITIONAL(USE_DHX, test x$compile_ssl = xyes)
+AM_CONDITIONAL(HAVE_LIBGCRYPT, test x$neta_cv_have_libgcrypt = xyes)
+AM_CONDITIONAL(HAVE_OPENSSL, test x$neta_cv_have_openssl = xyes)
+AM_CONDITIONAL(USE_DHX, test x$neta_cv_compile_dhx = xyes)
+AM_CONDITIONAL(USE_DHX2, test x$neta_cv_compile_dhx2 = xyes)
+AM_CONDITIONAL(USE_RANDNUM, test x$neta_cv_have_openssl = xyes)
 AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)
 AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes)
 AM_CONDITIONAL(USE_PAM, test x$netatalk_cv_install_pam = xyes)
 AM_CONDITIONAL(BUILD_PAM, test x$compile_pam = xyes)
 AM_CONDITIONAL(USE_PGP, test x$compile_pgp = xyes)
+AM_CONDITIONAL(DEFAULT_HOOK, test x$neta_cv_have_libgcrypt != xyes && test x$neta_cv_have_openssl != xyes)
 AM_CONDITIONAL(USE_COBALT, test x$sysv_style = xcobalt)
 AM_CONDITIONAL(USE_NETBSD, test x$sysv_style = xnetbsd)
 AM_CONDITIONAL(USE_REDHAT, test x$sysv_style = xredhat)
@@ -1021,6 +1034,7 @@ AM_CONDITIONAL(USE_SOLARIS, test x$sysv_style = xsolaris)
 AM_CONDITIONAL(USE_GENTOO, test x$sysv_style = xgentoo)
 AM_CONDITIONAL(USE_DEBIAN, test x$sysv_style = xdebian)
 AM_CONDITIONAL(USE_UNDEF, test x$sysv_style = x)
+AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
 
 dnl --------------------- generate files