rbb 01/04/08 21:48:17
Modified: . CHANGES Makefile.in configure.in
Log:
Cleanup the --with-libtool option. The test directory now compiles cleanly
when libtool is used. It doesn't work without libtool yet however.
Revision Changes Path
1.88 +4 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -d -b -w -u -r1.87 -r1.88
--- CHANGES 2001/04/07 18:35:25 1.87
+++ CHANGES 2001/04/09 04:48:17 1.88
@@ -1,5 +1,9 @@
Changes with APR b1
+ *) Fixup the --with-libtool option. This allows the test directory
+ to compile again. The test directory still doesn't work when
+ APR is configured without libtool. [Ryan Bloom]
+
*) If we don't have sigwait() in the system, see if sigsuspend() is
available, and use that instead. [Wilfredo Sanchez]
1.47 +1 -1 apr/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr/Makefile.in,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -b -w -u -r1.46 -r1.47
--- Makefile.in 2001/04/06 18:57:14 1.46
+++ Makefile.in 2001/04/09 04:48:17 1.47
@@ -62,7 +62,7 @@
$(TARGET_LIB):
@for i in $(SUBDIRS); do objects="$$objects $$i/[EMAIL PROTECTED]@";
done ; \
- $(LINK)
+ $(LINK) @lib_target@
delete-exports:
@if test -f $(TARGET_EXPORTS); then \
1.287 +4 -3 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -b -w -u -r1.286 -r1.287
--- configure.in 2001/04/08 16:44:37 1.286
+++ configure.in 2001/04/09 04:48:17 1.287
@@ -101,19 +101,20 @@
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)
AC_SUBST(link)
AC_SUBST(so_ext)
-
+AC_SUBST(lib_target)
dnl #----------------------------- Checks for compiler flags
nl='
