Add note about GNU make being required, and fix the make calls.

[netatalk.git] / configure.in

diff --git a/configure.in b/configure.in
index df4d44fdbb659910c2d4b1ee7cc84d2bb52c9f40..0c446fb058dd29b61fa6703dac27f577642c321e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.117 2001-10-24 16:18:00 srittau Exp $
+dnl $Id: configure.in,v 1.122 2001-10-30 18:38:29 jmarcus Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -341,15 +341,15 @@ if test "x$srvloc" != "xno"; then
 fi
 
 # Check for PAM libs
-AC_MSG_CHECKING([whether PAM support should be enabled])
+AC_MSG_CHECKING([if we should even bother with PAM])
 AC_ARG_WITH(pam,
     [  --with-pam              enable PAM support],
     [PAM_MSG="$withval"],
     [PAM_MSG="yes"]
 )
 AC_MSG_RESULT($PAM_MSG)
-use_pam_so=yes
-compile_pam=yes
+use_pam_so=no
+compile_pam=no
 
 if test "x$PAM_MSG" = "xyes"; then
        if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
@@ -610,7 +610,6 @@ if test x"$this_os" = "xnetbsd"; then
 
        dnl ----- NetBSD does not have crypt.h, uses unistd.h -----
        AC_DEFINE(UAM_DHX, 1)
-       AC_DEFINE(UAM_RNDNUM, 1)
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -625,7 +624,6 @@ if test x"$this_os" = "xopenbsd"; then
 
        dnl ----- OpenBSD does not have crypt.h, uses unistd.h -----
        AC_DEFINE(UAM_DHX, 1)
-       AC_DEFINE(UAM_RNDNUM, 1)
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -666,43 +664,7 @@ if test x"$this_os" = "xtru64"; then
 fi
 
 dnl -- look for openssl
-tryssl=yes
-AC_ARG_WITH(ssl-dir,
-       [  --with-ssl-dir=PATH     specify path to openssl installation (must contain
-                          lib and include dirs) ],
-       [
-               if test "x$withval" != "xno"; then
-                       tryssldir=$withval
-               else
-                       tryssl=no
-               fi
-       ]
-)
-
-if test "$tryssl" = "yes"; then
-       for ssldir in "" $tryssldir /usr /usr/local/openssl /usr/lib/openssl/ /usr/local/ssl /usr/lib/ssl /usr/local /usr/pkg /opt /opt/openssl /usr/local/ssl ; do
-               if test -f "$ssldir/include/openssl/cast.h" ; then
-                       LDFLAGS="$LDFLAGS -L$ssldir/lib -L$ssldir"
-                       CFLAGS="$CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
-                       if test "$need_dash_r" = "yes"; then
-                               LIBS="$LIBS -R$ssldir/lib -R$ssldir"
-                       fi
-
-                       dnl Check for the crypto library:
-                       AC_CHECK_LIB(crypto, main)
-                       dnl LIBS="$LIBS -lcrypto"
-                       dnl Check for "DES" library (for SSLeay, not openssl):
-                       AC_CHECK_LIB(des, main)
-
-                       AC_DEFINE(OPENSSL_DHX,  1)
-                       AC_DEFINE(UAM_DHX,      1)
-                       AC_DEFINE(UAM_RNDNUM,   1)
-                       compile_ssl=yes
-                       AC_MSG_RESULT([Found ssl and enabling RANDNUM and DHX support "$ssldir"])
-                       break
-               fi
-       done
-fi
+AC_PATH_SSL
 
 dnl --------------------- check for building PGP UAM module
 
@@ -807,6 +769,7 @@ AC_OUTPUT([Makefile
        libatalk/nbp/Makefile
        libatalk/netddp/Makefile
        libatalk/util/Makefile
+       macros/Makefile
        man/Makefile
        man/man1/Makefile
        man/man3/Makefile