apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1100846 - in /apr/apr/trunk: Makefile.in build/apu-conf.m4
Date Mon, 09 May 2011 00:14:51 GMT
Author: covener
Date: Mon May  9 00:14:50 2011
New Revision: 1100846

URL: http://svn.apache.org/viewvc?rev=1100846&view=rev
Log:
PR51074: APR not linked with libs added to APRUTIL_EXPORT_LIBS after
merged APR/APU.


Modified:
    apr/apr/trunk/Makefile.in
    apr/apr/trunk/build/apu-conf.m4

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=1100846&r1=1100845&r2=1100846&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Mon May  9 00:14:50 2011
@@ -35,6 +35,7 @@ INSTALL_DATA = @INSTALL_DATA@
 APR_DSO_MODULES = @APR_DSO_MODULES@
 LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS)
$(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APR_DSO_LIBDIR)
 APR_DSO_LIBDIR = @APR_DSO_LIBDIR@
+APRUTIL_EXPORT_LIBS = @APRUTIL_EXPORT_LIBS@
 
 #
 # Rules for building specific targets, starting with 'all' for
@@ -117,7 +118,7 @@ install: install-modules $(TARGETS)
 	fi
 
 $(TARGET_LIB): $(OBJECTS)
-	$(LINK) @lib_target@ $(ALL_LIBS)
+	$(LINK) @lib_target@ $(ALL_LIBS) $(APRUTIL_EXPORT_LIBS)
 
 install-modules: install-modules-@APR_HAVE_MODULES@
 

Modified: apr/apr/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apu-conf.m4?rev=1100846&r1=1100845&r2=1100846&view=diff
==============================================================================
--- apr/apr/trunk/build/apu-conf.m4 (original)
+++ apr/apr/trunk/build/apu-conf.m4 Mon May  9 00:14:50 2011
@@ -291,6 +291,7 @@ AC_SUBST(apu_has_ldap_tivoli)
 AC_SUBST(apu_has_ldap_zos)
 AC_SUBST(apu_has_ldap_other)
 AC_SUBST(LDADD_ldap)
+AC_SUBST(APRUITL_EXPORT_LIBS)
 
 ])
 



Mime
View raw message