apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wsanc...@apache.org
Subject cvs commit: apr-util/xml/expat buildconf.sh
Date Mon, 02 Apr 2001 22:49:31 GMT
wsanchez    01/04/02 15:49:31

  Modified:    .        buildconf.sh
               xml/expat buildconf.sh
  Log:
  Find GNU libtool when it's called glibtool.
  
  Revision  Changes    Path
  1.8       +7 -4      apr-util/buildconf.sh
  
  Index: buildconf.sh
  ===================================================================
  RCS file: /home/cvs/apr-util/buildconf.sh,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- buildconf.sh	2001/02/28 15:18:37	1.7
  +++ buildconf.sh	2001/04/02 22:49:29	1.8
  @@ -3,9 +3,12 @@
   #
   # Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
   #
  -### we may need to get smarter with these two lines (e.g. PrintPath)
  -ltpath=`build/PrintPath libtoolize`
  -ltpath=`dirname $ltpath`
  +libtoolize=`build/PrintPath glibtoolize libtoolize`
  +if [ "x$libtoolize" = "x" ]; then
  +    echo "libtoolize not found in path"
  +    exit 1
  +fi
  +ltpath=`dirname $libtoolize`
   ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
   echo "Incorporating $ltfile into aclocal.m4 ..."
   echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
  @@ -18,7 +21,7 @@
   # Note: we always replace the files, and we copy (rather than link) them.
   #
   echo "Copying libtool helper files ..."
  -$ltpath/libtoolize --force --copy
  +$libtoolize --force --copy
   
   #
   # Generate the autoconf header (include/apu_config.h) and ./configure
  
  
  
  1.3       +7 -3      apr-util/xml/expat/buildconf.sh
  
  Index: buildconf.sh
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/buildconf.sh,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- buildconf.sh	2001/03/30 23:22:05	1.2
  +++ buildconf.sh	2001/04/02 22:49:31	1.3
  @@ -3,8 +3,12 @@
   #
   # Build aclocal.m4 from libtool's libtool.m4
   #
  -ltpath=`conftools/PrintPath libtoolize`
  -ltpath=`dirname $ltpath`
  +libtoolize=`conftools/PrintPath glibtoolize libtoolize`
  +if [ "x$libtoolize" = "x" ]; then
  +    echo "libtoolize not found in path"
  +    exit 1
  +fi
  +ltpath=`dirname $libtoolize`
   ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
   echo "Incorporating $ltfile into aclocal.m4 ..."
   echo "dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf.sh" > aclocal.m4
  @@ -17,7 +21,7 @@
   # Note: we always replace the files, and we copy (rather than link) them.
   #
   echo "Copying libtool helper files ..."
  -$ltpath/libtoolize --force --copy
  +$libtoolize --force --copy
   
   #
   # Generate the autoconf header template (config.h.in) and ./configure
  
  
  

Mime
View raw message