diff options
-rwxr-xr-x | configure | 8 | ||||
-rw-r--r-- | ltmain.sh | 2 | ||||
-rw-r--r-- | m4/db.m4 | 8 |
3 files changed, 14 insertions, 4 deletions
@@ -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 @@ -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 @@ -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 |