diff -urdbN -x .build -x .inst -x .sinst -x chartables.c -x aclocal.m4 -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs pcre-4.2-orig/Makefile.in pcre-4.2/Makefile.in --- pcre-4.2-orig/Makefile.in 2003-04-14 16:33:21.000000000 +0200 +++ pcre-4.2/Makefile.in 2003-04-18 16:56:57.000000000 +0200 @@ -114,12 +114,12 @@ libpcre.la: $(OBJ) -rm -f libpcre.la - $(LINKLIB) -rpath $(LIBDIR) -version-info \ + $(LINKLIB) -rpath $(LIBDIR) -no-undefined -version-info \ '$(PCRELIBVERSION)' -o libpcre.la $(LOBJ) libpcreposix.la: pcreposix.@OBJEXT@ -rm -f libpcreposix.la - $(LINKLIB) -rpath $(LIBDIR) -L. -lpcre -version-info \ + $(LINKLIB) -rpath $(LIBDIR) -L. -lpcre -no-undefined -version-info \ '$(PCREPOSIXLIBVERSION)' -o libpcreposix.la pcreposix.lo pcre.@OBJEXT@: $(top_srcdir)/chartables.c $(top_srcdir)/pcre.c \ @@ -151,7 +151,7 @@ pcregrep.@OBJEXT@: $(top_srcdir)/pcregrep.c pcre.h Makefile config.h $(CC) -c $(CFLAGS) -I. $(UTF8) $(PCREGREP_OSTYPE) $(top_srcdir)/pcregrep.c -# Some Windows-specific targets, for Cygwin and MinGW +# Some Windows-specific targets, for MinGW. Do NOT use for Cygwin! winshared : .libs/@WIN_PREFIX@pcre.dll .libs/@WIN_PREFIX@pcreposix.dll diff -urdbN -x .build -x .inst -x .sinst -x chartables.c -x aclocal.m4 -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs pcre-4.2-orig/RunTest.in pcre-4.2/RunTest.in --- pcre-4.2-orig/RunTest.in 2003-04-14 16:33:23.000000000 +0200 +++ pcre-4.2/RunTest.in 2003-04-18 16:56:15.000000000 +0200 @@ -52,7 +52,7 @@ if [ $do1 = yes ] ; then echo "Testing main functionality (Perl compatible)" - ./pcretest $testdata/testinput1 testtry + ./.libs/pcretest $testdata/testinput1 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput1 if [ $? != 0 ] ; then exit 1; fi @@ -65,7 +65,7 @@ if [ $do2 = yes ] ; then echo "Testing API and error handling (not Perl compatible)" - ./pcretest -i $testdata/testinput2 testtry + ./.libs/pcretest -i $testdata/testinput2 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput2 if [ $? != 0 ] ; then exit 1; fi @@ -85,7 +85,7 @@ locale -a | grep '^fr$' >/dev/null if [ $? -eq 0 ] ; then echo "Testing locale-specific features (using 'fr' locale)" - ./pcretest $testdata/testinput3 testtry + ./.libs/pcretest $testdata/testinput3 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput3 if [ $? != 0 ] ; then @@ -110,7 +110,7 @@ if [ $do4 = yes ] ; then echo "Testing UTF-8 support (Perl compatible)" - ./pcretest $testdata/testinput4 testtry + ./.libs/pcretest $testdata/testinput4 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput4 if [ $? != 0 ] ; then exit 1; fi @@ -122,7 +122,7 @@ if [ $do5 = yes ] ; then echo "Testing API and internals for UTF-8 support (not Perl compatible)" - ./pcretest $testdata/testinput5 testtry + ./.libs/pcretest $testdata/testinput5 testtry if [ $? = 0 ] ; then $cf testtry $testdata/testoutput5 if [ $? != 0 ] ; then exit 1; fi diff -urdbN -x .build -x .inst -x .sinst -x chartables.c -x aclocal.m4 -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs pcre-4.2-orig/configure.in pcre-4.2/configure.in --- pcre-4.2-orig/configure.in 2003-04-14 16:33:21.000000000 +0200 +++ pcre-4.2/configure.in 2003-04-18 16:58:12.000000000 +0200 @@ -3,7 +3,8 @@ dnl This is required at the start; the name is the name of a file dnl it should be seeing, to verify it is in the same directory. -AC_INIT(dftables.c) +AC_INIT +AC_CONFIG_SRCDIR([dftables.c]) dnl A safety precaution @@ -157,14 +158,6 @@ NOT_ON_WINDOWS="#" WIN_PREFIX= ;; -cygwin* ) - ON_WINDOWS= - POSIX_OBJ=pcreposix.o - POSIX_LOBJ=pcreposix.lo - POSIX_LIB= - WIN_PREFIX=cyg - NOT_ON_WINDOWS="#" - ;; * ) ON_WINDOWS="#" NOT_ON_WINDOWS= @@ -182,8 +175,10 @@ AC_SUBST(POSIX_LIB) if test "x$enable_shared" = "xno" ; then - AC_DEFINE(PCRE_STATIC,1) + AC_DEFINE([PCRE_STATIC], [1], [Description]) fi dnl This must be last; it determines what files are written as well as config.h -AC_OUTPUT(Makefile pcre.h:pcre.in pcre-config:pcre-config.in RunTest:RunTest.in,[chmod a+x RunTest pcre-config]) +AC_CONFIG_FILES([Makefile pcre.h:pcre.in pcre-config:pcre-config.in RunTest:RunTest.in]) +AC_CONFIG_COMMANDS([default],[[chmod a+x RunTest pcre-config]],[[]]) +AC_OUTPUT diff -urdbN -x .build -x .inst -x .sinst -x chartables.c -x aclocal.m4 -x config.guess -x config.sub -x configure -x install-sh -x ltmain.sh -x missing -x mkinstalldirs pcre-4.2-orig/reconf-cygwin.sh pcre-4.2/reconf-cygwin.sh --- pcre-4.2-orig/reconf-cygwin.sh 1970-01-01 01:00:00.000000000 +0100 +++ pcre-4.2/reconf-cygwin.sh 2003-04-18 17:25:27.000000000 +0200 @@ -0,0 +1,32 @@ +#! /bin/sh + +# +# Create the libtool helper files +# +echo "Copying libtool helper files ..." + +# +# --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" +# +autoupdate +rm -f ltmain.sh ltconfig +aclocal +libtoolize --force --copy --automake + +ltfiles=/usr/autotool/devel/share +cp $ltfiles/libtool/missing \ + $ltfiles/libtool/install-sh \ + $ltfiles/libtool/mkinstalldirs \ + ./ + +echo "Creating configure ..." +### do some work to toss config.cache? +${AUTOCONF:-autoconf} + +# toss this; it gets created by autoconf on some systems +rm -rf autom4te*.cache *~ + +# exit with the right value, so any calling script can continue +exit 0