SOURCES: ncpfs-ac-php.patch (NEW), ncpfs-gettext.patch (NEW) - ini...
pascalek
pascalek at pld-linux.org
Wed Jun 13 12:14:48 CEST 2007
Author: pascalek Date: Wed Jun 13 10:14:48 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- initial revision
---- Files affected:
SOURCES:
ncpfs-ac-php.patch (NONE -> 1.1) (NEW), ncpfs-gettext.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/ncpfs-ac-php.patch
diff -u /dev/null SOURCES/ncpfs-ac-php.patch:1.1
--- /dev/null Wed Jun 13 12:14:48 2007
+++ SOURCES/ncpfs-ac-php.patch Wed Jun 13 12:14:43 2007
@@ -0,0 +1,615 @@
+diff -Nur ncpfs-2.2.6.orig/contrib/php/acinclude.m4 ncpfs-2.2.6.chng/contrib/php/acinclude.m4
+--- ncpfs-2.2.6.orig/contrib/php/acinclude.m4 2005-01-27 18:35:59.000000000 +0100
++++ ncpfs-2.2.6.chng/contrib/php/acinclude.m4 2007-06-13 11:06:05.000000000 +0200
+@@ -7,14 +7,14 @@
+ dnl
+ dnl Disable building CLI
+ dnl
+-AC_DEFUN(PHP_DISABLE_CLI,[
++AC_DEFUN([PHP_DISABLE_CLI],[
+ disable_cli=1
+ ])
+
+ dnl
+ dnl Separator into the configure --help display.
+ dnl
+-AC_DEFUN(PHP_HELP_SEPARATOR,[
++AC_DEFUN([PHP_HELP_SEPARATOR],[
+ AC_ARG_ENABLE([],[
+ $1
+ ],[])
+@@ -30,7 +30,7 @@
+ dnl
+ dnl If successful, adds -rdynamic to PHP_LDFLAGS.
+ dnl
+-AC_DEFUN(PHP_TARGET_RDYNAMIC,[
++AC_DEFUN([PHP_TARGET_RDYNAMIC],[
+ if test -n "$GCC"; then
+ dnl we should use a PHP-specific macro here
+ TSRM_CHECK_GCC_ARG(-rdynamic, gcc_rdynamic=yes)
+@@ -40,7 +40,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_REMOVE_USR_LIB,[
++AC_DEFUN([PHP_REMOVE_USR_LIB],[
+ unset ac_new_flags
+ for i in [$]$1; do
+ case [$]i in
+@@ -51,7 +51,7 @@
+ $1=[$]ac_new_flags
+ ])
+
+-AC_DEFUN(PHP_SETUP_OPENSSL,[
++AC_DEFUN([PHP_SETUP_OPENSSL],[
+ if test "$PHP_OPENSSL" = "no"; then
+ PHP_OPENSSL="/usr/local/ssl /usr/local /usr /usr/local/openssl"
+ fi
+@@ -104,7 +104,7 @@
+ dnl paths to the PHP build system which are only given in compiler
+ dnl notation.
+ dnl
+-AC_DEFUN(PHP_EVAL_LIBLINE,[
++AC_DEFUN([PHP_EVAL_LIBLINE],[
+ for ac_i in $1; do
+ case $ac_i in
+ -l*)
+@@ -124,7 +124,7 @@
+ dnl Use this macro, if you need to add header search paths to the PHP
+ dnl build system which are only given in compiler notation.
+ dnl
+-AC_DEFUN(PHP_EVAL_INCLINE,[
++AC_DEFUN([PHP_EVAL_INCLINE],[
+ for ac_i in $1; do
+ case $ac_i in
+ -I*)
+@@ -135,7 +135,7 @@
+ done
+ ])
+
+-AC_DEFUN(PHP_READDIR_R_TYPE,[
++AC_DEFUN([PHP_READDIR_R_TYPE],[
+ dnl HAVE_READDIR_R is also defined by libmysql
+ AC_CHECK_FUNC(readdir_r,ac_cv_func_readdir_r=yes,ac_cv_func_readdir=no)
+ if test "$ac_cv_func_readdir_r" = "yes"; then
+@@ -187,7 +187,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
++AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
+ PHP_SUBST(SHLIB_SUFFIX_NAME)
+ SHLIB_SUFFIX_NAME=so
+ case $host_alias in
+@@ -200,7 +200,7 @@
+ esac
+ ])
+
+-AC_DEFUN(PHP_DEBUG_MACRO,[
++AC_DEFUN([PHP_DEBUG_MACRO],[
+ DEBUG_LOG=$1
+ cat >$1 <<X
+ CONFIGURE: $CONFIGURE_COMMAND
+@@ -228,7 +228,7 @@
+ rm -fr conftest*
+ ])
+
+-AC_DEFUN(PHP_MISSING_PREAD_DECL,[
++AC_DEFUN([PHP_MISSING_PREAD_DECL],[
+ AC_CACHE_CHECK(whether pread works without custom declaration,ac_cv_pread,[
+ AC_TRY_COMPILE([#include <unistd.h>],[size_t (*func)() = pread],[
+ ac_cv_pread=yes
+@@ -266,7 +266,7 @@
+ esac
+ ])
+
+-AC_DEFUN(PHP_MISSING_PWRITE_DECL,[
++AC_DEFUN([PHP_MISSING_PWRITE_DECL],[
+ AC_CACHE_CHECK(whether pwrite works without custom declaration,ac_cv_pwrite,[
+ AC_TRY_COMPILE([#include <unistd.h>],[size_t (*func)() = pwrite],[
+ ac_cv_pwrite=yes
+@@ -302,7 +302,7 @@
+ esac
+ ])
+
+-AC_DEFUN(PHP_MISSING_TIME_R_DECL,[
++AC_DEFUN([PHP_MISSING_TIME_R_DECL],[
+ AC_MSG_CHECKING([for missing declarations of reentrant functions])
+ AC_TRY_COMPILE([#include <time.h>],[struct tm *(*func)() = localtime_r],[
+ :
+@@ -336,13 +336,13 @@
+ dnl PHP_LIBGCC_LIBPATH(gcc)
+ dnl Stores the location of libgcc in libgcc_libpath
+ dnl
+-AC_DEFUN(PHP_LIBGCC_LIBPATH,[
++AC_DEFUN([PHP_LIBGCC_LIBPATH],[
+ changequote({,})
+ libgcc_libpath=`$1 --print-libgcc-file-name|sed 's%/*[^/][^/]*$%%'`
+ changequote([,])
+ ])
+
+-AC_DEFUN(PHP_ARG_ANALYZE,[
++AC_DEFUN([PHP_ARG_ANALYZE],[
+ case [$]$1 in
+ shared,*)
+ ext_output="yes, shared"
+@@ -381,11 +381,11 @@
+ dnl default-val defaults to no. This will also set the variable ext_shared,
+ dnl and will overwrite any previous variable of that name.
+ dnl
+-AC_DEFUN(PHP_ARG_WITH,[
++AC_DEFUN([PHP_ARG_WITH],[
+ PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_))
+ ])
+
+-AC_DEFUN(PHP_REAL_ARG_WITH,[
++AC_DEFUN([PHP_REAL_ARG_WITH],[
+ if test -n "$2"; then
+ AC_MSG_CHECKING([$2])
+ fi
+@@ -399,11 +399,11 @@
+ dnl default-val defaults to no. This will also set the variable ext_shared,
+ dnl and will overwrite any previous variable of that name.
+ dnl
+-AC_DEFUN(PHP_ARG_ENABLE,[
++AC_DEFUN([PHP_ARG_ENABLE],[
+ PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_))
+ ])
+
+-AC_DEFUN(PHP_REAL_ARG_ENABLE,[
++AC_DEFUN([PHP_REAL_ARG_ENABLE],[
+ if test -n "$2"; then
+ AC_MSG_CHECKING([$2])
+ fi
+@@ -411,11 +411,11 @@
+ PHP_ARG_ANALYZE($5,[$2])
+ ])
+
+-AC_DEFUN(PHP_MODULE_PTR,[
++AC_DEFUN([PHP_MODULE_PTR],[
+ EXTRA_MODULE_PTRS="$EXTRA_MODULE_PTRS $1,"
+ ])
+
+-AC_DEFUN(PHP_CONFIG_NICE,[
++AC_DEFUN([PHP_CONFIG_NICE],[
+ rm -f $1
+ cat >$1<<EOF
+ #! /bin/sh
+@@ -438,7 +438,7 @@
+ chmod +x $1
+ ])
+
+-AC_DEFUN(PHP_TIME_R_TYPE,[
++AC_DEFUN([PHP_TIME_R_TYPE],[
+ AC_CACHE_CHECK(for type of reentrant time-related functions, ac_cv_time_r_type,[
+ AC_TRY_RUN([
+ #include <time.h>
+@@ -484,20 +484,20 @@
+ esac
+ ])
+
+-AC_DEFUN(PHP_SUBST,[
++AC_DEFUN([PHP_SUBST],[
+ PHP_VAR_SUBST="$PHP_VAR_SUBST $1"
+ ])
+
+-AC_DEFUN(PHP_SUBST_OLD,[
++AC_DEFUN([PHP_SUBST_OLD],[
+ PHP_SUBST($1)
+ AC_SUBST($1)
+ ])
+
+-AC_DEFUN(PHP_FAST_OUTPUT,[
++AC_DEFUN([PHP_FAST_OUTPUT],[
+ PHP_FAST_OUTPUT_FILES="$PHP_FAST_OUTPUT_FILES $1"
+ ])
+
+-AC_DEFUN(PHP_MKDIR_P_CHECK,[
++AC_DEFUN([PHP_MKDIR_P_CHECK],[
+ AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[
+ test -d conftestdir && rm -rf conftestdir
+ mkdir -p conftestdir/somedir >/dev/null 2>&1
+@@ -512,7 +512,7 @@
+ ])
+ ])
+
+-AC_DEFUN(PHP_GEN_CONFIG_VARS,[
++AC_DEFUN([PHP_GEN_CONFIG_VARS],[
+ PHP_MKDIR_P_CHECK
+ echo creating config_vars.mk
+ > config_vars.mk
+@@ -521,11 +521,11 @@
+ done
+ ])
+
+-AC_DEFUN(PHP_GEN_MAKEFILES,[
++AC_DEFUN([PHP_GEN_MAKEFILES],[
+ $SHELL $srcdir/build/fastgen.sh $srcdir $ac_cv_mkdir_p $BSD_MAKEFILE $1
+ ])
+
+-AC_DEFUN(PHP_TM_GMTOFF,[
++AC_DEFUN([PHP_TM_GMTOFF],[
+ AC_CACHE_CHECK([for tm_gmtoff in struct tm], ac_cv_struct_tm_gmtoff,
+ [AC_TRY_COMPILE([#include <sys/types.h>
+ #include <$ac_cv_struct_tm>], [struct tm tm; tm.tm_gmtoff;],
+@@ -538,19 +538,19 @@
+
+ dnl PHP_CONFIGURE_PART(MESSAGE)
+ dnl Idea borrowed from mm
+-AC_DEFUN(PHP_CONFIGURE_PART,[
++AC_DEFUN([PHP_CONFIGURE_PART],[
+ AC_MSG_RESULT()
+ AC_MSG_RESULT([${T_MD}$1${T_ME}])
+ ])
+
+-AC_DEFUN(PHP_PROG_SENDMAIL,[
++AC_DEFUN([PHP_PROG_SENDMAIL],[
+ AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib)
+ if test -n "$PROG_SENDMAIL"; then
+ AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
+ fi
+ ])
+
+-AC_DEFUN(PHP_RUNPATH_SWITCH,[
++AC_DEFUN([PHP_RUNPATH_SWITCH],[
+ dnl check for -R, etc. switch
+ AC_MSG_CHECKING([if compiler supports -R])
+ AC_CACHE_VAL(php_cv_cc_dashr,[
+@@ -578,7 +578,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_STRUCT_FLOCK,[
++AC_DEFUN([PHP_STRUCT_FLOCK],[
+ AC_CACHE_CHECK(for struct flock,ac_cv_struct_flock,
+ AC_TRY_COMPILE([
+ #include <unistd.h>
+@@ -596,7 +596,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_SOCKLEN_T,[
++AC_DEFUN([PHP_SOCKLEN_T],[
+ AC_CACHE_CHECK(for socklen_t,ac_cv_socklen_t,
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+@@ -618,7 +618,7 @@
+ dnl
+ dnl set the path of the file which contains the symbol export list
+ dnl
+-AC_DEFUN(PHP_SET_SYM_FILE,
++AC_DEFUN([PHP_SET_SYM_FILE],
+ [
+ PHP_SYM_FILE=$1
+ ])
+@@ -626,14 +626,14 @@
+ dnl
+ dnl PHP_BUILD_THREAD_SAFE
+ dnl
+-AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
++AC_DEFUN([PHP_BUILD_THREAD_SAFE],[
+ enable_experimental_zts=yes
+ if test "$pthreads_working" != "yes"; then
+ AC_MSG_ERROR([ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.])
+ fi
+ ])
+
+-AC_DEFUN(PHP_REQUIRE_CXX,[
++AC_DEFUN([PHP_REQUIRE_CXX],[
+ if test -z "$php_cxx_done"; then
+ AC_PROG_CXX
+ AC_PROG_CXXCPP
+@@ -644,21 +644,21 @@
+ dnl
+ dnl PHP_BUILD_SHARED
+ dnl
+-AC_DEFUN(PHP_BUILD_SHARED,[
++AC_DEFUN([PHP_BUILD_SHARED],[
+ php_build_target=shared
+ ])
+
+ dnl
+ dnl PHP_BUILD_STATIC
+ dnl
+-AC_DEFUN(PHP_BUILD_STATIC,[
++AC_DEFUN([PHP_BUILD_STATIC],[
+ php_build_target=static
+ ])
+
+ dnl
+ dnl PHP_BUILD_PROGRAM
+ dnl
+-AC_DEFUN(PHP_BUILD_PROGRAM,[
++AC_DEFUN([PHP_BUILD_PROGRAM],[
+ php_build_target=program
+ ])
+
+@@ -667,7 +667,7 @@
+ dnl
+ dnl execute code, if variable is not set in namespace
+ dnl
+-AC_DEFUN(AC_PHP_ONCE,[
++AC_DEFUN([AC_PHP_ONCE],[
+ changequote({,})
+ unique=`echo $2|sed 's/[^a-zA-Z0-9]/_/g'`
+ changequote([,])
+@@ -683,7 +683,7 @@
+ dnl
+ dnl expands path to an absolute path and assigns it to variable
+ dnl
+-AC_DEFUN(PHP_EXPAND_PATH,[
++AC_DEFUN([PHP_EXPAND_PATH],[
+ if test -z "$1" || echo "$1" | grep '^/' >/dev/null ; then
+ $2=$1
+ else
+@@ -700,7 +700,7 @@
+ dnl
+ dnl add a library to linkpath/runpath
+ dnl
+-AC_DEFUN(PHP_ADD_LIBPATH,[
++AC_DEFUN([PHP_ADD_LIBPATH],[
+ if test "$1" != "/usr/lib"; then
+ PHP_EXPAND_PATH($1, ai_p)
+ if test "$ext_shared" = "yes" && test -n "$2"; then
+@@ -720,7 +720,7 @@
+ dnl
+ dnl builds RPATH from PHP_RPATHS
+ dnl
+-AC_DEFUN(PHP_BUILD_RPATH,[
++AC_DEFUN([PHP_BUILD_RPATH],[
+ if test "$PHP_RPATH" = "yes" && test -n "$PHP_RPATHS"; then
+ OLD_RPATHS="$PHP_RPATHS"
+ unset PHP_RPATHS
+@@ -738,7 +738,7 @@
+ dnl add an include path.
+ dnl if before is 1, add in the beginning of INCLUDES.
+ dnl
+-AC_DEFUN(PHP_ADD_INCLUDE,[
++AC_DEFUN([PHP_ADD_INCLUDE],[
+ if test "$1" != "/usr/include"; then
+ PHP_EXPAND_PATH($1, ai_p)
+ AC_PHP_ONCE(INCLUDEPATH, $ai_p, [
+@@ -751,7 +751,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_X_ADD_LIBRARY,[
++AC_DEFUN([PHP_X_ADD_LIBRARY],[
+ ifelse($2,,$3="-l$1 [$]$3", $3="[$]$3 -l$1")
+ ])
+
+@@ -760,7 +760,7 @@
+ dnl
+ dnl add a library to the link line
+ dnl
+-AC_DEFUN(PHP_ADD_LIBRARY,[
++AC_DEFUN([PHP_ADD_LIBRARY],[
+ case $1 in
+ c|c_r|pthread*) ;;
+ *)
+@@ -782,7 +782,7 @@
+ dnl
+ dnl add a library to the link line (deferred)
+ dnl
+-AC_DEFUN(PHP_ADD_LIBRARY_DEFER,[
++AC_DEFUN([PHP_ADD_LIBRARY_DEFER],[
+ case $1 in
+ c|c_r|pthread*) ;;
+ *)
+@@ -806,7 +806,7 @@
+ dnl if shared-libadd is not empty and $ext_shared is yes,
+ dnl shared-libadd will be assigned the library information
+ dnl
+-AC_DEFUN(PHP_ADD_LIBRARY_WITH_PATH,[
++AC_DEFUN([PHP_ADD_LIBRARY_WITH_PATH],[
+ ifelse($3,,[
+ if test -n "$2"; then
+ PHP_ADD_LIBPATH($2)
+@@ -830,7 +830,7 @@
+ dnl add a library to the link line (deferred)
+ dnl and path to linkpath/runpath (not deferred)
+ dnl
+-AC_DEFUN(PHP_ADD_LIBRARY_DEFER_WITH_PATH,[
++AC_DEFUN([PHP_ADD_LIBRARY_DEFER_WITH_PATH],[
+ PHP_ADD_LIBPATH($2)
+ PHP_ADD_LIBRARY_DEFER($1)
+ ])
+@@ -838,14 +838,14 @@
+ dnl
+ dnl Set libtool variable
+ dnl
+-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
++AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
+ ])
+
+ dnl
+ dnl Check for cc option
+ dnl
+-AC_DEFUN(PHP_CHECK_CC_OPTION,[
++AC_DEFUN([PHP_CHECK_CC_OPTION],[
+ echo "main(){return 0;}" > conftest.$ac_ext
+ opt=$1
+ changequote({,})
+@@ -867,7 +867,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_REGEX,[
++AC_DEFUN([PHP_REGEX],[
+
+ if test "$REGEX_TYPE" = "php"; then
+ REGEX_LIB=regex/libregex.la
+@@ -890,7 +890,7 @@
+ dnl
+ dnl See if we have broken header files like SunOS has.
+ dnl
+-AC_DEFUN(PHP_MISSING_FCLOSE_DECL,[
++AC_DEFUN([PHP_MISSING_FCLOSE_DECL],[
+ AC_MSG_CHECKING([for fclose declaration])
+ AC_TRY_COMPILE([#include <stdio.h>],[int (*func)() = fclose],[
+ AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
+@@ -904,7 +904,7 @@
+ dnl
+ dnl Check for broken sprintf()
+ dnl
+-AC_DEFUN(PHP_AC_BROKEN_SPRINTF,[
++AC_DEFUN([PHP_AC_BROKEN_SPRINTF],[
+ AC_CACHE_CHECK(whether sprintf is broken, ac_cv_broken_sprintf,[
+ AC_TRY_RUN([main() {char buf[20];exit(sprintf(buf,"testing 123")!=11); }],[
+ ac_cv_broken_sprintf=no
+@@ -933,7 +933,7 @@
+ dnl If "nocli" is passed the extension will be built only with a non-cli
+ dnl sapi.
+ dnl
+-AC_DEFUN(PHP_EXTENSION,[
++AC_DEFUN([PHP_EXTENSION],[
+ EXT_SUBDIRS="$EXT_SUBDIRS $1"
+
+ if test -d "$abs_srcdir/ext/$1"; then
+@@ -984,7 +984,7 @@
+ dnl Must be run after all --with-NN options that let the user
+ dnl choose dynamic extensions, and after the gcc test.
+ dnl
+-AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
++AC_DEFUN([PHP_SOLARIS_PIC_WEIRDNESS],[
+ AC_MSG_CHECKING([whether -fPIC is required])
+ if test -n "$EXT_SHARED"; then
+ os=`uname -sr 2>/dev/null`
+@@ -1008,7 +1008,7 @@
+ dnl and sets $shared to "yes" or "no", and removes "shared,?" stuff
+ dnl from $withval.
+ dnl
+-AC_DEFUN(PHP_WITH_SHARED,[
++AC_DEFUN([PHP_WITH_SHARED],[
+ case $withval in
+ shared)
+ shared=yes
+@@ -1035,7 +1035,7 @@
+
+ dnl Written by Paul Eggert <eggert at twinsun.com>.
+
+-AC_DEFUN(PHP_SYS_LFS,
++AC_DEFUN([PHP_SYS_LFS],
+ [dnl
+ # If available, prefer support for large files unless the user specified
+ # one of the CPPFLAGS, LDFLAGS, or LIBS variables.
+@@ -1070,7 +1070,7 @@
+ esac
+ ])
+
+-AC_DEFUN(PHP_SOCKADDR_SA_LEN,[
++AC_DEFUN([PHP_SOCKADDR_SA_LEN],[
+ AC_CACHE_CHECK([for field sa_len in struct sockaddr],ac_cv_sockaddr_sa_len,[
+ AC_TRY_COMPILE([#include <sys/types.h>
+ #include <sys/socket.h>],
+@@ -1085,11 +1085,11 @@
+ dnl ## PHP_OUTPUT(file)
+ dnl ## adds "file" to the list of files generated by AC_OUTPUT
+ dnl ## This macro can be used several times.
+-AC_DEFUN(PHP_OUTPUT,[
++AC_DEFUN([PHP_OUTPUT],[
+ PHP_OUTPUT_FILES="$PHP_OUTPUT_FILES $1"
+ ])
+
+-AC_DEFUN(PHP_DECLARED_TIMEZONE,[
++AC_DEFUN([PHP_DECLARED_TIMEZONE],[
+ AC_CACHE_CHECK(for declared timezone, ac_cv_declared_timezone,[
+ AC_TRY_COMPILE([
+ #include <sys/types.h>
+@@ -1109,7 +1109,7 @@
+ fi
+ ])
+
+-AC_DEFUN(PHP_EBCDIC,[
++AC_DEFUN([PHP_EBCDIC],[
+ AC_CACHE_CHECK([whether system uses EBCDIC],ac_cv_ebcdic,[
+ AC_TRY_RUN( [
+ int main(void) {
+@@ -1127,12 +1127,12 @@
+ fi
+ ])
+
+-AC_DEFUN(AC_ADD_LIBPATH, [indir([PHP_ADD_LIBPATH], $@)])
+-AC_DEFUN(AC_ADD_LIBRARY, [indir([PHP_ADD_LIBRARY], $@)])
+-AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH, [indir([PHP_ADD_LIBRARY_WITH_PATH], $@)])
+-AC_DEFUN(AC_ADD_INCLUDE, [indir([PHP_ADD_INCLUDE], $@)])
++AC_DEFUN([AC_ADD_LIBPATH], [indir([PHP_ADD_LIBPATH], $@)])
++AC_DEFUN([AC_ADD_LIBRARY], [indir([PHP_ADD_LIBRARY], $@)])
++AC_DEFUN([AC_ADD_LIBRARY_WITH_PATH], [indir([PHP_ADD_LIBRARY_WITH_PATH], $@)])
++AC_DEFUN([AC_ADD_INCLUDE], [indir([PHP_ADD_INCLUDE], $@)])
+
+-AC_DEFUN(PHP_FOPENCOOKIE,[
++AC_DEFUN([PHP_FOPENCOOKIE],[
+ AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ])
+
+ if test "$have_glibc_fopencookie" = "yes" ; then
+@@ -1178,7 +1178,7 @@
+ dnl
+ dnl Wrapper for AC_CHECK_LIB
+ dnl
+-AC_DEFUN(PHP_CHECK_LIBRARY, [
++AC_DEFUN([PHP_CHECK_LIBRARY], [
+ save_old_LDFLAGS=$LDFLAGS
+ LDFLAGS="$5 $LDFLAGS"
+ AC_CHECK_LIB([$1],[$2],[
+@@ -1196,7 +1196,7 @@
+ dnl
+ dnl Common setup macro for iconv
+ dnl
+-AC_DEFUN(PHP_SETUP_ICONV, [
++AC_DEFUN([PHP_SETUP_ICONV], [
+ found_iconv=no
+ unset ICONV_DIR
+
+diff -Nur ncpfs-2.2.6.orig/contrib/php/configure.in ncpfs-2.2.6.chng/contrib/php/configure.in
+--- ncpfs-2.2.6.orig/contrib/php/configure.in 2005-01-27 18:35:59.000000000 +0100
++++ ncpfs-2.2.6.chng/contrib/php/configure.in 2007-06-13 11:00:31.000000000 +0200
+@@ -1,7 +1,7 @@
+
+ AC_INIT(Makefile.in)
+
+-AC_DEFUN(PHP_WITH_PHP_CONFIG,[
++AC_DEFUN([PHP_WITH_PHP_CONFIG],[
+ AC_ARG_WITH(php-config,
+ [ --with-php-config=PATH],[
+ PHP_CONFIG=$withval
+diff -Nur ncpfs-2.2.6.orig/contrib/php/dynlib.m4 ncpfs-2.2.6.chng/contrib/php/dynlib.m4
+--- ncpfs-2.2.6.orig/contrib/php/dynlib.m4 2005-01-27 18:35:59.000000000 +0100
++++ ncpfs-2.2.6.chng/contrib/php/dynlib.m4 2007-06-13 11:10:11.000000000 +0200
+@@ -19,7 +19,7 @@
+
+
+
+-AC_DEFUN(LIB_SHARED_CONVENIENCE,[
++AC_DEFUN([LIB_SHARED_CONVENIENCE],[
+ lib_target="\$(LTLIBRARY_NAME)"
+ cat >>$1<<EOF
+ \$(LTLIBRARY_NAME): \$(LTLIBRARY_SHARED_OBJECTS) \$(LTLIBRARY_DEPENDENCIES)
+@@ -28,7 +28,7 @@
+ EOF
+ ])
<<Diff was trimmed, longer than 597 lines>>
More information about the pld-cvs-commit
mailing list