apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r384750 - in /apr/apr/trunk: configure.in test/Makefile.in
Date Fri, 10 Mar 2006 10:09:36 GMT
Author: jorton
Date: Fri Mar 10 02:09:36 2006
New Revision: 384750

URL: http://svn.apache.org/viewcvs?rev=384750&view=rev
Log:
* configure.in: Set LT_NO_INSTALL to -no-install on all platforms but
Darwin.

* test/Makefile.in: Revert r384715 and use LT_NO_INSTALL instead of
hard-coding -no-install.

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

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/configure.in?rev=384750&r1=384749&r2=384750&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Fri Mar 10 02:09:36 2006
@@ -2047,6 +2047,16 @@
 AC_SUBST(EXEEXT)
 AC_SUBST(LIBTOOL_LIBS)
 
+# 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)
+
 #
 # BSD/OS (BSDi) needs to use a different include syntax in the Makefiles
 #

Modified: apr/apr/trunk/test/Makefile.in
URL: http://svn.apache.org/viewcvs/apr/apr/trunk/test/Makefile.in?rev=384750&r1=384749&r2=384750&view=diff
==============================================================================
--- apr/apr/trunk/test/Makefile.in (original)
+++ apr/apr/trunk/test/Makefile.in Fri Mar 10 02:09:36 2006
@@ -37,9 +37,9 @@
 INCDIR=../include
 INCLUDES=-I$(INCDIR) -I$(srcdir)/../include
 
-# uses libtool wrapper scripts which ensures we are testing the currently built
-# library in ../.libs/, not the installed/stale flavor due to -rpath.
-LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) $(ALL_LDFLAGS) -o
$@
+# link programs using -no-install to get real executables not
+# libtool wrapper scripts which link an executable when first run.
+LINK_PROG = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) @LT_NO_INSTALL@ $(ALL_LDFLAGS)
-o $@
 
 check: $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE)
 	for prog in $(STDTEST_PORTABLE) $(STDTEST_NONPORTABLE); do \



Mime
View raw message