solaris bug #1242278, #1240793, #1079670, from Andrew Morgan

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

diff --git a/macros/db3-check.m4 b/macros/db3-check.m4
index c21cbbba5cf0f0db0c4ff9e001946d0d03b78292..5d79ed8b0ed7f60cfd7a97ce09def0d6944a82f7 100644 (file)
--- a/macros/db3-check.m4
+++ b/macros/db3-check.m4
@@ -1,4 +1,4 @@
-dnl $Id: db3-check.m4,v 1.11.6.9.2.2 2006-09-09 01:36:39 didg 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
 
 
@@ -207,11 +207,17 @@ dnl                         bdbbindir="`echo $bdbdir | sed 's/include\/db4\.*.*/bin/'`"
                          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$,,'`"