Merge remote-tracking branch 'origin/develop' into spotlight

[netatalk.git] / macros / ssl-check.m4

diff --git a/macros/ssl-check.m4 b/macros/ssl-check.m4
index 6ff4242542673ca7816430ee544d2b9e4b9dc921..8a58142be879c1a8402dce97797e67feadee1ab6 100644 (file)
--- a/macros/ssl-check.m4
+++ b/macros/ssl-check.m4
@@ -1,7 +1,6 @@
-dnl $Id: ssl-check.m4,v 1.13 2005-04-28 20:50:05 bfernhomberg Exp $
 dnl Autoconf macro to check for SSL or OpenSSL
 
-AC_DEFUN([AC_CRYPT], [
+AC_DEFUN([AC_NETATALK_CRYPT], [
 
        saveLIBS=$LIBS
        LIBS=""
@@ -17,7 +16,7 @@ AC_DEFUN([AC_CRYPT], [
 ])
 
 
-AC_DEFUN([AC_PATH_SSL], [
+AC_DEFUN([AC_NETATALK_PATH_SSL], [
        AC_ARG_WITH(ssl-dir, [  --with-ssl-dir=PATH     specify path to OpenSSL installation (must contain
                           lib and include dirs)],
                [
@@ -38,7 +37,8 @@ AC_DEFUN([AC_PATH_SSL], [
        SSL_LIBS=""
        saved_LIBS=$LIBS
        saved_CFLAGS=$CFLAGS
-       compile_ssl=no
+       neta_cv_have_openssl=no
+dnl    compile_ssl=no
 
        dnl make sure atalk_libname is defined beforehand
        [[ -n "$atalk_libname" ]] || AC_MSG_ERROR([internal error, atalk_libname undefined])
@@ -64,13 +64,14 @@ dnl FIXME: The following looks crude and probably doesn't work properly.
 
                                AC_DEFINE(OPENSSL_DHX,  1, [Define if the OpenSSL DHX modules should be built])
                                AC_DEFINE(UAM_DHX,      1, [Define if the DHX UAM modules should be compiled])
-                               compile_ssl=yes
+                               neta_cv_have_openssl=yes
+                               neta_cv_compile_dhx=yes
                                CFLAGS=$saved_CFLAGS
                                LIBS=$saved_LIBS
                                break
                        fi
                done
-               if test "x$compile_ssl" = "xno"; then
+               if test "x$neta_cv_have_openssl" = "xno"; then
                        AC_MSG_RESULT([no])
                fi
        fi