Mailing-List: contact cvs-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Date: 6 Apr 2001 18:57:18 -0000
Message-ID: <20010406185718.83549.qmail@apache.org>
From: rbb@apache.org
To: apr-cvs@apache.org
Subject: cvs commit: apr/build rules.mk.in

rbb         01/04/06 11:57:18

  Modified:    .        CHANGES Makefile.in configure.in
               build    rules.mk.in
  Log:
  Make libtool a configure-time option.  This is done with --without-libtool.
  The default is to use libtool
  
  Revision  Changes    Path
  1.86      +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.85
  retrieving revision 1.86
  diff -u -d -b -w -u -r1.85 -r1.86
  --- CHANGES	2001/04/05 18:56:05	1.85
  +++ CHANGES	2001/04/06 18:57:13	1.86
  @@ -1,5 +1,8 @@
   Changes with APR b1  
   
  +  *) Make libtool optional at configure time.  This is done with 
  +     --without-libtool.  [Ryan Bloom]
  +
     *) Recognize systems where the TCP_NODELAY setting is inherited from
        the listening socket, and optimize apr_setsockopt(APR_TCP_NODELAY)
        accordingly.  [Jeff Trawick]
  
  
  
  1.46      +3 -4      apr/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apr/Makefile.in,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -d -b -w -u -r1.45 -r1.46
  --- Makefile.in	2001/04/05 03:59:29	1.45
  +++ Makefile.in	2001/04/06 18:57:14	1.46
  @@ -42,7 +42,7 @@
   
   delete-lib:
   	@if test -f $(TARGET_LIB); then \
  -	    for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
  +	    for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
   	    if test -n "`find $$objects -newer $(TARGET_LIB)`"; then \
   		echo Found newer objects. Will relink $(TARGET_LIB). ; \
   		echo $(RM) -f $(TARGET_LIB) ; \
  @@ -61,9 +61,8 @@
   	$(LIBTOOL) --mode=install cp $(TARGET_LIB) $(libdir)
   
   $(TARGET_LIB):
  -	@for i in $(SUBDIRS); do objects="$$objects $$i/*.lo"; done ; \
  -	    echo $(LINK) -rpath $(libdir) $$objects ; \
  -	    $(LINK) -rpath $(libdir) $$objects
  +	@for i in $(SUBDIRS); do objects="$$objects $$i/*.@so_ext@"; done ; \
  +	    $(LINK)
   
   delete-exports:
   	@if test -f $(TARGET_EXPORTS); then \
  
  
  
  1.278     +20 -0     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.277
  retrieving revision 1.278
  diff -u -d -b -w -u -r1.277 -r1.278
  --- configure.in	2001/04/05 18:56:05	1.277
  +++ configure.in	2001/04/06 18:57:15	1.278
  @@ -96,6 +96,26 @@
       ;;
   esac
   
  +AC_ARG_WITH(libtool, [--with-libtool   use libtool to link the library],
  +  [ if test "$withval" = "yes"; 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 \$< && touch \$@"
  +      link="ar cr \$(TARGET_LIB) \$\$objects; ranlib \$(TARGET_LIB)"
  +      so_ext="o"
  +    fi ], [
  +      lt_compile="\$(LIBTOOL) --mode=compile \$(LTFLAGS) \$(COMPILE) -c \$< && touch $@"
  +      link="\$(LIBTOOL) --mode=link \$(LTFLAGS) \$(COMPILE) \$(LDFLAGS) -o \$@"
  +      so_ext="lo"
  +    ] )
  +AC_SUBST(lt_compile)
  +AC_SUBST(link)
  +AC_SUBST(so_ext)
  +
  +
   dnl #----------------------------- Checks for compiler flags
   nl='
   '
  
  
  
  1.6       +3 -3      apr/build/rules.mk.in
  
  Index: rules.mk.in
  ===================================================================
  RCS file: /home/cvs/apr/build/rules.mk.in,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -d -b -w -u -r1.5 -r1.6
  --- rules.mk.in	2001/04/06 12:40:15	1.5
  +++ rules.mk.in	2001/04/06 18:57:17	1.6
  @@ -83,10 +83,10 @@
   #
   # Basic macro setup
   #
  -COMPILE      = $(CC) $(CPPFLAGS) $(INCLUDES) $(CFLAGS) $(OPTIM)
  -LT_COMPILE   = $(LIBTOOL) --mode=compile $(LTFLAGS) $(COMPILE) -c $< && touch $@
  +COMPILE      = $(CC) $(CPPFLAGS) $(CFLAGS) $(OPTIM) $(INCLUDES)
  +LT_COMPILE   = @lt_compile@
   
  -LINK         = $(LIBTOOL) --mode=link $(LTFLAGS) $(COMPILE) $(LDFLAGS) -o $@
  +LINK         = @link@
   
   MKEXPORT     = $(AWK) -f $(apr_builders)/make_export.awk
   MKDEP        = $(apr_builders)/mkdep.sh