Merge remote-tracking branch 'origin/branch-netatalk-3-0' into develop

[netatalk.git] / macros / libgcrypt.m4

diff --git a/macros/libgcrypt.m4 b/macros/libgcrypt.m4
index 324005741d2b7af9b5341cb64690da6cbbdeb0e4..21b323ec0f23a3d53254daf35117976d16355037 100644 (file)
--- a/macros/libgcrypt.m4
+++ b/macros/libgcrypt.m4
@@ -8,7 +8,7 @@ dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1.  Using
 dnl this features allows to prevent build against newer versions of libgcrypt
 dnl with a changed API.
 dnl
-AC_DEFUN([AM_PATH_LIBGCRYPT],
+AC_DEFUN([AC_NETATALK_PATH_LIBGCRYPT],
 [ AC_ARG_WITH(libgcrypt-dir,
             AC_HELP_STRING([--with-libgcrypt-dir=PATH],
                            [path where LIBGCRYPT is installed (optional). 
@@ -78,7 +78,7 @@ fi
      if test "$req_libgcrypt_api" -gt 0 ; then
         tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0`
         if test "$tmp" -gt 0 ; then
-           AC_MSG_CHECKING([LIBGCRYPT API version])
+           AC_MSG_CHECKING([libgcrypt API version])
            if test "$req_libgcrypt_api" -eq "$tmp" ; then
              AC_MSG_RESULT([okay])
            else
@@ -88,9 +88,30 @@ fi
         fi
      fi
   fi
+  if test $ok = yes; then
+     # Opensolaris 11/08 provided libgcrypt doesn't have CAST5,
+     # so we better check the general case
+      AC_MSG_CHECKING([libgcrypt hast CAST5 API])
+      cast=`$LIBGCRYPT_CONFIG --algorithms 2>/dev/null | grep cast5 | sed 's/\(.*\)\(cast5\)\(.*\)/\2/'`
+      if test x$cast = xcast5 ; then
+        AC_MSG_RESULT([yes])
+      else
+        AC_MSG_RESULT([no])
+        echo "***          Detected libgcryt without CAST5              ***"
+        echo "*** Please install/build another one and point to it with ***"
+        echo "***         --with-libgcrypt-dir=<path-to-lib>            ***"
+        ok=no
+      fi
+  fi
+
   if test $ok = yes; then
     LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags`
     LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs`
+    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])
     ifelse([$2], , :, [$2])
   else
     LIBGCRYPT_CFLAGS=""