X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=macros%2Fssl-check.m4;h=8d9c1b6c66650e5ca8f8f337057b8a229c69cccc;hb=831306e866cb444e2af19e0f968e04eab5106e9c;hp=6ff4242542673ca7816430ee544d2b9e4b9dc921;hpb=ecfc96169ab669b578e53fa8e13592934fe37788;p=netatalk.git

diff --git a/macros/ssl-check.m4 b/macros/ssl-check.m4
index 6ff42425..8d9c1b6c 100644
--- a/macros/ssl-check.m4
+++ b/macros/ssl-check.m4
@@ -1,7 +1,7 @@
-dnl $Id: ssl-check.m4,v 1.13 2005-04-28 20:50:05 bfernhomberg Exp $
+dnl $Id: ssl-check.m4,v 1.14 2008-11-22 12:07:26 didg Exp $
 dnl Autoconf macro to check for SSL or OpenSSL
 
-AC_DEFUN([AC_CRYPT], [
+AC_DEFUN([AC_NETATALK_CRYPT], [
 
 	saveLIBS=$LIBS
 	LIBS=""
@@ -17,7 +17,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 +38,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 +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