fielding 01/05/11 20:44:18
Modified: . CHANGES configure.in
build rules.mk.in
Log:
Allow LTFLAGS to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS.
Also, fix a bug that was preventing recursive extraclean from working.
Revision Changes Path
1.15 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- CHANGES 2001/04/30 19:03:43 1.14
+++ CHANGES 2001/05/12 03:44:17 1.15
@@ -1,5 +1,8 @@
Changes with APR-util b1
+ *) Allow LTFLAGS to be overridden by the configure command-line
+ (default="--silent") and introduce LT_LDFLAGS. [Roy Fielding]
+
*) Add APR_SHARELOCK support to apr_sdbm_open(), locking read operations
with a shared lock and all write ops with an excl lock. [Will Rowe]
1.23 +13 -8 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- configure.in 2001/05/09 17:10:28 1.22
+++ configure.in 2001/05/12 03:44:17 1.23
@@ -64,6 +64,9 @@
;;
*) dnl libtoolize requires that the following not be indented
AC_PROG_LIBTOOL
+ if test "x$LTFLAGS" = "x"; then
+ LTFLAGS='--silent'
+ fi
;;
esac
@@ -71,21 +74,23 @@
[ 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
\$@"
- so_ext="lo"
- lib_target="-rpath \$(libdir) \$\$objects"
+ lt_compile='$(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE) -c $< &&
touch $@'
+ link='$(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE)
$(LDFLAGS) -o $@'
+ so_ext='lo'
+ lib_target='-rpath $(libdir) $$objects'
else
- lt_compile="\$(COMPILE) -c \$<"
- link="ar cr \$(TARGET_LIB) \$\$objects; ranlib \$(TARGET_LIB)"
- so_ext="o"
- lib_target=""
+ 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)
+AC_SUBST(LTFLAGS)
+AC_SUBST(LT_LDFLAGS)
dnl
dnl grab flags from APR.
1.11 +5 -7 apr-util/build/rules.mk.in
Index: rules.mk.in
===================================================================
RCS file: /home/cvs/apr-util/build/rules.mk.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- rules.mk.in 2001/04/08 17:16:34 1.10
+++ rules.mk.in 2001/05/12 03:44:18 1.11
@@ -69,13 +69,12 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-### make LTFLAGS somewhat variable?
-LTFLAGS = --silent
-
#
# Basic macro setup
#
@@ -103,10 +102,9 @@
extraclean-recursive:
@otarget=`echo $@ | sed s/-recursive//`; \
list='$(SUBDIRS)'; \
- ttarget=`echo $otarget | sed s/.*clean.*/clean/`; \
- if test x"$ttarget" = "xclean"; then \
- list='$(SUBDIRS) $(CLEAN_SUBDIRS)'; \
- fi; \
+ case $$otarget in *clean) \
+ list='$(SUBDIRS) $(CLEAN_SUBDIRS)';; \
+ esac; \
for i in $$list; do \
if test -d "$$i"; then \
target="$$otarget"; \
