remove signed/unsigned gcc warning

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

diff --git a/macros/ssl-check.m4 b/macros/ssl-check.m4
index e026d64af39933b925023333d5bfcbe5457cf64b..d4c362c9b1bf753e4e49837deacf502fdfab211f 100644 (file)
--- a/macros/ssl-check.m4
+++ b/macros/ssl-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: ssl-check.m4,v 1.8.6.3 2004-04-21 00:56:59 bfernhomberg Exp $
+dnl $Id: ssl-check.m4,v 1.8.6.4.2.1 2008-12-02 03:11:59 didg Exp $
 dnl Autoconf macro to check for SSL or OpenSSL
 
 AC_DEFUN([AC_CRYPT], [
@@ -37,7 +37,9 @@ AC_DEFUN([AC_PATH_SSL], [
        SSL_CFLAGS=""
        SSL_LIBS=""
        saved_LIBS=$LIBS
-       compile_ssl=no
+       saved_CFLAGS=$CFLAGS
+       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])
@@ -52,6 +54,8 @@ AC_DEFUN([AC_PATH_SSL], [
                                        SSL_LIBS="$SSL_LIBS -R$ssldir/$atalk_libname -R$ssldir"
                                fi
                                AC_MSG_RESULT([$ssldir (enabling RANDNUM and DHX support)])
+                               CFLAGS="$CFLAGS $SSL_CFLAGS"
+                               LIBS="$LIBS $SSL_LIBS"
 
 dnl FIXME: The following looks crude and probably doesn't work properly.
                                dnl Check for the crypto library:
@@ -61,11 +65,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