cvs commit: apr/build .cvsignore

[jo...@apache.org]

jorton      2004/01/15 06:12:58

  Modified:    .        buildconf configure.in
               build    .cvsignore
  Log:
  Fix build with recent libtool HEAD:
  
  * buildconf: Use the libtool.m4 which libtoolize copies into the cwd,
  if found.  Move ltsugar.m4 into build if found.
  
  * configure.in: Pick up ltsugar.m4.
  
  Revision  Changes    Path
  1.27      +16 -7     apr/buildconf
  
  Index: buildconf
  ===================================================================
  RCS file: /home/cvs/apr/buildconf,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -b -d -u -r1.26 -r1.27
  --- buildconf	17 Jun 2003 20:44:25 -0000	1.26
  +++ buildconf	15 Jan 2004 14:12:58 -0000	1.27
  @@ -2,7 +2,7 @@
   # ====================================================================
   # The Apache Software License, Version 1.1
   #
  -# Copyright (c) 2000-2003 The Apache Software Foundation.  All rights
  +# Copyright (c) 2000-2004 The Apache Software Foundation.  All rights
   # reserved.
   #
   # Redistribution and use in source and binary forms, with or without
  @@ -80,8 +80,12 @@
   
   $libtoolize --copy --automake
   
  -ltpath=`dirname $libtoolize`
  -ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
  +if [ -f libtool.m4 ]; then 
  +   ltfile=`pwd`/libtool.m4
  +else
  +   ltpath=`dirname $libtoolize`
  +   ltfile=${LIBTOOL_M4-`cd $ltpath/../share/aclocal ; pwd`/libtool.m4}
  +fi
   
   if [ ! -f $ltfile ]; then
       echo "$ltfile not found"
  @@ -92,9 +96,14 @@
   
   cat $ltfile | sed -e 's/LIBTOOL=\(.*\)top_build/LIBTOOL=\1apr_build/' > 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
  +# libtool.m4 from 1.6 requires ltsugar.m4
  +if [ -f ltsugar.m4 ]; then
  +   rm -f build/ltsugar.m4
  +   mv ltsugar.m4 build/ltsugar.m4
  +fi
  +
  +# Clean up any leftovers
  +rm -f aclocal.m4 libtool.m4
   
   #
   # Generate the autoconf header and ./configure
  
  
  
  1.565     +1 -0      apr/configure.in
  
  Index: configure.in
  ===================================================================
  RCS file: /home/cvs/apr/configure.in,v
  retrieving revision 1.564
  retrieving revision 1.565
  diff -b -d -u -r1.564 -r1.565
  --- configure.in	12 Jan 2004 11:38:14 -0000	1.564
  +++ configure.in	15 Jan 2004 14:12:58 -0000	1.565
  @@ -16,6 +16,7 @@
   sinclude(build/apr_threads.m4)
   sinclude(build/apr_hints.m4)
   sinclude(build/libtool.m4)
  +sinclude(build/ltsugar.m4)
   
   dnl Save user-defined environment settings for later restoration
   dnl
  
  
  
  1.11      +1 -0      apr/build/.cvsignore
  
  Index: .cvsignore
  ===================================================================
  RCS file: /home/cvs/apr/build/.cvsignore,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -b -d -u -r1.10 -r1.11
  --- .cvsignore	30 Apr 2003 17:28:26 -0000	1.10
  +++ .cvsignore	15 Jan 2004 14:12:58 -0000	1.11
  @@ -1,5 +1,6 @@
   Makefile
   libtool.m4
  +ltsugar.m4
   ltconfig
   ltmain.sh
   ltcf-c.sh