apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From m...@apache.org
Subject svn commit: r383914 - in /apr/apr-util/branches/0.9.x: CHANGES Makefile.in build/apu-conf.m4
Date Tue, 07 Mar 2006 15:59:47 GMT
Author: maxb
Date: Tue Mar  7 07:59:32 2006
New Revision: 383914

URL: http://svn.apache.org/viewcvs?rev=383914&view=rev
Log:
Backport r59073, r59075, r59086, r59087 from trunk.
Use mkdir.sh, make_exports.awk, make_var_export.awk from the APR
installbuilddir, instead of requiring APR source to be available at APR-util
build time.  Requires APR 0.9.9, since earlier versions did not install
all necessary files to the installbuilddir.

* Makefile.in (install, exports.c, export_vars.h): Use new apr_rules.mk
    definitions APR_MKDIR, APR_MKEXPORT and APR_MKVAREXPORT.

* build/apu-conf.m4 (APU_FIND_APR):
    Remove the `apr-config --srcdir` invocation and corresponding AC_SUBST.

* CHANGES: Update.

Modified:
    apr/apr-util/branches/0.9.x/CHANGES
    apr/apr-util/branches/0.9.x/Makefile.in
    apr/apr-util/branches/0.9.x/build/apu-conf.m4

Modified: apr/apr-util/branches/0.9.x/CHANGES
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/CHANGES?rev=383914&r1=383913&r2=383914&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/CHANGES (original)
+++ apr/apr-util/branches/0.9.x/CHANGES Tue Mar  7 07:59:32 2006
@@ -1,5 +1,10 @@
 Changes with APR-util 0.9.9
 
+  *) Unix: No longer require an APR source directory to be available at
+     ./configure time, by making use of mkdir.sh, make_exports.awk,
+     make_var_export.awk installed to the installbuilddir by APR >= 0.9.9.
+     [Max Bowsher]
+
   *) Stop trying to link against Berkeley DB by default.  To enable use
      of Berkeley DB users must now explicitly pass --with-berkeley-db to
      configure, since Berkeley DB is released under a viral license that

Modified: apr/apr-util/branches/0.9.x/Makefile.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/Makefile.in?rev=383914&r1=383913&r2=383914&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/Makefile.in (original)
+++ apr/apr-util/branches/0.9.x/Makefile.in Tue Mar  7 07:59:32 2006
@@ -58,7 +58,7 @@
 install: $(TARGET_LIB) apu-config.out
 install: $(TARGET_LIB)
 	if [ ! -d $(DESTDIR)$(includedir) ]; then \
-	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(includedir); \
+	    $(APR_MKDIR) $(DESTDIR)$(includedir); \
 	fi;
 	cp -p $(top_srcdir)/include/*.h $(DESTDIR)$(includedir)
 
@@ -66,7 +66,7 @@
 		cp -p $(top_blddir)/include/*.h $(DESTDIR)$(includedir); \
 	fi;
 	if [ ! -d $(DESTDIR)$(libdir) ]; then \
-	    @APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(libdir); \
+	    $(APR_MKDIR) $(DESTDIR)$(libdir); \
 	fi;
 	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
 		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
@@ -74,7 +74,7 @@
 	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(DESTDIR)$(libdir)
 	$(LIBTOOL) --mode=install cp aprutil.exp $(DESTDIR)$(libdir)
 	if [ ! -d $(DESTDIR)$(bindir) ]; then \
-		@APR_SOURCE_DIR@/build/mkdir.sh $(DESTDIR)$(bindir); \
+		$(APR_MKDIR) $(DESTDIR)$(bindir); \
 	fi;
 	$(LIBTOOL) --mode=install cp apu-config.out $(DESTDIR)$(bindir)/apu-config
 	chmod 755 $(DESTDIR)$(bindir)/apu-config
@@ -96,10 +96,10 @@
 	fi
 
 exports.c:
-	$(AWK) -f @APR_SOURCE_DIR@/build/make_exports.awk $(EXPORT_FILES) > $@
+	$(APR_MKEXPORT) $(EXPORT_FILES) > $@
 
 export_vars.h:
-	$(AWK) -f @APR_SOURCE_DIR@/build/make_var_export.awk $(EXPORT_FILES) > $@
+	$(APR_MKVAREXPORT) $(EXPORT_FILES) > $@
 
 aprutil.exp: exports.c export_vars.h
 	@echo "#! lib@APRUTIL_LIBNAME@.so" > $@

Modified: apr/apr-util/branches/0.9.x/build/apu-conf.m4
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/build/apu-conf.m4?rev=383914&r1=383913&r2=383914&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/0.9.x/build/apu-conf.m4 Tue Mar  7 07:59:32 2006
@@ -26,11 +26,7 @@
 
   AC_SUBST(APR_INCLUDES)
   AC_SUBST(APR_LIBS)
-
-  dnl ### would be nice to obsolete these
-  APR_SOURCE_DIR="`$apr_config --srcdir`"
   AC_SUBST(APR_BUILD_DIR)
-  AC_SUBST(APR_SOURCE_DIR)
 ])
 
 



Mime
View raw message