[Fedora-directory-commits] ldapserver configure, 1.60, 1.61 ltmain.sh, 1.18, 1.19

[Nathan Kinder (nkinder)]

Author: nkinder

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

Modified Files:
	configure ltmain.sh 
Log Message:
Resolves: 253582
Summary: Check if pkgconfig is available before trying to use it.



Index: configure
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- configure	13 Aug 2007 15:35:35 -0000	1.60
+++ configure	20 Aug 2007 17:49:17 -0000	1.61
@@ -24272,8 +24272,12 @@
 # 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


Index: ltmain.sh
===================================================================
RCS file: /cvs/dirsec/ldapserver/ltmain.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ltmain.sh	8 Aug 2007 22:31:55 -0000	1.18
+++ ltmain.sh	20 Aug 2007 17:49:17 -0000	1.19
@@ -6460,6 +6460,8 @@
       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