[Expat-checkins] CVS: expat .cvsignore,1.6,1.7 MANIFEST,1.6,1.7 Makefile.in,1.15,1.16 buildconf.sh,1.2,1.3 configure.in,1.21,1.22

[Greg Stein]

Update of /cvsroot/expat/expat
In directory usw-pr-cvs1:/tmp/cvs-serv24948

Modified Files:
	.cvsignore MANIFEST Makefile.in buildconf.sh configure.in 
Log Message:
* stop using aclocal.m4 and directly sinclude() the .m4 files into the
  configure script. don't "clean" it and remove it from .cvsignore.
  Note: to avoid problems in developer dirs, we nuke the file in
  buildconf.sh for now; we'll stop doing that at some future time.
  [idea from ASF]

* look for glibtoolize, in addition to libtoolize (e.g. the MacOS X platform
  names it differently). [patch from ASF]

* conftools/missing is not needed

* use "exit 0" in buildconf.sh to help calling scripts. [patch from ASF]

* minor output cleanup in "make clean"



Index: .cvsignore
===================================================================
RCS file: /cvsroot/expat/expat/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** .cvsignore	2001/07/27 14:42:33	1.6
--- .cvsignore	2001/08/23 11:27:26	1.7
***************
*** 1,4 ****
  Makefile
- aclocal.m4
  configure
  config.cache
--- 1,3 ----

Index: MANIFEST
===================================================================
RCS file: /cvsroot/expat/expat/MANIFEST,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** MANIFEST	2001/07/27 13:28:49	1.6
--- MANIFEST	2001/08/23 11:27:26	1.7
***************
*** 14,18 ****
  conftools/ltconfig
  conftools/ltmain.sh
- conftools/missing
  conftools/mkinstalldirs
  doc/reference.html
--- 14,17 ----

Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile.in	2001/08/23 09:24:45	1.15
--- Makefile.in	2001/08/23 11:27:26	1.16
***************
*** 76,86 ****
  
  clean:
- 	# clean up the lib dir
  	cd lib && rm -f $(LIBRARY) *.o *.lo && rm -rf .libs _libs
- 	# clean up the xmlwf dir
  	cd xmlwf && rm -f xmlwf *.o
- 	# clean up the examples dir
  	cd examples && rm -f elements outline *.o
- 	# other random cleanup
  	find . -name core | xargs rm -f
  
--- 76,82 ----
***************
*** 91,95 ****
  
  extraclean: distclean
! 	rm -f aclocal.m4 config.h.in configure
  	rm -f conftools/config.guess conftools/config.sub
  	rm -f conftools/ltconfig conftools/ltmain.sh
--- 87,91 ----
  
  extraclean: distclean
! 	rm -f config.h.in configure
  	rm -f conftools/config.guess conftools/config.sub
  	rm -f conftools/ltconfig conftools/ltmain.sh

Index: buildconf.sh
===================================================================
RCS file: /cvsroot/expat/expat/buildconf.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** buildconf.sh	2001/07/24 19:54:20	1.2
--- buildconf.sh	2001/08/23 11:27:26	1.3
***************
*** 2,27 ****
  
  #
! # Build aclocal.m4 from libtool's libtool.m4
  #
! ltpath=`conftools/PrintPath libtoolize`
! ltpath=`dirname $ltpath`
! 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
! echo "dnl edits here will be lost" >> aclocal.m4
! cat $ltfile >> aclocal.m4
! 
! ltfile='conftools/ac_c_bigendian_cross.m4'
! echo "Incorporating $ltfile into aclocal.m4 ..."
! cat $ltfile >> aclocal.m4
  
  #
! # Create the libtool helper files
  #
! # Note: we always replace the files, and we copy (rather than link) them.
  #
! echo "Copying libtool helper files ..."
! $ltpath/libtoolize --force --copy
  
  #
  # Generate the autoconf header template (config.h.in) and ./configure
--- 2,34 ----
  
  #
! # Create the libtool helper files
  #
! echo "Copying libtool helper files ..."
  
  #
! # find libtoolize, or glibtoolize on MacOS X
  #
! libtoolize=`conftools/PrintPath glibtoolize libtoolize`
! if [ "x$libtoolize" = "x" ]; then
!     echo "libtoolize not found in path"
!     exit 1
! fi
! 
  #
! # --force to ensure that we replace with current files
! # --copy to avoid symlinks; we want originals for the distro
! # --automake to make it shut up about "things to do"
! #
! $libtoolize --force --copy --automake
  
+ ltpath=`dirname $libtoolize`
+ ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+ cp $ltfile conftools/libtool.m4
+ 
+ ### for a little while... remove stray aclocal.m4 files from
+ ### developers' working copies. we no longer use it. (nothing else
+ ### will remove it, and leaving it creates big problems)
+ rm -f aclocal.m4
+ 
  #
  # Generate the autoconf header template (config.h.in) and ./configure
***************
*** 33,34 ****
--- 40,44 ----
  ### do some work to toss config.cache?
  autoconf
+ 
+ # exit with the right value, so any calling script can continue
+ exit 0

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** configure.in	2001/08/23 09:24:45	1.21
--- configure.in	2001/08/23 11:27:26	1.22
***************
*** 45,48 ****
--- 45,51 ----
  AC_CONFIG_HEADER(config.h)
  
+ sinclude(conftools/libtool.m4)
+ sinclude(conftools/ac_c_bigendian_cross.m4)
+ 
  AC_LIBTOOL_WIN32_DLL
  AC_PROG_LIBTOOL