There was nothing wrong with these. So please explain in what
situation these changes were needed?
--Jani
On Sun, 7 Dec 2003, Marcus Boerger wrote:
>helly Sat Dec 6 19:21:48 2003 EDT
>
> Modified files:
> /php-src/ext/cpdf config.m4
> /php-src/ext/dba config.m4
> /php-src/ext/dom config.m4
> /php-src/ext/gd config.m4
> Log:
> Fix enabling shared builds.
>
>
>Index: php-src/ext/cpdf/config.m4
>diff -u php-src/ext/cpdf/config.m4:1.17 php-src/ext/cpdf/config.m4:1.18
>--- php-src/ext/cpdf/config.m4:1.17 Tue Sep 30 22:53:02 2003
>+++ php-src/ext/cpdf/config.m4 Sat Dec 6 19:21:45 2003
>@@ -1,4 +1,4 @@
>-dnl $Id: config.m4,v 1.17 2003/10/01 02:53:02 sniper Exp $
>+dnl $Id: config.m4,v 1.18 2003/12/07 00:21:45 helly Exp $
>
> AC_DEFUN(CPDF_JPEG_TEST,[
> AC_ARG_WITH(jpeg-dir,
>@@ -47,41 +47,36 @@
> ])
>
> 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
>-
>- 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])
>-
>- 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
>+PHP_ARG_WITH(cpdflib,
>+[ --with-cpdflib[=DIR] Include cpdflib support (requires cpdflib >= 2).])
>
>- if test -z "$CPDFLIB_INCLUDE"; then
>+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
>+
>+ 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
>Index: php-src/ext/dba/config.m4
>diff -u php-src/ext/dba/config.m4:1.56 php-src/ext/dba/config.m4:1.57
>--- php-src/ext/dba/config.m4:1.56 Fri Oct 3 01:24:19 2003
>+++ php-src/ext/dba/config.m4 Sat Dec 6 19:21:46 2003
>@@ -1,5 +1,5 @@
> dnl
>-dnl $Id: config.m4,v 1.56 2003/10/03 05:24:19 sniper Exp $
>+dnl $Id: config.m4,v 1.57 2003/12/07 00:21:46 helly Exp $
> dnl
>
> dnl Suppose we need FlatFile if no support or only CDB is used.
>@@ -64,6 +64,7 @@
>
> 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_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 @@
> 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)
>Index: php-src/ext/dom/config.m4
>diff -u php-src/ext/dom/config.m4:1.13 php-src/ext/dom/config.m4:1.14
>--- php-src/ext/dom/config.m4:1.13 Sat Nov 29 15:40:17 2003
>+++ php-src/ext/dom/config.m4 Sat Dec 6 19:21:47 2003
>@@ -1,9 +1,10 @@
> dnl
>-dnl $Id: config.m4,v 1.13 2003/11/29 20:40:17 rrichards Exp $
>+dnl $Id: config.m4,v 1.14 2003/12/07 00:21:47 helly Exp $
> 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 @@
> 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.])
>Index: php-src/ext/gd/config.m4
>diff -u php-src/ext/gd/config.m4:1.141 php-src/ext/gd/config.m4:1.142
>--- php-src/ext/gd/config.m4:1.141 Tue Sep 30 22:53:06 2003
>+++ php-src/ext/gd/config.m4 Sat Dec 6 19:21:47 2003
>@@ -1,5 +1,5 @@
> dnl
>-dnl $Id: config.m4,v 1.141 2003/10/01 02:53:06 sniper Exp $
>+dnl $Id: config.m4,v 1.142 2003/12/07 00:21:47 helly Exp $
> dnl
>
> dnl
>@@ -9,6 +9,7 @@
> 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 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"
>
>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
