diff options
| -rwxr-xr-x | TSRM/buildconf | 8 | ||||
| -rw-r--r-- | ext/pcre/config0.m4 | 26 |
2 files changed, 4 insertions, 30 deletions
diff --git a/TSRM/buildconf b/TSRM/buildconf index deb6aedb79..3a896bcb1a 100755 --- a/TSRM/buildconf +++ b/TSRM/buildconf @@ -3,10 +3,10 @@ mv aclocal.m4 aclocal.m4.old 2>/dev/null aclocal if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then - echo "buildconf: keeping ${1}aclocal.m4" + echo keeping ${1}aclocal.m4 mv aclocal.m4.old aclocal.m4 else - echo "buildconf: created or modified ${1}aclocal.m4" + echo created or modified ${1}aclocal.m4 fi autoheader @@ -16,9 +16,9 @@ automake --add-missing --include-deps mv configure configure.old 2>/dev/null autoconf if cmp configure.old configure > /dev/null 2>&1; then - echo "buildconf: keeping ${1}configure" + echo keeping ${1}configure mv configure.old configure else - echo "buildconf: created or modified ${1}configure" + echo created or modified ${1}configure fi diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 deleted file mode 100644 index eef4563d31..0000000000 --- a/ext/pcre/config0.m4 +++ /dev/null @@ -1,26 +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 Don't include Perl Compatible Regular Expressions support],[ - if test "$withval" = "yes"; then - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) - else - AC_MSG_RESULT(no) - fi -],[ - EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" - PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_PCRE, 1) - AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) -]) -AC_SUBST(PCRE_SUBDIR) |