diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | build/rules.mk.in | 4 | ||||
| -rw-r--r-- | configure.in | 21 |
3 files changed, 18 insertions, 10 deletions
@@ -1,5 +1,8 @@ Changes with APR b1 + *) Allow LTFLAGS to be overridden by the configure command-line + (default="--silent") and introduce LT_LDFLAGS. [Roy Fielding] + *) Add memory code kindly donated to APR by Elrond <elrond@samba-tng.org> Luke Kenneth Casson Leighton <lkcl@samba-tng.org> diff --git a/build/rules.mk.in b/build/rules.mk.in index 128d57668..4c128f4e1 100644 --- a/build/rules.mk.in +++ b/build/rules.mk.in @@ -108,8 +108,8 @@ ALL_LDFLAGS = $(EXTRA_LDFLAGS) $(NOTEST_LDFLAGS) $(LDFLAGS) ALL_LIBS = $(LIBS) $(NOTEST_LIBS) $(EXTRA_LIBS) ALL_INCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) -### make LTFLAGS somewhat variable? -LTFLAGS = --silent +LTFLAGS = @LTFLAGS@ +LT_LDFLAGS = @LT_LDFLAGS@ # # Basic macro setup diff --git a/configure.in b/configure.in index 63bb2bf7f..f61e03488 100644 --- a/configure.in +++ b/configure.in @@ -100,6 +100,9 @@ case "$host_alias" in ;; *) dnl libtoolize requires that the following not be indented AC_PROG_LIBTOOL + if test "x$LTFLAGS" = "x"; then + LTFLAGS='--silent' + fi ;; esac @@ -107,21 +110,23 @@ AC_ARG_ENABLE(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) \$(ALL_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) $(ALL_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 #----------------------------- Checks for compiler flags nl=' |