rbb 01/04/08 10:16:34
Modified: . CHANGES Makefile.in configure.in
build rules.mk.in
Log:
Allow APR-util to be compiled without libtool. The default is to continue
to use libtool, but it can be turned off with --without-libtool.
Revision Changes Path
1.7 +4 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -b -w -u -r1.6 -r1.7
--- CHANGES 2001/04/05 09:08:48 1.6
+++ CHANGES 2001/04/08 17:16:34 1.7
@@ -1,5 +1,9 @@
Changes with APR-util b1
+ *) 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]
+
*) Repair calling convention for apr_register_optional_fn to
eliminate GP fault on Win32. [William Rowe]
1.27 +3 -4 apr-util/Makefile.in
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apr-util/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -b -w -u -r1.26 -r1.27
--- Makefile.in 2001/04/05 04:00:10 1.26
+++ Makefile.in 2001/04/08 17:16:34 1.27
@@ -27,7 +27,7 @@
delete-lib:
@if test -f $(TARGET_LIB); then \
- objects="`find $(SUBDIRS) -name '*.lo' -a -newer $(TARGET_LIB)`" ; \
+ objects="`find $(SUBDIRS) -name '[EMAIL PROTECTED]@' -a -newer
$(TARGET_LIB)`" ; \
if test -n "$$objects"; then \
echo Found newer objects. Will relink $(TARGET_LIB). ; \
echo $(RM) -f $(TARGET_LIB) ; \
@@ -46,9 +46,8 @@
$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
$(TARGET_LIB):
- @objects="`find $(SUBDIRS) -name '*.lo'`" ; \
- echo $(LINK) $$objects ; \
- $(LINK) -rpath $(libdir) $$objects
+ @objects="`find $(SUBDIRS) -name '[EMAIL PROTECTED]@'`" ; \
+ $(LINK)
delete-exports:
@if test -f $(TARGET_EXPORTS); then \
1.17 +19 -0 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -b -w -u -r1.16 -r1.17
--- configure.in 2001/03/31 06:16:53 1.16
+++ configure.in 2001/04/08 17:16:34 1.17
@@ -52,6 +52,25 @@
;;
esac
+AC_ARG_WITH(libtool, [--with-libtool use libtool to link the library],
+ [ use_libtool=$withval ], [ use_libtool="yes" ] )
+
+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"
+ so_ext="lo"
+ lib_target="\$(libdir) \$\$objects"
+else
+ lt_compile="\$(COMPILE) -c \$<"
+ link="ar cr \$(TARGET_LIB) \$\$objects; ranlib \$(TARGET_LIB)"
+ so_ext="o"
+fi
+
+AC_SUBST(lt_compile)
+AC_SUBST(link)
+AC_SUBST(so_ext)
+AC_SUBST(lib_target)
+
dnl
dnl grab flags from APR.
dnl ### APR doesn't have "nice" names for its exports (yet), but it isn't
1.10 +2 -2 apr-util/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr-util/build/rules.mk.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -b -w -u -r1.9 -r1.10
--- rules.mk.in 2001/02/20 01:56:33 1.9
+++ rules.mk.in 2001/04/08 17:16:34 1.10
@@ -80,9 +80,9 @@
# Basic macro setup
#
COMPILE = $(CC) $(CFLAGS)
-LT_COMPILE = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< &&
touch $@
+LT_COMPILE = @lt_compile@
-LINK = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
+LINK = @link@
MKEXPORT = $(AWK) -f $(APR_SOURCE_DIR)/build/make_export.awk
SCANDOC = $(APR_SOURCE_DIR)/build/scandoc.pl
