Resolves: 253582

Summary: Check if pkgconfig is available before trying to use it.

3 files changed, 14 insertions, 4 deletions

diff --git a/configure b/configure
index 53a2a60a..aec91f14 100755
--- a/configure
+++ b/configure
@@ -24272,8 +24272,12 @@ LDFLAGS="$save_ldflags"
 # 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`
+if  test -n "$PKG_CONFIG"; then
+  if $PKG_CONFIG --exists db; then
+    db_bindir=`$PKG_CONFIG --variable=bindir db`
+  else
+    db_bindir=/usr/bin
+  fi
 else
   db_bindir=/usr/bin
 fi
diff --git a/ltmain.sh b/ltmain.sh
index d70dc75c..0223495a 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -6460,6 +6460,8 @@ relink_command=\"$relink_command\""
       do
        eval "if test \"\${save_$lt_var+set}\" = set; then
                $lt_var=\$save_$lt_var; export $lt_var
+             else
+               $lt_unset $lt_var
              fi"
       done
 
diff --git a/m4/db.m4 b/m4/db.m4
index 79da2f04..24927a87 100644
--- a/m4/db.m4
+++ b/m4/db.m4
@@ -84,8 +84,12 @@ LDFLAGS="$save_ldflags"
 # 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`
+if  test -n "$PKG_CONFIG"; then
+  if $PKG_CONFIG --exists db; then
+    db_bindir=`$PKG_CONFIG --variable=bindir db`
+  else
+    db_bindir=/usr/bin
+  fi
 else
   db_bindir=/usr/bin
 fi