[Expat-checkins] expat Makefile.in,1.31,1.32 configure.in,1.28,1.29 make-release.sh,1.1,1.2

[gstein@users.sourceforge.net]

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

Modified Files:
	Makefile.in configure.in make-release.sh 
Log Message:
Add some cygwin fixes.

* Makefile.in:
  - from cygwin: add -no-undefined to the library link line

* conftools/get-version.sh: (new file)
  - script to extract the version number from expat.h

* configure.in:
  (some from the cygwin patch)
  - update the prereq to 2.52 instead of just 2.50
  - update the AC_INIT line to 2.52 standards: include the package
    name, version (with a lot of gunk to get this), and where to send
    bugs)
  - update the output file generation to 2.52 standards

* make-release.sh:
  - update to use the new get-version.sh script

* lib/expat.h:
  - from cygwin: add a little define for CYGWIN



Index: Makefile.in
===================================================================
RCS file: /cvsroot/expat/expat/Makefile.in,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** Makefile.in	17 May 2002 21:38:44 -0000	1.31
--- Makefile.in	18 May 2002 00:26:59 -0000	1.32
***************
*** 111,115 ****
  COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
  LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
! LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
  LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
  
--- 111,115 ----
  COMPILE = $(CC) $(CFLAGS) $(DEFS) $(CPPFLAGS) $(INCLUDES)
  LTCOMPILE = $(LIBTOOL) $(LTFLAGS) --mode=compile $(COMPILE)
! LINK_LIB = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) -no-undefined $(VSNFLAG) -rpath $(libdir) $(LDFLAGS) -o $@
  LINK_EXE = $(LIBTOOL) $(LTFLAGS) --mode=link $(COMPILE) $(LDFLAGS) -o $@
  

Index: configure.in
===================================================================
RCS file: /cvsroot/expat/expat/configure.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** configure.in	17 May 2002 21:30:06 -0000	1.28
--- configure.in	18 May 2002 00:26:59 -0000	1.29
***************
*** 11,18 ****
  dnl
  
! dnl Ensure that subversion is configured with autoconf 2.50 or newer
! AC_PREREQ(2.50)
  
! AC_INIT(Makefile.in)
  AC_CONFIG_AUX_DIR(conftools)
  
--- 11,34 ----
  dnl
  
! dnl Ensure that subversion is configured with autoconf 2.52 or newer
! AC_PREREQ(2.52)
  
! dnl Get the version number of Expat, using m4's esyscmd() command to run
! dnl the command at m4-generation time. This allows us to create an m4
! dnl symbol holding the correct version number. AC_INIT() requires the
! dnl version number at m4-time, rather than when ./configure is run, so
! dnl all this must happen as part of m4, not as part of the shell code
! dnl contained in ./configure.
! dnl
! dnl NOTE: esyscmd() is a GNU M4 extension. Thus, we wrap it in an appropriate
! dnl test. I believe this test will work, but I don't have a place with non-
! dnl GNU M4 to test it right now.
! define([expat_version], ifdef([__gnu__],
!                               [esyscmd(conftools/get-version.sh lib/expat.h)],
!                               [1.95.x]))
! AC_INIT(expat, expat_version, expat-bugs@lists.sourceforge.net)
! undefine([expat_version])
! 
! AC_CONFIG_SRCDIR(Makefile.in)
  AC_CONFIG_AUX_DIR(conftools)
  
***************
*** 99,103 ****
            [Define to specify how much context to retain around the current parse point.])
  
! AC_OUTPUT(Makefile)
  
  abs_srcdir="`cd $srcdir && pwd`"
--- 115,120 ----
            [Define to specify how much context to retain around the current parse point.])
  
! AC_CONFIG_FILES(Makefile)
! AC_OUTPUT
  
  abs_srcdir="`cd $srcdir && pwd`"

Index: make-release.sh
===================================================================
RCS file: /cvsroot/expat/expat/make-release.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** make-release.sh	23 Aug 2001 13:26:37 -0000	1.1
--- make-release.sh	18 May 2002 00:26:59 -0000	1.2
***************
*** 28,36 ****
  
  # figure out the release version
! hdr="$tmpdir/lib/expat.h"
! MAJOR_VERSION="`sed -n -e '/MAJOR_VERSION/s/[^0-9]*//gp' $hdr`"
! MINOR_VERSION="`sed -n -e '/MINOR_VERSION/s/[^0-9]*//gp' $hdr`"
! MICRO_VERSION="`sed -n -e '/MICRO_VERSION/s/[^0-9]*//gp' $hdr`"
! vsn=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION
  
  echo ""
--- 28,32 ----
  
  # figure out the release version
! vsn="`$tmpdir/conftools/get-version.sh $tmpdir/lib/expat.h`"
  
  echo ""