apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r757746 - in /apr/apr/trunk: Makefile.in configure.in
Date Tue, 24 Mar 2009 11:41:52 GMT
Author: jorton
Date: Tue Mar 24 11:41:50 2009
New Revision: 757746

URL: http://svn.apache.org/viewvc?rev=757746&view=rev
Log:
* configure.in, Makefile.in: Fix build of DSOs, merged from APR-util.

Modified:
    apr/apr/trunk/Makefile.in
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=757746&r1=757745&r2=757746&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Tue Mar 24 11:41:50 2009
@@ -32,11 +32,16 @@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 
+APU_MODULES = @APU_MODULES@
+LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(ALL_CFLAGS) $(ALL_LDFLAGS)
$(APRUTIL_LDFLAGS) -release $(APR_MAJOR_VERSION) -module -rpath $(APU_DSO_LIBDIR)
+APU_DSO_LIBDIR = @APU_DSO_LIBDIR@
+
 #
 # Rules for building specific targets, starting with 'all' for
 # building the entire package.
 #
-TARGETS = $(TARGET_LIB) apr.exp apr-config.out build/apr_rules.out
+TARGETS = $(TARGET_LIB) $(APU_MODULES) \
+	apr.exp apr-config.out build/apr_rules.out
 
 LT_VERSION = @LT_VERSION@
 
@@ -96,6 +101,14 @@
 $(TARGET_LIB): $(OBJECTS)
 	$(LINK) @lib_target@ $(ALL_LIBS)
 
+install-modules: install-modules-@APU_HAVE_MODULES@
+
+install-modules-no:
+
+install-modules-yes: $(APU_MODULES)
+	$(APR_MKDIR) $(DESTDIR)$(APU_DSO_LIBDIR)
+	@for m in $(APU_MODULES); do $(LIBTOOL) $(LT_LTFLAGS) $(LTFLAGS) --mode=install $(INSTALL)
-m 755 $$m $(DESTDIR)$(APU_DSO_LIBDIR); done
+
 exports.c: $(HEADERS)
 	$(APR_MKEXPORT) $(HEADERS) > $@
 

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=757746&r1=757745&r2=757746&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Mar 24 11:41:50 2009
@@ -2472,7 +2472,7 @@
 AC_SUBST(APRUTIL_LIBNAME)
 
 # Set up destination directory for DSOs.
-APU_DSO_LIBDIR="\${libdir}/apr-util-${APRUTIL_MAJOR_VERSION}"
+APU_DSO_LIBDIR="\${libdir}/apr-util-${APR_MAJOR_VERSION}"
 # Set APU_HAVE_MODULES appropriately for the Makefile
 if test -n "$APU_MODULES"; then 
    APU_HAVE_MODULES=yes



Mime
View raw message