Attachment 151247 Details for Bug 233215 – cvs diff ldapserver/m4/db.m4 (*** db.m4.diff)

[patch] cvs diff ldapserver/m4/db.m4 (*** db.m4.diff)

m4.diffs (text/plain), 1.44 KB, created by Noriko Hosoi on 2007-03-30 01:42:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Noriko Hosoi

Created: 2007-03-30 01:42:23 UTC

Size: 1.44 KB

patch

obsolete

>Index: db.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
>retrieving revision 1.7
>diff -t -w -U4 -r1.7 db.m4
>--- db.m4	7 Feb 2007 23:57:34 -0000	1.7
>+++ db.m4	30 Mar 2007 01:39:20 -0000
>@@ -50,9 +50,8 @@
>   fi
> ],
> AC_MSG_RESULT(no))
> dnl default path for the db tools (see [210947] for more details)
>-db_bindir=/usr/bin
> 
> dnl - check in system locations
> if test -z "$db_inc"; then
>   AC_MSG_CHECKING(for db.h)
>@@ -79,4 +78,14 @@
>   [AC_MSG_ERROR([$db_incdir/db.h is version $db_libver but libdb-$db_libver not found])],
>   [$LIBNSL])
> LDFLAGS="$save_ldflags"
> 
>+# if DB is not found yet, try pkg-config
>+
>+# last resort
>+# Although the other db_* variables are correctly assigned at this point,
>+# db_bindir needs to be set by pkg-config if possible (e.g., on 64-bit Solaris)
>+if $PKG_CONFIG --exists db; then
>+  db_bindir=`$PKG_CONFIG --variable=bindir db`
>+else
>+  db_bindir=/usr/bin
>+fi
>Index: icu.m4
>===================================================================
>RCS file: /cvs/dirsec/ldapserver/m4/icu.m4,v
>retrieving revision 1.1
>diff -t -w -U4 -r1.1 icu.m4
>--- icu.m4	17 Oct 2006 17:07:14 -0000	1.1
>+++ icu.m4	30 Mar 2007 01:39:20 -0000
>@@ -81,9 +81,9 @@
>     AC_MSG_ERROR([$withval not found])
>   fi
> ],
> AC_MSG_RESULT(no))
>-# if not found yet, try pkg-config
>+# if ICU is not found yet, try pkg-config
> 
> # last resort
> if test -z "$icu_lib"; then
>   AC_MSG_CHECKING(for icu with icu-config)

Actions: View | Diff

Attachments on bug 233215: 150603 | 150606 | 151245 | 151246 | 151247 | 151248 | 151305 | 152506 | 279051