fielding    01/05/11 20:41:53

  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.
  
  Revision  Changes    Path
  1.104     +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.103
  retrieving revision 1.104
  diff -u -r1.103 -r1.104
  --- CHANGES	2001/05/11 00:29:23	1.103
  +++ CHANGES	2001/05/12 03:41:53	1.104
  @@ -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>
  
  
  
  1.303     +13 -8     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.302
  retrieving revision 1.303
  diff -u -r1.302 -r1.303
  --- configure.in	2001/05/10 18:08:12	1.302
  +++ configure.in	2001/05/12 03:41:53	1.303
  @@ -100,6 +100,9 @@
       ;;
   *)  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 @@
     [ 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='
  
  
  
  1.14      +2 -2      apr/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rules.mk.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- rules.mk.in	2001/05/04 02:39:44	1.13
  +++ rules.mk.in	2001/05/12 03:41:53	1.14
  @@ -108,8 +108,8 @@
   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