This commit was manufactured by cvs2svn to create tag 'php_4_0b3_RC2'.php-4.0b3_RC2

2 files changed, 23 insertions, 88 deletions

diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
deleted file mode 100644
index 729e99e52d..0000000000
--- a/ext/pcre/config0.m4
+++ /dev/null
@@ -1,64 +0,0 @@
-dnl $Id$
-dnl config.m4 for extension pcre
-
-dnl By default we'll compile and link against the bundled PCRE library
-dnl if DIR is supplied, we'll use that for linking
-
-AC_MSG_CHECKING(whether to include PCRE support)
-AC_ARG_WITH(pcre-regex,
-[  --without-pcre-regex    Do not include Perl Compatible Regular Expressions 
-                          support. Use --with-pcre-regex=DIR to specify DIR
-                          where PCRE's include and library files are located,
-                          if not using bundled library.],
-[
-	case "$withval" in 
-		no)
-			AC_MSG_RESULT(no)
-			;;
-		yes)
-			EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS"
-			PCRE_SUBDIR="pcrelib"
-			AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
-			AC_MSG_RESULT(yes)
-			PHP_EXTENSION(pcre)
-			PHP_OUTPUT(ext/pcre/pcrelib/Makefile)
-			;;
-		*)
-			if test -f $withval/pcre.h ; then
-				changequote({,})
-				pcre_major=`grep PCRE_MAJOR $withval/pcre.h | sed -e 's/[^0-9]//g'`
-				pcre_minor=`grep PCRE_MINOR $withval/pcre.h | sed -e 's/[^0-9]//g'`
-				changequote([,])
-				pcre_version=$pcre_major$pcre_minor
-				if test "$pcre_version" -ge 208; then
-					AC_ADD_INCLUDE($withval)
-				else
-					AC_MSG_ERROR(PCRE extension requires PCRE library version >= 2.08)
-				fi
-			else
-				AC_MSG_ERROR(Could not find pcre.h in $withval)
-			fi
-
-			if test -f $withval/libpcre.a ; then
-				AC_ADD_LIBRARY_WITH_PATH(pcre, $withval)
-			else
-				AC_MSG_ERROR(Could not find libpcre.a in $withval)
-			fi
-
-			AC_DEFINE(HAVE_PCRE, 1)
-			AC_MSG_RESULT(yes)
-			PHP_EXTENSION(pcre)
-			;;
-	esac
-],[
-  PCRE_LIBADD=pcrelib/libpcre.la
-  PCRE_SUBDIRS=pcrelib
-  AC_DEFINE(HAVE_BUNDLED_PCRE, 1)
-  AC_MSG_RESULT(yes)
-  PHP_EXTENSION(pcre)
-  PHP_OUTPUT(ext/pcre/pcrelib/Makefile)
-]) 
-AC_SUBST(PCRE_LIBADD)
-AC_SUBST(PCRE_SUBDIRS)
-
-AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)])
diff --git a/makedist b/makedist
index cb80934270..6c9a393089 100755
--- a/makedist
+++ b/makedist
@@ -55,17 +55,16 @@ MY_OLDPWD=`pwd`
 ARCHIVE=$MY_OLDPWD/$PKG-$VER.tar.gz
 
 # temporary directory used to check out files from CVS
-DIR=$PKG-$VER
-DIRPATH=$MY_OLDPWD/$DIR
+TMPDIR=$MY_OLDPWD/cvstmp-$PKG-$VER
 
-if test -d "$DIRPATH"; then
-    echo "The directory $DIR"
+if test -d "$TMPDIR"; then
+    echo "Temporary directory $TMPDIR"
     echo "already exists, rename or remove it and run makedist again."
     exit 1
 fi
 
 # version part of the CVS release tag
-CVSVER=`echo $VER | sed -e 's/[\.\-]/_/g'`
+CVSVER=`echo $VER | sed -e 's/\./_/g'`
 
 # CVS release tag
 CVSTAG=${PKG}_$CVSVER
@@ -77,17 +76,17 @@ ZENDMOD=`cat libzend/CVS/Repository | sed -e 's!^/[^/]*/!!'`
 # should become "TSRM"
 TSRMMOD=`cat TSRM/CVS/Repository | sed -e 's!^/[^/]*/!!'`
 
-if test ! -d $DIRPATH; then
-    mkdir -p $DIRPATH || exit 2
+if test ! -d $TMPDIR; then
+    mkdir -p $TMPDIR || exit 2
 fi
 
-#cd $DIRPATH || exit 3
+cd $TMPDIR || exit 3
 
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$CVSMOD'...$ECHO_C"
-cvs -Q export -d $DIR -r $CVSTAG $CVSMOD || exit 4
+cvs -Q export -r $CVSTAG $CVSMOD || exit 4
 echo ""
 
-cd $DIR || exit 5
+cd $CVSMOD || exit 5
 
 # Check out Zend
 $ECHO_N "makedist: exporting tag '$CVSTAG' from '$ZENDMOD'...$ECHO_C"
@@ -122,26 +121,26 @@ echo "/* Dummy File */" > ext/bcmath/number.c
 echo "/* Dummy File */" > ext/bcmath/number.h
 
 #perl -i -p -e 's/\r\n/\n/' *.dsw *.dsp
-#set +x
-#
-#INC="$INC \
-#configuration-scanner.c \
-#configuration-parser.c configuration-parser.h \
-#acconfig.h aclocal.m4 missing mkinstalldirs \
-#ltconfig ltmain.sh config.sub config.guess php_config.h.in \
-#configure install-sh Makefile.in"
-#
-#
-#mkdir $PKG-$VER || exit 6
-#mv $INC $PKG-$VER || exit 7
+set +x
+
+INC="$INC \
+configuration-scanner.c \
+configuration-parser.c configuration-parser.h \
+acconfig.h aclocal.m4 missing mkinstalldirs \
+ltconfig ltmain.sh config.sub config.guess php_config.h.in \
+configure install-sh Makefile.in"
+
+
+mkdir $PKG-$VER || exit 6
+mv $INC $PKG-$VER || exit 7
  
-cd $MY_OLDPWD
 $ECHO_N "makedist: making gzipped tar archive...$ECHO_C"
 tar czf $ARCHIVE $PKG-$VER || exit 8
 echo ""
 
 $ECHO_N "makedist: cleaning up...$ECHO_C"
-rm -rf $DIRPATH || exit 9
+cd $MY_OLDPWD
+rm -rf $TMPDIR || exit 9
 echo ""
 
 exit 0