Attachment 233041 Details for Bug 340361 – diffs

[patch] diffs

cvsdiffs (text/plain), 1.47 KB, created by Rich Megginson on 2007-10-19 19:49:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rich Megginson

Created: 2007-10-19 19:49:46 UTC

Size: 1.47 KB

patch

obsolete

>Index: ldapserver/m4/db.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
>retrieving revision 1.9
>diff -u -8 -r1.9 db.m4
>--- ldapserver/m4/db.m4	20 Aug 2007 17:49:17 -0000	1.9
>+++ ldapserver/m4/db.m4	19 Oct 2007 19:47:48 -0000
>@@ -25,16 +25,18 @@
> AC_ARG_WITH(db, [  --with-db=PATH   Berkeley DB directory],
> [
>   if test "$withval" = "yes"; then
>     AC_MSG_RESULT(yes)
>     dnl - check in system locations
>     if test -f "/usr/include/db.h"; then
>       db_incdir="/usr/include"
>       db_inc="-I/usr/include"
>+      db_lib='-L$(libdir)'
>+      db_libdir='$(libdir)'
>     else
>       AC_MSG_ERROR([db.h not found])
>     fi
>   elif test -d "$withval"/include -a -d "$withval"/lib; then
>     AC_MSG_RESULT([using $withval])
>     dnl - check the user provided location
>     DBDIR=$withval
>     db_lib="-L$DBDIR/lib"
>@@ -54,16 +56,18 @@
> 
> dnl - check in system locations
> if test -z "$db_inc"; then
>   AC_MSG_CHECKING(for db.h)
>   if test -f "/usr/include/db.h"; then
>     AC_MSG_RESULT([using /usr/include/db.h])
>     db_incdir="/usr/include"
>     db_inc="-I/usr/include"
>+    db_lib='-L$(libdir)'
>+    db_libdir='$(libdir)'
>   else
>     AC_MSG_RESULT(no)
>     AC_MSG_ERROR([db not found, specify with --with-db.])
>   fi
> fi
> dnl figure out which version of db we're using from the header file
> db_ver_maj=`grep DB_VERSION_MAJOR $db_incdir/db.h | awk '{print $3}'`
> db_ver_min=`grep DB_VERSION_MINOR $db_incdir/db.h | awk '{print $3}'`

Actions: View | Diff

Attachments on bug 340361: 233041 | 233071