[Fedora-directory-commits] ldapserver/m4 db.m4, 1.7, 1.8 icu.m4, 1.1, 1.2

[Noriko Hosoi (nhosoi)]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/m4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1973

Modified Files:
	db.m4 icu.m4 
Log Message:
Resolves: #233215
Summary: verify-db.pl still assumes the db dir is always in the instance dir (Comment #10)
Description: To set db_bindir, if db.pc exists, check if bindir variable is
defined in the file or not.  If it's defined, set it to db_bindir.  If not,
set the default path /usr/bin to db_bindir.



Index: db.m4
===================================================================
RCS file: /cvs/dirsec/ldapserver/m4/db.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- db.m4	7 Feb 2007 23:57:34 -0000	1.7
+++ db.m4	30 Mar 2007 18:20:06 -0000	1.8
@@ -51,7 +51,6 @@
 ],
 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
@@ -80,3 +79,13 @@
   [$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
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- icu.m4	17 Oct 2006 17:07:14 -0000	1.1
+++ icu.m4	30 Mar 2007 18:20:06 -0000	1.2
@@ -82,7 +82,7 @@
   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