diff options
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/config.h.stub | 5 | ||||
| -rw-r--r-- | ext/pcre/config.m4 | 8 | ||||
| -rw-r--r-- | ext/pcre/config0.m4 | 8 |
3 files changed, 8 insertions, 13 deletions
diff --git a/ext/pcre/config.h.stub b/ext/pcre/config.h.stub deleted file mode 100644 index 128deea9ab..0000000000 --- a/ext/pcre/config.h.stub +++ /dev/null @@ -1,5 +0,0 @@ -/* define if you want to use the PCRE extension */ -#define HAVE_PCRE 0 - -#define HAVE_BUNDLED_PCRE 0 -#undef USE_BCOPY diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4 index 5105fe4bfe..9592bc0e2b 100644 --- a/ext/pcre/config.m4 +++ b/ext/pcre/config.m4 @@ -18,7 +18,7 @@ AC_ARG_WITH(pcre-regex, yes) EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) @@ -45,7 +45,7 @@ AC_ARG_WITH(pcre-regex, AC_MSG_ERROR(Could not find libpcre.a in $withval) fi - AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) ;; @@ -53,7 +53,7 @@ AC_ARG_WITH(pcre-regex, ],[ PCRE_LIBADD=pcrelib/libpcre.la PCRE_SUBDIRS=pcrelib - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) @@ -61,4 +61,4 @@ AC_ARG_WITH(pcre-regex, PHP_SUBST(PCRE_LIBADD) PHP_SUBST(PCRE_SUBDIRS) -AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) +AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])]) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 5105fe4bfe..9592bc0e2b 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -18,7 +18,7 @@ AC_ARG_WITH(pcre-regex, yes) EXTRA_LIBS="-L$abs_builddir/ext/pcre/pcrelib -lpcre $EXTRA_LIBS" PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) @@ -45,7 +45,7 @@ AC_ARG_WITH(pcre-regex, AC_MSG_ERROR(Could not find libpcre.a in $withval) fi - AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) ;; @@ -53,7 +53,7 @@ AC_ARG_WITH(pcre-regex, ],[ PCRE_LIBADD=pcrelib/libpcre.la PCRE_SUBDIRS=pcrelib - AC_DEFINE(HAVE_BUNDLED_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) PHP_FAST_OUTPUT(ext/pcre/pcrelib/Makefile) @@ -61,4 +61,4 @@ AC_ARG_WITH(pcre-regex, PHP_SUBST(PCRE_LIBADD) PHP_SUBST(PCRE_SUBDIRS) -AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1)]) +AC_CHECK_FUNC(memmove, [], [AC_DEFINE(USE_BCOPY, 1, [ ])]) |