]> arthur.barton.de Git - netatalk.git/commitdiff
Moved macro AC_PATH_SSL into its own file.
authorsrittau <srittau>
Sat, 27 Oct 2001 13:16:03 +0000 (13:16 +0000)
committersrittau <srittau>
Sat, 27 Oct 2001 13:16:03 +0000 (13:16 +0000)
Added macros/Makefile to generated files.

configure.in

index 09cabdadf380b6485aacdcc2d5b81e521220e1c7..9a36e46d6aee2a265603525a872dcd3395373815 100644 (file)
@@ -1,65 +1,6 @@
-dnl $Id: configure.in,v 1.119 2001-10-27 13:07:16 srittau Exp $
+dnl $Id: configure.in,v 1.120 2001-10-27 13:16:03 srittau Exp $
 dnl configure.in for netatalk
 
-dnl Check for SSL
-AC_DEFUN([AC_PATH_SSL], [
-       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
-               ]
-       )
-
-       SSL_CFLAGS=""
-       SSL_LIBS=""
-       compile_ssl=no
-
-       if test "$tryssl" = "yes"; then
-               AC_MSG_CHECKING([for SSL])
-               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
-                               SSL_CFLAGS="$SSL_CFLAGS -I$ssldir/include -I$ssldir/include/openssl"
-                               SSL_LIBS="$SSL_LIBS -L$ssldir/lib -L$ssldir -lcrypto"
-                               if test "$need_dash_r" = "yes"; then
-                                       SSL_LIBS="$SSL_LIBS -R$ssldir/lib -R$ssldir"
-                               fi
-                               AC_MSG_RESULT([$ssldir (enabling RANDNUM and DHX support)])
-
-                               dnl Check for the crypto library:
-                               AC_CHECK_LIB(crypto, main)
-                               dnl Check for "DES" library (for SSLeay, not openssl):
-                               AC_CHECK_LIB(des, main)
-
-                               dnl FIXME: do that temporarily
-                               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
-
-                               AC_DEFINE(OPENSSL_DHX,  1)
-                               AC_DEFINE(UAM_DHX,      1)
-                               compile_ssl=yes
-                               break
-                       fi
-               done
-               if test "x$compile_ssl" = "xno"; then
-                       AC_MSG_RESULT([no])
-               fi
-       fi
-       AC_SUBST(SSL_CFLAGS)
-       AC_SUBST(SSL_LIBS)
-])
-
-
-
 AC_INIT(bin/adv1tov2/adv1tov2.c)
 
 NETATALK_VERSION=`cat VERSION`
@@ -828,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