Fix enabling shared builds.

diff --git a/ext/cpdf/config.m4 b/ext/cpdf/config.m4
index b1bce3bab4105698ab776f058f13c075fda6ae18..8e45b8d33cf4557f4c51afa89ff84736241fa02b 100644 (file)
--- a/ext/cpdf/config.m4
+++ b/ext/cpdf/config.m4
@@ -47,41 +47,36 @@ AC_DEFUN(CPDF_TIFF_TEST,[
 ])
 
 AC_MSG_CHECKING(for cpdflib support)
-AC_ARG_WITH(cpdflib,
-[  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).],
-[
-  PHP_WITH_SHARED
-  if test "$withval" != "no"; then
-    cpdf_withval=$withval
-    PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS))
-    PHP_SUBST(CPDF_SHARED_LIBADD)
-    CPDF_JPEG_TEST
-    CPDF_TIFF_TEST
+PHP_ARG_WITH(cpdflib,
+[  --with-cpdflib[=DIR]    Include cpdflib support (requires cpdflib >= 2).])
 
-    for i in $cpdf_withval /usr/local /usr; do
-      if test -f "$i/include/cpdflib.h"; then
-        CPDFLIB_INCLUDE=$i/include
-        AC_MSG_CHECKING(for cpdflib.h)
-        AC_MSG_RESULT([in $i/include])
+if test "$PHP_CPDFLIB" != "no"; then
+  PHP_NEW_EXTENSION(cpdf, cpdf.c, $ext_shared,, \\$(GDLIB_CFLAGS))
+  PHP_SUBST(CPDF_SHARED_LIBADD)
+  CPDF_JPEG_TEST
+  CPDF_TIFF_TEST
 
-        PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
-          PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
-          PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
-          AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
-        ], [
-          AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
-        ], [
-          -L$i/lib $CPDF_SHARED_LIBADD
-        ])
-        break
-      fi
-    done  
-
-    if test -z "$CPDFLIB_INCLUDE"; then
+  for i in $PHP_CPDFLIB /usr/local /usr; do
+    if test -f "$i/include/cpdflib.h"; then
+      CPDFLIB_INCLUDE=$i/include
       AC_MSG_CHECKING(for cpdflib.h)
-      AC_MSG_ERROR([not found])
+      AC_MSG_RESULT([in $i/include])
+
+      PHP_CHECK_LIBRARY(cpdf, cpdf_open, [
+        PHP_ADD_INCLUDE($CPDFLIB_INCLUDE)
+        PHP_ADD_LIBRARY_WITH_PATH(cpdf, $i/lib, CPDF_SHARED_LIBADD)
+        AC_DEFINE(HAVE_CPDFLIB,1,[Whether you have cpdflib])
+      ], [
+        AC_MSG_ERROR([Cpdflib module requires cpdflib >= 2.])
+      ], [
+        -L$i/lib $CPDF_SHARED_LIBADD
+      ])
+      break
     fi
+  done  
+
+  if test -z "$CPDFLIB_INCLUDE"; then
+    AC_MSG_CHECKING(for cpdflib.h)
+    AC_MSG_ERROR([not found])
   fi
-],[
-  AC_MSG_RESULT(no)
-])
+fi

diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 8fd659f0627f6bb3fbd49243a4901776ac64f502..577095340bd6fcc1e506fbc8357a10fcd15ecd2a 100644 (file)
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -64,6 +64,7 @@ AC_DEFUN(AC_DBA_STD_RESULT,[
 
 PHP_ARG_ENABLE(dba,whether to enable DBA,
 [  --enable-dba            Build DBA with builtin modules])
+dba_shared=$ext_shared
 
 AC_ARG_WITH(gdbm,
 [  --with-gdbm[=DIR]         DBA: Include GDBM support],[
@@ -170,8 +171,8 @@ AC_DEFUN(PHP_DBA_DB_CHECK,[
       AC_MSG_ERROR(Version 4.1 requires patch level 25)
     ])
   fi
-  if test "$ext_shared" = "yes"; then
-    AC_MSG_CHECKING(if db can be used as shared extension)
+  if test "$dba_shared" = "yes"; then
+    AC_MSG_CHECKING(if dba can be used as shared extension)
     AC_EGREP_CPP(yes,[
 #include "$THIS_INCLUDE"
 #if DB_VERSION_MAJOR > 3 || (DB_VERSION_MAJOR == 3 && DB_VERSION_MINOR > 2)
@@ -429,7 +430,7 @@ AC_MSG_CHECKING(whether to enable DBA interface)
 if test "$HAVE_DBA" = "1"; then
   AC_MSG_RESULT(yes)
   AC_DEFINE(HAVE_DBA, 1, [ ])
-  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $ext_shared)
+  PHP_NEW_EXTENSION(dba, dba.c dba_cdb.c dba_db2.c dba_dbm.c dba_gdbm.c dba_ndbm.c dba_db3.c dba_db4.c dba_flatfile.c dba_inifile.c $cdb_sources $flat_sources $ini_sources, $dba_shared)
   PHP_ADD_BUILD_DIR($ext_builddir/libinifile)
   PHP_ADD_BUILD_DIR($ext_builddir/libcdb)
   PHP_ADD_BUILD_DIR($ext_builddir/libflatfile)

diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index 82c97e6bd34ce4fb54f2c1142ccdd617b71e9937..43cd721927398d86d0e5a86f8c45b4bf239d36ee 100644 (file)
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -4,6 +4,7 @@ dnl
 
 PHP_ARG_ENABLE(dom, whether to enable DOM support,
 [  --disable-dom           Disable new DOM support.], yes)
+dom_shared=$ext_shared
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
@@ -24,7 +25,7 @@ if test "$PHP_DOM" != "no" && test "$PHP_LIBXML" != "no"; then
                             domimplementationsource.c entityreference.c \
                             notation.c xpath.c dom_iterators.c \
                             typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], 
-                            $ext_shared)
+                            $dom_shared)
     PHP_SUBST(DOM_SHARED_LIBADD)
   ], [
     AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])

diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index aacb084e13cbade8ad87841e6d253035513b679a..15cb49566d2ad70f70bea762abb95f2f6ee75fed 100644 (file)
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -9,6 +9,7 @@ dnl
 PHP_ARG_WITH(gd, for GD support,
 [  --with-gd[=DIR]         Include GD support where DIR is GD install prefix.
                           If DIR is not set, the bundled GD library will be used.])
+gd_shared=$ext_shared
 
 if test -z "$PHP_JPEG_DIR"; then
   PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
@@ -399,7 +400,7 @@ dnl
 dnl Common for both builtin and external GD
 dnl
 if test "$PHP_GD" != "no"; then
-  PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS))
+  PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $gd_shared,, \\$(GDLIB_CFLAGS))
 
   if test "$GD_MODULE_TYPE" = "builtin"; then
     GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"