sniper Fri May 6 22:51:54 2005 EDT
Removed files:
/php-src/ext/pdo Makefile.frag
Modified files:
/php-src Makefile.global acinclude.m4 configure.in
/php-src/ext/curl config.m4
/php-src/ext/dom config.m4
/php-src/ext/iconv config.m4
/php-src/ext/interbase php_ibase_udf.c
/php-src/ext/libxml config0.m4
/php-src/ext/mbstring config.m4
/php-src/ext/odbc config.m4
/php-src/ext/pdo config.m4
/php-src/ext/pdo_sqlite .cvsignore config.m4
/php-src/ext/pdo_sqlite/sqlite/src .cvsignore
/php-src/ext/session config.m4
/php-src/ext/sqlite config.m4
/php-src/ext/xml config.m4
/php-src/sapi/embed config.m4
/php-src/scripts Makefile.frag phpize.m4
Log:
- Added PHP_INSTALL_HEADERS() macro
- Fixed several VPATH build issues
- Changed all awk calls to use $AWK
- Changed all mkdir calls to use "$php_shtool mkdir"
http://cvs.php.net/diff.php/php-src/Makefile.global?r1=1.51&r2=1.52&ty=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.51 php-src/Makefile.global:1.52
--- php-src/Makefile.global:1.51 Thu Dec 4 10:57:55 2003
+++ php-src/Makefile.global Fri May 6 22:51:50 2005
@@ -5,6 +5,8 @@
DEFS = -DPHP_ATOM_INC -I$(top_builddir)/include -I$(top_builddir)/main
-I$(top_srcdir)
COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS)
$(PHP_FRAMEWORKPATH)
+CORE_HEADERS = Zend/ TSRM/ include/ main/ main/streams/ regex/ ext/standard/
+INSTALL_HEADERS = $(CORE_HEADERS) $(INSTALL_EXT_HEADERS)
all: $(all_targets)
@echo
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.305&r2=1.306&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.305 php-src/acinclude.m4:1.306
--- php-src/acinclude.m4:1.305 Sat Apr 30 05:29:09 2005
+++ php-src/acinclude.m4 Fri May 6 22:51:50 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.305 2005/04/30 09:29:09 sniper Exp $
+dnl $Id: acinclude.m4,v 1.306 2005/05/07 02:51:50 sniper Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -138,7 +138,7 @@
dnl
AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
-test -d include || mkdir include
+test -d include || $php_shtool mkdir include
> Makefile.objects
> Makefile.fragments
dnl We need to play tricks here to avoid matching the grep line itself
@@ -901,7 +901,11 @@
])
AC_DEFUN([PHP_ADD_BUILD_DIR],[
- BUILD_DIR="$BUILD_DIR $1"
+ ifelse($2,,[
+ BUILD_DIR="$BUILD_DIR $1"
+ ], [
+ $php_shtool mkdir -p $1
+ ])
])
AC_DEFUN([PHP_GEN_BUILD_DIRS],[
@@ -919,13 +923,13 @@
dnl "shared" can be set to "shared" or "yes" to build the extension as
dnl a dynamically loadable library. Optional parameter "sapi_class" can
dnl be set to "cli" to mark extension build only with CLI or CGI sapi's.
-dnl extra-cflags are passed to the compiler, with @ext_srcdir@ being
-dnl substituted.
+dnl "extra-cflags" are passed to the compiler, with
+dnl @ext_srcdir@ and @ext_builddir@ being substituted.
AC_DEFUN([PHP_NEW_EXTENSION],[
ext_builddir=[]PHP_EXT_BUILDDIR($1)
ext_srcdir=[]PHP_EXT_SRCDIR($1)
- ifelse($5,,ac_extra=,[ac_extra=`echo "$5"|sed [EMAIL
PROTECTED]@#$ext_srcdir#g`])
+ ifelse($5,,ac_extra=,[ac_extra=`echo "$5"|sed [EMAIL
PROTECTED]@#$ext_srcdir#g|sed [EMAIL PROTECTED]@#$ext_builddir#g`])
if test "$3" != "shared" && test "$3" != "yes" && test "$4" != "cli"; then
dnl ---------------------------------------------- Static module
@@ -2345,6 +2349,29 @@
dnl Misc. macros
dnl -------------------------------------------------------------------------
+dnl
+dnl PHP_INSTALL_HEADERS(path [, file ...])
+dnl
+dnl PHP header files to be installed
+dnl
+AC_DEFUN([PHP_INSTALL_HEADERS],[
+ if test -z "$2"; then
+ for header_file in $1; do
+ PHP_RUN_ONCE(INSTALLHEADERS, $header_file, [
+ INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $header_file"
+ ])
+ done
+ else
+ header_path=$1
+ for header_file in $2; do
+ hp_hf="$header_path/$header_file"
+ PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
+ INSTALL_EXT_HEADERS="$INSTALL_EXT_HEADERS $hp_hf"
+ ])
+ done
+ fi
+])
+
dnl
dnl PHP_AP_EXTRACT_VERSION(/path/httpd)
dnl
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.552&r2=1.553&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.552 php-src/configure.in:1.553
--- php-src/configure.in:1.552 Sat Apr 30 00:27:23 2005
+++ php-src/configure.in Fri May 6 22:51:50 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.552 2005/04/30 04:27:23 sniper Exp $ -*- autoconf
-*-
+dnl ## $Id: configure.in,v 1.553 2005/05/07 02:51:50 sniper Exp $ -*- autoconf
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -1122,6 +1122,7 @@
PHP_SUBST(PHP_FRAMEWORKS)
PHP_SUBST(PHP_FRAMEWORKPATH)
PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
+PHP_SUBST(INSTALL_EXT_HEADERS)
old_CC=$CC
http://cvs.php.net/diff.php/php-src/ext/curl/config.m4?r1=1.27&r2=1.28&ty=u
Index: php-src/ext/curl/config.m4
diff -u php-src/ext/curl/config.m4:1.27 php-src/ext/curl/config.m4:1.28
--- php-src/ext/curl/config.m4:1.27 Wed Feb 9 11:22:48 2005
+++ php-src/ext/curl/config.m4 Fri May 6 22:51:51 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.27 2005/02/09 16:22:48 rasmus Exp $
+dnl $Id: config.m4,v 1.28 2005/05/07 02:51:51 sniper Exp $
dnl
PHP_ARG_WITH(curl, for CURL support,
@@ -41,7 +41,7 @@
fi
curl_version_full=`$CURL_CONFIG --version`
- curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | awk 'BEGIN
{ FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK
'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
if test "$curl_version" -ge 7010005; then
AC_MSG_RESULT($curl_version_full)
CURL_LIBS=`$CURL_CONFIG --libs`
http://cvs.php.net/diff.php/php-src/ext/dom/config.m4?r1=1.18&r2=1.19&ty=u
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.18 php-src/ext/dom/config.m4:1.19
--- php-src/ext/dom/config.m4:1.18 Wed Apr 27 09:12:54 2005
+++ php-src/ext/dom/config.m4 Fri May 6 22:51:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.18 2005/04/27 13:12:54 sniper Exp $
+dnl $Id: config.m4,v 1.19 2005/05/07 02:51:52 sniper Exp $
dnl
PHP_ARG_ENABLE(dom, whether to enable DOM support,
@@ -30,6 +30,7 @@
typeinfo.c domerror.c domlocator.c namednodemap.c
userdatahandler.c],
$ext_shared)
PHP_SUBST(DOM_SHARED_LIBADD)
+ PHP_INSTALL_HEADERS([ext/dom/xml_common.h])
PHP_ADD_EXTENSION_DEP(dom, libxml)
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2
installation.])
http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.31&r2=1.32&ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.31 php-src/ext/iconv/config.m4:1.32
--- php-src/ext/iconv/config.m4:1.31 Thu Feb 24 14:27:10 2005
+++ php-src/ext/iconv/config.m4 Fri May 6 22:51:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.31 2005/02/24 19:27:10 sniper Exp $
+dnl $Id: config.m4,v 1.32 2005/05/07 02:51:52 sniper Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -138,6 +138,7 @@
PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared,,
[-I\"$PHP_ICONV_PREFIX/include\"])
PHP_SUBST(ICONV_SHARED_LIBADD)
+ PHP_INSTALL_HEADERS([ext/iconv])
else
AC_MSG_ERROR(Please reinstall the iconv library.)
fi
http://cvs.php.net/diff.php/php-src/ext/interbase/php_ibase_udf.c?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/interbase/php_ibase_udf.c
diff -u php-src/ext/interbase/php_ibase_udf.c:1.7
php-src/ext/interbase/php_ibase_udf.c:1.8
--- php-src/ext/interbase/php_ibase_udf.c:1.7 Sat Jun 5 06:03:42 2004
+++ php-src/ext/interbase/php_ibase_udf.c Fri May 6 22:51:52 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ibase_udf.c,v 1.7 2004/06/05 10:03:42 abies Exp $ */
+/* $Id: php_ibase_udf.c,v 1.8 2005/05/07 02:51:52 sniper Exp $ */
/**
* This UDF library adds the ability to call PHP functions from SQL
@@ -124,8 +124,8 @@
#endif
#ifdef PHP_EMBED
-# include "php_main.h"
-# include "php_embed.h"
+# include "php_main.h"
+# include "sapi/embed/php_embed.h"
static void __attribute__((constructor)) init()
{
http://cvs.php.net/diff.php/php-src/ext/libxml/config0.m4?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/libxml/config0.m4
diff -u php-src/ext/libxml/config0.m4:1.1 php-src/ext/libxml/config0.m4:1.2
--- php-src/ext/libxml/config0.m4:1.1 Wed Nov 12 18:42:38 2003
+++ php-src/ext/libxml/config0.m4 Fri May 6 22:51:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.1 2003/11/12 23:42:38 sniper Exp $
+dnl $Id: config0.m4,v 1.2 2005/05/07 02:51:52 sniper Exp $
dnl
PHP_ARG_ENABLE(libxml, whether to enable LIBXML support,
@@ -18,6 +18,7 @@
PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [
AC_DEFINE(HAVE_LIBXML,1,[ ])
PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared)
+ PHP_INSTALL_HEADERS([ext/libxml/php_libxml.h])
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2
installation.])
])
http://cvs.php.net/diff.php/php-src/ext/mbstring/config.m4?r1=1.56&r2=1.57&ty=u
Index: php-src/ext/mbstring/config.m4
diff -u php-src/ext/mbstring/config.m4:1.56 php-src/ext/mbstring/config.m4:1.57
--- php-src/ext/mbstring/config.m4:1.56 Tue Mar 22 17:22:08 2005
+++ php-src/ext/mbstring/config.m4 Fri May 6 22:51:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.56 2005/03/22 22:22:08 moriyoshi Exp $
+dnl $Id: config.m4,v 1.57 2005/05/07 02:51:52 sniper Exp $
dnl
AC_DEFUN([PHP_MBSTRING_ADD_SOURCES], [
@@ -273,6 +273,7 @@
dnl libmbfl is required
PHP_MBSTRING_SETUP_LIBMBFL
PHP_MBSTRING_EXTENSION
+ PHP_INSTALL_HEADERS([ext/mbstring], [libmbfl libmbfl/mbfl])
fi
# vim600: sts=2 sw=2 et
http://cvs.php.net/diff.php/php-src/ext/odbc/config.m4?r1=1.74&r2=1.75&ty=u
Index: php-src/ext/odbc/config.m4
diff -u php-src/ext/odbc/config.m4:1.74 php-src/ext/odbc/config.m4:1.75
--- php-src/ext/odbc/config.m4:1.74 Thu Apr 21 19:01:53 2005
+++ php-src/ext/odbc/config.m4 Fri May 6 22:51:52 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.74 2005/04/21 23:01:53 sniper Exp $
+dnl $Id: config.m4,v 1.75 2005/05/07 02:51:52 sniper Exp $
dnl
dnl
@@ -517,15 +517,15 @@
PHP_WITH_SHARED
if test "$withval" = "yes"; then
# find dbmaker's home directory
- DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | awk -F: '{print $6}'`
+ DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'`
# check DBMaker version (from 5.0 to 2.0)
DBMAKER_VERSION=5.0
while test ! -d $DBMAKER_HOME/$DBMAKER_VERSION -a "$DBMAKER_VERSION" !=
"2.9"; do
- DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | awk '{ print $1-1;}'`
- MAJOR_V=`echo $DM_VER | awk '{ print $1/10; }' | awk -F. '{ print
$1; }'`
- MINOR_V=`echo $DM_VER | awk '{ print $1%10; }'`
+ DM_VER=`echo $DBMAKER_VERSION | sed -e 's/\.//' | $AWK '{ print
$1-1;}'`
+ MAJOR_V=`echo $DM_VER | $AWK '{ print $1/10; }' | $AWK -F. '{ print
$1; }'`
+ MINOR_V=`echo $DM_VER | $AWK '{ print $1%10; }'`
DBMAKER_VERSION=$MAJOR_V.$MINOR_V
done
http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/pdo/config.m4
diff -u php-src/ext/pdo/config.m4:1.11 php-src/ext/pdo/config.m4:1.12
--- php-src/ext/pdo/config.m4:1.11 Fri May 6 18:58:42 2005
+++ php-src/ext/pdo/config.m4 Fri May 6 22:51:52 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.11 2005/05/06 22:58:42 sniper Exp $
+dnl $Id: config.m4,v 1.12 2005/05/07 02:51:52 sniper Exp $
dnl config.m4 for extension pdo
dnl vim:se ts=2 sw=2 et:
@@ -51,5 +51,5 @@
esac
fi
PHP_NEW_EXTENSION(pdo, pdo.c pdo_dbh.c pdo_stmt.c pdo_sql_parser.c
pdo_sqlstate.c, $ext_shared)
- PHP_ADD_MAKEFILE_FRAGMENT
+ PHP_INSTALL_HEADERS(ext/pdo, [php_pdo.h php_pdo_driver.h])
fi
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/.cvsignore?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/pdo_sqlite/.cvsignore
diff -u php-src/ext/pdo_sqlite/.cvsignore:1.2
php-src/ext/pdo_sqlite/.cvsignore:1.3
--- php-src/ext/pdo_sqlite/.cvsignore:1.2 Wed Feb 16 23:23:14 2005
+++ php-src/ext/pdo_sqlite/.cvsignore Fri May 6 22:51:52 2005
@@ -26,4 +26,3 @@
missing
mkinstalldirs
modules
-sqlite3.h
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.18&r2=1.19&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.18
php-src/ext/pdo_sqlite/config.m4:1.19
--- php-src/ext/pdo_sqlite/config.m4:1.18 Sun Mar 20 20:24:36 2005
+++ php-src/ext/pdo_sqlite/config.m4 Fri May 6 22:51:52 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.18 2005/03/21 01:24:36 wez Exp $
+dnl $Id: config.m4,v 1.19 2005/05/07 02:51:52 sniper Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
@@ -64,7 +64,6 @@
PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core,
$ext_shared,,-I$pdo_inc_path)
else
# use bundled libs
- PHP_PDO_SQLITE_CFLAGS="[EMAIL PROTECTED]@/sqlite/src"
pdo_sqlite_sources="sqlite/src/attach.c sqlite/src/auth.c
sqlite/src/btree.c \
sqlite/src/build.c sqlite/src/date.c sqlite/src/delete.c
sqlite/src/expr.c \
sqlite/src/func.c sqlite/src/hash.c sqlite/src/insert.c
sqlite/src/legacy.c \
@@ -79,20 +78,19 @@
PHP_NEW_EXTENSION(pdo_sqlite,
$php_pdo_sqlite_sources_core $pdo_sqlite_sources,
- $ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
+ $ext_shared,,[EMAIL PROTECTED]@/sqlite/src -DPDO_SQLITE_BUNDLED=1
-DSQLITE_OMIT_CURSOR -I$pdo_inc_path)
- PHP_ADD_BUILD_DIR($ext_builddir/sqlite)
- PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src)
+ PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1)
AC_CHECK_SIZEOF(char *,4)
AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION`
- PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | awk -F.
'{printf("%d%03d%03d", $1, $2, $3)}'`
- sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/
$ext_srcdir/sqlite/src/sqlite.h.in > $ext_srcdir/sqlite3.h
+ PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F.
'{printf("%d%03d%03d", $1, $2, $3)}'`
+ sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e
s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/
$ext_srcdir/sqlite/src/sqlite.h.in > $ext_builddir/sqlite/src/sqlite3.h
if ! test -f $ext_srcdir/sqlite/src/parse.h ; then
$CC -o $ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/tool/lemon.c
$ext_srcdir/sqlite/tool/lemon $ext_srcdir/sqlite/src/parse.y
- cat $ext_srcdir/sqlite/src/parse.h $ext_srcdir/sqlite/src/vdbe.c
| awk -f $ext_srcdir/sqlite/mkopcodeh.awk > $ext_srcdir/sqlite/src/opcodes.h
- sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | awk -f
$ext_srcdir/sqlite/mkopcodec.awk > $ext_srcdir/sqlite/src/opcodes.c
+ cat $ext_srcdir/sqlite/src/parse.h $ext_srcdir/sqlite/src/vdbe.c |
$AWK -f $ext_srcdir/sqlite/mkopcodeh.awk > $ext_srcdir/sqlite/src/opcodes.h
+ sort -n +2 $ext_srcdir/sqlite/src/opcodes.h | Â$AWK -f
$ext_srcdir/sqlite/mkopcodec.awk > $ext_srcdir/sqlite/src/opcodes.c
$CC -o $ext_srcdir/sqlite/tool/mkkeywordhash
$ext_srcdir/sqlite/tool/mkkeywordhash.c
$ext_srcdir/sqlite/tool/mkkeywordhash >
$ext_srcdir/sqlite/src/keywordhash.h
else
@@ -100,11 +98,11 @@
fi
if test "$ext_shared" = "no" -o "$ext_srcdir" != "$abs_srcdir"; then
- echo '#include "php_config.h"' > $ext_srcdir/sqlite/src/config.h
+ echo '#include <php_config.h>' > $ext_builddir/sqlite/src/config.h
else
- echo "#include \"$abs_builddir/config.h\"" >
$ext_srcdir/sqlite/src/config.h
+ echo "#include \"$abs_builddir/config.h\"" >
$ext_builddir/sqlite/src/config.h
fi
- cat >> $ext_srcdir/sqlite/src/config.h <<EOF
+ cat >> $ext_builddir/sqlite/src/config.h <<EOF
#if ZTS
# define THREADSAFE 1
#endif
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/sqlite/src/.cvsignore?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo_sqlite/sqlite/src/.cvsignore
diff -u php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.3
php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.4
--- php-src/ext/pdo_sqlite/sqlite/src/.cvsignore:1.3 Sun Feb 27 00:20:19 2005
+++ php-src/ext/pdo_sqlite/sqlite/src/.cvsignore Fri May 6 22:51:52 2005
@@ -3,3 +3,4 @@
*.gcda
*.gcno
parse.out
+sqlite3.h
http://cvs.php.net/diff.php/php-src/ext/session/config.m4?r1=1.26&r2=1.27&ty=u
Index: php-src/ext/session/config.m4
diff -u php-src/ext/session/config.m4:1.26 php-src/ext/session/config.m4:1.27
--- php-src/ext/session/config.m4:1.26 Wed Nov 3 09:32:51 2004
+++ php-src/ext/session/config.m4 Fri May 6 22:51:53 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.26 2004/11/03 14:32:51 jorton Exp $
+dnl $Id: config.m4,v 1.27 2005/05/07 02:51:53 sniper Exp $
dnl
PHP_ARG_ENABLE(session, whether to enable PHP sessions,
@@ -13,6 +13,7 @@
PHP_PREAD_TEST
PHP_NEW_EXTENSION(session, session.c mod_files.c mod_mm.c mod_user.c,
$ext_shared)
PHP_SUBST(SESSION_SHARED_LIBADD)
+ PHP_INSTALL_HEADERS(ext/session, [php_session.h mod_files.h mod_user.h])
AC_DEFINE(HAVE_PHP_SESSION,1,[ ])
fi
@@ -27,5 +28,6 @@
PHP_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/$PHP_LIBDIR, SESSION_SHARED_LIBADD)
PHP_ADD_INCLUDE($MM_DIR/include)
+ PHP_INSTALL_HEADERS([ext/session/mod_mm.h])
AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])
fi
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.34&r2=1.35&ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.34 php-src/ext/sqlite/config.m4:1.35
--- php-src/ext/sqlite/config.m4:1.34 Fri May 6 18:51:05 2005
+++ php-src/ext/sqlite/config.m4 Fri May 6 22:51:53 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.34 2005/05/06 22:51:05 sniper Exp $
+dnl $Id: config.m4,v 1.35 2005/05/07 02:51:53 sniper Exp $
dnl config.m4 for extension sqlite
dnl vim:et:ts=2:sw=2
@@ -58,11 +58,13 @@
],[
-L$SQLITE_DIR/$PHP_LIBDIR -lm
])
+ SQLITE_MODULE_TYPE=external
PHP_SQLITE_CFLAGS=$pdo_inc_path
sqlite_extra_sources="libsqlite/src/encode.c"
else
# use bundled library
- PHP_SQLITE_CFLAGS="[EMAIL PROTECTED]@/libsqlite/src $pdo_inc_path"
+ SQLITE_MODULE_TYPE=builtin
+ PHP_SQLITE_CFLAGS="[EMAIL PROTECTED]@/libsqlite/src $pdo_inc_path"
sqlite_extra_sources="libsqlite/src/opcodes.c \
libsqlite/src/parse.c libsqlite/src/encode.c \
libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
@@ -79,8 +81,18 @@
PHP_ADD_EXTENSION_DEP(sqlite, spl)
PHP_ADD_EXTENSION_DEP(sqlite, pdo)
- PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
- PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
+ fi
+
+ dnl
+ dnl Common for both bundled/external
+ dnl
+ sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
+ PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
+ PHP_SUBST(SQLITE_SHARED_LIBADD)
+ PHP_INSTALL_HEADERS([$ext_builddir/libsqlite/src/sqlite.h])
+
+ if test "$SQLITE_MODULE_TYPE" = "builtin"; then
+ PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src, 1)
AC_CHECK_SIZEOF(char *, 4)
AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer])
dnl use latin 1 for SQLite older than 2.8.9; the utf-8 handling
@@ -97,15 +109,15 @@
SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION`
PHP_SUBST(SQLITE_VERSION)
- sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/
$ext_srcdir/libsqlite/src/sqlite.h.in >$ext_srcdir/libsqlite/src/sqlite.h
+ sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/
$ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h
if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
- echo '#include <php_config.h>' > $ext_srcdir/libsqlite/src/config.h
+ echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
else
- echo "#include \"$abs_builddir/config.h\"" >
$ext_srcdir/libsqlite/src/config.h
+ echo "#include \"$abs_builddir/config.h\"" >
$ext_builddir/libsqlite/src/config.h
fi
- cat >> $ext_srcdir/libsqlite/src/config.h <<EOF
+ cat >> $ext_builddir/libsqlite/src/config.h <<EOF
#if ZTS
# define THREADSAFE 1
#endif
@@ -114,14 +126,7 @@
#endif
EOF
fi
-
- dnl
- dnl Common for both bundled/external
- dnl
- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources"
- PHP_NEW_EXTENSION(sqlite, $sqlite_sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
- PHP_SUBST(SQLITE_SHARED_LIBADD)
-
+
AC_CHECK_FUNCS(usleep nanosleep)
AC_CHECK_HEADERS(time.h)
fi
http://cvs.php.net/diff.php/php-src/ext/xml/config.m4?r1=1.51&r2=1.52&ty=u
Index: php-src/ext/xml/config.m4
diff -u php-src/ext/xml/config.m4:1.51 php-src/ext/xml/config.m4:1.52
--- php-src/ext/xml/config.m4:1.51 Wed Apr 27 09:12:55 2005
+++ php-src/ext/xml/config.m4 Fri May 6 22:51:53 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.51 2005/04/27 13:12:55 sniper Exp $
+dnl $Id: config.m4,v 1.52 2005/05/07 02:51:53 sniper Exp $
dnl
PHP_ARG_ENABLE(xml,whether to enable XML support,
@@ -26,6 +26,7 @@
PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
xml_extra_sources="compat.c"
+ PHP_ADD_EXTENSION_DEP(xml, libxml)
], [
AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
])
@@ -53,6 +54,6 @@
PHP_NEW_EXTENSION(xml, xml.c $xml_extra_sources, $ext_shared)
PHP_SUBST(XML_SHARED_LIBADD)
- PHP_ADD_EXTENSION_DEP(xml, libxml)
+ PHP_INSTALL_HEADERS([ext/xml])
AC_DEFINE(HAVE_XML, 1, [ ])
fi
http://cvs.php.net/diff.php/php-src/sapi/embed/config.m4?r1=1.8&r2=1.9&ty=u
Index: php-src/sapi/embed/config.m4
diff -u php-src/sapi/embed/config.m4:1.8 php-src/sapi/embed/config.m4:1.9
--- php-src/sapi/embed/config.m4:1.8 Mon Jan 20 21:46:07 2003
+++ php-src/sapi/embed/config.m4 Fri May 6 22:51:53 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.8 2003/01/21 02:46:07 edink Exp $
+dnl $Id: config.m4,v 1.9 2005/05/07 02:51:53 sniper Exp $
dnl
AC_MSG_CHECKING(for embedded SAPI library support)
@@ -29,4 +29,5 @@
if test "$PHP_EMBED_TYPE" != "no"; then
PHP_SELECT_SAPI(embed, $PHP_EMBED_TYPE, php_embed.c)
+ PHP_INSTALL_HEADERS([sapi/embed/php_embed.h])
fi
http://cvs.php.net/diff.php/php-src/scripts/Makefile.frag?r1=1.20&r2=1.21&ty=u
Index: php-src/scripts/Makefile.frag
diff -u php-src/scripts/Makefile.frag:1.20 php-src/scripts/Makefile.frag:1.21
--- php-src/scripts/Makefile.frag:1.20 Tue May 3 07:34:32 2005
+++ php-src/scripts/Makefile.frag Fri May 6 22:51:53 2005
@@ -31,32 +31,14 @@
$(INSTALL) $(BUILD_FILES_EXEC) $(INSTALL_ROOT)$(phpbuilddir) && \
$(INSTALL_DATA) $(BUILD_FILES) $(INSTALL_ROOT)$(phpbuilddir))
-HEADER_DIRS = \
- Zend/ \
- TSRM/ \
- include/ \
- main/ \
- main/streams/ \
- regex/ \
- ext/iconv/ \
- ext/libxml/ \
- ext/standard/ \
- ext/session/ \
- ext/dom/xml_common.h \
- ext/xml/ \
- ext/mbstring/ \
- ext/mbstring/libmbfl/ \
- ext/mbstring/libmbfl/mbfl/ \
- ext/sqlite/libsqlite/src/sqlite.h
-
install-headers:
- [EMAIL PROTECTED] i in $(HEADER_DIRS); do \
+ [EMAIL PROTECTED] i in $(INSTALL_HEADERS); do \
i=`$(top_srcdir)/build/shtool path -d $$i`; \
paths="$$paths $(INSTALL_ROOT)$(phpincludedir)/$$i"; \
done; \
$(mkinstalldirs) $$paths && \
echo "Installing header files:
$(INSTALL_ROOT)$(phpincludedir)/" && \
- for i in $(HEADER_DIRS); do \
+ for i in $(INSTALL_HEADERS); do \
if test -f "$(top_srcdir)/$$i"; then \
$(INSTALL_DATA) $(top_srcdir)/$$i
$(INSTALL_ROOT)$(phpincludedir)/$$i; \
elif test -f "$(top_builddir)/$$i"; then \
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.13&r2=1.14&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.13 php-src/scripts/phpize.m4:1.14
--- php-src/scripts/phpize.m4:1.13 Thu Mar 17 03:16:51 2005
+++ php-src/scripts/phpize.m4 Fri May 6 22:51:53 2005
@@ -2,8 +2,6 @@
AC_INIT(config.m4)
-PHP_INIT_BUILD_SYSTEM
-
AC_DEFUN([PHP_WITH_PHP_CONFIG],[
AC_ARG_WITH(php-config,
[ --with-php-config=PATH],[
@@ -19,6 +17,10 @@
if test -z "$prefix"; then
AC_MSG_ERROR(Cannot find php-config. Please use --with-php-config=PATH)
fi
+
+ php_shtool=$srcdir/build/shtool
+ PHP_INIT_BUILD_SYSTEM
+
AC_MSG_CHECKING(for PHP prefix)
AC_MSG_RESULT($prefix)
AC_MSG_CHECKING(for PHP includes)
@@ -106,7 +108,7 @@
PHP_GEN_BUILD_DIRS
PHP_GEN_GLOBAL_MAKEFILE
-test -d modules || mkdir modules
+test -d modules || $php_shtool mkdir modules
touch .deps
AC_CONFIG_HEADER(config.h)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
