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.

2 files changed, 11 insertions, 2 deletions

diff --git a/m4/db.m4 b/m4/db.m4
index 96f1f717..79da2f04 100644
--- a/m4/db.m4
+++ b/m4/db.m4
@@ -51,7 +51,6 @@ AC_ARG_WITH(db, [  --with-db=PATH   Berkeley DB directory],
 ],
 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 @@ AC_CHECK_LIB([db-$db_libver], [db_create], [true],
   [$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
diff --git a/m4/icu.m4 b/m4/icu.m4
index 73785006..f36ef932 100644
--- a/m4/icu.m4
+++ b/m4/icu.m4
@@ -82,7 +82,7 @@ AC_ARG_WITH(icu-bin, [  --with-icu-bin=PATH     ICU binary directory],
   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