apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r388877 - in /apr/apr-util/branches/0.9.x: configure.in test/Makefile.in
Date Sun, 26 Mar 2006 04:01:52 GMT
Author: wrowe
Date: Sat Mar 25 20:01:51 2006
New Revision: 388877

URL: http://svn.apache.org/viewcvs?rev=388877&view=rev
Log:

  Cross-backport jorton's work on apr commit 384750, allowing apr-util
  test/ apps to run on OS/X and skipping the -no-install flag which hurts
  for some reason with dylib linkage.

Modified:
    apr/apr-util/branches/0.9.x/configure.in
    apr/apr-util/branches/0.9.x/test/Makefile.in

Modified: apr/apr-util/branches/0.9.x/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/configure.in?rev=388877&r1=388876&r2=388877&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/configure.in (original)
+++ apr/apr-util/branches/0.9.x/configure.in Sat Mar 25 20:01:51 2006
@@ -126,6 +126,16 @@
 APRUTIL_LIBNAME="aprutil${libsuffix}"
 AC_SUBST(APRUTIL_LIBNAME)
 
+# Use -no-install to link the test programs on all platforms
+# but Darwin, where it would cause the programs to be linked
+# against installed versions of libapr instead of those just
+# built.
+case $host in
+*-apple-darwin*) LT_NO_INSTALL="" ;;
+*) LT_NO_INSTALL="-no-install" ;;
+esac
+AC_SUBST(LT_NO_INSTALL)
+
 EXTRA_OS_LINK=""
 host_alias=`uname -s`
 case "$host_alias" in

Modified: apr/apr-util/branches/0.9.x/test/Makefile.in
URL: http://svn.apache.org/viewcvs/apr/apr-util/branches/0.9.x/test/Makefile.in?rev=388877&r1=388876&r2=388877&view=diff
==============================================================================
--- apr/apr-util/branches/0.9.x/test/Makefile.in (original)
+++ apr/apr-util/branches/0.9.x/test/Makefile.in Sat Mar 25 20:01:51 2006
@@ -13,7 +13,7 @@
 # bring in rules.mk for standard functionality
 @INCLUDE_RULES@
 PROGRAM_DEPENDENCIES = @APRUTIL_LIBS@
-APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@ -no-install
+APRUTIL_LDFLAGS = @APRUTIL_LDFLAGS@ @LT_NO_INSTALL@
 
 all: $(PROGRAMS)
 



Mime
View raw message