rbb 01/04/08 21:56:20
Modified: . CHANGES Makefile.in configure.in
Log:
Migrate the --without-libtool changes from APR to APR-util. This allows
for more flexibility.
Revision Changes Path
1.8 +4 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -b -w -u -r1.7 -r1.8
--- CHANGES 2001/04/08 17:16:34 1.7
+++ CHANGES 2001/04/09 04:56:20 1.8
@@ -1,5 +1,9 @@
Changes with APR-util b1
+ *) Migrate the --without-libtool changes from APR to APR-util.
+ This cleans things up, and allows more flexibility when building
+ programs. [Ryan Bloom]
+
*) Allow APR-util to be compiled without libtool. The default is
to use libtool, but it can turned off with --without-libtool
on the configure command. [Ryan Bloom]
1.28 +1 -1 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -b -w -u -r1.27 -r1.28
--- Makefile.in 2001/04/08 17:16:34 1.27
+++ Makefile.in 2001/04/09 04:56:20 1.28
@@ -47,7 +47,7 @@
$(TARGET_LIB):
@objects="`find $(SUBDIRS) -name '[EMAIL PROTECTED]@'`" ; \
- $(LINK)
+ $(LINK) @lib_target@
delete-exports:
@if test -f $(TARGET_EXPORTS); then \
1.18 +3 -2 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -b -w -u -r1.17 -r1.18
--- configure.in 2001/04/08 17:16:34 1.17
+++ configure.in 2001/04/09 04:56:20 1.18
@@ -57,13 +57,14 @@
if test "x$use_libtool" = "xyes"; then
lt_compile="\$(LIBTOOL) --mode=compile \$(LTFLAGS) \$(COMPILE) -c \$<
&& touch \$@"
- link="\$(LIBTOOL) --mode=link \$(LTFLAGS) \$(COMPILE) \$(LDFLAGS) -o
\$@ -rpath \$(libdir) \$\$objects"
+ link="\$(LIBTOOL) --mode=link \$(LTFLAGS) \$(COMPILE) \$(LDFLAGS) -o
\$@"
so_ext="lo"
- lib_target="\$(libdir) \$\$objects"
+ lib_target="-rpath \$(libdir) \$\$objects"
else
lt_compile="\$(COMPILE) -c \$<"
link="ar cr \$(TARGET_LIB) \$\$objects; ranlib \$(TARGET_LIB)"
so_ext="o"
+ lib_target=""
fi
AC_SUBST(lt_compile)
