Relevant BUGIDs:

Purpose of commit: bugfix

Commit summary:
---------------

2010-10-20  Thorsten Kukuk  <kukuk@thkukuk.de>

        * configure.in: Check for libdb with symbol versions, too.
        Patch from Diego Elio Pettenò.

diff --git a/ChangeLog b/ChangeLog
index 31140626504f65a4f1a24a82c71e5c8cde779c4d..19a9877a68efdbb1fc138f16c724732c9fbc287f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-10-20  Thorsten Kukuk  <kukuk@thkukuk.de>
 
+       * configure.in: Check for libdb with symbol versions, too.
+       Patch from Diego Elio Pettenò.
+
        * modules/pam_mkhomedir/mkhomedir_helper.c (rec_mkdir): Create
        parent directories always with mode 0755.
        (create_homedir): Create main directory with mode 0700 at first.

diff --git a/configure.in b/configure.in
index 397e0159f7987da0c2a06361c77ade076f1cd0dc..a6f659dacbbb10cf96fdfdeb44339a074ece057e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -423,10 +423,11 @@ AC_ARG_WITH([db-uniquename],
        AS_HELP_STRING([--with-db-uniquename=extension],[Unique name for db libraries and functions.]))
 if test x"$WITH_DB" != xno ; then
         if test x"$WITH_DB" = xyes -o x"$WITH_DB" = xdb ; then
-              AC_CHECK_LIB([db$with_db_uniquename], [db_create$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
-              if test -z "$LIBDB" ; then
-                  AC_CHECK_LIB([db$with_db_uniquename], [dbm_store$with_db_uniquename], LIBDB="-ldb$with_db_uniquename", LIBDB="")
-              fi
+              old_libs=$LIBS
+              LIBS="$LIBS -ldb$with_db_uniquename"
+              AC_CHECK_FUNCS([db_create$with_db_uniquename db_create dbm_store$with_db_uniquename dbm_store],
+                [LIBDB="-ldb$with_db_uniquename"; break])
+              LIBS=$old_libs
         fi
         if test -z "$LIBDB" ; then
             AC_CHECK_LIB([ndbm],[dbm_store], LIBDB="-lndbm", LIBDB="")