diff options
| author | Jani Taskinen <jani@php.net> | 2008-06-02 14:12:20 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2008-06-02 14:12:20 +0000 |
| commit | f047195f55c4e08b9710c1ee740bc06b4e943da1 (patch) | |
| tree | 6ed431be5d375fb4a60c0d2d73bb600ff1aeb41e /ext/pcre/config0.m4 | |
| parent | c60365e9b3a0ae9a810a73dc3b6d2fa618cead1d (diff) | |
| download | php-git-f047195f55c4e08b9710c1ee740bc06b4e943da1.tar.gz | |
MFH: simplify, readability
Diffstat (limited to 'ext/pcre/config0.m4')
| -rw-r--r-- | ext/pcre/config0.m4 | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 9d71b33555..68f5a0f24a 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -7,9 +7,7 @@ dnl if DIR is supplied, we'll use that for linking PHP_ARG_WITH(pcre-regex,, [ --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support. - DIR is the PCRE install prefix [BUNDLED]], yes) - - ext_shared=no + DIR is the PCRE install prefix [BUNDLED]], yes, no) if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then AC_MSG_CHECKING([for PCRE headers location]) @@ -45,17 +43,23 @@ PHP_ARG_WITH(pcre-regex,, AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6]) fi - PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR) AC_DEFINE(HAVE_PCRE, 1, [ ]) PHP_ADD_INCLUDE($PCRE_INCDIR) - PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared) + PHP_NEW_EXTENSION(pcre, php_pcre.c, no) PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h]) - PHP_SUBST(PCRE_SHARED_LIBADD) else AC_MSG_CHECKING([for PCRE library to use]) AC_MSG_RESULT([bundled]) - PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c php_pcre.c, $ext_shared,,-I@ext_srcdir@/pcrelib) + pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucp_searchfuncs.c \ + pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \ + pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c pcrelib/pcre_globals.c \ + pcrelib/pcre_info.c pcrelib/pcre_maketables.c pcrelib/pcre_newline.c \ + pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c pcrelib/pcre_study.c \ + pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c pcrelib/pcre_valid_utf8.c \ + pcrelib/pcre_version.c pcrelib/pcre_xclass.c" + PHP_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c, no,,-I@ext_srcdir@/pcrelib) PHP_ADD_BUILD_DIR($ext_builddir/pcrelib) PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/]) AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ]) |