jani            Mon Jun  2 14:12:20 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/pcre   config0.m4 
  Log:
  MFH: simplify, readability
  
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.10.2.2&r2=1.38.2.3.2.10.2.3&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.10.2.2 
php-src/ext/pcre/config0.m4:1.38.2.3.2.10.2.3
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.10.2.2       Fri May 23 19:07:27 2008
+++ php-src/ext/pcre/config0.m4 Mon Jun  2 14:12:20 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.10.2.2 2008/05/23 19:07:27 tony2001 Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.10.2.3 2008/06/02 14:12:20 jani Exp $
 dnl
 
 dnl By default we'll compile and link against the bundled PCRE library
@@ -7,9 +7,7 @@
 
 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 @@
       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,,[EMAIL PROTECTED]@/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,,[EMAIL 
PROTECTED]@/pcrelib)
     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
     PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
     AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to