apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From field...@apache.org
Subject cvs commit: apr/build .cvsignore
Date Sat, 31 Mar 2001 05:23:37 GMT
fielding    01/03/30 21:23:37

  Modified:    .        .cvsignore CHANGES buildconf configure.in
               build    .cvsignore
  Log:
  Make it easier to replace libtool on OS/2 by copying libtool.m4 into
  aclocal.m4 rather than distributing it under its own name.  This way
  we can copy a replacement for libtool.m4 on those platforms that don't
  work well with libtool.
  
  Revision  Changes    Path
  1.5       +1 -0      apr/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr/.cvsignore,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- .cvsignore	2001/03/24 06:00:39	1.4
  +++ .cvsignore	2001/03/31 05:23:36	1.5
  @@ -1,4 +1,5 @@
   Makefile
  +aclocal.m4
   config.cache
   config.log
   config.status
  
  
  
  1.75      +3 -0      apr/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/apr/CHANGES,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- CHANGES	2001/03/15 18:27:41	1.74
  +++ CHANGES	2001/03/31 05:23:36	1.75
  @@ -1,5 +1,8 @@
   Changes with APR b1  
   
  +  *) Make it easier to replace libtool on OS/2 via aclocal.m4.
  +     [Roy Fielding]
  +
     *) Add apr_ipsubnet_create() and apr_ipsubnet_test() for testing
        whether or not an address is within a subnet.  [Jeff Trawick]
   
  
  
  
  1.14      +37 -32    apr/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr/buildconf,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- buildconf	2001/03/24 08:45:50	1.13
  +++ buildconf	2001/03/31 05:23:36	1.14
  @@ -56,38 +56,43 @@
   # buildconf: Build the support scripts needed to compile from a
   #            checked-out version of the source code.
   
  -# Verify that the builder has the right config tools installed
  -#
  -build/buildcheck.sh || exit 1
  -
  -libtoolize=`build/PrintPath glibtoolize libtoolize`
  -if [ "x$libtoolize" = "x" ]; then
  -    echo "libtoolize not found in path"
  -    exit 1
  -fi
  -
  -# Create the libtool helper files
  -#
  -# Note: we copy (rather than link) them to simplify distribution.
  -# Note: APR supplies its own config.guess and config.sub -- we do not
  -#       rely on libtool's versions
  -#
  -echo "Copying libtool helper files ..."
  -
  -$libtoolize --copy --automake
  -
  -ltpath=`dirname $libtoolize`
  -ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
  -
  -if [ ! -f $ltfile ]; then
  -    echo "$ltfile not found"
  -    exit 1
  -fi
  -cp -f $ltfile build/libtool.m4
  -
  -# This is just temporary until people's workspaces are cleared -- remove
  -# any old aclocal.m4 left over from prior build so it doesn't cause errors.
  -rm -f aclocal.m4
  +osname=`build/config.guess`
  +case "$osname" in
  +    *os2_emx*)
  +        echo "Using OS/2-specific aplibtool"
  +        cp -f build/os2_libtool.m4 aclocal.m4
  +        ;;
  +    *)
  +        # Verify that the builder has the right config tools installed
  +        #
  +        build/buildcheck.sh || exit 1
  +
  +        libtoolize=`build/PrintPath glibtoolize libtoolize`
  +        if [ "x$libtoolize" = "x" ]; then
  +            echo "libtoolize not found in path"
  +            exit 1
  +        fi
  +
  +        # Create the libtool helper files
  +        #
  +        # Note: we copy (rather than link) them to simplify distribution.
  +        # Note: APR supplies its own config.guess and config.sub -- we do not
  +        #       rely on libtool's versions
  +        #
  +        echo "Copying libtool helper files ..."
  +
  +        $libtoolize --copy --automake
  +
  +        ltpath=`dirname $libtoolize`
  +        ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
  +
  +        if [ ! -f $ltfile ]; then
  +            echo "$ltfile not found"
  +            exit 1
  +        fi
  +        cp -f $ltfile aclocal.m4
  +        ;;
  +esac
   
   #
   # Generate the autoconf header and ./configure
  
  
  
  1.264     +1 -13     apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.263
  retrieving revision 1.264
  diff -u -r1.263 -r1.264
  --- configure.in	2001/03/29 15:50:29	1.263
  +++ configure.in	2001/03/31 05:23:36	1.264
  @@ -15,7 +15,6 @@
   sinclude(build/apr_network.m4)
   sinclude(build/apr_threads.m4)
   sinclude(build/apr_hints.m4)
  -sinclude(build/libtool.m4)
   
   AC_CANONICAL_SYSTEM
   echo "Configuring APR library"
  @@ -79,18 +78,7 @@
   dnl prep libtool
   dnl
   echo "performing libtool configuration..."
  -
  -case "$host_alias" in
  -*os2*)
  -    # Use a custom made libtool replacement
  -    echo "using aplibtool"
  -    LIBTOOL="$srcdir/build/aplibtool"
  -    gcc -o $LIBTOOL.exe $LIBTOOL.c
  -    ;;
  -*)
  -    AC_PROG_LIBTOOL
  -    ;;
  -esac
  +AC_PROG_LIBTOOL
   
   dnl #----------------------------- Checks for compiler flags
   nl='
  
  
  
  1.3       +0 -1      apr/build/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr/build/.cvsignore,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- .cvsignore	2001/03/24 06:00:40	1.2
  +++ .cvsignore	2001/03/31 05:23:37	1.3
  @@ -1,4 +1,3 @@
  -libtool.m4
   ltconfig
   ltmain.sh
   rules.mk
  
  
  

Mime
View raw message