Joe, does the attached patch float your boat?

[hint to readers, apu-1-config --avoid-ldap --link-libtool --libs ]

William A. Rowe, Jr. wrote:

Please focus on the apu-1-config script which is the only place things
have changed behavior.  And we can discuss how it should behave.  But
your veto has nothing to do with your justification for vetoing this
patch, so if you still have a veto to this patch, please restate it.

Bill

Index: apu-config.in
===================================================================
--- apu-config.in	(revision 659293)
+++ apu-config.in	(working copy)
@@ -54,7 +54,8 @@
   --includedir      print location where headers are installed
   --ldflags         print linker flags
   --libs            print library information
-  --ldap-libs       print additional library information to link with ldap
+  --avoid-ldap      do not include ldap library information with --libs
+  --ldap-libs       print additional library information to link with ldap
   --srcdir          print APR-util source directory
   --link-ld         print link switch(es) for linking to APR-util
   --link-libtool    print the libtool inputs for linking to APR-util
@@ -111,8 +112,11 @@
     echo $bindir
     exit 0
     ;;
+    --avoid-ldap)
+    LDAP_LIBS=""
+    ;;
     --libs)
-    flags="$flags $LIBS"
+    flags="$flags $LDAP_LIBS $LIBS"
     ;;
     --ldap-libs)
     flags="$flags $LDAP_LIBS"
Index: apr-util.pc.in
===================================================================
--- apr-util.pc.in	(revision 659288)
+++ apr-util.pc.in	(working copy)
@@ -9,5 +9,5 @@
 Version: @APRUTIL_DOTTED_VERSION@
 # assume that apr-util requires libapr of same major version
 Requires: [EMAIL PROTECTED]@
-Libs: -L${libdir} [EMAIL PROTECTED]@ @APRUTIL_EXPORT_LIBS@
+Libs: -L${libdir} [EMAIL PROTECTED]@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
 Cflags: -I${includedir}

Reply via email to