apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r659666 - in /apr/apr-util/branches/1.3.x: CHANGES apr-util.pc.in apu-config.in
Date Fri, 23 May 2008 21:28:00 GMT
Author: wrowe
Date: Fri May 23 14:27:59 2008
New Revision: 659666

URL: http://svn.apache.org/viewvc?rev=659666&view=rev
Log:
Resolve jorton's veto by reversing this behavior, introduce the
apr-1-config --avoid-ldap --libs for cleaner, abeit nonsensical,
linkage.

Backports: r659665

Modified:
    apr/apr-util/branches/1.3.x/CHANGES
    apr/apr-util/branches/1.3.x/apr-util.pc.in
    apr/apr-util/branches/1.3.x/apu-config.in

Modified: apr/apr-util/branches/1.3.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/CHANGES?rev=659666&r1=659665&r2=659666&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.3.x/CHANGES [utf-8] Fri May 23 14:27:59 2008
@@ -3,9 +3,9 @@
 
   *) Modularize ldap's stub with the dbd dso modular structure, and teach
      the apu dso's to respect the system specific shared lib path var.
-     To link to the native ldap libs, query `apu-1-config --ldap-libs`
-     (in addition to the usual linker queries for compiling and linking).
-     [William Rowe]
+     To link to an application without ldap libs, query 
+     `apu-1-config --avoid-ldap --libs` (in addition to the usual linker
+     queries for compiling and linking).  [William Rowe]
 
   *) Support building DBD drivers as DSOs by default; use --disable-util-dso
      flag to configure to use static link.  [Joe Orton, Bojan Smojver]

Modified: apr/apr-util/branches/1.3.x/apr-util.pc.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/apr-util.pc.in?rev=659666&r1=659665&r2=659666&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/apr-util.pc.in (original)
+++ apr/apr-util/branches/1.3.x/apr-util.pc.in Fri May 23 14:27:59 2008
@@ -9,5 +9,5 @@
 Version: @APRUTIL_DOTTED_VERSION@
 # assume that apr-util requires libapr of same major version
 Requires: apr-@APRUTIL_MAJOR_VERSION@
-Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @APRUTIL_EXPORT_LIBS@
+Libs: -L${libdir} -l@APRUTIL_LIBNAME@ @LDADD_ldap@ @APRUTIL_EXPORT_LIBS@
 Cflags: -I${includedir}

Modified: apr/apr-util/branches/1.3.x/apu-config.in
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.3.x/apu-config.in?rev=659666&r1=659665&r2=659666&view=diff
==============================================================================
--- apr/apr-util/branches/1.3.x/apu-config.in (original)
+++ apr/apr-util/branches/1.3.x/apu-config.in Fri May 23 14:27:59 2008
@@ -54,6 +54,7 @@
   --includedir      print location where headers are installed
   --ldflags         print linker flags
   --libs            print library information
+  --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
@@ -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"



Mime
View raw message