Opensolaris libgcrypt doesn't include CAST5, test for it in configure, from Frank...

[netatalk.git] / macros / db3-check.m4

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index 9bcb60255bcb6dc567c09314083bebcd245097bf..5d79ed8b0ed7f60cfd7a97ce09def0d6944a82f7 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,11 +1,10 @@
-dnl $Id: db3-check.m4,v 1.11.6.7 2004-05-17 02:24:32 bfernhomberg Exp $
+dnl $Id: db3-check.m4,v 1.11.6.9.2.3 2008-12-03 19:17:27 didg Exp $
 dnl Autoconf macros to check for the Berkeley DB library
 
 
 AC_DEFUN([NETATALK_BDB_LINK_TRY],
 [if test $atalk_cv_lib_db = no ; then
-       AC_CACHE_CHECK([for Berkeley DB link (]ifelse($2,,default,$2)[)],[$1],
-[
+       AC_MSG_CHECKING([for Berkeley DB link (]ifelse($2,,default,$2)[)])
        atalk_DB_LIB=ifelse($2,,-ldb,$2)
        atalk_LIBS=$LIBS
        LIBS="$atalk_DB_LIB $LIBS"
@@ -13,18 +12,15 @@ AC_DEFUN([NETATALK_BDB_LINK_TRY],
        AC_TRY_LINK([
 #include <db.h>
 ],[
-int main(void) {
        char *version;
        int major, minor, patch;
 
        version = db_version( &major, &minor, &patch );
        return (0);
-}
 ],[$1=yes],[$1=no])
 
+       AC_MSG_RESULT([$$1])
        LIBS="$atalk_LIBS"
-])
-
        if test $$1 = yes ; then
                atalk_cv_lib_db=ifelse($2,,-ldb,$2)
        fi
@@ -82,7 +78,7 @@ int main(void) {
 AC_DEFUN([NETATALK_BDB_HEADER],
 [
        savedcflags="$CFLAGS"
-       CPPFLAGS="$CFLAGS -I$1"
+       CFLAGS="-I$1 $CFLAGS"
        dnl check for header version
         AC_MSG_CHECKING(ifelse($1,,default,$1)[/db.h version >= ${DB_MAJOR_REQ}.${DB_MINOR_REQ}.${DB_PATCH_REQ}])
         AC_TRY_RUN([
@@ -112,10 +108,15 @@ int main(void) {
         else
                 AC_MSG_RESULT([yes])
         fi
-       CPPFLAGS="$savedcflags"
+       CFLAGS="$savedcflags"
 ])
 
-
+dnl I don't understand this stuff below
+dnl AFAIK it works for 4.1 and 4.2 and (4.3 xor 4.4) 
+dnl you can have 4.2 and 4.3 installed
+dnl but If you have 4.3 and 4.4 it won't work with 4.3
+dnl only 4.4
+dnl didier 
 AC_DEFUN([NETATALK_BERKELEY_LINK],
 [
 atalk_cv_lib_db=no
@@ -123,6 +124,17 @@ NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.2])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb42])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-42])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-2])
+
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.4])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb44])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-44])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-4])
+
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_2,[-ldb-4.3])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db42,[-ldb43])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_42,[-ldb-43])
+NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_2,[-ldb-4-3])
+
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_4_dot_1,[-ldb-4.1])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db41,[-ldb41])
 NETATALK_BDB_LINK_TRY(atalk_cv_db_db_41,[-ldb-41])
@@ -138,7 +150,7 @@ AC_DEFUN([AC_PATH_BDB],
        trybdbdir=""
        dobdbsearch=yes
        bdb_search_dirs="/usr/local/include /usr/include"
-       search_subdirs="/db4.2 /db4.1 /db4 /"
+       search_subdirs="/db4.2 /db42 /db4.3 /db43 /db4.4 /db44 /db4.1 /db41 /db4 /"
 
 dnl required BDB version
        DB_MAJOR_REQ=4
@@ -184,20 +196,28 @@ dnl define the required BDB version
                        NETATALK_BDB_HEADER([${bdbdir}${subdir}])
                        if test ${atalk_cv_bdbheader} != "no"; then
                        
-                         bdblibdir="`echo $bdbdir | sed 's/\/include\/db4\.*.*//'`"
+dnl                      bdblibdir="`echo $bdbdir | sed 's/\/include\/db4\.*.*//'`"
+                         bdblibdir="`echo $bdbdir | sed 's/\/include\/db4.*//'`"
                          bdblibdir="`echo $bdblibdir | sed 's/\/include$//'`"
                          bdblibdir="${bdblibdir}/${atalk_libname}"
-                         bdbbindir="`echo $bdbdir | sed 's/include\/db4\.*.*/bin/'`"
+dnl                      bdbbindir="`echo $bdbdir | sed 's/include\/db4\.*.*/bin/'`"
+                         bdbbindir="`echo $bdbdir | sed 's/\/include\/db4.*/bin/'`"
                          bdbbindir="`echo $bdbbindir | sed 's/include$/bin/'`"
 
-                         CPPFLAGS="$CFLAGS -I${bdbdir}${subdir}"
+                         CPPFLAGS="-I${bdbdir}${subdir} $CFLAGS"
                          CFLAGS=""
                          LDFLAGS="-L$bdblibdir $LDFLAGS"
+                         if test "x$need_dash_r" = "xyes"; then
+                               LDFLAGS="$LDFLAGS -R${bdblibdir}"
+                         fi
                          NETATALK_BERKELEY_LINK
                          if test x"${atalk_cv_lib_db}" != x"no"; then
                                NETATALK_BDB_CHECK_VERSION
                                if test x"${atalk_cv_bdb_version}" != x"no"; then
                                    BDB_LIBS="-L${bdblibdir} ${atalk_cv_lib_db}"
+                                   if test "x$need_dash_r" = "xyes"; then
+                                       BDB_LIBS="$BDB_LIBS -R${bdblibdir}"
+                                   fi
                                    BDB_CFLAGS="-I${bdbdir}${subdir}"
                                     BDB_BIN=$bdbbindir
                                     BDB_PATH="`echo $bdbdir | sed 's,include\/db4$,,'`"