Use new macro AC_PATH_DB3.

Replaced LDFLAGS by LIBS.

Longer description for --enable-overwrite.

diff --git a/configure.in b/configure.in
index 0c446fb058dd29b61fa6703dac27f577642c321e..cd58f6d5f728073e78943b9798f38593988d382f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.122 2001-10-30 18:38:29 jmarcus Exp $
+dnl $Id: configure.in,v 1.123 2001-11-13 19:06:09 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -239,58 +239,27 @@ dnl Don't use DB3 unless it's needed
 db3_required=no
 
 dnl Check for CNID DB support
+AC_MSG_CHECKING([whether CNID support should be enabled])
 AC_ARG_ENABLE(cnid-db,
        [  --enable-cnid-db        use persistent cnid database per volume (EXPERIMENTAL) ],
-       if test "x$enableval" = "xyes"; then
-               dnl Now we need DB3
-               db3_required="yes"
-
-               dnl Note that we don't AC_DEFINE(CNID_DB, 1) here...
-               dnl we have to check for the library first.
-               dnl AC_MSG_RESULT([db3 check enabled])
-       fi
+       [
+               if test "x$enableval" = "xyes"; then
+                       dnl Now we need DB3
+                       db3_required="yes"
+                       AC_DEFINE(CNID_DB)
+                       AC_MSG_RESULT([yes])
+               else
+                       AC_MSG_RESULT([no])
+               fi
+       ],[AC_MSG_RESULT([no])]
 )
 
 dnl Check for Berkeley DB3 library
-AC_ARG_WITH(db3,
-       [  --with-db3=PATH         specify path to Berkeley DB3 installation],
-       if test "x$withval" != "xno"; then
-               trydb3dir="$withval"
-       fi
-)
-
-db3_found=no
-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
-                       AC_CHECK_LIB(db, main,
-                               dnl AC_MSG_RESULT([enabling db3 support])
-                               db3_found=yes
-                               dnl -- also enable CNID DB when this is found
-                               AC_DEFINE(CNID_DB, 1)
-                               AC_MSG_RESULT([using persistent cnid database per volume])
-                               LIBS="$LIBS -ldb",
-                               dnl Not Found
-                               AC_MSG_ERROR([Berkeley DB3 library not found!])
-                       )
-               fi
-               break
-       fi
-done
-
-dnl Die if the library is required, but not found
-if test "x$db3_required" != "xno"; then
-       if test "x$db3_found" = "xno"; then
-               dnl Not Found
-               AC_MSG_ERROR([Berkeley DB3 library not found!])
-       fi
+if test "x$db3_required" = "xyes"; then
+       AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
 fi
+CFLAGS="$CFLAGS $DB3_CFLAGS"
+LIBS="$LIBS $DB3_LIBS"
 
 AC_ARG_WITH(did,
        [  --with-did=SCHEME       set DID scheme (last,mtab)],
@@ -330,7 +299,7 @@ AM_CONDITIONAL(USE_SRVLOC, test "x$srvloc" != "xno")
 if test "x$srvloc" != "xno"; then
     for slpdir in "" $srvloc /usr /usr/local ; do
                if test -f "$slpdir/include/slp.h" ; then
-                       LDFLAGS="$LDFLAGS -L$slpdir/lib -lslp"
+                       LIBS="$LIBS -L$slpdir/lib -lslp"
                        CFLAGS="$CFLAGS -I$slpdir/include"
                AC_CHECK_LIB(slp,SLPOpen)
                AC_CHECK_FUNCS(SLPReg SLPDereg SLPClose)
@@ -473,7 +442,7 @@ AC_SUBST(UAMS_PATH)
 dnl --------------------------------------------------------------------------
 dnl drop in includes for top level directory structures here...
 dnl --------------------------------------------------------------------------
-LDFLAGS="$LDFLAGS -L\$(top_srcdir)/libatalk/"
+LIBS="$LIBS -L\$(top_srcdir)/libatalk/"
 CFLAGS="$CFLAGS -I\$(top_srcdir)/include -I\$(top_srcdir)/sys"
 
 dnl --------------------------------------------------------------------------
@@ -693,7 +662,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],
+       [  --enable-overwrite      overwrite configuration files during installation],
        [OVERWRITE_CONFIG="${enable_overwrite}"],
        [OVERWRITE_CONFIG="no"]
 )