[oe-commits] org.oe.dev modphp: Apache2 module for php, patches and BB file.
awilcox commit
openembedded-commits at lists.openembedded.org
Thu Dec 7 19:49:11 UTC 2006
modphp: Apache2 module for php, patches and BB file.
Author: awilcox at openembedded.org
Branch: org.openembedded.dev
Revision: f95531de08ee9b3e73eddf2d45dc9c2e55c7fb5d
ViewMTN: http://monotone.openembedded.org/revision.psp?id=f95531de08ee9b3e73eddf2d45dc9c2e55c7fb5d
Files:
1
packages/modphp
packages/modphp/files
packages/modphp/files/70_mod_php4.conf
packages/modphp/files/70_mod_php5.conf
packages/modphp/files/autotools.patch
packages/modphp/files/configure.patch
packages/modphp/files/endianness.patch
packages/modphp/files/pear.patch
packages/modphp/files/php.ini
packages/modphp/modphp5.inc
packages/modphp/modphp_5.1.6.bb
Diffs:
#
# mt diff -r7447c98ad7a1cff1d4e9e2a01c19ca645d7c50de -rf95531de08ee9b3e73eddf2d45dc9c2e55c7fb5d
#
#
#
# add_dir "packages/modphp"
#
# add_dir "packages/modphp/files"
#
# add_file "packages/modphp/files/70_mod_php4.conf"
# content [ca58da2610b541c241b59efe8cd09cd4593e562d]
#
# add_file "packages/modphp/files/70_mod_php5.conf"
# content [728f7edf2edc5be418989344207a72e354cf07f7]
#
# add_file "packages/modphp/files/autotools.patch"
# content [e16c84356931236e346b13b83e3b87fb32dc92d5]
#
# add_file "packages/modphp/files/configure.patch"
# content [542b2115d7348fdd4cc10c8b31c8f528c29e1eda]
#
# add_file "packages/modphp/files/endianness.patch"
# content [a99089d58b7913c76fc9cbdb5a8dea4dab6962d8]
#
# add_file "packages/modphp/files/pear.patch"
# content [f2d6f0c8390d611f4807efe1a5a782464a1ca207]
#
# add_file "packages/modphp/files/php.ini"
# content [f7e21dee32c288f43b96bd4e9c4ba842d039e711]
#
# add_file "packages/modphp/modphp5.inc"
# content [284d86ea27ed4767ea77ea816ac6cff85cf92d32]
#
# add_file "packages/modphp/modphp_5.1.6.bb"
# content [e7be65f9e60c682274d674175f582d826e93158c]
#
============================================================
--- packages/modphp/files/70_mod_php4.conf ca58da2610b541c241b59efe8cd09cd4593e562d
+++ packages/modphp/files/70_mod_php4.conf ca58da2610b541c241b59efe8cd09cd4593e562d
@@ -0,0 +1,19 @@
+# vim: ft=apache sw=4 ts=4
+<IfDefine PHP4>
+
+ # Load the module first
+ <IfModule !sapi_apache2.c>
+ LoadModule php4_module modules/libphp4.so
+ </IfModule>
+
+ # Set it to handle the files
+ <IfModule mod_mime.c>
+ AddType application/x-httpd-php .php
+ AddType application/x-httpd-php .phtml
+ AddType application/x-httpd-php .php3
+ AddType application/x-httpd-php .php4
+ AddType application/x-httpd-php-source .phps
+ </IfModule>
+
+ AddDirectoryIndex index.php index.phtml
+</IfDefine>
============================================================
--- packages/modphp/files/70_mod_php5.conf 728f7edf2edc5be418989344207a72e354cf07f7
+++ packages/modphp/files/70_mod_php5.conf 728f7edf2edc5be418989344207a72e354cf07f7
@@ -0,0 +1,12 @@
+# vim: ft=apache sw=4 ts=4
+<IfDefine PHP5>
+ # Load the module first
+ <IfModule !sapi_apache2.c>
+ LoadModule php5_module lib/apache2/modules/libphp5.so
+ </IfModule>
+
+ # Set it to handle the files
+ AddHandler php5-script .php .phtml .php3 .php4 .php5
+ AddType application/x-httpd-php-source .phps
+ DirectoryIndex index.html index.html.var index.php index.phtml
+</IfDefine>
============================================================
--- packages/modphp/files/autotools.patch e16c84356931236e346b13b83e3b87fb32dc92d5
+++ packages/modphp/files/autotools.patch e16c84356931236e346b13b83e3b87fb32dc92d5
@@ -0,0 +1,935 @@
+
+#
+# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
+#
+
+--- php-4.3.6/acinclude.m4~autotools.patch 2004-01-19 20:11:40.000000000 -0500
++++ php-4.3.6/acinclude.m4 2004-06-04 18:21:54.893679473 -0400
+@@ -16,7 +16,7 @@
+ sed -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments
+ ])
+
+-AC_DEFUN(PHP_PROG_RE2C,[
++AC_DEFUN([PHP_PROG_RE2C],[
+ AC_CHECK_PROG(RE2C, re2c, re2c, [exit 0;])
+ ])
+
+@@ -770,10 +770,10 @@
+ OVERALL_TARGET=[]ifelse($1,,php,$1)
+ php_c_pre='$(CC)'
+ php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
+- php_c_post=' && echo > $[@]'
++ php_c_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+ php_cxx_pre='$(CXX)'
+ php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
+- php_cxx_post=' && echo > $[@]'
++ php_cxx_post=' && echo "[#] Generated by PHP badness - GNU libtool" > $[@] && echo "pic_object=none" >> $[@] && echo "non_pic_object=$[@]" | sed -e "s,=.*/,=,; s,\.lo,\.o,g" >> $[@]'
+ php_lo=o
+
+ shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
+@@ -1481,6 +1481,7 @@
+
+ dnl even newer glibcs have a different seeker definition...
+
++ AC_CACHE_CHECK([if cookie io functions use off64_t], php_cv_lib_cookie_io_functions_use_off64_t,
+ AC_TRY_RUN([
+ #define _GNU_SOURCE
+ #include <stdio.h>
+@@ -1510,8 +1511,8 @@
+ }
+
+ ],
+- [ cookie_io_functions_use_off64_t=yes ],
+- [ ] )
++ [ php_cv_lib_cookie_io_functions_use_off64_t=yes ],
++ [ php_cv_lib_cookie_io_functions_use_off64_t=no ] ))
+
+ else
+ dnl older glibc versions (up to 2.1.2 ?)
+--- php-4.3.6/ext/cpdf/config.m4~autotools.patch 2003-09-30 22:53:53.000000000 -0400
++++ php-4.3.6/ext/cpdf/config.m4 2004-06-04 18:21:54.893679473 -0400
+@@ -1,6 +1,6 @@
+ dnl $Id: config.m4,v 1.10.4.6 2003/10/01 02:53:53 sniper Exp $
+
+-AC_DEFUN(CPDF_JPEG_TEST,[
++AC_DEFUN([CPDF_JPEG_TEST],[
+ AC_ARG_WITH(jpeg-dir,
+ [ --with-jpeg-dir[=DIR] CPDF: Set the path to libjpeg install prefix.],[
+ for i in $withval /usr/local /usr; do
+@@ -23,7 +23,7 @@
+ ],)
+ ])
+
+-AC_DEFUN(CPDF_TIFF_TEST,[
++AC_DEFUN([CPDF_TIFF_TEST],[
+ AC_ARG_WITH(tiff-dir,
+ [ --with-tiff-dir[=DIR] CPDF: Set the path to libtiff install prefix.],[
+ for i in $withval /usr/local /usr; do
+--- php-4.3.6/ext/db/config.m4~autotools.patch 2003-08-15 14:42:11.000000000 -0400
++++ php-4.3.6/ext/db/config.m4 2004-06-04 18:21:54.893679473 -0400
+@@ -4,7 +4,7 @@
+
+ # Checks for libraries.
+ # Prefer gdbm, Berkeley DB and ndbm/dbm, in that order
+-AC_DEFUN(AC_PREFERRED_DB_LIB,[
++AC_DEFUN([AC_PREFERRED_DB_LIB],[
+ AC_CHECK_LIB(gdbm, gdbm_open,[AC_DEFINE(GDBM,1, [Whether you have GDBM]) DBM_TYPE=gdbm; DBM_LIB=-lgdbm],
+ [AC_CHECK_LIB(c, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=],
+ [AC_CHECK_LIB(dbm, dbm_open,[AC_DEFINE(NDBM,1,[ ]) DBM_TYPE=ndbm; DBM_LIB=-ldbm],
+--- php-4.3.6/ext/dba/config.m4~autotools.patch 2004-03-07 19:01:03.000000000 -0500
++++ php-4.3.6/ext/dba/config.m4 2004-06-04 18:21:54.894679234 -0400
+@@ -4,11 +4,11 @@
+
+ dnl Suppose we need FlatFile if no support or only CDB is used.
+
+-AC_DEFUN(PHP_DBA_STD_BEGIN,[
++AC_DEFUN([PHP_DBA_STD_BEGIN],[
+ unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT
+ ])
+
+-AC_DEFUN(PHP_TEMP_LDFLAGS,[
++AC_DEFUN([PHP_TEMP_LDFLAGS],[
+ old_LDFLAGS=$LDFLAGS
+ LDFLAGS="$1 $LDFLAGS"
+ $2
+@@ -16,14 +16,14 @@
+ ])
+
+ dnl Assign INCLUDE/LFLAGS from PREFIX
+-AC_DEFUN(PHP_DBA_STD_ASSIGN,[
++AC_DEFUN([PHP_DBA_STD_ASSIGN],[
+ if test -n "$THIS_PREFIX" && test "$THIS_PREFIX" != "/usr"; then
+ THIS_LFLAGS=$THIS_PREFIX/lib
+ fi
+ ])
+
+ dnl Standard check
+-AC_DEFUN(PHP_DBA_STD_CHECK,[
++AC_DEFUN([PHP_DBA_STD_CHECK],[
+ THIS_RESULT="yes"
+ if test -z "$THIS_INCLUDE"; then
+ AC_MSG_ERROR([DBA: Could not find necessary header file(s).])
+@@ -34,14 +34,14 @@
+ ])
+
+ dnl Attach THIS_x to DBA_x
+-AC_DEFUN(PHP_DBA_STD_ATTACH,[
++AC_DEFUN([PHP_DBA_STD_ATTACH],[
+ PHP_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
+ unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX
+ ])
+
+ dnl Print the result message
+ dnl parameters(name [, full name [, empty or error message]])
+-AC_DEFUN(AC_DBA_STD_RESULT,[
++AC_DEFUN([AC_DBA_STD_RESULT],[
+ THIS_NAME=[]translit($1,a-z0-9-,A-Z0-9_)
+ if test -n "$2"; then
+ THIS_FULL_NAME="$2"
+@@ -131,7 +131,7 @@
+
+ dnl Berkeley specific (library and version test)
+ dnl parameters(version, library list, function)
+-AC_DEFUN(PHP_DBA_DB_CHECK,[
++AC_DEFUN([PHP_DBA_DB_CHECK],[
+ for LIB in $2; do
+ if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then
+ PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib -l$LIB,[
+@@ -340,7 +340,7 @@
+ ])
+ AC_DBA_STD_RESULT(dbm)
+
+-AC_DEFUN(PHP_DBA_BUILTIN_CDB,[
++AC_DEFUN([PHP_DBA_BUILTIN_CDB],[
+ AC_DEFINE(DBA_CDB_BUILTIN, 1, [ ])
+ AC_DEFINE(DBA_CDB_MAKE, 1, [ ])
+ AC_DEFINE(DBA_CDB, 1, [ ])
+@@ -386,7 +386,7 @@
+ ])
+ AC_DBA_STD_RESULT(cdb)
+
+-AC_DEFUN(PHP_DBA_BUILTIN_INI,[
++AC_DEFUN([PHP_DBA_BUILTIN_INI],[
+ AC_DEFINE(DBA_INIFILE, 1, [ ])
+ ini_sources="libinifile/inifile.c"
+ THIS_RESULT="builtin"
+@@ -404,7 +404,7 @@
+ ])
+ AC_DBA_STD_RESULT(inifile,INI File)
+
+-AC_DEFUN(PHP_DBA_BUILTIN_FLATFILE,[
++AC_DEFUN([PHP_DBA_BUILTIN_FLATFILE],[
+ AC_DEFINE(DBA_FLATFILE, 1, [ ])
+ flat_sources="libflatfile/flatfile.c"
+ THIS_RESULT="builtin"
+--- php-4.3.6/ext/domxml/config.m4~autotools.patch 2002-10-30 12:42:36.000000000 -0500
++++ php-4.3.6/ext/domxml/config.m4 2004-06-04 18:21:54.894679234 -0400
+@@ -2,7 +2,7 @@
+ dnl $Id: config.m4,v 1.44 2002/10/30 17:42:36 helly Exp $
+ dnl
+
+-AC_DEFUN(PHP_DOM_CHECK_VERSION,[
++AC_DEFUN([PHP_DOM_CHECK_VERSION],[
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=-I$DOMXML_DIR/include$DOMXML_DIR_ADD
+ AC_MSG_CHECKING(for libxml version)
+@@ -78,7 +78,7 @@
+ PHP_SUBST(DOMXML_SHARED_LIBADD)
+ fi
+
+-AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[
++AC_DEFUN([PHP_DOM_XSLT_CHECK_VERSION],[
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=-I$DOMXSLT_DIR/include
+ AC_MSG_CHECKING(for libxslt version)
+@@ -95,7 +95,7 @@
+ CPPFLAGS=$old_CPPFLAGS
+ ])
+
+-AC_DEFUN(PHP_DOM_EXSLT_CHECK_VERSION,[
++AC_DEFUN([PHP_DOM_EXSLT_CHECK_VERSION],[
+ old_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS=-I$DOMEXSLT_DIR/include
+ AC_MSG_CHECKING(for libexslt version)
+--- php-4.3.6/ext/gd/config.m4~autotools.patch 2003-12-25 17:33:02.000000000 -0500
++++ php-4.3.6/ext/gd/config.m4 2004-06-04 18:21:54.894679234 -0400
+@@ -47,7 +47,7 @@
+ dnl Checks for the configure options
+ dnl
+
+-AC_DEFUN(PHP_GD_JPEG,[
++AC_DEFUN([PHP_GD_JPEG],[
+ if test "$PHP_JPEG_DIR" != "no"; then
+
+ for i in $PHP_JPEG_DIR /usr/local /usr; do
+@@ -72,7 +72,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_PNG,[
++AC_DEFUN([PHP_GD_PNG],[
+ if test "$PHP_PNG_DIR" != "no"; then
+
+ for i in $PHP_PNG_DIR /usr/local /usr; do
+@@ -107,7 +107,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_XPM,[
++AC_DEFUN([PHP_GD_XPM],[
+ if test "$PHP_XPM_DIR" != "no"; then
+
+ for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
+@@ -141,7 +141,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_FREETYPE1,[
++AC_DEFUN([PHP_GD_FREETYPE1],[
+ if test "$PHP_TTF" != "no"; then
+ if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
+ if test -n "$PHP_TTF"; then
+@@ -175,7 +175,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_FREETYPE2,[
++AC_DEFUN([PHP_GD_FREETYPE2],[
+ if test "$PHP_FREETYPE_DIR" != "no"; then
+
+ for i in $PHP_FREETYPE_DIR /usr/local /usr; do
+@@ -200,7 +200,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_T1LIB,[
++AC_DEFUN([PHP_GD_T1LIB],[
+ if test "$PHP_T1LIB" != "no"; then
+
+ for i in $PHP_T1LIB /usr/local /usr; do
+@@ -224,19 +224,19 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_TTSTR,[
++AC_DEFUN([PHP_GD_TTSTR],[
+ if test "$PHP_GD_NATIVE_TTF" = "yes"; then
+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_JISX0208,[
++AC_DEFUN([PHP_GD_JISX0208],[
+ if test "$PHP_GD_JIS_CONV" = "yes"; then
+ USE_GD_JIS_CONV=1
+ fi
+ ])
+
+-AC_DEFUN(PHP_GD_CHECK_VERSION,[
++AC_DEFUN([PHP_GD_CHECK_VERSION],[
+ PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+ PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+ PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
+--- php-4.3.6/ext/imap/config.m4~autotools.patch 2004-01-16 19:01:06.000000000 -0500
++++ php-4.3.6/ext/imap/config.m4 2004-06-04 18:21:54.894679234 -0400
+@@ -2,7 +2,7 @@
+ dnl $Id: config.m4,v 1.49.2.11 2004/01/17 00:01:06 sniper Exp $
+ dnl
+
+-AC_DEFUN(IMAP_INC_CHK,[if test -r "$i$1/c-client.h"; then
++AC_DEFUN([IMAP_INC_CHK],[if test -r "$i$1/c-client.h"; then
+ AC_DEFINE(HAVE_IMAP2000, 1, [ ])
+ IMAP_DIR=$i
+ IMAP_INC_DIR=$i$1
+@@ -13,7 +13,7 @@
+ break
+ ])
+
+-AC_DEFUN(IMAP_LIB_CHK,[
++AC_DEFUN([IMAP_LIB_CHK],[
+ str="$IMAP_DIR/$1/lib$lib.*"
+ for i in `echo $str`; do
+ test -r $i && IMAP_LIBDIR=$IMAP_DIR/$1 && break 2
+@@ -21,7 +21,7 @@
+ ])
+
+ dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs])
+-AC_DEFUN(PHP_IMAP_TEST_BUILD, [
++AC_DEFUN([PHP_IMAP_TEST_BUILD], [
+ old_LIBS=$LIBS
+ LIBS="$4 $LIBS"
+ AC_TRY_RUN([
+@@ -54,7 +54,7 @@
+ ])
+ ])
+
+-AC_DEFUN(PHP_IMAP_KRB_CHK, [
++AC_DEFUN([PHP_IMAP_KRB_CHK], [
+ AC_ARG_WITH(kerberos,
+ [ --with-kerberos[=DIR] IMAP: Include Kerberos support. DIR is the Kerberos install dir.],[
+ PHP_KERBEROS=$withval
+@@ -101,7 +101,7 @@
+
+ ])
+
+-AC_DEFUN(PHP_IMAP_SSL_CHK, [
++AC_DEFUN([PHP_IMAP_SSL_CHK], [
+ AC_ARG_WITH(imap-ssl,
+ [ --with-imap-ssl=<DIR> IMAP: Include SSL support. DIR is the OpenSSL install dir.],[
+ PHP_IMAP_SSL=$withval
+--- php-4.3.6/ext/java/config.m4~autotools.patch 2003-04-04 12:43:13.000000000 -0500
++++ php-4.3.6/ext/java/config.m4 2004-06-04 18:21:54.895678994 -0400
+@@ -1,7 +1,7 @@
+ dnl
+ dnl $Id: config.m4,v 1.46.4.3 2003/04/04 17:43:13 sniper Exp $
+ dnl
+-AC_DEFUN(JAVA_FIND_JAR, [
++AC_DEFUN([JAVA_FIND_JAR], [
+ AC_MSG_CHECKING([Java Jar location])
+ if test "$PHP_JAVA" = "yes"; then
+ if JAVA_JAR=`which jar 2>/dev/null`; then
+@@ -31,7 +31,7 @@
+ AC_MSG_RESULT([$JAVA_JAR])
+ ])
+
+-AC_DEFUN(JAVA_FIND_C, [
++AC_DEFUN([JAVA_FIND_C], [
+ AC_MSG_CHECKING([Java C location])
+ if test "$PHP_JAVA" = "yes"; then
+ JAVA_C=`which javac`
+@@ -55,7 +55,7 @@
+ AC_MSG_RESULT([$JAVA_C])
+ ])
+
+-AC_DEFUN(JAVA_CHECK_LIB, [
++AC_DEFUN([JAVA_CHECK_LIB], [
+ AC_MSG_CHECKING([Checking for libjava])
+ if test -d $PHP_JAVA/lib/kaffe; then
+ PHP_ADD_LIBPATH($PHP_JAVA/lib)
+--- php-4.3.6/ext/ldap/config.m4~autotools.patch 2003-06-30 20:02:29.000000000 -0400
++++ php-4.3.6/ext/ldap/config.m4 2004-06-04 18:21:54.895678994 -0400
+@@ -2,7 +2,7 @@
+ dnl $Id: config.m4,v 1.26.2.6 2003/07/01 00:02:29 sniper Exp $
+ dnl
+
+-AC_DEFUN(PHP_LDAP_CHECKS, [
++AC_DEFUN([PHP_LDAP_CHECKS], [
+ if test -f $1/include/ldap.h; then
+ LDAP_DIR=$1
+ LDAP_INCDIR=$1/include
+--- php-4.3.6/ext/msql/config.m4~autotools.patch 2002-03-12 11:25:28.000000000 -0500
++++ php-4.3.6/ext/msql/config.m4 2004-06-04 18:21:54.895678994 -0400
+@@ -5,7 +5,7 @@
+ dnl
+ dnl Test mSQL version by checking if msql.h has "IDX_TYPE" defined.
+ dnl
+-AC_DEFUN(PHP_MSQL_VERSION,[
++AC_DEFUN([PHP_MSQL_VERSION],[
+ AC_MSG_CHECKING([mSQL version])
+ ac_php_oldcppflags=$CPPFLAGS
+ CPPFLAGS="$INCLUDES $CPPFLAGS"
+--- php-4.3.6/ext/mysql/config.m4~autotools.patch 2003-12-31 06:28:38.000000000 -0500
++++ php-4.3.6/ext/mysql/config.m4 2004-06-04 18:21:54.895678994 -0400
+@@ -7,7 +7,7 @@
+ sinclude(libmysql/acinclude.m4)
+ sinclude(libmysql/mysql.m4)
+
+-AC_DEFUN(MYSQL_LIB_CHK, [
++AC_DEFUN([MYSQL_LIB_CHK], [
+ str="$MYSQL_DIR/$1/libmysqlclient.*"
+ for j in `echo $str`; do
+ if test -r $j; then
+@@ -17,7 +17,7 @@
+ done
+ ])
+
+-AC_DEFUN(PHP_MYSQL_SOCKET_SEARCH, [
++AC_DEFUN([PHP_MYSQL_SOCKET_SEARCH], [
+ for i in \
+ /var/run/mysqld/mysqld.sock \
+ /var/tmp/mysql.sock \
+--- php-4.3.6/ext/mysql/libmysql/acinclude.m4~autotools.patch 2002-12-05 10:46:41.000000000 -0500
++++ php-4.3.6/ext/mysql/libmysql/acinclude.m4 2004-06-04 18:21:54.895678994 -0400
+@@ -1,6 +1,6 @@
+ # Local macros for automake & autoconf
+
+-AC_DEFUN(MYSQL_FUNCTION_CHECKS,[
++AC_DEFUN([MYSQL_FUNCTION_CHECKS],[
+
+ # Standard MySQL list
+ AC_CHECK_FUNCS(alarm bmove \
+@@ -27,7 +27,7 @@
+ MYSQL_CHECK_GETHOSTNAME_R
+ ])
+
+-AC_DEFUN(MYSQL_CHECK_GETHOSTNAME_R,[
++AC_DEFUN([MYSQL_CHECK_GETHOSTNAME_R],[
+ # Check definition of gethostbyname_r (glibc2.0.100 is different from Solaris)
+ ac_save_CXXFLAGS="$CXXFLAGS"
+ AC_CACHE_CHECK([style of gethostname_r routines], mysql_cv_gethostname_style,
+@@ -90,7 +90,7 @@
+ fi
+ ])
+
+-AC_DEFUN(MYSQL_CHECK_SIGWAIT_STYLE,[
++AC_DEFUN([MYSQL_CHECK_SIGWAIT_STYLE],[
+ # Check definition av posix sigwait()
+ AC_CACHE_CHECK("style of sigwait", mysql_cv_sigwait,
+ AC_TRY_LINK(
+@@ -134,7 +134,7 @@
+ fi
+ ])
+
+-AC_DEFUN(MYSQL_CHECK_READDIR_R_ARGS,[
++AC_DEFUN([MYSQL_CHECK_READDIR_R_ARGS],[
+ # Check definition of readdir_r
+ AC_CACHE_CHECK("args to readdir_r", mysql_cv_readdir_r,
+ AC_TRY_LINK(
+@@ -153,7 +153,7 @@
+ fi
+ ])
+
+-AC_DEFUN(MYSQL_CHECK_PTHREAD_MUTEX_INIT,[
++AC_DEFUN([MYSQL_CHECK_PTHREAD_MUTEX_INIT],[
+ # Check definition of pthread_mutex_init
+ AC_CACHE_CHECK(%s
>>> DIFF TRUNCATED @ 16K
More information about the Openembedded-commits
mailing list