]> arthur.barton.de Git - netatalk.git/blobdiff - configure.in
Added "macros" as include directory.
[netatalk.git] / configure.in
index 04d4d22e8a9e787cab95f906c1426380419bb3d5..9a36e46d6aee2a265603525a872dcd3395373815 100644 (file)
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.111 2001-10-10 15:26:05 srittau Exp $
+dnl $Id: configure.in,v 1.120 2001-10-27 13:16:03 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -154,7 +154,7 @@ AC_ARG_ENABLE(afs,
 )
 
 AC_ARG_WITH(config-dir,
-       [  --with-config-dir=DIR   obsolete - use --pkgconfdir],
+       [  --with-config-dir=DIR   obsolete - use --with-pkgconfdir],
                sysconfdir="$withval",
                if test "x$prefix" = "xNONE"; then
                        sysconfdir="$ac_default_prefix/etc"
@@ -165,13 +165,13 @@ AC_ARG_WITH(config-dir,
 
 AC_ARG_WITH(pkgconfdir,
        [  --with-pkgconfdir=DIR   package specific configuration in DIR
-                          [default=SYSCONF/netatalk]],
+                          [[SYSCONF/netatalk]]],
                PKGCONFDIR="$withval",
                PKGCONFDIR="${sysconfdir}/netatalk"
 )
 
 AC_ARG_WITH(cracklib,
-       [  --with-cracklib=dict    enable/set location of cracklib dictionary],
+       [  --with-cracklib=DICT    enable/set location of cracklib dictionary],
        if test "x$withval" != "xno" ; then
                cracklib="$withval"
                AC_CHECK_LIB(crack, main,
@@ -240,7 +240,7 @@ db3_required=no
 
 dnl Check for CNID DB support
 AC_ARG_ENABLE(cnid-db,
-       [  --enable-cnid-db   use persistent cnid database per volume (EXPERIMENTAL) ],
+       [  --enable-cnid-db        use persistent cnid database per volume (EXPERIMENTAL) ],
        if test "x$enableval" = "xyes"; then
                dnl Now we need DB3
                db3_required="yes"
@@ -260,10 +260,12 @@ AC_ARG_WITH(db3,
 )
 
 db3_found=no
-for db3dir in "" $trydb3dir /usr /usr /usr/local ; do
-       if test -f "$db3dir/include/db3/db.h" ; then
-               LDFLAGS="$LDFLAGS -L$db3dir/lib"
-               CFLAGS="$CFLAGS -I$db3dir/include/db3"
+for db3dir in "" $trydb3dir "$trydb3dir/include" /usr/local/BerkeleyDB.3.3/include /usr/include/db3  /usr/local/include/db3 ; do
+       if test -f "$db3dir/db.h" ; then
+               db3libdir="`echo $db3dir | sed 's/include\/db3$/lib/'`"
+               db3libdir="`echo $db3libdir | sed 's/include$/lib/'`"
+               LDFLAGS="$LDFLAGS -L$db3libdir"
+               CFLAGS="$CFLAGS -I$db3dir"
 
                dnl If we require DB3, die if we don't have it
                if test "x$db3_required" != "xno"; then
@@ -291,7 +293,7 @@ if test "x$db3_required" != "xno"; then
 fi
 
 AC_ARG_WITH(did,
-       [  --with-did=[scheme]     set DID scheme (last,mtab)],
+       [  --with-did=SCHEME       set DID scheme (last,mtab)],
        if test "x$withval" != "xno" ; then
                if test "$withval" = "last"; then
                        AC_DEFINE(USE_LASTDID, 1)
@@ -306,19 +308,19 @@ AC_ARG_WITH(did,
 
 msg_dir=""
 AC_ARG_WITH(message-dir,
-       [  --with-msg-dir=path     path to message files [default=$ac_prefix_default/etc/msg]],
+       [  --with-msg-dir=PATH     path to message files [[PKGCONF/msg]]],
                msg_dir="$withval"
                if test x"$msg_dir" = "x"; then
                        msg_dir="${PKGCONFDIR}/msg"
                fi
                AC_DEFINE_UNQUOTED(SERVERTEXT, "$msg_dir",
-                       [path to message dir [default=$ac_prefix_default/etc/msg]])
+                       [path to message dir [[PKGCONF/msg]]])
                SERVERTEXT="$msg_dir"
                AC_SUBST(SERVERTEXT)
 )
 
 AC_ARG_ENABLE(srvloc,
-       [  --enable-srvloc         Turn on Server Location Protocol support (EXPERIMENTAL)],
+       [  --enable-srvloc         turn on Server Location Protocol support (EXPERIMENTAL)],
        srvloc=$enableval,
        srvloc=no
 )
@@ -341,17 +343,19 @@ fi
 # Check for PAM libs
 AC_MSG_CHECKING([whether PAM support should be enabled])
 AC_ARG_WITH(pam,
-    [  --with-pam              Enable PAM support],
+    [  --with-pam              enable PAM support],
     [PAM_MSG="$withval"],
     [PAM_MSG="yes"]
 )
 AC_MSG_RESULT($PAM_MSG)
+use_pam_so=yes
+compile_pam=yes
 
 if test "x$PAM_MSG" = "xyes"; then
        if test "x$ac_cv_header_security_pam_appl_h" = "xyes" ; then
         
                AC_CHECK_LIB(pam, pam_set_item, 
-                               [use_pam_so=yes; compile_pam=yes; AC_DEFINE(USE_PAM)],
+                               [PAPD_LIBS="$PAPD_LIBS -lpam"; AFPD_LIBS="$AFPD_LIBS -lpam"; use_pam_so=yes; compile_pam=yes; AC_DEFINE(USE_PAM)],
                        [use_pam_so=no; compile_pam=no]
                )
        fi
@@ -434,7 +438,7 @@ AC_ARG_ENABLE(timelord,
 AC_MSG_RESULT([$compile_timelord])
 
 AC_ARG_WITH(uams-path,
-       [  --with-uams-path=path   path to UAMs [default=PKGCONF/uams]],
+       [  --with-uams-path=PATH   path to UAMs [[PKGCONF/uams]]],
        uams_path="$withval",
        uams_path="${PKGCONFDIR}/uams"
 )
@@ -606,9 +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)
-       compile_dhx=yes
-       compile_ssl=yes
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -623,9 +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)
-       compile_dhx=yes
-       compile_ssl=yes
        AC_DEFINE(NO_CRYPT_H, 1)
 fi
 
@@ -666,44 +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_dhx=yes
-                       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
 
@@ -721,7 +682,7 @@ AC_ARG_ENABLE(pgp-uam,
 dnl --------------------- check for building Kerberos v4 UAM module
 
 AC_ARG_ENABLE(krb4-uam,
-       [  --enable-krb4-uam      enable build of Kerberos v4 UAM module],
+       [  --enable-krb4-uam       enable build of Kerberos v4 UAM module],
        if test "$enableval" = "yes"; then
                AC_DEFINE(UAM_KRB4, 1)
                compile_kerberos=yes
@@ -732,8 +693,7 @@ dnl --------------------- overwrite the config files . . . or not.
 
 AC_MSG_CHECKING([whether configuration files should be overwritten])
 AC_ARG_ENABLE(overwrite,
-       [  --enable-overwrite      Overwrite configuration files
-                                  default=PKGCONFDIR],
+       [  --enable-overwrite      overwrite configuration files],
        [OVERWRITE_CONFIG="${enable_overwrite}"],
        [OVERWRITE_CONFIG="no"]
 )
@@ -751,7 +711,7 @@ AC_SUBST(OVERWRITE_CONFIG)
 
 AM_CONDITIONAL(SOLARIS_MODULE, test x$solaris_module = xyes)
 AM_CONDITIONAL(COMPILE_TIMELORD, test x$compile_timelord = xyes)
-AM_CONDITIONAL(USE_DHX, test x$compile_dhx = xyes)
+AM_CONDITIONAL(USE_DHX, test x$compile_ssl = xyes)
 AM_CONDITIONAL(USE_KERBEROS, test x$compile_kerberos = xyes)
 AM_CONDITIONAL(USE_PAM_SO, test x$use_pam_so = xyes)
 AM_CONDITIONAL(USE_PAM, test x$compile_pam = xyes)
@@ -809,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