subject:"\[PHP\-CVS\] cvs\: php\-src \/ acinclude.m4"

[PHP-CVS] cvs: php-src / acinclude.m4

2009-05-09 Thread Jani Taskinen

janiSat May  9 20:26:28 2009 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fixed bug #47468 (enable cli|cgi-only extensions  for embed sapi)
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.392r2=1.393diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.392 php-src/acinclude.m4:1.393
--- php-src/acinclude.m4:1.392  Thu Dec  4 00:41:17 2008
+++ php-src/acinclude.m4Sat May  9 20:26:28 2009
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.392 2008/12/04 00:41:17 dsp Exp $
+dnl $Id: acinclude.m4,v 1.393 2009/05/09 20:26:28 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -920,7 +920,7 @@
 ])
 
 dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[, 
cxx[, zend_ext])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [, sapi_class [, extra-cflags 
[, cxx [, zend_ext])
 dnl
 dnl Includes an extension in the build.
 dnl
@@ -968,12 +968,15 @@
   if test $3 != shared  test $3 != yes  test $4 = cli; then
 dnl -- CLI static module
 [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
-if test $PHP_SAPI = cgi; then
-  PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
-  EXT_STATIC=$EXT_STATIC $1
-else
-  PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
-fi
+case $PHP_SAPI in
+  cgi|embed[)]
+PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
+EXT_STATIC=$EXT_STATIC $1
+;;
+  *[)]
+PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
+;;
+esac
 EXT_CLI_STATIC=$EXT_CLI_STATIC $1
   fi
   PHP_ADD_BUILD_DIR($ext_builddir)



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2008-12-03 Thread David Soria Parra

dsp Thu Dec  4 00:41:17 2008 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  MFB: Fix test for auto_cflags and explictly set GCC=no if we detect suncc
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.391r2=1.392diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.391 php-src/acinclude.m4:1.392
--- php-src/acinclude.m4:1.391  Thu Nov  6 20:38:02 2008
+++ php-src/acinclude.m4Thu Dec  4 00:41:17 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.391 2008/11/06 20:38:02 dsp Exp $
+dnl $Id: acinclude.m4,v 1.392 2008/12/04 00:41:17 dsp Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2776,6 +2776,7 @@
 SUNCC=no
 AC_MSG_RESULT([no]),
 SUNCC=yes
+GCC=no
 test -n $auto_cflags  CFLAGS=-fsimple=2 -xnorunpath -xO4 
-xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto 
-xstrconst -xtarget=native -zlazyload
 GCC=
 AC_MSG_RESULT([yes])
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.667r2=1.668diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.667 php-src/configure.in:1.668
--- php-src/configure.in:1.667  Thu Nov 27 19:45:16 2008
+++ php-src/configure.inThu Dec  4 00:41:17 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.667 2008/11/27 19:45:16 scottmac Exp $ -*- autoconf 
-*-
+## $Id: configure.in,v 1.668 2008/12/04 00:41:17 dsp Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -796,7 +796,7 @@
 CXXFLAGS=$CXXFLAGS -O0
   fi
   if test $SUNCC = yes; then
-if -n $auto_cflags; then
+if test -n $auto_cflags; then
   CFLAGS=-g
   CXXFLAGS=-g
 else



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2008-11-06 Thread David Soria Parra

dsp Thu Nov  6 20:38:02 2008 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  Detect Sun C compiler and set default flags if it is used
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.390r2=1.391diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.390 php-src/acinclude.m4:1.391
--- php-src/acinclude.m4:1.390  Mon Sep  8 10:24:05 2008
+++ php-src/acinclude.m4Thu Nov  6 20:38:02 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.390 2008/09/08 10:24:05 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.391 2008/11/06 20:38:02 dsp Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2766,6 +2766,22 @@
   )
 ])
 
+dnl PHP_DETECT_SUNCC
+dnl Detect if the systems default compiler is suncc.
+dnl We also set some usefull CFLAGS if the user didn't set any
+AC_DEFUN([PHP_DETECT_SUNCC],[
+  SUNCC=no
+  AC_MSG_CHECKING([for suncc])
+  AC_EGREP_CPP([^__SUNPRO_C], [__SUNPRO_C],
+SUNCC=no
+AC_MSG_RESULT([no]),
+SUNCC=yes
+test -n $auto_cflags  CFLAGS=-fsimple=2 -xnorunpath -xO4 
-xalias_level=basic -xipo=1 -xlibmopt -xprefetch_level=1 -xprefetch=auto 
-xstrconst -xtarget=native -zlazyload
+GCC=
+AC_MSG_RESULT([yes])
+  )
+])
+
 dnl
 dnl PHP_CRYPT_R_STYLE
 dnl detect the style of crypt_r() is any is available
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.664r2=1.665diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.664 php-src/configure.in:1.665
--- php-src/configure.in:1.664  Wed Jul 30 23:31:41 2008
+++ php-src/configure.inThu Nov  6 20:38:02 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.664 2008/07/30 23:31:41 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.665 2008/11/06 20:38:02 dsp Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -142,6 +142,7 @@
 
 AC_PROG_CC
 PHP_DETECT_ICC
+PHP_DETECT_SUNCC
 AC_PROG_CC_C_O
 dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
 dnl AC_PROG_CC_STDC
@@ -214,6 +215,10 @@
   CFLAGS=$CFLAGS -ieee
 fi
 ;;
+  sparc*)
+if test $SUNCC = yes; then
+  CFLAGS=$CFLAGS -xmemalign=8s
+fi
 esac
 
 dnl activate some gcc specific optimizations for gcc = 4
@@ -788,6 +793,15 @@
 CFLAGS=$CFLAGS -O0
 CXXFLAGS=$CXXFLAGS -O0
   fi
+  if test $SUNCC = yes; then
+if -n $auto_cflags; then
+  CFLAGS=-g
+  CXXFLAGS=-g
+else
+  CFLAGS=$CFLAGS -g
+  CXXFLAGS=$CFLAGS -g
+fi
+  fi
 else
   PHP_DEBUG=0
   ZEND_DEBUG=no



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2008-09-08 Thread Antony Dovgal

tony2001Mon Sep  8 10:24:07 2008 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  add missing file
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.389r2=1.390diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.389 php-src/acinclude.m4:1.390
--- php-src/acinclude.m4:1.389  Thu Jul 24 14:17:21 2008
+++ php-src/acinclude.m4Mon Sep  8 10:24:05 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.389 2008/07/24 14:17:21 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.390 2008/09/08 10:24:05 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2416,6 +2416,7 @@
   $php_shtool mkdir -p ext/iconv
 
   echo  ext/iconv/php_have_bsd_iconv.h
+  echo  ext/iconv/php_have_ibm_iconv.h
   echo  ext/iconv/php_have_glibc_iconv.h
   echo  ext/iconv/php_have_libiconv.h
   echo  ext/iconv/php_have_iconv.h



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2008-07-24 Thread Antony Dovgal

tony2001Thu Jul 24 14:17:22 2008 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  set GCC to no if ICC was detected
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.388r2=1.389diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.388 php-src/acinclude.m4:1.389
--- php-src/acinclude.m4:1.388  Mon Jul 21 10:29:59 2008
+++ php-src/acinclude.m4Thu Jul 24 14:17:21 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.388 2008/07/21 10:29:59 jani Exp $
+dnl $Id: acinclude.m4,v 1.389 2008/07/24 14:17:21 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2751,7 +2751,7 @@
 
 dnl
 dnl PHP_DETECT_ICC
-dnl
+dnl Detect Intel C++ Compiler and unset $GCC if ICC found
 AC_DEFUN([PHP_DETECT_ICC],
 [
   ICC=no
@@ -2760,6 +2760,7 @@
 ICC=no
 AC_MSG_RESULT([no]),
 ICC=yes
+GCC=no
 AC_MSG_RESULT([yes])
   )
 ])



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2008-07-21 Thread Jani Taskinen

janiMon Jul 21 10:29:59 2008 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Sync to PHP_5_3
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.387r2=1.388diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.387 php-src/acinclude.m4:1.388
--- php-src/acinclude.m4:1.387  Wed Mar 26 14:46:16 2008
+++ php-src/acinclude.m4Mon Jul 21 10:29:59 2008
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.387 2008/03/26 14:46:16 scottmac Exp $
+dnl $Id: acinclude.m4,v 1.388 2008/07/21 10:29:59 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -931,8 +931,9 @@
 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 
-dnl cxx can be used to indicate that a C++ shared module is desired.
 dnl @ext_srcdir@ and @ext_builddir@ being substituted.
+dnl cxx can be used to indicate that a C++ shared module is desired.
+dnl zend_ext indicates a zend extension.
 AC_DEFUN([PHP_NEW_EXTENSION],[
   ext_builddir=[]PHP_EXT_BUILDDIR($1)
   ext_srcdir=[]PHP_EXT_SRCDIR($1)
@@ -2154,11 +2155,11 @@
   AC_CHECK_PROG(RE2C, re2c, re2c)
   if test -n $RE2C; then
 AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
-  re2c_vernum=`re2c --vernum 2/dev/null`
+  re2c_vernum=`$RE2C --vernum 2/dev/null`
   if test -z $re2c_vernum || test $re2c_vernum -lt 1304; then
 php_cv_re2c_version=invalid
   else
-php_cv_re2c_version=`re2c --version | cut -d ' ' -f 2  2/dev/null` 
(ok)
+php_cv_re2c_version=`$RE2C --version | cut -d ' ' -f 2  2/dev/null` 
(ok)
   fi 
 ])
   fi
@@ -2716,6 +2717,7 @@
 enable-zend-multibyte[)] continue;;
   esac 
 fi
+
 is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 
'abcdefghijklmnopqrstuvwxyz_'`
 if eval test x\$$is_arg_set = x; then
   PHP_UNKNOWN_CONFIGURE_OPTIONS=$PHP_UNKNOWN_CONFIGURE_OPTIONS



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-12-30 Thread Jon Parise

jon Mon Dec 31 04:27:47 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Document the 'cxx' parameter to PHP_NEW_EXTENSION.
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.384r2=1.385diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.384 php-src/acinclude.m4:1.385
--- php-src/acinclude.m4:1.384  Mon Aug 20 14:28:29 2007
+++ php-src/acinclude.m4Mon Dec 31 04:27:47 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.384 2007/08/20 14:28:29 jani Exp $
+dnl $Id: acinclude.m4,v 1.385 2007/12/31 04:27:47 jon Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -927,6 +927,7 @@
 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 
+dnl cxx can be used to indicate that a C++ shared module is desired.
 dnl @ext_srcdir@ and @ext_builddir@ being substituted.
 AC_DEFUN([PHP_NEW_EXTENSION],[
   ext_builddir=[]PHP_EXT_BUILDDIR($1)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2007-08-20 Thread Jani Taskinen

janiMon Aug 20 14:28:30 2007 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  - Part 1 of fixing problems with runpath switch (make --disable-rpath work 
for real)
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.383r2=1.384diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.383 php-src/acinclude.m4:1.384
--- php-src/acinclude.m4:1.383  Fri Aug  3 10:46:19 2007
+++ php-src/acinclude.m4Mon Aug 20 14:28:29 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.383 2007/08/03 10:46:19 jani Exp $
+dnl $Id: acinclude.m4,v 1.384 2007/08/20 14:28:29 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -323,6 +323,9 @@
 ld_runpath_switch=-L
   fi
 fi
+if test $PHP_RPATH = no; then
+  ld_runpath_switch=
+fi
 ])
 
 dnl
@@ -447,7 +450,8 @@
   _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
 ],[
   if test $ext_shared = yes; then
-$2=$ld_runpath_switch$ai_p -L$ai_p [$]$2
+$2=-L$ai_p [$]$2
+test -n $ld_runpath_switch  $2=$ld_runpath_switch$ai_p [$]$2
   else
 _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
   fi
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.639r2=1.640diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.639 php-src/configure.in:1.640
--- php-src/configure.in:1.639  Mon Aug  6 14:33:06 2007
+++ php-src/configure.inMon Aug 20 14:28:29 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.639 2007/08/06 14:33:06 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.640 2007/08/20 14:28:29 jani Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -138,6 +138,10 @@
 PHP_ARG_WITH(libdir, for system library directory,
 [  --with-libdir=NAME  Look for libraries in .../NAME rather than 
.../lib],lib,no)
 
+PHP_ARG_ENABLE(rpath, whether to enable runpaths,
+[  --disable-rpath Disable passing additional runtime library
+  search paths], yes, no)
+
 dnl check for -R, etc. switch
 PHP_RUNPATH_SWITCH
 
@@ -755,10 +759,6 @@
   AC_DEFINE(PHP_SIGCHILD, 0, [ ])
 fi
 
-PHP_ARG_ENABLE(rpath, whether to enable runpaths,
-[  --disable-rpath Disable passing additional runtime library
-  search paths], yes, no)
-
 PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc,
 [  --enable-libgcc Enable explicitly linking against libgcc], no, no)
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-08-03 Thread Jani Taskinen

janiFri Aug  3 10:46:19 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.382r2=1.383diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.382 php-src/acinclude.m4:1.383
--- php-src/acinclude.m4:1.382  Thu Jul 26 22:45:22 2007
+++ php-src/acinclude.m4Fri Aug  3 10:46:19 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.382 2007/07/26 22:45:22 jani Exp $
+dnl $Id: acinclude.m4,v 1.383 2007/08/03 10:46:19 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2708,7 +2708,7 @@
   esac 
 fi
 is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 
'abcdefghijklmnopqrstuvwxyz_'`
-if eval test -z \$$is_arg_set; then
+if eval test x\$$is_arg_set = x; then
   PHP_UNKNOWN_CONFIGURE_OPTIONS=$PHP_UNKNOWN_CONFIGURE_OPTIONS
 [$]arg
 fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-25 Thread Jani Taskinen

janiWed Jul 25 21:19:43 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Allow using extra headers in PHP_CHECK_SIZEOF
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.379r2=1.380diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.379 php-src/acinclude.m4:1.380
--- php-src/acinclude.m4:1.379  Thu Jul 19 12:35:56 2007
+++ php-src/acinclude.m4Wed Jul 25 21:19:43 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.379 2007/07/19 12:35:56 jani Exp $
+dnl $Id: acinclude.m4,v 1.380 2007/07/25 21:19:43 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1026,21 +1026,17 @@
 dnl Checks for structures, typedefs, broken functions, etc.
 dnl -
 
+dnl Internal helper macro
+dnl _PHP_CHECK_SIZEOF(type, cross-value, extra-headers [, found-action [, 
not-found-action]])
 dnl
-dnl PHP_CHECK_SIZEOF(TYPE [, CROSS-SIZE])
-dnl Enhanced version of AC_CHECK_SIZEOF for checking more types 
-dnl than just those defined in stdio.h
-dnl
-AC_DEFUN(PHP_CHECK_SIZEOF,
-[changequote(, )dnl
-dnl The name to #define.
-define(AC_TYPE_NAME, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
-dnl The cache variable name.
-define(AC_CV_NAME, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
-changequote([, ])dnl
-AC_MSG_CHECKING(size of $1)
-AC_CACHE_VAL(AC_CV_NAME,
-[AC_TRY_RUN([#include stdio.h
+AC_DEFUN([_PHP_CHECK_SIZEOF], [
+  php_cache_value=php_cv_sizeof_[]$1
+  AC_CACHE_VAL(php_cv_sizeof_[]$1, [
+old_LIBS=$LIBS
+LIBS=
+old_LDFLAGS=$LDFLAGS
+LDFLAGS=
+AC_TRY_RUN([#include stdio.h
 #if STDC_HEADERS
 #include stdlib.h
 #include stddef.h
@@ -1051,17 +1047,41 @@
 #ifdef HAVE_UNISTD_H
 #include unistd.h
 #endif
+$3
+
 int main()
 {
-   FILE *f=fopen(conftestval, w);
-   if (!f) return(1);
-   fprintf(f, %d\n, sizeof($1));
-   return(0);
-   }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , 
AC_CV_NAME=$2))])dnl
-AC_MSG_RESULT($AC_CV_NAME)
-AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in a $1.])
-undefine([AC_TYPE_NAME])dnl
-undefine([AC_CV_NAME])dnl
+   FILE *fp = fopen(conftestval, w);
+   if (!fp) return(1);
+   fprintf(fp, %d\n, sizeof($1));
+   return(0);
+}
+  ], [
+eval $php_cache_value=`cat conftestval`
+  ], [
+eval $php_cache_value=0
+  ], [
+ifelse([$2],,[eval $php_cache_value=0], [eval $php_cache_value=$2])
+])
+  LDFLAGS=$old_LDFLAGS
+  LIBS=$old_LIBS
+])
+  if eval test \$$php_cache_value != 0; then
+ifelse([$4],[],:,[$4])
+ifelse([$5],[],,[else $5])
+  fi
+])
+
+dnl
+dnl PHP_CHECK_SIZEOF(type, cross-value, extra-headers)
+dnl
+AC_DEFUN(PHP_CHECK_SIZEOF, [
+  AC_MSG_CHECKING([size of $1])
+  _PHP_CHECK_SIZEOF($1, $2, $3, [
+AC_DEFINE_UNQUOTED([SIZEOF_]translit($1,a-z,A-Z_), [$]php_cv_sizeof_[]$1, 
[Size of $1])
+AC_DEFINE_UNQUOTED([HAVE_]translit($1,a-z,A-Z_), 1, [Whether $1 is 
available])
+  ])
+  AC_MSG_RESULT([[$][php_cv_sizeof_]translit($1, ,_)])
 ])
 
 dnl

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-19 Thread Jani Taskinen

janiThu Jul 19 12:35:56 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Stop configure if scanner files are not found and invalid/no flex is found
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.378r2=1.379diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.378 php-src/acinclude.m4:1.379
--- php-src/acinclude.m4:1.378  Mon Jul 16 10:11:39 2007
+++ php-src/acinclude.m4Thu Jul 19 12:35:56 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.378 2007/07/16 10:11:39 jani Exp $
+dnl $Id: acinclude.m4,v 1.379 2007/07/19 12:35:56 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2077,8 +2077,17 @@
   
   case $php_cv_flex_version in
 |invalid[)]
-  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version).
-  AC_MSG_WARN([$flex_msg])
+  if test -f $abs_srcdir/Zend/zend_language_scanner.c  test -f 
$abs_srcdir/Zend/zend_ini_scanner.c; then
+AC_MSG_WARN([flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version)])
+  else
+flex_msg=Supported flex versions are: $flex_version_list
+if test $flex_version = none; then
+  flex_msg=flex not found. flex is required to generate the Zend/PHP 
parsers! $flex_msg
+else
+  flex_msg=Found invalid flex version: $flex_version. $flex_msg
+fi
+AC_MSG_ERROR([$flex_msg])
+  fi
   LEX=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-16 Thread Jani Taskinen

janiMon Jul 16 10:00:31 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix issue in differentiating between --with-* and --enable-*
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.376r2=1.377diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.376 php-src/acinclude.m4:1.377
--- php-src/acinclude.m4:1.376  Thu Jul 12 17:46:14 2007
+++ php-src/acinclude.m4Mon Jul 16 10:00:31 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.376 2007/07/12 17:46:14 jani Exp $
+dnl $Id: acinclude.m4,v 1.377 2007/07/16 10:00:31 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -696,6 +696,7 @@
 dnl the PHP_ARG_ANALYZE_EX.
 dnl
 AC_DEFUN([PHP_ARG_WITH],[
+php_with_[]translit($1,A-Z0-9-,a-z0-9_)=ifelse($4,,no,$4)
 
PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_),[ifelse($5,,yes,$5)])
 ])
 
@@ -723,7 +724,8 @@
 dnl the PHP_ARG_ANALYZE_EX.
 dnl
 AC_DEFUN([PHP_ARG_ENABLE],[
-PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_),[ifelse($5,,yes,$5)])
+php_enable_[]translit($1,A-Z0-9-,a-z0-9_)=ifelse($4,,no,$4)
+PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_),[ifelse($5,,yes,$5)])
 ])
 
 dnl PHP_REAL_ARG_ENABLE
@@ -2617,16 +2619,16 @@
   for arg in $ac_configure_args; do
 case $arg in
   --with-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--with-//g' -e 's/=.*//g'`
+   arg_name=`echo [$]arg | $SED -e 's/--with-/with-/g' -e 's/=.*//g'`
 ;;
   --without-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--without-//g' -e 's/=.*//g'`
+   arg_name=`echo [$]arg | $SED -e 's/--without-/with-/g' -e 's/=.*//g'`
 ;;
   --enable-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--enable-//g' -e 's/=.*//g'`
+   arg_name=`echo [$]arg | $SED -e 's/--enable-/enable-/g' -e 's/=.*//g'`
 ;;
   --disable-*[)]
-   arg_name=`echo [$]arg | $SED -e 's/--disable-//g' -e 's/=.*//g'`
+   arg_name=`echo [$]arg | $SED -e 's/--disable-/enable-/g' -e 
's/=.*//g'`
 ;;
   *[)]
continue
@@ -2634,20 +2636,21 @@
 esac
 case $arg_name in
   # Allow --disable-all / --enable-all
-  all[)];;
+  enable-all[)];;
 
   # Allow certain libtool options
-  libtool-lock | pic | tags | shared | static | fast-install | gnu-ld[)];;
+  enable-libtool-lock | with-pic | with-tags | enable-shared | 
enable-static | enable-fast-install | with-gnu-ld[)];;
 
   # Allow certain TSRM options
-  tsrm-pth | tsrm-st | tsrm-pthreads[)];;
+  with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads[)];;
 
   # Allow certain Zend options
-  zend-vm | maintainer-zts | inline-optimization | zend-multibyte[)];;
+  with-zend-vm | enable-maintainer-zts | enable-inline-optimization | 
enable-zend-multibyte[)];;
 
   # All the rest must be set using the PHP_ARG_* macros
+  # PHP_ARG_* macros set php_enable_arg_name or php_with_arg_name
   *[)]
-is_arg_set=PHP_[]`echo [$]arg_name | tr 'abcdefghijklmnopqrstuvwxyz-' 
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 
'abcdefghijklmnopqrstuvwxyz_'`
 if eval test -z \$$is_arg_set; then
   PHP_UNKNOWN_CONFIGURE_OPTIONS=$PHP_UNKNOWN_CONFIGURE_OPTIONS
 [$]arg

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-16 Thread Jani Taskinen

janiMon Jul 16 10:11:39 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - The --enable-zend-multibyte option does not exist in PHP 6
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.377r2=1.378diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.377 php-src/acinclude.m4:1.378
--- php-src/acinclude.m4:1.377  Mon Jul 16 10:00:31 2007
+++ php-src/acinclude.m4Mon Jul 16 10:11:39 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.377 2007/07/16 10:00:31 jani Exp $
+dnl $Id: acinclude.m4,v 1.378 2007/07/16 10:11:39 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2645,7 +2645,7 @@
   with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads[)];;
 
   # Allow certain Zend options
-  with-zend-vm | enable-maintainer-zts | enable-inline-optimization | 
enable-zend-multibyte[)];;
+  with-zend-vm | enable-maintainer-zts | enable-inline-optimization[)];;
 
   # All the rest must be set using the PHP_ARG_* macros
   # PHP_ARG_* macros set php_enable_arg_name or php_with_arg_name


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-12 Thread Jani Taskinen

janiThu Jul 12 17:46:14 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  fix the configure output
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.375r2=1.376diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.375 php-src/acinclude.m4:1.376
--- php-src/acinclude.m4:1.375  Wed Jul 11 21:47:04 2007
+++ php-src/acinclude.m4Thu Jul 12 17:46:14 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.375 2007/07/11 21:47:04 jani Exp $
+dnl $Id: acinclude.m4,v 1.376 2007/07/12 17:46:14 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2119,7 +2119,7 @@
 dnl Common setup macro for ICU
 dnl
 AC_DEFUN([PHP_SETUP_ICU],[
-  PHP_ARG_WITH(icu-dir, for location of ICU headers and libraries,
+  PHP_ARG_WITH(icu-dir,,
   [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], DEFAULT, no)
 
   if test $PHP_ICU_DIR = no; then
@@ -2133,13 +2133,15 @@
 ICU_CONFIG=$PHP_ICU_DIR/bin/icu-config
   fi
 
+  AC_MSG_CHECKING([for location of ICU headers and libraries])
+
   dnl Trust icu-config to know better what the install prefix is..
   icu_install_prefix=`$ICU_CONFIG --prefix 2 /dev/null`
   if test $? != 0 || test -z $icu_install_prefix; then
 AC_MSG_RESULT([not found])
 AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please 
verify ICU install prefix and make sure icu-config works.])
   else
-AC_MSG_RESULT([found in $icu_install_prefix])
+AC_MSG_RESULT([$icu_install_prefix])
 
 dnl Check ICU version
 AC_MSG_CHECKING([for ICU 3.4 or greater])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/standard config.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 10:27:16 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/standard   config.m4 
  Log:
  - Cleanup, nuked some unnecessary macros.
  http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.371r2=1.372diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.371 php-src/acinclude.m4:1.372
--- php-src/acinclude.m4:1.371  Tue Jul 10 10:18:26 2007
+++ php-src/acinclude.m4Wed Jul 11 10:27:16 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.371 2007/07/10 10:18:26 jani Exp $
+dnl $Id: acinclude.m4,v 1.372 2007/07/11 10:27:16 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2627,31 +2627,6 @@
 ])
 
 dnl
-dnl PHP_REGEX
-dnl
-AC_DEFUN([PHP_REGEX],[
-  if test $REGEX_TYPE = php; then
-AC_DEFINE(HAVE_REGEX_T_RE_MAGIC, 1, [ ])
-AC_DEFINE(HSREGEX,1,[ ])
-AC_DEFINE(REGEX,1,[ ])
-PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
-  elif test $REGEX_TYPE = system; then
-AC_DEFINE(REGEX,0,[ ])
-dnl Check if field re_magic exists in struct regex_t
-AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], 
ac_cv_regex_t_re_magic, [
-  AC_TRY_COMPILE([#include sys/types.h
-#include regex.h], [regex_t rt; rt.re_magic;],
-  [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
-])
-if test $ac_cv_regex_t_re_magic = yes; then
-  AC_DEFINE([HAVE_REGEX_T_RE_MAGIC], [ ], 1)
-fi 
-  fi
-  AC_MSG_CHECKING([which regex library to use])
-  AC_MSG_RESULT([$REGEX_TYPE])
-])
-
-dnl
 dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
 dnl
 AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/config.m4?r1=1.84r2=1.85diff_format=u
Index: php-src/ext/standard/config.m4
diff -u php-src/ext/standard/config.m4:1.84 php-src/ext/standard/config.m4:1.85
--- php-src/ext/standard/config.m4:1.84 Thu Aug 24 11:05:38 2006
+++ php-src/ext/standard/config.m4  Wed Jul 11 10:27:16 2007
@@ -1,13 +1,12 @@
-dnl $Id: config.m4,v 1.84 2006/08/24 11:05:38 tony2001 Exp $ -*- autoconf -*-
+dnl $Id: config.m4,v 1.85 2007/07/11 10:27:16 jani Exp $ -*- autoconf -*-
 
 divert(3)dnl
 
 dnl
 dnl Check if flush should be called explicitly after buffered io
 dnl
-AC_DEFUN([AC_FLUSH_IO],[
-  AC_CACHE_CHECK([whether flush should be called explicitly after a buffered 
io], ac_cv_flush_io,[
-  AC_TRY_RUN( [
+AC_CACHE_CHECK([whether flush should be called explicitly after a buffered 
io], ac_cv_flush_io,[
+AC_TRY_RUN( [
 #include stdio.h
 #include stdlib.h
 
@@ -48,24 +47,21 @@
 ],[
   ac_cv_flush_io=no
 ])])
-  if test $ac_cv_flush_io = yes; then
-AC_DEFINE(HAVE_FLUSHIO, 1, [Define if flush should be called explicitly 
after a buffered io.])
-  fi
-])
+if test $ac_cv_flush_io = yes; then
+  AC_DEFINE(HAVE_FLUSHIO, 1, [Define if flush should be called explicitly 
after a buffered io.])
+fi
 
 dnl
 dnl Check for crypt() capabilities
 dnl
-AC_DEFUN([AC_CRYPT_CAP],[
-
-  if test $ac_cv_func_crypt = no; then
+if test $ac_cv_func_crypt = no; then
   AC_CHECK_LIB(crypt, crypt, [
 LIBS=-lcrypt $LIBS -lcrypt
 AC_DEFINE(HAVE_CRYPT, 1, [ ])
   ])
-  fi
+fi
   
-  AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
+AC_CACHE_CHECK(for standard DES crypt, ac_cv_crypt_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include unistd.h
@@ -82,21 +78,20 @@
exit(0);
 #endif
 }],[
-ac_cv_crypt_des=yes
-  ],[
-ac_cv_crypt_des=no
-  ],[
-ac_cv_crypt_des=yes
-  ])
-  ])
-  if test $ac_cv_crypt_des = yes; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system 
supports standard DES salt])
+  ac_cv_crypt_des=yes
+],[
+  ac_cv_crypt_des=no
+],[
+  ac_cv_crypt_des=yes
+])])
+if test $ac_cv_crypt_des = yes; then
+  ac_result=1
+else
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_STD_DES_CRYPT, $ac_result, [Whether the system supports 
standard DES salt])
 
-  AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
+AC_CACHE_CHECK(for extended DES crypt, ac_cv_crypt_ext_des,[
   AC_TRY_RUN([
 #if HAVE_UNISTD_H
 #include unistd.h
@@ -108,27 +103,26 @@
 
 main() {
 #if HAVE_CRYPT
-exit (strcmp((char 
*)crypt(rasmuslerdorf,_J9..rasm),_J9..rasmBYk8r9AiWNc));
+  exit (strcmp((char 
*)crypt(rasmuslerdorf,_J9..rasm),_J9..rasmBYk8r9AiWNc));
 #else
-   exit(0);
+  exit(0);
 #endif
 }],[
-ac_cv_crypt_ext_des=yes
-  ],[
-ac_cv_crypt_ext_des=no
-  ],[
-ac_cv_crypt_ext_des=no
-  ])
-  ])
-  if test $ac_cv_crypt_ext_des = yes; then
-ac_result=1
-  else
-ac_result=0
-  fi
-  AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system 
supports extended DES salt])
+  ac_cv_crypt_ext_des=yes
+],[
+  ac_cv_crypt_ext_des=no
+],[
+  ac_cv_crypt_ext_des=no
+])])
+if test $ac_cv_crypt_ext_des = yes; then
+  ac_result=1
+else
+  ac_result=0
+fi
+AC_DEFINE_UNQUOTED(PHP_EXT_DES_CRYPT, $ac_result, [Whether the system supports 
extended DES salt])
 
-

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 10:35:47 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Improved PHP_SETUP_ICU
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.372r2=1.373diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.372 php-src/acinclude.m4:1.373
--- php-src/acinclude.m4:1.372  Wed Jul 11 10:27:16 2007
+++ php-src/acinclude.m4Wed Jul 11 10:35:47 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.372 2007/07/11 10:27:16 jani Exp $
+dnl $Id: acinclude.m4,v 1.373 2007/07/11 10:35:47 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2122,30 +2122,16 @@
 dnl Common setup macro for ICU
 dnl
 AC_DEFUN([PHP_SETUP_ICU],[
-  unset PHP_ICU_DIR
+  PHP_ARG_WITH(icu-dir, for location of ICU headers and libraries,
+  [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], DEFAULT, no)
 
-  AC_MSG_CHECKING([for location of ICU headers and libraries])
-
-  AC_ARG_WITH(icu-dir,
-  [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], 
-  [
-if test x$withval != xyes; then
-  PHP_ICU_DIR=$withval
-else
-  PHP_ICU_DIR=DEFAULT
-fi
-  ], [
+  if test $PHP_ICU_DIR = no; then
 PHP_ICU_DIR=DEFAULT
-  ])
+  fi
 
   if test $PHP_ICU_DIR = DEFAULT; then
-ICU_CONFIG=icu-config
-for i in /usr/local/bin /usr/bin; do
-  if test -x $i/icu-config; then
-ICU_CONFIG=$i/icu-config
-break;
-  fi
-done
+dnl Try to find icu-config
+AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin])
   else
 ICU_CONFIG=$PHP_ICU_DIR/bin/icu-config
   fi
@@ -2167,7 +2153,7 @@
 IFS=$ac_IFS
 icu_version=`expr [$]1 \* 1000 + [$]2`
 AC_MSG_RESULT([found $icu_version_full])
-   
+
 if test $icu_version -lt 3004; then
   AC_MSG_ERROR([ICU version 3.4 or later is required])
 fi
@@ -2179,7 +2165,6 @@
   fi
 ])
 
-
 dnl
 dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
 dnl

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/mbstring mbstring.c /ext/standard basic_functions.c mail.c php_mail.h /main config.w32.h main.c /win32/build config.w32.h.in

2007-07-11 Thread Johannes Schl

johannesWed Jul 11 17:39:04 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/mbstring   mbstring.c 
/php-src/ext/standard   basic_functions.c mail.c php_mail.h 
/php-src/main   config.w32.h main.c 
/php-src/win32/buildconfig.w32.h.in 
  Log:
  - Always enable mail() function
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.373r2=1.374diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.373 php-src/acinclude.m4:1.374
--- php-src/acinclude.m4:1.373  Wed Jul 11 10:35:47 2007
+++ php-src/acinclude.m4Wed Jul 11 17:39:04 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.373 2007/07/11 10:35:47 jani Exp $
+dnl $Id: acinclude.m4,v 1.374 2007/07/11 17:39:04 johannes Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1991,9 +1991,6 @@
 AC_DEFUN([PHP_PROG_SENDMAIL], [
   PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib
   AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH)
-  if test -n $PROG_SENDMAIL; then
-AC_DEFINE(HAVE_SENDMAIL,1,[whether you have sendmail])
-  fi
   PHP_SUBST(PROG_SENDMAIL)
 ])
 
http://cvs.php.net/viewvc.cgi/php-src/ext/mbstring/mbstring.c?r1=1.268r2=1.269diff_format=u
Index: php-src/ext/mbstring/mbstring.c
diff -u php-src/ext/mbstring/mbstring.c:1.268 
php-src/ext/mbstring/mbstring.c:1.269
--- php-src/ext/mbstring/mbstring.c:1.268   Wed Apr  4 15:23:09 2007
+++ php-src/ext/mbstring/mbstring.c Wed Jul 11 17:39:04 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: mbstring.c,v 1.268 2007/04/04 15:23:09 masugata Exp $ */
+/* $Id: mbstring.c,v 1.269 2007/07/11 17:39:04 johannes Exp $ */
 
 /*
  * PHP 4 Multibyte String module mbstring
@@ -3317,7 +3317,6 @@
 /* {{{ proto int mb_send_mail(string to, string subject, string message [, 
string additional_headers [, string additional_parameters]])
  *  Sends an email message with MIME scheme
  */
-#if HAVE_SENDMAIL
 
 #define SKIP_LONG_HEADER_SEP_MBSTRING(str, pos)
\
if (str[pos] == '\r'  str[pos + 1] == '\n'  (str[pos + 2] == ' ' || 
str[pos + 2] == '\t')) {\
@@ -3821,16 +3820,6 @@
 #undef PHP_MBSTR_MAIL_MIME_HEADER2
 #undef PHP_MBSTR_MAIL_MIME_HEADER3
 #undef PHP_MBSTR_MAIL_MIME_HEADER4
-
-#else  /* HAVE_SENDMAIL */
-
-PHP_FUNCTION(mb_send_mail)
-{
-   RETURN_FALSE;
-}
-
-#endif /* HAVE_SENDMAIL */
-
 /* }}} */
 
 /* {{{ proto mixed mb_get_info([string type])
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.863r2=1.864diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.863 
php-src/ext/standard/basic_functions.c:1.864
--- php-src/ext/standard/basic_functions.c:1.863Wed Jul 11 15:52:44 2007
+++ php-src/ext/standard/basic_functions.c  Wed Jul 11 17:39:04 2007
@@ -17,7 +17,7 @@
+--+
  */
 
-/* $Id: basic_functions.c,v 1.863 2007/07/11 15:52:44 dmitry Exp $ */
+/* $Id: basic_functions.c,v 1.864 2007/07/11 17:39:04 johannes Exp $ */
 
 #include php.h
 #include php_streams.h
@@ -1816,7 +1816,6 @@
 #endif
 /* }}} */
 /* {{{ mail.c */
-#ifdef HAVE_SENDMAIL
 static
 ZEND_BEGIN_ARG_INFO(arginfo_ezmlm_hash, 0)
ZEND_ARG_INFO(0, addr)
@@ -1830,7 +1829,6 @@
ZEND_ARG_INFO(0, additional_headers)
ZEND_ARG_INFO(0, additional_parameters)
 ZEND_END_ARG_INFO()
-#endif
 /* }}} */
 /* {{{ math.c */
 static
@@ -3693,10 +3691,8 @@
PHP_FALIAS(diskfreespace,   disk_free_space,
arginfo_disk_free_space)
 
/* functions from mail.c */
-#ifdef HAVE_SENDMAIL
PHP_FE(mail,
arginfo_mail)
PHP_FE(ezmlm_hash,  
arginfo_ezmlm_hash)
-#endif
 
/* functions from syslog.c */
 #ifdef HAVE_SYSLOG_H
@@ -4944,14 +4940,9 @@
 
case 1: /*send an email */
{
-#if HAVE_SENDMAIL
if (!php_mail(opt, PHP error_log message, 
message, headers, NULL TSRMLS_CC)) {
return FAILURE;
}
-#else
-   php_error_docref(NULL TSRMLS_CC, E_WARNING, 
Mail option not available!);
-   return FAILURE;
-#endif
}
break;
 
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/mail.c?r1=1.93r2=1.94diff_format=u
Index: php-src/ext/standard/mail.c
diff -u php-src/ext/standard/mail.c:1.93 php-src/ext/standard/mail.c:1.94
---

[PHP-CVS] cvs: php-src / acinclude.m4

2007-07-11 Thread Jani Taskinen

janiWed Jul 11 21:47:04 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB: PHP_CHECK_CONFIGURE_OPTIONS
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.374r2=1.375diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.374 php-src/acinclude.m4:1.375
--- php-src/acinclude.m4:1.374  Wed Jul 11 17:39:04 2007
+++ php-src/acinclude.m4Wed Jul 11 21:47:04 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.374 2007/07/11 17:39:04 johannes Exp $
+dnl $Id: acinclude.m4,v 1.375 2007/07/11 21:47:04 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2609,6 +2609,53 @@
 ])
 
 dnl
+dnl PHP_CHECK_CONFIGURE_OPTIONS
+dnl
+AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[
+  for arg in $ac_configure_args; do
+case $arg in
+  --with-*[)]
+   arg_name=`echo [$]arg | $SED -e 's/--with-//g' -e 's/=.*//g'`
+;;
+  --without-*[)]
+   arg_name=`echo [$]arg | $SED -e 's/--without-//g' -e 's/=.*//g'`
+;;
+  --enable-*[)]
+   arg_name=`echo [$]arg | $SED -e 's/--enable-//g' -e 's/=.*//g'`
+;;
+  --disable-*[)]
+   arg_name=`echo [$]arg | $SED -e 's/--disable-//g' -e 's/=.*//g'`
+;;
+  *[)]
+   continue
+;;
+esac
+case $arg_name in
+  # Allow --disable-all / --enable-all
+  all[)];;
+
+  # Allow certain libtool options
+  libtool-lock | pic | tags | shared | static | fast-install | gnu-ld[)];;
+
+  # Allow certain TSRM options
+  tsrm-pth | tsrm-st | tsrm-pthreads[)];;
+
+  # Allow certain Zend options
+  zend-vm | maintainer-zts | inline-optimization | zend-multibyte[)];;
+
+  # All the rest must be set using the PHP_ARG_* macros
+  *[)]
+is_arg_set=PHP_[]`echo [$]arg_name | tr 'abcdefghijklmnopqrstuvwxyz-' 
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'`
+if eval test -z \$$is_arg_set; then
+  PHP_UNKNOWN_CONFIGURE_OPTIONS=$PHP_UNKNOWN_CONFIGURE_OPTIONS
+[$]arg
+fi
+;;
+esac
+  done
+])
+
+dnl
 dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
 dnl
 AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2007-07-10 Thread Jani Taskinen

janiTue Jul 10 10:18:26 2007 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  - Removed --enable-versioning
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.370r2=1.371diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.370 php-src/acinclude.m4:1.371
--- php-src/acinclude.m4:1.370  Fri Jun 29 01:09:53 2007
+++ php-src/acinclude.m4Tue Jul 10 10:18:26 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.370 2007/06/29 01:09:53 sniper Exp $
+dnl $Id: acinclude.m4,v 1.371 2007/07/10 10:18:26 jani Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -746,16 +746,6 @@
 dnl -
 
 dnl
-dnl PHP_SET_SYM_FILE(path)
-dnl
-dnl set the path of the file which contains the symbol export list
-dnl
-AC_DEFUN([PHP_SET_SYM_FILE],
-[
-  PHP_SYM_FILE=$1
-])
-
-dnl
 dnl PHP_BUILD_THREAD_SAFE
 dnl
 AC_DEFUN([PHP_BUILD_THREAD_SAFE],[
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.632r2=1.633diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.632 php-src/configure.in:1.633
--- php-src/configure.in:1.632  Fri Jul  6 10:58:36 2007
+++ php-src/configure.inTue Jul 10 10:18:26 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.632 2007/07/06 10:58:36 tony2001 Exp $ -*- autoconf 
-*-
+ ## $Id: configure.in,v 1.633 2007/07/10 10:18:26 jani Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -809,16 +809,6 @@
   AC_MSG_RESULT(using system default)
 ])
 
-AC_MSG_CHECKING([whether to enable versioning])
-AC_ARG_ENABLE(versioning,
-[  --enable-versioning Export only required symbols.
-  See INSTALL for more information], [
-  PHP_VERSIONING=$enableval
-],[
-  PHP_VERSIONING=no
-])
-AC_MSG_RESULT([$PHP_VERSIONING])
-
 dnl ## check for ICU library location and version
 PHP_SETUP_ICU
 
@@ -860,23 +850,6 @@
 dnl Extensions post-config
 dnl -
 
-if test $PHP_VERSIONING = yes; then
-  if test -n $PHP_MODULES; then
-AC_MSG_ERROR([--enable-versioning cannot be used with shared modules])
-  fi
-
-  case $host_alias in
-*darwin*)
-  AC_MSG_ERROR([--enable-versioning is not supported on your platform])
-  ;;
-  esac
- 
-  test -z $PHP_SYM_FILE  PHP_SYM_FILE=$abs_srcdir/sapi/$PHP_SAPI/php.sym
-  if test -f $PHP_SYM_FILE; then
-EXTRA_LDFLAGS=-export-symbols $PHP_SYM_FILE $EXTRA_LDFLAGS
-  fi
-fi
-
 enable_shared=yes
 enable_static=yes
 



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /scripts php-config.in phpize.in /scripts/man1 php-config.1.in

2007-06-28 Thread Jani Taskinen

sniper  Fri Jun 29 01:09:54 2007 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/scriptsphp-config.in phpize.in 
/php-src/scripts/man1   php-config.1.in 
  Log:
  - Improved php-config:
. Added --configure-options option to get configure line for current build
. Added --php-sapis option which shows SAPIs available
. Fixed problem with missing php binary when CLI is not build but CGI is.
  - Fixed broken sed issues in phpize script
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.369r2=1.370diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.369 php-src/acinclude.m4:1.370
--- php-src/acinclude.m4:1.369  Wed Jun 27 14:40:02 2007
+++ php-src/acinclude.m4Fri Jun 29 01:09:53 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.369 2007/06/27 14:40:02 sniper Exp $
+dnl $Id: acinclude.m4,v 1.370 2007/06/29 01:09:53 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2590,8 +2590,8 @@
 AC_DEFUN([PHP_CONFIG_NICE],[
   AC_REQUIRE([AC_PROG_EGREP])
   AC_REQUIRE([LT_AC_PROG_SED])
-  PHP_SUBST(EGREP)
-  PHP_SUBST(SED)
+  PHP_SUBST_OLD(EGREP)
+  PHP_SUBST_OLD(SED)
   test -f $1  mv $1 $1.old
   rm -f $1.old
   cat $1EOF
@@ -2620,18 +2620,20 @@
  break;
 fi
 echo '[$]arg' \\  $1
-CONFIGURE_COMMAND=$CONFIGURE_COMMAND '[$]arg'
+CONFIGURE_OPTIONS=$CONFIGURE_OPTIONS '[$]arg'
  else
 if test `expr -- $arg : '--.*` = 0; then
  break;
 fi
 echo [$]arg \\  $1
-CONFIGURE_COMMAND=$CONFIGURE_COMMAND [$]arg
+CONFIGURE_OPTIONS=$CONFIGURE_OPTIONS [$]arg
  fi
   done
   echo '[$]@'  $1
   chmod +x $1
+  CONFIGURE_COMMAND=$CONFIGURE_COMMAND $CONFIGURE_OPTIONS
   PHP_SUBST_OLD(CONFIGURE_COMMAND)
+  PHP_SUBST_OLD(CONFIGURE_OPTIONS)
 ])
 
 dnl
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.629r2=1.630diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.629 php-src/configure.in:1.630
--- php-src/configure.in:1.629  Wed Jun 27 14:40:02 2007
+++ php-src/configure.inFri Jun 29 01:09:53 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.629 2007/06/27 14:40:02 sniper Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.630 2007/06/29 01:09:53 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -1077,8 +1077,13 @@
   PHP_CLI_TARGET=\$(SAPI_CLI_PATH)
   PHP_INSTALL_CLI_TARGET=install-cli
   PHP_ADD_SOURCES(sapi/cli, php_cli.c php_cli_readline.c getopt.c,, cli)
+  PHP_INSTALLED_SAPIS=cli $PHP_SAPI
+else
+  PHP_INSTALLED_SAPIS=$PHP_SAPI
 fi
 
+PHP_SUBST_OLD(PHP_INSTALLED_SAPIS)
+
 PHP_SUBST(PHP_CLI_TARGET)
 PHP_SUBST(PHP_SAPI_OBJS)
 PHP_SUBST(PHP_CLI_OBJS)
http://cvs.php.net/viewvc.cgi/php-src/scripts/php-config.in?r1=1.7r2=1.8diff_format=u
Index: php-src/scripts/php-config.in
diff -u php-src/scripts/php-config.in:1.7 php-src/scripts/php-config.in:1.8
--- php-src/scripts/php-config.in:1.7   Thu Jul 27 08:50:41 2006
+++ php-src/scripts/php-config.in   Fri Jun 29 01:09:54 2007
@@ -1,10 +1,11 @@
 #! /bin/sh
 
+SED=@SED@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
 version=@PHP_VERSION@
-version_id=@PHP_VERSION_ID@
-includedir=@includedir@/php
+vernum=@PHP_VERSION_ID@
+include_dir=@includedir@/php
 includes=-I$includedir -I$includedir/main -I$includedir/TSRM 
-I$includedir/Zend -I$includedir/ext -I$includedir/ext/date/lib
 ldflags=@PHP_LDFLAGS@
 libs=@EXTRA_LIBS@
@@ -12,30 +13,73 @@
 program_prefix=@program_prefix@
 program_suffix=@program_suffix@
 exe_extension=@EXEEXT@
-php_binary=@bindir@/${program_prefix}php${program_suffix}${exe_extension}
+php_cli_binary=NONE
+php_cgi_binary=NONE
+configure_options=@CONFIGURE_OPTIONS@
+php_sapis=@PHP_INSTALLED_SAPIS@
+
+# Set php_cli_binary and php_cgi_binary if available
+for sapi in $php_sapis; do
+  case $sapi in
+  cli)
+
php_cli_binary=@bindir@/${program_prefix}php${program_suffix}${exe_extension}
+;;
+  cgi)
+
php_cgi_binary=@bindir@/${program_prefix}php-cgi${program_suffix}${exe_extension}
+;;
+  esac
+done
+
+# Determine which (if any) php binary is available
+if test $php_cli_binary != NONE; then
+  php_binary=$php_cli_binary
+else
+  php_binary=$php_cgi_binary
+fi
+
+# Remove quotes
+configure_options=`echo $configure_options | $SED -e s#'##g`
 
 case $1 in
 --prefix)
-   echo $prefix;;
+  echo $prefix;;
 --includes)
-   echo $includes;;
+  echo $includes;;
 --ldflags)
-   echo $ldflags;;
+  echo $ldflags;;
 --libs)
-   echo $libs;;
+  echo $libs;;
 --extension-dir)
-   echo $extension_dir;;
+  echo $extension_dir;;
 --include-dir)
-   echo $includedir;;
+  echo $include_dir;;
 --php-binary)
-   echo $php_binary;;
+  echo $php_binary;;
+--php-sapis)
+  echo $php_sapis;;
+--configure-options)
+  echo $configure_options;;
 --version)
-   echo $version;;
+  echo $version;;
 --vernum)
-   echo

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2007-06-27 Thread Jani Taskinen

sniper  Wed Jun 27 14:40:02 2007 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  - Added PHP_CHECK_SIZEOF macro (special version of AC_CHECK_SIZEOF)
  # Now types like ptrdiff_t, ssize_t and intmax_t get defined to something
  # useful..
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.368r2=1.369diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.368 php-src/acinclude.m4:1.369
--- php-src/acinclude.m4:1.368  Thu May 24 21:43:56 2007
+++ php-src/acinclude.m4Wed Jun 27 14:40:02 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.368 2007/05/24 21:43:56 sniper Exp $
+dnl $Id: acinclude.m4,v 1.369 2007/06/27 14:40:02 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1035,6 +1035,44 @@
 dnl -
 
 dnl
+dnl PHP_CHECK_SIZEOF(TYPE [, CROSS-SIZE])
+dnl Enhanced version of AC_CHECK_SIZEOF for checking more types 
+dnl than just those defined in stdio.h
+dnl
+AC_DEFUN(PHP_CHECK_SIZEOF,
+[changequote(, )dnl
+dnl The name to #define.
+define(AC_TYPE_NAME, translit(sizeof_$1, [a-z *], [A-Z_P]))dnl
+dnl The cache variable name.
+define(AC_CV_NAME, translit(ac_cv_sizeof_$1, [ *], [_p]))dnl
+changequote([, ])dnl
+AC_MSG_CHECKING(size of $1)
+AC_CACHE_VAL(AC_CV_NAME,
+[AC_TRY_RUN([#include stdio.h
+#if STDC_HEADERS
+#include stdlib.h
+#include stddef.h
+#endif
+#ifdef HAVE_INTTYPES_H
+#include inttypes.h
+#endif
+#ifdef HAVE_UNISTD_H
+#include unistd.h
+#endif
+int main()
+{
+   FILE *f=fopen(conftestval, w);
+   if (!f) return(1);
+   fprintf(f, %d\n, sizeof($1));
+   return(0);
+   }], AC_CV_NAME=`cat conftestval`, AC_CV_NAME=0, ifelse([$2], , , 
AC_CV_NAME=$2))])dnl
+AC_MSG_RESULT($AC_CV_NAME)
+AC_DEFINE_UNQUOTED(AC_TYPE_NAME, $AC_CV_NAME, [The number of bytes in a $1.])
+undefine([AC_TYPE_NAME])dnl
+undefine([AC_CV_NAME])dnl
+])
+
+dnl
 dnl PHP_CHECK_IN_ADDR_T
 dnl
 AC_DEFUN([PHP_CHECK_IN_ADDR_T], [
@@ -2713,6 +2751,9 @@
   fi
 ])
 
+dnl
+dnl PHP_TEST_WRITE_STDOUT
+dnl
 AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
   AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
 AC_TRY_RUN([
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.628r2=1.629diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.628 php-src/configure.in:1.629
--- php-src/configure.in:1.628  Mon Jun 25 14:23:21 2007
+++ php-src/configure.inWed Jun 27 14:40:02 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.628 2007/06/25 14:23:21 dmitry Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.629 2007/06/27 14:40:02 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -422,15 +422,17 @@
 PHP_STRUCT_FLOCK
 PHP_SOCKLEN_T
 
-AC_CHECK_SIZEOF(intmax_t, 0)
 AC_CHECK_SIZEOF(size_t, 8)
-AC_CHECK_SIZEOF(ssize_t, 8)
-AC_CHECK_SIZEOF(ptrdiff_t, 8)
 AC_CHECK_SIZEOF(long long, 8)
 AC_CHECK_SIZEOF(long long int, 8)
 AC_CHECK_SIZEOF(long, 8)
 AC_CHECK_SIZEOF(int, 4)
 
+dnl These are defined elsewhere than stdio.h
+PHP_CHECK_SIZEOF(intmax_t, 0)
+PHP_CHECK_SIZEOF(ssize_t, 8)
+PHP_CHECK_SIZEOF(ptrdiff_t, 8)
+
 dnl Check for members of the stat structure
 AC_STRUCT_ST_BLKSIZE
 dnl AC_STRUCT_ST_BLOCKS will screw QNX because fileblocks.o does not exists

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-05-24 Thread Jani Taskinen

sniper  Thu May 24 19:36:12 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB:- Fix idiotic change in logic. (hint: flex is _REQUIRED_ for building PHP!
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.365r2=1.366diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.365 php-src/acinclude.m4:1.366
--- php-src/acinclude.m4:1.365  Sat May  5 12:24:45 2007
+++ php-src/acinclude.m4Thu May 24 19:36:12 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.365 2007/05/05 12:24:45 helly Exp $
+dnl $Id: acinclude.m4,v 1.366 2007/05/24 19:36:12 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2050,9 +2050,8 @@
   
   case $php_cv_flex_version in
 |invalid[)]
-  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version).
-  AC_MSG_WARN([$flex_msg])
-  LEX=echo \error: $flex_msg\ 12 ; exit 1;
+  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list (found: $flex_version).
+  AC_MSG_ERROR([$flex_msg])
   ;;
   esac
   PHP_SUBST(LEX)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-05-24 Thread Jani Taskinen

sniper  Thu May 24 19:52:30 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB:- Fix previous fix. (just revert of Stefan's bad fix..)
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.366r2=1.367diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.366 php-src/acinclude.m4:1.367
--- php-src/acinclude.m4:1.366  Thu May 24 19:36:12 2007
+++ php-src/acinclude.m4Thu May 24 19:52:30 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.366 2007/05/24 19:36:12 sniper Exp $
+dnl $Id: acinclude.m4,v 1.367 2007/05/24 19:52:30 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2050,8 +2050,9 @@
   
   case $php_cv_flex_version in
 |invalid[)]
-  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list (found: $flex_version).
-  AC_MSG_ERROR([$flex_msg])
+  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version).
+  AC_MSG_WARN([$flex_msg])
+  LEX=exit 0;
   ;;
   esac
   PHP_SUBST(LEX)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-05-05 Thread Marcus Boerger

helly   Sat May  5 12:14:20 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix re2c check and bump requirement to 0.12.0
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.363r2=1.364diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.363 php-src/acinclude.m4:1.364
--- php-src/acinclude.m4:1.363  Sun Mar 25 10:21:43 2007
+++ php-src/acinclude.m4Sat May  5 12:14:20 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.363 2007/03/25 10:21:43 sniper Exp $
+dnl $Id: acinclude.m4,v 1.364 2007/05/05 12:14:20 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2067,11 +2067,11 @@
   AC_CHECK_PROG(RE2C, re2c, re2c)
   if test -n $RE2C; then
 AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
-  re2c_vernum=`echo  | re2c --vernum 2/dev/null`
-  if test -z $re2c_vernum || test $re2c_vernum -lt 911; then
+  re2c_vernum=`re2c --vernum 2/dev/null`
+  if test -z $re2c_vernum || test $re2c_vernum -lt 1200; then
 php_cv_re2c_version=invalid
   else
-php_cv_re2c_version=`echo  | re2c --version | cut -d ' ' -f 2  
2/dev/null` (ok)
+php_cv_re2c_version=`re2c --version | cut -d ' ' -f 2  2/dev/null` 
(ok)
   fi 
 ])
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-05-05 Thread Marcus Boerger

helly   Sat May  5 12:24:46 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Update version in error message as well
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.364r2=1.365diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.364 php-src/acinclude.m4:1.365
--- php-src/acinclude.m4:1.364  Sat May  5 12:14:20 2007
+++ php-src/acinclude.m4Sat May  5 12:24:45 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.364 2007/05/05 12:14:20 helly Exp $
+dnl $Id: acinclude.m4,v 1.365 2007/05/05 12:24:45 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2077,7 +2077,7 @@
   fi
   case $php_cv_re2c_version in
 |invalid[)]
-  AC_MSG_WARN([You will need re2c 0.9.11 or later if you want to 
regenerate PHP parsers.])
+  AC_MSG_WARN([You will need re2c 0.12.0 or later if you want to 
regenerate PHP parsers.])
   RE2C=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-03-25 Thread Jani Taskinen

sniper  Sun Mar 25 10:21:43 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB:- Check if Makefile.frag actually exists before running sed on it.
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.362r2=1.363diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.362 php-src/acinclude.m4:1.363
--- php-src/acinclude.m4:1.362  Tue Feb 20 20:10:53 2007
+++ php-src/acinclude.m4Sun Mar 25 10:21:43 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.362 2007/02/20 20:10:53 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.363 2007/03/25 10:21:43 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -177,7 +177,7 @@
   ifelse($1,,src=$ext_srcdir/Makefile.frag,src=$1)
   ifelse($2,,ac_srcdir=$ext_srcdir,ac_srcdir=$2)
   ifelse($3,,ac_builddir=$ext_builddir,ac_builddir=$3)
-  $SED -e s#\$(srcdir)#$ac_srcdir#g -e s#\$(builddir)#$ac_builddir#g $src  
 Makefile.fragments
+  test -f $src  $SED -e s#\$(srcdir)#$ac_srcdir#g -e 
s#\$(builddir)#$ac_builddir#g $src   Makefile.fragments
 ])
 
 dnl

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /sapi/cgi config9.m4

2007-02-20 Thread Antony Dovgal

tony2001Tue Feb 20 20:10:53 2007 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/sapi/cgi   config9.m4 
  Log:
  move PHP_TEST_WRITE_STDOUT to acinclude.m4 and use it in configure.in
  its result is used in sapi/cli  sapi/embed, not just sapi/cgi
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.361r2=1.362diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.361 php-src/acinclude.m4:1.362
--- php-src/acinclude.m4:1.361  Wed Jan 31 21:29:53 2007
+++ php-src/acinclude.m4Tue Feb 20 20:10:53 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.361 2007/01/31 21:29:53 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.362 2007/02/20 20:10:53 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2712,3 +2712,33 @@
 AC_MSG_ERROR([Unable to detect data struct used by crypt_r])
   fi
 ])
+
+AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
+  AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
+AC_TRY_RUN([
+#ifdef HAVE_UNISTD_H
+#include unistd.h
+#endif
+
+#define TEXT This is the test message -- 
+
+main()
+{
+  int n;
+
+  n = write(1, TEXT, sizeof(TEXT)-1);
+  return (!(n == sizeof(TEXT)-1));
+}
+],[
+  ac_cv_write_stdout=yes
+],[
+  ac_cv_write_stdout=no
+],[
+  ac_cv_write_stdout=no
+])
+  ])
+  if test $ac_cv_write_stdout = yes; then
+AC_DEFINE(PHP_WRITE_STDOUT, 1, [whether write(2) works])
+  fi
+])
+
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.622r2=1.623diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.622 php-src/configure.in:1.623
--- php-src/configure.in:1.622  Fri Jan 26 11:13:50 2007
+++ php-src/configure.inTue Feb 20 20:10:53 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.622 2007/01/26 11:13:50 tony2001 Exp $ -*- autoconf 
-*-
+ ## $Id: configure.in,v 1.623 2007/02/20 20:10:53 tony2001 Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -286,6 +286,9 @@
 dnl Check whether the system byte ordering is bigendian
 PHP_C_BIGENDIAN
 
+dnl Check whether writing to stdout works
+PHP_TEST_WRITE_STDOUT
+
 dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
 dnl and source packages.  This should be harmless on other OSs.
 if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/config9.m4?r1=1.21r2=1.22diff_format=u
Index: php-src/sapi/cgi/config9.m4
diff -u php-src/sapi/cgi/config9.m4:1.21 php-src/sapi/cgi/config9.m4:1.22
--- php-src/sapi/cgi/config9.m4:1.21Thu Feb  2 10:00:09 2006
+++ php-src/sapi/cgi/config9.m4 Tue Feb 20 20:10:53 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config9.m4,v 1.21 2006/02/02 10:00:09 dmitry Exp $
+dnl $Id: config9.m4,v 1.22 2007/02/20 20:10:53 tony2001 Exp $
 dnl
 
 AC_ARG_ENABLE(cgi,
@@ -10,36 +10,6 @@
   PHP_SAPI_CGI=yes
 ])
 
-AC_DEFUN([PHP_TEST_WRITE_STDOUT],[
-  AC_CACHE_CHECK(whether writing to stdout works,ac_cv_write_stdout,[
-AC_TRY_RUN([
-#ifdef HAVE_UNISTD_H
-#include unistd.h
-#endif
-
-#define TEXT This is the test message -- 
-
-main()
-{
-  int n;
-
-  n = write(1, TEXT, sizeof(TEXT)-1);
-  return (!(n == sizeof(TEXT)-1));
-}
-],[
-  ac_cv_write_stdout=yes
-],[
-  ac_cv_write_stdout=no
-],[
-  ac_cv_write_stdout=no
-])
-  ])
-  if test $ac_cv_write_stdout = yes; then
-AC_DEFINE(PHP_WRITE_STDOUT, 1, [whether write(2) works])
-  fi
-])
-
-
 if test $PHP_SAPI = default; then
   AC_MSG_CHECKING(for CGI build)
   if test $PHP_SAPI_CGI != no; then
@@ -82,8 +52,6 @@
 esac
 PHP_SUBST(SAPI_CGI_PATH)
 
-PHP_TEST_WRITE_STDOUT
-
 INSTALL_IT=@echo \Installing PHP CGI into: 
\$(INSTALL_ROOT)\$(bindir)/\; \$(INSTALL) -m 0755 \$(SAPI_CGI_PATH) 
\$(INSTALL_ROOT)\$(bindir)/\$(program_prefix)php\$(program_suffix)\$(EXEEXT)
 PHP_SELECT_SAPI(cgi, program, fastcgi.c cgi_main.c getopt.c, , 
'$(SAPI_CGI_PATH)')
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-01-15 Thread Antony Dovgal

tony2001Mon Jan 15 14:03:55 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  improve icu-config check
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.358r2=1.359diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.358 php-src/acinclude.m4:1.359
--- php-src/acinclude.m4:1.358  Fri Jan 12 19:13:07 2007
+++ php-src/acinclude.m4Mon Jan 15 14:03:55 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.358 2007/01/12 19:13:07 andrei Exp $
+dnl $Id: acinclude.m4,v 1.359 2007/01/15 14:03:55 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2121,9 +2121,9 @@
 
   dnl Trust icu-config to know better what the install prefix is..
   icu_install_prefix=`$ICU_CONFIG --prefix 2 /dev/null`
-  if test -z $icu_install_prefix; then
+  if test $? != 0 || test -z $icu_install_prefix; then
 AC_MSG_RESULT([not found])
-AC_MSG_ERROR([Please specify the correct ICU install prefix.])
+AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please 
verify ICU install prefix and make sure icu-config works.])
   else
 AC_MSG_RESULT([found in $icu_install_prefix])
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-01-15 Thread Antony Dovgal

tony2001Mon Jan 15 14:07:18 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  tabs - ws
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.359r2=1.360diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.359 php-src/acinclude.m4:1.360
--- php-src/acinclude.m4:1.359  Mon Jan 15 14:03:55 2007
+++ php-src/acinclude.m4Mon Jan 15 14:07:18 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.359 2007/01/15 14:03:55 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.360 2007/01/15 14:07:18 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2098,25 +2098,25 @@
   AC_ARG_WITH(icu-dir,
   [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], 
   [
-   if test x$withval != xyes; then
- PHP_ICU_DIR=$withval
-   else
- PHP_ICU_DIR=DEFAULT
-   fi
+if test x$withval != xyes; then
+  PHP_ICU_DIR=$withval
+else
+  PHP_ICU_DIR=DEFAULT
+fi
   ], [
-   PHP_ICU_DIR=DEFAULT
+PHP_ICU_DIR=DEFAULT
   ])
 
   if test $PHP_ICU_DIR = DEFAULT; then
-   ICU_CONFIG=icu-config
-   for i in /usr/local/bin /usr/bin; do
- if test -x $i/icu-config; then
-   ICU_CONFIG=$i/icu-config
-   break;
- fi
-   done
+ICU_CONFIG=icu-config
+for i in /usr/local/bin /usr/bin; do
+  if test -x $i/icu-config; then
+ICU_CONFIG=$i/icu-config
+break;
+  fi
+done
   else
-   ICU_CONFIG=$PHP_ICU_DIR/bin/icu-config
+ICU_CONFIG=$PHP_ICU_DIR/bin/icu-config
   fi
 
   dnl Trust icu-config to know better what the install prefix is..
@@ -2127,23 +2127,24 @@
   else
 AC_MSG_RESULT([found in $icu_install_prefix])
 
-   dnl Check ICU version
-   AC_MSG_CHECKING([for ICU 3.4 or greater])
-   icu_version_full=`$ICU_CONFIG --version`
-   ac_IFS=$IFS
-   IFS=.
-   set $icu_version_full
-   IFS=$ac_IFS
-   icu_version=`expr [$]1 \* 1000 + [$]2`
-   AC_MSG_RESULT([found $icu_version_full])
-   if test $icu_version -lt 3004; then
- AC_MSG_ERROR([ICU version 3.4 or later is required])
-   fi
-
-   ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
-   ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
-   PHP_EVAL_INCLINE($ICU_INCS)
-   PHP_EVAL_LIBLINE($ICU_LIBS, $1)
+dnl Check ICU version
+AC_MSG_CHECKING([for ICU 3.4 or greater])
+icu_version_full=`$ICU_CONFIG --version`
+ac_IFS=$IFS
+IFS=.
+set $icu_version_full
+IFS=$ac_IFS
+icu_version=`expr [$]1 \* 1000 + [$]2`
+AC_MSG_RESULT([found $icu_version_full])
+   
+if test $icu_version -lt 3004; then
+  AC_MSG_ERROR([ICU version 3.4 or later is required])
+fi
+
+ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
+ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+PHP_EVAL_INCLINE($ICU_INCS)
+PHP_EVAL_LIBLINE($ICU_LIBS, $1)
   fi
 ])
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2007-01-12 Thread Andrei Zmievski

andrei  Fri Jan 12 18:57:11 2007 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  Create PHP_SETUP_ICU macro that can be used in self-contained
  extensions.
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.356r2=1.357diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.356 php-src/acinclude.m4:1.357
--- php-src/acinclude.m4:1.356  Wed Jan 10 23:46:08 2007
+++ php-src/acinclude.m4Fri Jan 12 18:57:11 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.356 2007/01/10 23:46:08 andrei Exp $
+dnl $Id: acinclude.m4,v 1.357 2007/01/12 18:57:11 andrei Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2086,6 +2086,69 @@
 dnl -
 
 dnl
+dnl PHP_SETUP_ICU([shared-add])
+dnl
+dnl Common setup macro for kerberos
+dnl
+AC_DEFUN([PHP_SETUP_ICU],[
+  unset PHP_ICU_DIR
+
+  AC_MSG_CHECKING([for location of ICU headers and libraries])
+
+  AC_ARG_WITH(icu-dir,
+  [  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], 
+  [
+   if test x$withval != xyes; then
+ PHP_ICU_DIR=$withval
+   else
+ PHP_ICU_DIR=DEFAULT
+   fi
+  ], [
+   PHP_ICU_DIR=DEFAULT
+  ])
+
+  if test $PHP_ICU_DIR = DEFAULT; then
+   ICU_CONFIG=icu-config
+   for i in /usr/local/bin /usr/bin; do
+ if test -x $i/icu-config; then
+   ICU_CONFIG=$i/icu-config
+   break;
+ fi
+   done
+  else
+   ICU_CONFIG=$PHP_ICU_DIR/bin/icu-config
+  fi
+
+  dnl Trust icu-config to know better what the install prefix is..
+  icu_install_prefix=`$ICU_CONFIG --prefix 2 /dev/null`
+  if test -z $icu_install_prefix; then
+AC_MSG_RESULT([not found])
+AC_MSG_ERROR([Please specify the correct ICU install prefix.])
+  else
+AC_MSG_RESULT([found in $icu_install_prefix])
+
+   dnl Check ICU version
+   AC_MSG_CHECKING([for ICU 3.4 or greater])
+   icu_version_full=`$ICU_CONFIG --version`
+   ac_IFS=$IFS
+   IFS=.
+   set $icu_version_full
+   IFS=$ac_IFS
+   icu_version=`expr [$]1 \* 1000 + [$]2`
+   AC_MSG_RESULT([found $icu_version_full])
+   if test $icu_version -lt 3004; then
+ AC_MSG_ERROR([ICU version 3.4 or later is required])
+   fi
+
+   ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
+   ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
+   PHP_EVAL_INCLINE($ICU_INCS)
+   PHP_EVAL_LIBLINE($ICU_LIBS, $1)
+  fi
+])
+
+
+dnl
 dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
 dnl
 dnl Common setup macro for kerberos
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.620r2=1.621diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.620 php-src/configure.in:1.621
--- php-src/configure.in:1.620  Wed Jan 10 23:46:08 2007
+++ php-src/configure.inFri Jan 12 18:57:11 2007
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.620 2007/01/10 23:46:08 andrei Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.621 2007/01/12 18:57:11 andrei Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -815,58 +815,8 @@
 ])
 AC_MSG_RESULT([$PHP_VERSIONING])
 
-dnl ## check for ICU library location
-AC_MSG_CHECKING([for location of ICU headers and libraries])
-AC_ARG_WITH(icu-dir,
-[  --with-icu-dir=DIR  Specify where ICU libraries and headers can be 
found], 
-[
-  if test x$withval != xyes; then
-PHP_ICU_DIR=$withval
-  else
-PHP_ICU_DIR=DEFAULT
-  fi
-], [
-  PHP_ICU_DIR=DEFAULT
-])
-
-if test $PHP_ICU_DIR = DEFAULT; then
-  ICU_CONFIG=icu-config
-  for i in /usr/local/bin /usr/bin; do
-if test -x $i/icu-config; then
-  ICU_CONFIG=$i/icu-config
-  break;
-fi
-  done
-else
-  ICU_CONFIG=$PHP_ICU_DIR/bin/icu-config
-fi
-
-dnl Trust icu-config to know better what the install prefix is..
-icu_install_prefix=`$ICU_CONFIG --prefix 2 /dev/null`
-if test -z $icu_install_prefix; then
-  AC_MSG_RESULT([not found])
-  AC_MSG_ERROR([Please specify the correct ICU install prefix.])
-else
-  AC_MSG_RESULT([found in $icu_install_prefix])
-
-  dnl Check ICU version
-  AC_MSG_CHECKING([for ICU 3.4 or greater])
-  icu_version_full=`$ICU_CONFIG --version`
-  ac_IFS=$IFS
-  IFS=.
-  set $icu_version_full
-  IFS=$ac_IFS
-  icu_version=`expr [$]1 \* 1000 + [$]2`
-  AC_MSG_RESULT([found $icu_version_full])
-  if test $icu_version -lt 3004; then
-AC_MSG_ERROR([ICU version 3.4 or later is required])
-  fi
-
-  ICU_INCS=`$ICU_CONFIG --cppflags-searchpath`
-  ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio`
-  PHP_EVAL_INCLINE($ICU_INCS)
-  PHP_EVAL_LIBLINE($ICU_LIBS)
-fi
+dnl ## check for ICU library location and version
+PHP_SETUP_ICU
 
 divert(5)
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2007-01-12 Thread Andrei Zmievski

andrei  Fri Jan 12 19:13:07 2007 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fix copy/paste typo.
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.357r2=1.358diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.357 php-src/acinclude.m4:1.358
--- php-src/acinclude.m4:1.357  Fri Jan 12 18:57:11 2007
+++ php-src/acinclude.m4Fri Jan 12 19:13:07 2007
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.357 2007/01/12 18:57:11 andrei Exp $
+dnl $Id: acinclude.m4,v 1.358 2007/01/12 19:13:07 andrei Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2088,7 +2088,7 @@
 dnl
 dnl PHP_SETUP_ICU([shared-add])
 dnl
-dnl Common setup macro for kerberos
+dnl Common setup macro for ICU
 dnl
 AC_DEFUN([PHP_SETUP_ICU],[
   unset PHP_ICU_DIR

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-12-12 Thread Antony Dovgal

tony2001Tue Dec 12 10:15:58 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  fix typo
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.352r2=1.353diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.352 php-src/acinclude.m4:1.353
--- php-src/acinclude.m4:1.352  Tue Dec 12 07:36:37 2006
+++ php-src/acinclude.m4Tue Dec 12 10:15:58 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.352 2006/12/12 07:36:37 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.353 2006/12/12 10:15:58 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2639,6 +2639,6 @@
 AC_DEFINE(CRYPT_R_GNU_SOURCE, 1, [Define if struct crypt_data requires 
_GNU_SOURCE])
   fi
   if test $php_cv_crypt_r_style = none; then
-AC_MSG_ERROR([Unable to detect data struct is used by crypt_r])
+AC_MSG_ERROR([Unable to detect data struct used by crypt_r])
   fi
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/standard crypt.c

2006-12-12 Thread Antony Dovgal

tony2001Tue Dec 12 12:06:00 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/standard   crypt.c 
  Log:
  missing part of the fix for #39795
  crypt.h defines struct crypt_data only if _REENTRANT is defined
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.353r2=1.354diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.353 php-src/acinclude.m4:1.354
--- php-src/acinclude.m4:1.353  Tue Dec 12 10:15:58 2006
+++ php-src/acinclude.m4Tue Dec 12 12:06:00 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.353 2006/12/12 10:15:58 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.354 2006/12/12 12:06:00 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2600,6 +2600,7 @@
   AC_CACHE_CHECK([which data struct is used by crypt_r], php_cv_crypt_r_style,[
 php_cv_crypt_r_style=none
 AC_TRY_COMPILE([
+#define _REENTRANT 1
 #include crypt.h
 ],[
 CRYPTD buffer;
@@ -2609,6 +2610,7 @@
 
 if test $php_cv_crypt_r_style = none; then
   AC_TRY_COMPILE([
+#define _REENTRANT 1
 #include crypt.h
 ],[
 struct crypt_data buffer;
@@ -2619,6 +2621,7 @@
 
 if test $php_cv_crypt_r_style = none; then
   AC_TRY_COMPILE([
+#define _REENTRANT 1
 #define _GNU_SOURCE
 #include crypt.h
 ],[
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.67r2=1.68diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.67 php-src/ext/standard/crypt.c:1.68
--- php-src/ext/standard/crypt.c:1.67   Tue Dec 12 07:36:36 2006
+++ php-src/ext/standard/crypt.cTue Dec 12 12:06:00 2006
@@ -17,7 +17,7 @@
|  Rasmus Lerdorf [EMAIL PROTECTED] |
+--+
  */
-/* $Id: crypt.c,v 1.67 2006/12/12 07:36:36 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.68 2006/12/12 12:06:00 tony2001 Exp $ */
 #include stdlib.h
 
 #include php.h
@@ -148,7 +148,7 @@
salt[2] = '\0';
 #endif
}
-#ifdef HAVE_CRYPT_R
+#if defined(HAVE_CRYPT_R)  defined(_REENTRANT)
{
 #if defined(CRYPT_R_STRUCT_CRYPT_DATA)
struct crypt_data buffer;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/standard crypt.c

2006-12-11 Thread Antony Dovgal

tony2001Tue Dec 12 07:36:37 2006 UTC

  Modified files:  
/php-src/ext/standard   crypt.c 
/php-srcconfigure.in acinclude.m4 
  Log:
  fix #39795 (build fails on AIX because crypt_r() uses different data struct)
  
  
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.66r2=1.67diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.66 php-src/ext/standard/crypt.c:1.67
--- php-src/ext/standard/crypt.c:1.66   Sun Dec  3 13:46:09 2006
+++ php-src/ext/standard/crypt.cTue Dec 12 07:36:36 2006
@@ -17,7 +17,7 @@
|  Rasmus Lerdorf [EMAIL PROTECTED] |
+--+
  */
-/* $Id: crypt.c,v 1.66 2006/12/03 13:46:09 tony2001 Exp $ */
+/* $Id: crypt.c,v 1.67 2006/12/12 07:36:36 tony2001 Exp $ */
 #include stdlib.h
 
 #include php.h
@@ -28,6 +28,9 @@
 #include unistd.h
 #endif
 #if HAVE_CRYPT_H
+#if defined(CRYPT_R_GNU_SOURCE)  !defined(_GNU_SOURCE)
+#define _GNU_SOURCE
+#endif
 #include crypt.h
 #endif
 #if TM_IN_SYS_TIME
@@ -147,8 +150,15 @@
}
 #ifdef HAVE_CRYPT_R
{
+#if defined(CRYPT_R_STRUCT_CRYPT_DATA)
struct crypt_data buffer;
memset(buffer, 0, sizeof(buffer));
+#elif defined(CRYPT_R_CRYPTD)
+   CRYPTD buffer;
+#else 
+#error Data struct used by crypt_r() is unknown. Please report.
+#endif
+
RETURN_STRING(crypt_r(str, salt, buffer), 1);
}
 #else
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.617r2=1.618diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.617 php-src/configure.in:1.618
--- php-src/configure.in:1.617  Tue Dec  5 08:08:33 2006
+++ php-src/configure.inTue Dec 12 07:36:37 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.617 2006/12/05 08:08:33 dmitry Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.618 2006/12/12 07:36:37 tony2001 Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -465,7 +465,6 @@
 ctime_r \
 cuserid \
 crypt \
-crypt_r \
 flock \
 ftok \
 funopen \
@@ -598,6 +597,11 @@
 PHP_READDIR_R_TYPE
 PHP_CHECK_IN_ADDR_T
 
+AC_CHECK_FUNCS(crypt_r, [ php_crypt_r=1 ], [ php_crypt_r=0 ])
+if test x$php_crypt_r = x1; then
+  PHP_CRYPT_R_STYLE
+fi
+
 divert(4)
 
 dnl ## In diversion 4 we check user-configurable general settings.
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.351r2=1.352diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.351 php-src/acinclude.m4:1.352
--- php-src/acinclude.m4:1.351  Mon Dec  4 18:28:34 2006
+++ php-src/acinclude.m4Tue Dec 12 07:36:37 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.351 2006/12/04 18:28:34 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.352 2006/12/12 07:36:37 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2590,3 +2590,55 @@
   )
 ])
 
+dnl
+dnl PHP_CRYPT_R_STYLE
+dnl detect the style of crypt_r() is any is available
+dnl see APR_CHECK_CRYPT_R_STYLE() for original version
+dnl
+AC_DEFUN([PHP_CRYPT_R_STYLE],
+[
+  AC_CACHE_CHECK([which data struct is used by crypt_r], php_cv_crypt_r_style,[
+php_cv_crypt_r_style=none
+AC_TRY_COMPILE([
+#include crypt.h
+],[
+CRYPTD buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=cryptd)
+
+if test $php_cv_crypt_r_style = none; then
+  AC_TRY_COMPILE([
+#include crypt.h
+],[
+struct crypt_data buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=struct_crypt_data)
+fi
+
+if test $php_cv_crypt_r_style = none; then
+  AC_TRY_COMPILE([
+#define _GNU_SOURCE
+#include crypt.h
+],[
+struct crypt_data buffer;
+crypt_r(passwd, hash, buffer);
+], 
+php_cv_crypt_r_style=struct_crypt_data_gnu_source)
+fi
+])
+
+  if test $php_cv_crypt_r_style = cryptd; then
+AC_DEFINE(CRYPT_R_CRYPTD, 1, [Define if crypt_r has uses CRYPTD])
+  fi
+  if test $php_cv_crypt_r_style = struct_crypt_data -o 
$php_cv_crypt_r_style = struct_crypt_data_gnu_source; then
+AC_DEFINE(CRYPT_R_STRUCT_CRYPT_DATA, 1, [Define if crypt_r uses struct 
crypt_data])
+  fi
+  if test $php_cv_crypt_r_style = struct_crypt_data_gnu_source; then
+AC_DEFINE(CRYPT_R_GNU_SOURCE, 1, [Define if struct crypt_data requires 
_GNU_SOURCE])
+  fi
+  if test $php_cv_crypt_r_style = none; then
+AC_MSG_ERROR([Unable to detect data struct is used by crypt_r])
+  fi
+])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2006-12-04 Thread Antony Dovgal

tony2001Mon Dec  4 18:28:34 2006 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  fix build with Sun compiler, which doesn't support -O0
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.350r2=1.351diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.350 php-src/acinclude.m4:1.351
--- php-src/acinclude.m4:1.350  Mon Oct  2 20:49:13 2006
+++ php-src/acinclude.m4Mon Dec  4 18:28:34 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.350 2006/10/02 20:49:13 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.351 2006/12/04 18:28:34 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2574,3 +2574,19 @@
 ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])
   fi
 ])
+
+dnl
+dnl PHP_DETECT_ICC
+dnl
+AC_DEFUN([PHP_DETECT_ICC],
+[
+  ICC=no
+  AC_MSG_CHECKING([for icc])
+  AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
+ICC=no
+AC_MSG_RESULT([no]),
+ICC=yes
+AC_MSG_RESULT([yes])
+  )
+])
+
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.615r2=1.616diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.615 php-src/configure.in:1.616
--- php-src/configure.in:1.615  Thu Nov 30 17:10:55 2006
+++ php-src/configure.inMon Dec  4 18:28:34 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.615 2006/11/30 17:10:55 iliaa Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.616 2006/12/04 18:28:34 tony2001 Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -120,6 +120,7 @@
 dnl -
 
 AC_PROG_CC
+PHP_DETECT_ICC
 AC_PROG_CC_C_O
 dnl Change to AC_PROG_CC_STDC when we start requiring a post-2.13 autoconf
 dnl AC_PROG_CC_STDC
@@ -684,8 +685,11 @@
   CFLAGS=`echo $CFLAGS | $SED -e 's/-O[0-9]*//g'`
   CXXFLAGS=`echo $CXXFLAGS | $SED -e 's/-O[0-9]*//g'`
   changequote([,])
-  CFLAGS=$CFLAGS -O0
-  CXXFLAGS=$CXXFLAGS -O0
+  dnl add -O0 only if GCC or ICC is used
+  if test $GCC = yes || test $ICC = yes; then
+CFLAGS=$CFLAGS -O0
+CXXFLAGS=$CXXFLAGS -O0
+  fi
 else
   PHP_DEBUG=0
   ZEND_DEBUG=no

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-10-02 Thread Ilia Alshanetsky

iliaa   Mon Oct  2 15:34:57 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB: Fixed bug #39004 (Fixed generation of config.nice with autoconf 2.60).
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.347r2=1.348diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.347 php-src/acinclude.m4:1.348
--- php-src/acinclude.m4:1.347  Fri Jun 16 08:00:23 2006
+++ php-src/acinclude.m4Mon Oct  2 15:34:56 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.347 2006/06/16 08:00:23 sesser Exp $
+dnl $Id: acinclude.m4,v 1.348 2006/10/02 15:34:56 iliaa Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2503,9 +2503,21 @@
 fi
   done
 
-  for arg in [$]0 [$]@; do
-echo '[$]arg' \\  $1
-CONFIGURE_COMMAND=$CONFIGURE_COMMAND '[$]arg'
+  echo '[$]0'  $1
+  for arg in $ac_configure_args; do
+ if test `expr substr $arg 1 1` != '; then
+if test `expr substr $arg 1 2` != '--'; then
+ break;
+fi
+echo '[$]arg' \\  $1
+CONFIGURE_COMMAND=$CONFIGURE_COMMAND '[$]arg'
+ else
+   if test `expr substr $arg 2 2` != '--'; then
+ break;
+fi
+echo [$]arg \\  $1
+CONFIGURE_COMMAND=$CONFIGURE_COMMAND [$]arg
+ fi
   done
   echo '[$]@'  $1
   chmod +x $1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-10-02 Thread Antony Dovgal

tony2001Mon Oct  2 19:17:43 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  fix the fix for #39004 
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.348r2=1.349diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.348 php-src/acinclude.m4:1.349
--- php-src/acinclude.m4:1.348  Mon Oct  2 15:34:56 2006
+++ php-src/acinclude.m4Mon Oct  2 19:17:43 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.348 2006/10/02 15:34:56 iliaa Exp $
+dnl $Id: acinclude.m4,v 1.349 2006/10/02 19:17:43 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2503,16 +2503,16 @@
 fi
   done
 
-  echo '[$]0'  $1
+  echo '[$]0' \\  $1
   for arg in $ac_configure_args; do
- if test `expr substr $arg 1 1` != '; then
-if test `expr substr $arg 1 2` != '--'; then
+ if test `expr -- $arg : '.*` = 0; then
+if test `expr -- $arg : --.*` = 0; then
  break;
 fi
 echo '[$]arg' \\  $1
 CONFIGURE_COMMAND=$CONFIGURE_COMMAND '[$]arg'
  else
-   if test `expr substr $arg 2 2` != '--'; then
+if test `expr -- $arg : '--.*` = 0; then
  break;
 fi
 echo [$]arg \\  $1

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-10-02 Thread Antony Dovgal

tony2001Mon Oct  2 20:49:13 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  the last part of the fix for #39004
  
  
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.349r2=1.350diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.349 php-src/acinclude.m4:1.350
--- php-src/acinclude.m4:1.349  Mon Oct  2 19:17:43 2006
+++ php-src/acinclude.m4Mon Oct  2 20:49:13 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.349 2006/10/02 19:17:43 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.350 2006/10/02 20:49:13 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2504,6 +2504,11 @@
   done
 
   echo '[$]0' \\  $1
+  if test `expr -- [$]0 : '.*` = 0; then
+CONFIGURE_COMMAND=$CONFIGURE_COMMAND '[$]0'
+  else 
+CONFIGURE_COMMAND=$CONFIGURE_COMMAND [$]0
+  fi
   for arg in $ac_configure_args; do
  if test `expr -- $arg : '.*` = 0; then
 if test `expr -- $arg : --.*` = 0; then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-06-16 Thread Stefan Esser

sesser  Fri Jun 16 08:00:24 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fixed that configure bails out on wrong flex version. Now a wrong flex version
  will issue a warning and when flex is needed during the make process the make
  process will die with an error message.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.346r2=1.347diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.346 php-src/acinclude.m4:1.347
--- php-src/acinclude.m4:1.346  Thu May 11 22:05:16 2006
+++ php-src/acinclude.m4Fri Jun 16 08:00:23 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.346 2006/05/11 22:05:16 iliaa Exp $
+dnl $Id: acinclude.m4,v 1.347 2006/06/16 08:00:23 sesser Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2048,7 +2048,8 @@
   case $php_cv_flex_version in
 |invalid[)]
   flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version).
-  AC_MSG_ERROR([$flex_msg])
+  AC_MSG_WARN([$flex_msg])
+  LEX=echo \error: $flex_msg\ 12 ; exit 1;
   ;;
   esac
   PHP_SUBST(LEX)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-05-11 Thread Ilia Alshanetsky

iliaa   Thu May 11 22:05:16 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB: Fixed bug #37413 (Rejected versions of flex that don't work). 
  
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.345r2=1.346diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.345 php-src/acinclude.m4:1.346
--- php-src/acinclude.m4:1.345  Mon Apr 10 12:17:29 2006
+++ php-src/acinclude.m4Thu May 11 22:05:16 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.345 2006/04/10 12:17:29 sniper Exp $
+dnl $Id: acinclude.m4,v 1.346 2006/05/11 22:05:16 iliaa Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2048,8 +2048,7 @@
   case $php_cv_flex_version in
 |invalid[)]
   flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version).
-  AC_MSG_WARN([$flex_msg])
-  LEX=exit 0;
+  AC_MSG_ERROR([$flex_msg])
   ;;
   esac
   PHP_SUBST(LEX)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /scripts phpize.m4

2006-04-10 Thread Jani Taskinen

sniper  Mon Apr 10 12:16:08 2006 UTC

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/scriptsphpize.m4 
  Log:
  - Determine the shared/link lib suffixes in one macro.
  
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.343r2=1.344diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.343 php-src/acinclude.m4:1.344
--- php-src/acinclude.m4:1.343  Sat Apr  8 17:34:57 2006
+++ php-src/acinclude.m4Mon Apr 10 12:16:08 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.343 2006/04/08 17:34:57 andrei Exp $
+dnl $Id: acinclude.m4,v 1.344 2006/04/10 12:16:08 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1877,40 +1877,27 @@
 dnl -
 
 dnl
-dnl PHP_SHLIB_BUILD_SUFFIX_NAME
-dnl
-dnl Determines link library suffix
-dnl suffix can be: .so, .sl or .dylib
-dnl
-AC_DEFUN([PHP_SHLIB_BUILD_SUFFIX_NAME],[
- AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
- PHP_SUBST(SHLIB_SUFFIX_NAME)
- SHLIB_SUFFIX_NAME=so
- case $host_alias in
- *hpux*[)]
-   SHLIB_SUFFIX_NAME=sl
-   ;;
- *darwin*[)]
-   SHLIB_SUFFIX_NAME=dylib
-   ;;
- esac
-])
-
-dnl
 dnl PHP_SHLIB_SUFFIX_NAME
 dnl
-dnl Determines shared library suffix
+dnl Determines link library suffix SHLIB_SUFFIX_NAME
+dnl which can be: .so, .sl or .dylib
+dnl
+dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME
 dnl suffix can be: .so or .sl
 dnl
 AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
- PHP_SUBST(SHLIB_DL_SUFFIX_NAME)
+ PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
+ PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
+ SHLIB_SUFFIX_NAME=so
  SHLIB_DL_SUFFIX_NAME=$SHLIB_SUFFIX_NAME
  case $host_alias in
  *hpux*[)]
+   SHLIB_SUFFIX_NAME=sl
SHLIB_DL_SUFFIX_NAME=sl
;;
  *darwin*[)]
+   SHLIB_SUFFIX_NAME=dylib
SHLIB_DL_SUFFIX_NAME=so
;;
  esac
http://cvs.php.net/viewcvs.cgi/php-src/configure.in?r1=1.602r2=1.603diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.602 php-src/configure.in:1.603
--- php-src/configure.in:1.602  Sat Apr  8 17:34:57 2006
+++ php-src/configure.inMon Apr 10 12:16:08 2006
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.602 2006/04/08 17:34:57 andrei Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.603 2006/04/10 12:16:08 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -224,8 +224,7 @@
 
 PTHREADS_CHECK
 PHP_HELP_SEPARATOR([SAPI modules:])
-PHP_SHLIB_SUFFIX_NAME
-PHP_SHLIB_BUILD_SUFFIX_NAME
+PHP_SHLIB_SUFFIX_NAMES
 PHP_SAPI=default
 PHP_BUILD_PROGRAM
 
@@ -1148,8 +1147,6 @@
 PHP_SUBST(WARNING_LEVEL)
 PHP_SUBST(PHP_FRAMEWORKS)
 PHP_SUBST(PHP_FRAMEWORKPATH)
-PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
-PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)
 PHP_SUBST(INSTALL_HEADERS)
 
 old_CC=$CC
http://cvs.php.net/viewcvs.cgi/php-src/scripts/phpize.m4?r1=1.19r2=1.20diff_format=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.19 php-src/scripts/phpize.m4:1.20
--- php-src/scripts/phpize.m4:1.19  Sat Apr  8 17:34:57 2006
+++ php-src/scripts/phpize.m4   Mon Apr 10 12:16:08 2006
@@ -59,8 +59,7 @@
 [PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
 
 PHP_RUNPATH_SWITCH
-PHP_SHLIB_SUFFIX_NAME
-PHP_SHLIB_BUILD_SUFFIX_NAME
+PHP_SHLIB_SUFFIX_NAMES
 PHP_WITH_PHP_CONFIG
 
 PHP_BUILD_SHARED

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-04-10 Thread Jani Taskinen

sniper  Mon Apr 10 12:17:29 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  fix typo
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.344r2=1.345diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.344 php-src/acinclude.m4:1.345
--- php-src/acinclude.m4:1.344  Mon Apr 10 12:16:08 2006
+++ php-src/acinclude.m4Mon Apr 10 12:17:29 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.344 2006/04/10 12:16:08 sniper Exp $
+dnl $Id: acinclude.m4,v 1.345 2006/04/10 12:17:29 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1877,7 +1877,7 @@
 dnl -
 
 dnl
-dnl PHP_SHLIB_SUFFIX_NAME
+dnl PHP_SHLIB_SUFFIX_NAMES
 dnl
 dnl Determines link library suffix SHLIB_SUFFIX_NAME
 dnl which can be: .so, .sl or .dylib
@@ -1885,7 +1885,7 @@
 dnl Determines shared library suffix SHLIB_DL_SUFFIX_NAME
 dnl suffix can be: .so or .sl
 dnl
-AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
+AC_DEFUN([PHP_SHLIB_SUFFIX_NAMES],[
  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
  PHP_SUBST_OLD(SHLIB_SUFFIX_NAME)
  PHP_SUBST_OLD(SHLIB_DL_SUFFIX_NAME)


-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-03-26 Thread Andrei Zmievski

andrei  Mon Mar 27 05:01:49 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB
  
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.341r2=1.342diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.341 php-src/acinclude.m4:1.342
--- php-src/acinclude.m4:1.341  Tue Feb 28 13:07:19 2006
+++ php-src/acinclude.m4Mon Mar 27 05:01:48 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.341 2006/02/28 13:07:19 helly Exp $
+dnl $Id: acinclude.m4,v 1.342 2006/03/27 05:01:48 andrei Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1890,9 +1890,6 @@
   *hpux*[)]
 SHLIB_SUFFIX_NAME=sl
 ;;
-  *darwin*[)]
-SHLIB_SUFFIX_NAME=dylib
-;;
   esac
 ])
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-02-28 Thread Marcus Boerger

helly   Tue Feb 28 12:25:43 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix dependency checks
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.339r2=1.340diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.339 php-src/acinclude.m4:1.340
--- php-src/acinclude.m4:1.339  Sat Dec 24 11:37:25 2005
+++ php-src/acinclude.m4Tue Feb 28 12:25:43 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.339 2005/12/24 11:37:25 helly Exp $
+dnl $Id: acinclude.m4,v 1.340 2006/02/28 12:25:43 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1000,8 +1000,7 @@
 dnl
 dnl PHP_ADD_EXTENSION_DEP(extname, depends [, depconf])
 dnl
-dnl This macro is currently a placeholder in the config.m4 file
-dnl it is scanned by genif.sh when it builds the internal functions
+dnl This macro is is scanned by genif.sh when it builds the internal functions
 dnl list, so that modules can be init'd in the correct order
 dnl $1 = name of extension, $2 = extension upon which it depends
 dnl $3 = optional: if true, it's ok for $2 to have not been configured
@@ -1013,6 +1012,7 @@
 AC_DEFUN([PHP_ADD_EXTENSION_DEP], [
   am_i_shared=$[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]
   is_it_shared=$[PHP_]translit($2,a-z_-,A-Z__)[_SHARED]
+  is_it_enabled=$[PHP_]translit($2,a-z_-,A-Z__)
   if test $am_i_shared = no  test $is_it_shared = yes ; then
 AC_MSG_ERROR([
 You've configured extension $1 to build statically, but it
@@ -1021,7 +1021,7 @@
 build to be successful.
 ])
   fi
-  if test x$is_it_shared = x  test x$3 != xtrue; then
+  if test x$is_it_enabled = x  test x$3 != xtrue; then
 AC_MSG_ERROR([
 You've configured extension $1, which depends on extension $2,
 but you've either not enabled $2, or have disabled it.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2006-02-28 Thread Marcus Boerger

helly   Tue Feb 28 13:07:19 2006 UTC

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix the fix
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.340r2=1.341diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.340 php-src/acinclude.m4:1.341
--- php-src/acinclude.m4:1.340  Tue Feb 28 12:25:43 2006
+++ php-src/acinclude.m4Tue Feb 28 13:07:19 2006
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.340 2006/02/28 12:25:43 helly Exp $
+dnl $Id: acinclude.m4,v 1.341 2006/02/28 13:07:19 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1000,7 +1000,7 @@
 dnl
 dnl PHP_ADD_EXTENSION_DEP(extname, depends [, depconf])
 dnl
-dnl This macro is is scanned by genif.sh when it builds the internal functions
+dnl This macro is scanned by genif.sh when it builds the internal functions
 dnl list, so that modules can be init'd in the correct order
 dnl $1 = name of extension, $2 = extension upon which it depends
 dnl $3 = optional: if true, it's ok for $2 to have not been configured
@@ -1021,7 +1021,7 @@
 build to be successful.
 ])
   fi
-  if test x$is_it_enabled = x  test x$3 != xtrue; then
+  if test x$is_it_enabled = xno  test x$3 != xtrue; then
 AC_MSG_ERROR([
 You've configured extension $1, which depends on extension $2,
 but you've either not enabled $2, or have disabled it.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-12-24 Thread Marcus Boerger

helly   Sat Dec 24 11:37:25 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Require re2c 0.9.11 and use correct version notation
  
http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.338r2=1.339diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.338 php-src/acinclude.m4:1.339
--- php-src/acinclude.m4:1.338  Sat Dec 17 16:22:43 2005
+++ php-src/acinclude.m4Sat Dec 24 11:37:25 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.338 2005/12/17 16:22:43 sniper Exp $
+dnl $Id: acinclude.m4,v 1.339 2005/12/24 11:37:25 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2058,7 +2058,7 @@
   if test -n $RE2C; then
 AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
   re2c_vernum=`echo  | re2c --vernum 2/dev/null`
-  if test -z $re2c_vernum || test $re2c_vernum -lt 908; then
+  if test -z $re2c_vernum || test $re2c_vernum -lt 911; then
 php_cv_re2c_version=invalid
   else
 php_cv_re2c_version=`echo  | re2c --version | cut -d ' ' -f 2  
2/dev/null` (ok)
@@ -2067,7 +2067,7 @@
   fi
   case $php_cv_re2c_version in
 |invalid[)]
-  AC_MSG_WARN([You will need re2c 0.98 or later if you want to regenerate 
PHP parsers.])
+  AC_MSG_WARN([You will need re2c 0.9.11 or later if you want to 
regenerate PHP parsers.])
   RE2C=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-12-17 Thread Jani Taskinen

sniper  Sat Dec 17 16:22:44 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB51: Extension dependancy improvements during configure
  http://cvs.php.net/viewcvs.cgi/php-src/acinclude.m4?r1=1.337r2=1.338diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.337 php-src/acinclude.m4:1.338
--- php-src/acinclude.m4:1.337  Mon Nov 21 23:07:31 2005
+++ php-src/acinclude.m4Sat Dec 17 16:22:43 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.337 2005/11/21 23:07:31 sniper Exp $
+dnl $Id: acinclude.m4,v 1.338 2005/12/17 16:22:43 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -255,14 +255,14 @@
 
 dnl choose the right compiler/flags/etc. for the source-file
   case $ac_src in
- *.c[)] ac_comp=$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o 
$ac_bdir$ac_obj.$b_lo $6$b_c_post ;;
- *.s[)] ac_comp=$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o 
$ac_bdir$ac_obj.$b_lo $6$b_c_post ;;
- *.S[)] ac_comp=$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o 
$ac_bdir$ac_obj.$b_lo $6$b_c_post ;;
- *.cpp|*.cc|*.cxx[)] ac_comp=$b_cxx_pre $3 $ac_inc $b_cxx_meta -c 
$ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_cxx_post ;;
+*.c[)] ac_comp=$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o 
$ac_bdir$ac_obj.$b_lo $6$b_c_post ;;
+*.s[)] ac_comp=$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o 
$ac_bdir$ac_obj.$b_lo $6$b_c_post ;;
+*.S[)] ac_comp=$b_c_pre $3 $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o 
$ac_bdir$ac_obj.$b_lo $6$b_c_post ;;
+*.cpp|*.cc|*.cxx[)] ac_comp=$b_cxx_pre $3 $ac_inc $b_cxx_meta -c 
$ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $6$b_cxx_post ;;
   esac
 
 dnl create a rule for the object/source combo
- cat Makefile.objectsEOF
+cat Makefile.objectsEOF
 $ac_bdir[$]ac_obj.lo: $ac_srcdir[$]ac_src
$ac_comp
 EOF
@@ -301,27 +301,27 @@
 AC_DEFUN([PHP_RUNPATH_SWITCH],[
 AC_MSG_CHECKING([if compiler supports -R])
 AC_CACHE_VAL(php_cv_cc_dashr,[
-   SAVE_LIBS=$LIBS
-   LIBS=-R /usr/$PHP_LIBDIR $LIBS
-   AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
-   LIBS=$SAVE_LIBS])
+  SAVE_LIBS=$LIBS
+  LIBS=-R /usr/$PHP_LIBDIR $LIBS
+  AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
+  LIBS=$SAVE_LIBS])
 AC_MSG_RESULT([$php_cv_cc_dashr])
 if test $php_cv_cc_dashr = yes; then
-   ld_runpath_switch=-R
+  ld_runpath_switch=-R
 else
-   AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
-   AC_CACHE_VAL(php_cv_cc_rpath,[
-   SAVE_LIBS=$LIBS
-   LIBS=-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS
-   AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
-   LIBS=$SAVE_LIBS])
-   AC_MSG_RESULT([$php_cv_cc_rpath])
-   if test $php_cv_cc_rpath = yes; then
-   ld_runpath_switch=-Wl,-rpath,
-   else
-   dnl something innocuous
-   ld_runpath_switch=-L
-   fi
+  AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
+  AC_CACHE_VAL(php_cv_cc_rpath,[
+SAVE_LIBS=$LIBS
+LIBS=-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS
+AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
+LIBS=$SAVE_LIBS])
+  AC_MSG_RESULT([$php_cv_cc_rpath])
+  if test $php_cv_cc_rpath = yes; then
+ld_runpath_switch=-Wl,-rpath,
+  else
+dnl something innocuous
+ld_runpath_switch=-L
+  fi
 fi
 ])
 
@@ -856,7 +856,7 @@
   ;;
 *netware*[)]
   suffix=nlm
-  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) ifelse($1, php5lib, , -L$(top_builddir)/netware 
-lphp5lib) $(translit(ifelse($1, php5lib, $1, m4_substr($1, 
3)),a-z_-,A-Z__)_SHARED_LIBADD)'
   ;;
 *[)]
   suffix=la
@@ -940,7 +940,7 @@
 
   if test $3 != shared  test $3 != yes  test $4 != cli; then
 dnl -- Static module
-
+[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
 PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
 EXT_STATIC=$EXT_STATIC $1
 if test $3 != nocli; then
@@ -949,19 +949,23 @@
   else
 if test $3 = shared || test $3 = yes; then
 dnl -- Shared module
+  [PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=yes
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
   case $host_alias in
-  *netware*)
-PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware, 
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
-  ;;
+*netware*[)]
+

[PHP-CVS] cvs: php-src / acinclude.m4

2005-10-13 Thread Rob Richards

rrichards   Thu Oct 13 16:16:44 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  bump libxml min version to 2.6.11
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.335r2=1.336ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.335 php-src/acinclude.m4:1.336
--- php-src/acinclude.m4:1.335  Thu Sep  1 04:25:32 2005
+++ php-src/acinclude.m4Thu Oct 13 16:16:39 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.335 2005/09/01 08:25:32 sniper Exp $
+dnl $Id: acinclude.m4,v 1.336 2005/10/13 20:16:39 rrichards Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2333,7 +2333,7 @@
 set $libxml_full_version
 IFS=$ac_IFS
 LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3`
-if test $LIBXML_VERSION -ge 2006008; then
+if test $LIBXML_VERSION -ge 2006011; then
   LIBXML_LIBS=`$XML2_CONFIG --libs`
   LIBXML_INCS=`$XML2_CONFIG --cflags`
   PHP_EVAL_LIBLINE($LIBXML_LIBS, $1)
@@ -2356,7 +2356,7 @@
   fi
   $2
 else
-  AC_MSG_ERROR([libxml2 version 2.6.8 or greater required.])
+  AC_MSG_ERROR([libxml2 version 2.6.11 or greater required.])
 fi
 ifelse([$3],[],,[else $3])
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-09-01 Thread Jani Taskinen

sniper  Thu Sep  1 04:25:35 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Bump up libxml2 version requirement to = 2.6.8
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.334r2=1.335ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.334 php-src/acinclude.m4:1.335
--- php-src/acinclude.m4:1.334  Fri Aug 12 11:16:52 2005
+++ php-src/acinclude.m4Thu Sep  1 04:25:32 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.334 2005/08/12 15:16:52 sniper Exp $
+dnl $Id: acinclude.m4,v 1.335 2005/09/01 08:25:32 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2333,7 +2333,7 @@
 set $libxml_full_version
 IFS=$ac_IFS
 LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3`
-if test $LIBXML_VERSION -ge 2006000; then
+if test $LIBXML_VERSION -ge 2006008; then
   LIBXML_LIBS=`$XML2_CONFIG --libs`
   LIBXML_INCS=`$XML2_CONFIG --cflags`
   PHP_EVAL_LIBLINE($LIBXML_LIBS, $1)
@@ -2356,7 +2356,7 @@
   fi
   $2
 else
-  AC_MSG_ERROR([libxml2 version 2.6.0 or greater required.])
+  AC_MSG_ERROR([libxml2 version 2.6.8 or greater required.])
 fi
 ifelse([$3],[],,[else $3])
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-07-18 Thread Jani Taskinen

sniper  Mon Jul 18 13:20:24 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  fix macro
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.331r2=1.332ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.331 php-src/acinclude.m4:1.332
--- php-src/acinclude.m4:1.331  Wed Jul 13 20:12:22 2005
+++ php-src/acinclude.m4Mon Jul 18 13:20:24 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.331 2005/07/14 00:12:22 sniper Exp $
+dnl $Id: acinclude.m4,v 1.332 2005/07/18 17:20:24 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2492,7 +2492,7 @@
 dnl Check if field re_magic exists in struct regex_t
 AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], 
ac_cv_regex_t_re_magic, [
   AC_TRY_COMPILE([#include sys/types.h
-#include regex.h], [struct regex_t rt; rt.re_magic;],
+#include regex.h], [regex_t rt; rt.re_magic;],
   [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
 ])
 if test $ac_cv_regex_t_re_magic = yes; then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-07-13 Thread Jani Taskinen

sniper  Wed Jul 13 10:33:40 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Added check whether re_magic exists in struct regex_t
  # per Andrei's request
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.327r2=1.328ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.327 php-src/acinclude.m4:1.328
--- php-src/acinclude.m4:1.327  Thu Jul  7 19:18:21 2005
+++ php-src/acinclude.m4Wed Jul 13 10:33:38 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.327 2005/07/07 23:18:21 sniper Exp $
+dnl $Id: acinclude.m4,v 1.328 2005/07/13 14:33:38 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2471,13 +2471,21 @@
 dnl
 AC_DEFUN([PHP_REGEX],[
   if test $REGEX_TYPE = php; then
+AC_DEFINE(HAVE_REGEX_T_RE_MAGIC, 1, [ ])
 AC_DEFINE(HSREGEX,1,[ ])
 AC_DEFINE(REGEX,1,[ ])
 PHP_ADD_SOURCES(regex, regcomp.c regexec.c regerror.c regfree.c)
   elif test $REGEX_TYPE = system; then
 AC_DEFINE(REGEX,0,[ ])
+dnl Check if field re_magic exists in struct regex_t
+AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], 
ac_cv_regex_t_re_magic, [
+  AC_TRY_COMPILE([#include regex.h], [struct regex_t rt; rt.re_magic;],
+  [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
+])
+if test $ac_cv_regex_re_magic = yes; then
+  AC_DEFINE([HAVE_REGEX_RE_MAGIC], [ ], 1)
+fi 
   fi
-
   AC_MSG_CHECKING([which regex library to use])
   AC_MSG_RESULT([$REGEX_TYPE])
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-07-13 Thread Jani Taskinen

sniper  Wed Jul 13 10:34:47 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  typofix
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.328r2=1.329ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.328 php-src/acinclude.m4:1.329
--- php-src/acinclude.m4:1.328  Wed Jul 13 10:33:38 2005
+++ php-src/acinclude.m4Wed Jul 13 10:34:46 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.328 2005/07/13 14:33:38 sniper Exp $
+dnl $Id: acinclude.m4,v 1.329 2005/07/13 14:34:46 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2482,8 +2482,8 @@
   AC_TRY_COMPILE([#include regex.h], [struct regex_t rt; rt.re_magic;],
   [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
 ])
-if test $ac_cv_regex_re_magic = yes; then
-  AC_DEFINE([HAVE_REGEX_RE_MAGIC], [ ], 1)
+if test $ac_cv_regex_t_re_magic = yes; then
+  AC_DEFINE([HAVE_REGEX_T_RE_MAGIC], [ ], 1)
 fi 
   fi
   AC_MSG_CHECKING([which regex library to use])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-07-13 Thread Jani Taskinen

sniper  Wed Jul 13 20:08:16 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fix the re_magic test by adding missing #include sys/types.h
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.329r2=1.330ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.329 php-src/acinclude.m4:1.330
--- php-src/acinclude.m4:1.329  Wed Jul 13 10:34:46 2005
+++ php-src/acinclude.m4Wed Jul 13 20:08:13 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.329 2005/07/13 14:34:46 sniper Exp $
+dnl $Id: acinclude.m4,v 1.330 2005/07/14 00:08:13 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2479,7 +2479,8 @@
 AC_DEFINE(REGEX,0,[ ])
 dnl Check if field re_magic exists in struct regex_t
 AC_CACHE_CHECK([whether field re_magic exists in struct regex_t], 
ac_cv_regex_t_re_magic, [
-  AC_TRY_COMPILE([#include regex.h], [struct regex_t rt; rt.re_magic;],
+  AC_TRY_COMPILE([#include sys/types.h
+#include regex.h], [struct regex_t rt; rt.re_magic;],
   [ac_cv_regex_t_re_magic=yes], [ac_cv_regex_t_re_magic=no])
 ])
 if test $ac_cv_regex_t_re_magic = yes; then

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /main php_network.h

2005-07-13 Thread Jani Taskinen

sniper  Wed Jul 13 20:12:27 2005 EDT

  Modified files:  
/php-srcconfigure.in acinclude.m4 
/php-src/main   php_network.h 
  Log:
  - Fixed cacheing bug in PHP_SOCKADDR_SA_LEN macro
  - Removed duplicate sa_len check from configure.in
  - Unified the sockaddr tests into PHP_SOCKADDR_CHECKS macro
  
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.572r2=1.573ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.572 php-src/configure.in:1.573
--- php-src/configure.in:1.572  Tue Jul 12 16:25:27 2005
+++ php-src/configure.inWed Jul 13 20:12:20 2005
@@ -1,4 +1,4 @@
- ## $Id: configure.in,v 1.572 2005/07/12 20:25:27 andi Exp $ -*- autoconf -*-
+ ## $Id: configure.in,v 1.573 2005/07/14 00:12:20 sniper Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -442,24 +442,8 @@
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
 
-dnl Check for struct sockaddr_storage
-AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_sockaddr_storage,
-[AC_TRY_COMPILE([ #include sys/types.h
-#include sys/socket.h], [struct sockaddr_storage s; s],
-  ac_cv_sockaddr_storage=yes, ac_cv_sockaddr_storage=no)])
-if test $ac_cv_sockaddr_storage = yes; then
-  AC_DEFINE(HAVE_SOCKADDR_STORAGE,1,[Whether you have struct sockaddr_storage])
-fi
-
-dnl Check if sockaddr data structure includes an sa_len member
-AC_TRY_COMPILE([
-#include sys/types.h
-#include sys/socket.h
-], [
-  static struct sockaddr sa; int n = (int) sa.sa_len; return n
-], [
-  AC_DEFINE(HAVE_SOCKADDR_LEN,1,[Whether sockaddr struct has sa_len])
-], [])
+dnl Checks for sockaddr_storage and sockaddr.sa_len
+PHP_SOCKADDR_CHECKS
 
 dnl Check for IPv6 support
 AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.330r2=1.331ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.330 php-src/acinclude.m4:1.331
--- php-src/acinclude.m4:1.330  Wed Jul 13 20:08:13 2005
+++ php-src/acinclude.m4Wed Jul 13 20:12:22 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.330 2005/07/14 00:08:13 sniper Exp $
+dnl $Id: acinclude.m4,v 1.331 2005/07/14 00:12:22 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1482,17 +1482,29 @@
 ])
 
 dnl
-dnl PHP_SOCKADDR_SA_LEN
+dnl PHP_SOCKADDR_CHECKS
 dnl
-AC_DEFUN([PHP_SOCKADDR_SA_LEN],[
+AC_DEFUN([PHP_SOCKADDR_CHECKS], [
+  dnl Check for struct sockaddr_storage exists
+  AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_sockaddr_storage,
+[AC_TRY_COMPILE([#include sys/types.h
+#include sys/socket.h],
+[struct sockaddr_storage s; s],
+[ac_cv_sockaddr_storage=yes], [ac_cv_sockaddr_storage=no])
+  ])
+  if test $ac_cv_sockaddr_storage = yes; then
+AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, [Whether you have struct 
sockaddr_storage])
+  fi
+  dnl Check if field sa_len exists in struct sockaddr 
   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],
-[struct sockaddr s; s.sa_len;],
-[ac_cv_sockaddr_sa_len=yes
- AC_DEFINE(HAVE_SOCKADDR_SA_LEN,1,[ ])],
-[ac_cv_sockaddr_sa_len=no])
+[static struct sockaddr sa; int n = (int) sa.sa_len; return n;],
+[ac_cv_sockaddr_sa_len=yes], [ac_cv_sockaddr_sa_len=no])
   ])
+  if test $ac_cv_sockaddr_sa_len = yes; then
+AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Whether struct sockaddr has field 
sa_len])
+  fi
 ])
 
 dnl
http://cvs.php.net/diff.php/php-src/main/php_network.h?r1=1.54r2=1.55ty=u
Index: php-src/main/php_network.h
diff -u php-src/main/php_network.h:1.54 php-src/main/php_network.h:1.55
--- php-src/main/php_network.h:1.54 Mon Jun 13 22:39:42 2005
+++ php-src/main/php_network.h  Wed Jul 13 20:12:26 2005
@@ -16,7 +16,7 @@
+--+
  */
 
-/* $Id: php_network.h,v 1.54 2005/06/14 02:39:42 iliaa Exp $ */
+/* $Id: php_network.h,v 1.55 2005/07/14 00:12:26 sniper Exp $ */
 
 #ifndef _PHP_NETWORK_H
 #define _PHP_NETWORK_H
@@ -210,7 +210,7 @@
 typedef struct sockaddr_storage php_sockaddr_storage;
 #else
 typedef struct {
-#ifdef HAVE_SOCKADDR_LEN
+#ifdef HAVE_SOCKADDR_SA_LEN
unsigned char ss_len;
unsigned char ss_family;
 #else

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/date config.m4

2005-07-07 Thread Jani Taskinen

sniper  Thu Jul  7 19:18:22 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/date   config.m4 
  Log:
  - Fixed stupid bug in PHP_INSTALL_HEADERS() macro: foo bar != foo bar
  - ext/date/lib/timelib_config.h is also installed now
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.326r2=1.327ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.326 php-src/acinclude.m4:1.327
--- php-src/acinclude.m4:1.326  Thu Jul  7 01:54:42 2005
+++ php-src/acinclude.m4Thu Jul  7 19:18:21 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.326 2005/07/07 05:54:42 dmitry Exp $
+dnl $Id: acinclude.m4,v 1.327 2005/07/07 23:18:21 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2366,21 +2366,21 @@
 dnl PHP header files to be installed
 dnl
 AC_DEFUN([PHP_INSTALL_HEADERS],[
-  if test -z $2; then
-for header_file in $1; do
+  ifelse([$2],[],[
+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
+for header_file in $2; do
   hp_hf=$header_path/$header_file
   PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
-INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_path/$header_file
+INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $hp_hf
   ])
 done 
-  fi
+  ])
 ])
 
 dnl
http://cvs.php.net/diff.php/php-src/ext/date/config.m4?r1=1.9r2=1.10ty=u
Index: php-src/ext/date/config.m4
diff -u php-src/ext/date/config.m4:1.9 php-src/ext/date/config.m4:1.10
--- php-src/ext/date/config.m4:1.9  Thu Jun 30 02:40:57 2005
+++ php-src/ext/date/config.m4  Thu Jul  7 19:18:22 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.9 2005/06/30 06:40:57 derick Exp $
+dnl $Id: config.m4,v 1.10 2005/07/07 23:18:22 sniper Exp $
 dnl config.m4 for date extension
 
 sinclude(ext/date/lib/timelib.m4)
@@ -10,10 +10,10 @@
 
 PHP_NEW_EXTENSION(date, php_date.c $timelib_sources, no,, $PHP_DATE_CFLAGS)
 PHP_ADD_BUILD_DIR([$ext_builddir/lib], 1)
-PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h 
lib/timelib_structs.h])
+PHP_INSTALL_HEADERS([ext/date], [php_date.h lib/timelib.h 
lib/timelib_structs.h lib/timelib_config.h])
 
-cat  $ext_builddir/lib/timelib_config.h EOF
-#if PHP_WIN32
+cat  $ext_builddir/lib/timelib_config.h EOF
+#ifdef PHP_WIN32
 # include config.w32.h
 #else
 # include php_config.h

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-06-28 Thread Jani Taskinen

sniper  Tue Jun 28 16:58:35 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  re2c 0.98 is the current working version
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.324r2=1.325ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.324 php-src/acinclude.m4:1.325
--- php-src/acinclude.m4:1.324  Mon Jun 27 14:30:14 2005
+++ php-src/acinclude.m4Tue Jun 28 16:58:34 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.324 2005/06/27 18:30:14 sniper Exp $
+dnl $Id: acinclude.m4,v 1.325 2005/06/28 20:58:34 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2013,7 +2013,7 @@
   if test -n $RE2C; then
 AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
   re2c_vernum=`echo  | re2c --vernum 2/dev/null`
-  if test -z $re2c_vernum || test $re2c_vernum -lt 906; then
+  if test -z $re2c_vernum || test $re2c_vernum -lt 908; then
 php_cv_re2c_version=invalid
   else
 php_cv_re2c_version=`echo  | re2c --version | cut -d ' ' -f 2  
2/dev/null` (ok)
@@ -2024,7 +2024,7 @@
   fi
   case $php_cv_re2c_version in
 |invalid[)]
-  AC_MSG_WARN([You will need re2c 0.96 or later if you want to regenerate 
PHP parsers.])
+  AC_MSG_WARN([You will need re2c 0.98 or later if you want to regenerate 
PHP parsers.])
   RE2C=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-06-27 Thread Jani Taskinen

sniper  Mon Jun 27 14:30:16 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Cache the xml2-config path
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.323r2=1.324ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.323 php-src/acinclude.m4:1.324
--- php-src/acinclude.m4:1.323  Wed Jun 22 02:50:24 2005
+++ php-src/acinclude.m4Mon Jun 27 14:30:14 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.323 2005/06/22 06:50:24 sniper Exp $
+dnl $Id: acinclude.m4,v 1.324 2005/06/27 18:30:14 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2305,15 +2305,18 @@
 dnl Common setup macro for libxml
 dnl
 AC_DEFUN([PHP_SETUP_LIBXML], [
-
+AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
+[
   for i in $PHP_LIBXML_DIR /usr/local /usr; do
 if test -x $i/bin/xml2-config; then
-  XML2_CONFIG=$i/bin/xml2-config
+  ac_cv_php_xml2_config_path=$i/bin/xml2-config
   break
 fi
   done
+])
 
-  if test -x $XML2_CONFIG; then
+  if test -x $ac_cv_php_xml2_config_path; then
+XML2_CONFIG=$ac_cv_php_xml2_config_path
 libxml_full_version=`$XML2_CONFIG --version`
 ac_IFS=$IFS
 IFS=.

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-06-22 Thread Jani Taskinen

sniper  Wed Jun 22 02:50:27 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Never ever add /usr/lib as libpath, even if --with-libdir is used
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.322r2=1.323ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.322 php-src/acinclude.m4:1.323
--- php-src/acinclude.m4:1.322  Tue Jun 21 06:20:03 2005
+++ php-src/acinclude.m4Wed Jun 22 02:50:24 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.322 2005/06/21 10:20:03 sniper Exp $
+dnl $Id: acinclude.m4,v 1.323 2005/06/22 06:50:24 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -441,7 +441,7 @@
 dnl Adds a path to linkpath/runpath (LDFLAGS)
 dnl
 AC_DEFUN([PHP_ADD_LIBPATH],[
-  if test $1 != /usr/$PHP_LIBDIR; then
+  if test $1 != /usr/$PHP_LIBDIR  test $1 != /usr/lib; then
 PHP_EXPAND_PATH($1, ai_p)
 ifelse([$2],,[
   _PHP_ADD_LIBPATH_GLOBAL([$ai_p])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-06-21 Thread Jani Taskinen

sniper  Tue Jun 21 06:20:04 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fix configure problem in braindead systems like Solaris.
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.321r2=1.322ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.321 php-src/acinclude.m4:1.322
--- php-src/acinclude.m4:1.321  Mon Jun 20 07:06:53 2005
+++ php-src/acinclude.m4Tue Jun 21 06:20:03 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.321 2005/06/20 11:06:53 sniper Exp $
+dnl $Id: acinclude.m4,v 1.322 2005/06/21 10:20:03 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2360,14 +2360,14 @@
 dnl
 AC_DEFUN([PHP_INSTALL_HEADERS],[
   if test -z $2; then
-for header_file in $1; do
+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
+for header_file in $2; do
   hp_hf=$header_path/$header_file
   PHP_RUN_ONCE(INSTALLHEADERS, $hp_hf, [
 INSTALL_EXT_HEADERS=$INSTALL_EXT_HEADERS $header_path/$header_file

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /sapi/cli config.m4

2005-06-20 Thread Jani Taskinen

sniper  Mon Jun 20 07:06:55 2005 EDT

  Modified files:  
/php-srcconfigure.in acinclude.m4 
/php-src/sapi/cli   config.m4 
  Log:
  Some netware related build issues fixed (patch by: Kamesh Jayachandran 
kameshj at fastmail dot fm
  
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.563r2=1.564ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.563 php-src/configure.in:1.564
--- php-src/configure.in:1.563  Sat Jun 11 13:03:41 2005
+++ php-src/configure.inMon Jun 20 07:06:53 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.563 2005/06/11 17:03:41 andi Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.564 2005/06/20 11:06:53 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -183,7 +183,11 @@
 AC_DEFINE_UNQUOTED(PHP_OS,$PHP_OS,[hardcode for each of the cross 
compiler host])
 AC_DEFINE_UNQUOTED(PHP_UNAME,$PHP_UNAME,[hardcode for each of the cross 
compiler host])
 PHP_BUILD_PROGRAM
-PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS,php)
+PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS)
+PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS)
+PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\)
+PHP_SUBST(PHP5LIB_SHARED_LIBADD)
+PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware)
 ;;
 esac
 
@@ -1217,7 +1221,16 @@
plain_wrapper.c userspace.c transports.c xp_socket.c mmap.c)
 
 PHP_ADD_SOURCES(/main, internal_functions.c,, sapi)
-PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+
+case $host_alias in
+*netware*)
+  PHP_ADD_BUILD_DIR(win32)
+  PHP_ADD_BUILD_DIR(netware)
+  ;;
+*)
+  PHP_ADD_SOURCES(/main, internal_functions_cli.c,, cli)
+  ;;
+esac
 
 PHP_ADD_SOURCES(/Zend, zend_language_parser.c zend_language_scanner.c \
 zend_ini_parser.c zend_ini_scanner.c)
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.320r2=1.321ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.320 php-src/acinclude.m4:1.321
--- php-src/acinclude.m4:1.320  Sun Jun 19 20:20:45 2005
+++ php-src/acinclude.m4Mon Jun 20 07:06:53 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.320 2005/06/20 00:20:45 sniper Exp $
+dnl $Id: acinclude.m4,v 1.321 2005/06/20 11:06:53 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -950,6 +950,11 @@
 if test $3 = shared || test $3 = yes; then
 dnl -- Shared module
   PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
+  case $host_alias in
+  *netware*)
+PHP_ADD_LIBRARY_WITH_PATH(php5lib, netware, 
translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+  ;;
+  esac
   PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
   AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to 
build $1 as dynamic module)
 fi
http://cvs.php.net/diff.php/php-src/sapi/cli/config.m4?r1=1.20r2=1.21ty=u
Index: php-src/sapi/cli/config.m4
diff -u php-src/sapi/cli/config.m4:1.20 php-src/sapi/cli/config.m4:1.21
--- php-src/sapi/cli/config.m4:1.20 Sun May 29 19:16:46 2005
+++ php-src/sapi/cli/config.m4  Mon Jun 20 07:06:54 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.20 2005/05/29 23:16:46 sniper Exp $
+dnl $Id: config.m4,v 1.21 2005/06/20 11:06:54 sniper Exp $
 dnl
 
 AC_MSG_CHECKING(for CLI build)
@@ -22,6 +22,9 @@
   *darwin*)
 BUILD_CLI=\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) 
\$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) 
\$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_CLI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) 
\$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_CLI_PATH)
 ;;
+  *netware*)
+BUILD_CLI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) 
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) 
\$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -Lnetware -lphp5lib -o 
\$(SAPI_CLI_PATH)
+;;
   *)
 BUILD_CLI=\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) 
\$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) 
\$(PHP_GLOBAL_OBJS) \$(PHP_CLI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o 
\$(SAPI_CLI_PATH)
 ;;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/pdo_firebird config.m4 /ext/pdo_mysql config.m4 /ext/pdo_oci config.m4 /ext/pdo_odbc config.m4 /ext/pdo_pgsql config.m4 /ext/pdo_sqlite config.m4

2005-06-13 Thread Jani Taskinen

sniper  Mon Jun 13 20:00:53 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/pdo_firebird   config.m4 
/php-src/ext/pdo_mysql  config.m4 
/php-src/ext/pdo_ociconfig.m4 
/php-src/ext/pdo_odbc   config.m4 
/php-src/ext/pdo_pgsql  config.m4 
/php-src/ext/pdo_sqlite config.m4 
  Log:
  - Added PHP_CHECK_PDO_INCLUDES macro (caches the result)
  
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.316r2=1.317ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.316 php-src/acinclude.m4:1.317
--- php-src/acinclude.m4:1.316  Mon Jun 13 04:44:47 2005
+++ php-src/acinclude.m4Mon Jun 13 20:00:51 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.316 2005/06/13 08:44:47 sniper Exp $
+dnl $Id: acinclude.m4,v 1.317 2005/06/14 00:00:51 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2469,3 +2469,21 @@
   AC_MSG_CHECKING([which regex library to use])
   AC_MSG_RESULT([$REGEX_TYPE])
 ])
+
+dnl
+dnl PHP_CHECK_PDO_INCLUDES
+dnl
+AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
+  AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
+AC_MSG_CHECKING([for PDO includes])
+if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+  pdo_inc_path=$abs_srcdir/ext
+elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+  pdo_inc_path=$abs_srcdir/ext
+elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+  pdo_inc_path=$prefix/include/php/ext
+else
+  AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+fi
+  ])
+])
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.7r2=1.8ty=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.7 
php-src/ext/pdo_firebird/config.m4:1.8
--- php-src/ext/pdo_firebird/config.m4:1.7  Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_firebird/config.m4  Mon Jun 13 20:00:52 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.7 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.8 2005/06/14 00:00:52 sniper Exp $
 dnl
 
 if test $PHP_PDO != no; then
@@ -40,18 +40,8 @@
 -L$FIREBIRD_LIBDIR
   ])
  
-  AC_MSG_CHECKING([for PDO includes])
-  if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$prefix/include/php/ext
-  else
-AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
-  fi
-  AC_MSG_RESULT($pdo_inc_path)
- 
+  PHP_CHECK_PDO_INCLUDES
+
   PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR, 
PDO_FIREBIRD_SHARED_LIBADD)
   PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
   AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.21r2=1.22ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.21 
php-src/ext/pdo_mysql/config.m4:1.22
--- php-src/ext/pdo_mysql/config.m4:1.21Mon Jun 13 19:37:20 2005
+++ php-src/ext/pdo_mysql/config.m4 Mon Jun 13 20:00:53 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.21 2005/06/13 23:37:20 sniper Exp $
+dnl $Id: config.m4,v 1.22 2005/06/14 00:00:53 sniper Exp $
 dnl
 
 if test $PHP_PDO != no; then
@@ -61,17 +61,7 @@
   AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare])
   LDFLAGS=$_SAVE_LDFLAGS
 
-  AC_MSG_CHECKING([for PDO includes])
-  if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$prefix/include/php/ext
-  else
-AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
-  fi
-  AC_MSG_RESULT($pdo_inc_path)
+  PHP_CHECK_PDO_INCLUDES
 
   PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c, 
$ext_shared,,-I$pdo_inc_path)
   PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.12r2=1.13ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.12 php-src/ext/pdo_oci/config.m4:1.13
--- php-src/ext/pdo_oci/config.m4:1.12  Sun May 29 19:16:43 2005
+++ php-src/ext/pdo_oci/config.m4   Mon Jun 13 20:00:53 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.12 2005/05/29 23:16:43 sniper Exp $
+dnl $Id: config.m4,v 1.13 2005/06/14 00:00:53 sniper Exp $
 
 if test $PHP_PDO != no; then
 
@@ -160,17 +160,7 @@
 -L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
   ])
 
-  AC_MSG_CHECKING([for PDO includes])
-  if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$abs_srcdir/ext
-  elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
-pdo_inc_path=$prefix/include/php/ext

[PHP-CVS] cvs: php-src / acinclude.m4

2005-06-13 Thread Jani Taskinen

sniper  Mon Jun 13 21:43:53 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Allow different things to be done when found / not-found
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.317r2=1.318ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.317 php-src/acinclude.m4:1.318
--- php-src/acinclude.m4:1.317  Mon Jun 13 20:00:51 2005
+++ php-src/acinclude.m4Mon Jun 13 21:43:53 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.317 2005/06/14 00:00:51 sniper Exp $
+dnl $Id: acinclude.m4,v 1.318 2005/06/14 01:43:53 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2471,7 +2471,7 @@
 ])
 
 dnl
-dnl PHP_CHECK_PDO_INCLUDES
+dnl PHP_CHECK_PDO_INCLUDES([found [, not-found]])
 dnl
 AC_DEFUN([PHP_CHECK_PDO_INCLUDES],[
   AC_CACHE_CHECK([for PDO includes], pdo_inc_path, [
@@ -2482,8 +2482,11 @@
   pdo_inc_path=$abs_srcdir/ext
 elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
   pdo_inc_path=$prefix/include/php/ext
-else
-  AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
 fi
   ])
+  if test -n $pdo_inc_path; then
+ifelse([$1],[],:,[$1])
+  else
+ifelse([$2],[],[AC_MSG_ERROR([Cannot find php_pdo_driver.h.])],[$2])
+  fi
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-06-13 Thread Jani Taskinen

sniper  Mon Jun 13 22:18:44 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Make this usable for header files too
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.318r2=1.319ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.318 php-src/acinclude.m4:1.319
--- php-src/acinclude.m4:1.318  Mon Jun 13 21:43:53 2005
+++ php-src/acinclude.m4Mon Jun 13 22:18:44 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.318 2005/06/14 01:43:53 sniper Exp $
+dnl $Id: acinclude.m4,v 1.319 2005/06/14 02:18:44 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -38,7 +38,7 @@
 dnl
 dnl Generates 'AC_DEFINE(HAVE_WHAT, 1, [ ])'
 dnl
-AC_DEFUN([PHP_DEF_HAVE],[AC_DEFINE([HAVE_]translit($1,a-z_-,A-Z__), 1, [ ])])
+AC_DEFUN([PHP_DEF_HAVE],[AC_DEFINE([HAVE_]translit($1,a-z_.-,A-Z___), 1, [ ])])
 
 dnl
 dnl PHP_RUN_ONCE(namespace, variable, code)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/sqlite config.m4 ZendEngine2 acinclude.m4

2005-06-07 Thread Jani Taskinen

sniper  Tue Jun  7 12:47:33 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
/ZendEngine2acinclude.m4 
/php-src/ext/sqlite config.m4 
  Log:
  - Show none when nothing is found
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.314r2=1.315ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.314 php-src/acinclude.m4:1.315
--- php-src/acinclude.m4:1.314  Thu Jun  2 17:36:36 2005
+++ php-src/acinclude.m4Tue Jun  7 12:47:32 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.314 2005/06/02 21:36:36 sniper Exp $
+dnl $Id: acinclude.m4,v 1.315 2005/06/07 16:47:32 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1977,10 +1977,13 @@
 fi
   done
 ])
+  else
+flex_version=none
   fi
+  
   case $php_cv_flex_version in
 |invalid[)]
-  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found $flex_version).
+  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found: $flex_version).
   AC_MSG_WARN([$flex_msg])
   LEX=exit 0;
   ;;
@@ -2004,6 +2007,8 @@
 php_cv_re2c_version=`echo  | re2c --version | cut -d ' ' -f 2  
2/dev/null` (ok)
   fi 
 ])
+  else
+php_cv_re2c_version=none
   fi
   case $php_cv_re2c_version in
 |invalid[)]
http://cvs.php.net/diff.php/ZendEngine2/acinclude.m4?r1=1.13r2=1.14ty=u
Index: ZendEngine2/acinclude.m4
diff -u ZendEngine2/acinclude.m4:1.13 ZendEngine2/acinclude.m4:1.14
--- ZendEngine2/acinclude.m4:1.13   Sun May 29 14:56:18 2005
+++ ZendEngine2/acinclude.m4Tue Jun  7 12:47:33 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.13 2005/05/29 18:56:18 hholzgra Exp $
+dnl $Id: acinclude.m4,v 1.14 2005/06/07 16:47:33 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -17,10 +17,12 @@
 fi
   done
 ])
+  else
+bison_version=none
   fi
   case $php_cv_bison_version in
 |invalid[)]
-  bison_msg=bison versions supported for regeneration of the Zend/PHP 
parsers: $bison_version_list  (found $bison_version).
+  bison_msg=bison versions supported for regeneration of the Zend/PHP 
parsers: $bison_version_list  (found: $bison_version).
   AC_MSG_WARN([$bison_msg])
   YACC=exit 0;
   ;;
http://cvs.php.net/diff.php/php-src/ext/sqlite/config.m4?r1=1.39r2=1.40ty=u
Index: php-src/ext/sqlite/config.m4
diff -u php-src/ext/sqlite/config.m4:1.39 php-src/ext/sqlite/config.m4:1.40
--- php-src/ext/sqlite/config.m4:1.39   Thu Jun  2 16:06:37 2005
+++ php-src/ext/sqlite/config.m4Tue Jun  7 12:47:33 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.39 2005/06/02 20:06:37 sniper Exp $
+dnl $Id: config.m4,v 1.40 2005/06/07 16:47:33 sniper Exp $
 dnl config.m4 for extension sqlite
 dnl vim:et:ts=2:sw=2
 
@@ -33,10 +33,12 @@
 fi
   done
 ])
+  else
+lemon_version=none
   fi
   case $php_cv_lemon_version in
 |invalid[)]
-  lemon_msg=lemon versions supported for regeneration of libsqlite 
parsers: $lemon_version_list (found $lemon_version).
+  lemon_msg=lemon versions supported for regeneration of libsqlite 
parsers: $lemon_version_list (found: $lemon_version).
   AC_MSG_WARN([$lemon_msg])
   LEMON=exit 0;
   ;;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /build libtool.m4

2005-06-02 Thread Jani Taskinen

sniper  Thu Jun  2 17:36:38 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
/php-src/build  libtool.m4 
  Log:
  - Revert previous change in build/libtool.m4 and make sure 
the PATH_SEPARATOR check is only done under autoconf 2.13.
  # fixes also the php-gtk buildconf probs
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.313r2=1.314ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.313 php-src/acinclude.m4:1.314
--- php-src/acinclude.m4:1.313  Mon May 30 06:56:13 2005
+++ php-src/acinclude.m4Thu Jun  2 17:36:36 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.313 2005/05/30 10:56:13 sniper Exp $
+dnl $Id: acinclude.m4,v 1.314 2005/06/02 21:36:36 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2413,7 +2413,6 @@
 dnl Generates the config.nice file
 dnl
 AC_DEFUN([PHP_CONFIG_NICE],[
-  AC_REQUIRE([LT_AC_PATH_SEPARATOR])
   AC_REQUIRE([AC_PROG_EGREP])
   AC_REQUIRE([LT_AC_PROG_SED])
   PHP_SUBST(EGREP)
http://cvs.php.net/diff.php/php-src/build/libtool.m4?r1=1.6r2=1.7ty=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.6 php-src/build/libtool.m4:1.7
--- php-src/build/libtool.m4:1.6Mon May 30 02:55:20 2005
+++ php-src/build/libtool.m4Thu Jun  2 17:36:38 2005
@@ -9,12 +9,12 @@
 
 # serial 47 AC_PROG_LIBTOOL
 
-
+ifdef([AC_ACVERSION],[
+# autoconf 2.13 compatibility
 # Set PATH_SEPARATOR variable
 # -
 # Find the correct PATH separator.  Usually this is :', but
 # DJGPP uses ;' like DOS.
-AC_DEFUN([LT_AC_PATH_SEPARATOR], [
 if test X${PATH_SEPARATOR+set} != Xset; then
   UNAME=${UNAME-`uname 2/dev/null`}
   case X$UNAME in
@@ -23,8 +23,7 @@
   esac
   PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
-]) # LT_AC_PATH_SEPARATOR
-
+])
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
 # ---
@@ -96,7 +95,6 @@
 # 
 AC_DEFUN([AC_LIBTOOL_SETUP],
 [AC_PREREQ(2.13)dnl
-AC_REQUIRE([LT_AC_PATH_SEPARATOR])dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / acinclude.m4

2005-05-30 Thread Hartmut Holzgraefe


Antony Dovgal wrote:
+  # we only support certain flex versions

So, comments start with # or with dnl ?


Comments that affect the m4 code have to start with dnl,
this on the other hand is a comment that i want to have
in the output file so it uses whatever comment syntax is
appropriate for the output format (here: shell batch code)

The comments in libtool.m4 that i changed earlier were
ment to comment out M4 macro definitions and uses,
in that case it is important to use the M4 comment syntax

--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /build libtool.m4 /scripts phpize.in

2005-05-30 Thread Jani Taskinen

sniper  Mon May 30 02:55:21 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
/php-src/build  libtool.m4 
/php-src/scriptsphpize.in 
  Log:
  - Changed the PATH_SEPARATOR check to a macro
  - Made sure we're generating aclocal.m4 in same way with both buildconf
and phpize.
  # Bug #33177
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.311r2=1.312ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.311 php-src/acinclude.m4:1.312
--- php-src/acinclude.m4:1.311  Sun May 29 15:28:34 2005
+++ php-src/acinclude.m4Mon May 30 02:55:19 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.311 2005/05/29 19:28:34 hholzgra Exp $
+dnl $Id: acinclude.m4,v 1.312 2005/05/30 06:55:19 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2413,6 +2413,7 @@
 dnl Generates the config.nice file
 dnl
 AC_DEFUN([PHP_CONFIG_NICE],[
+  AC_REQUIRE([LT_AC_PATH_SEPARATOR])
   AC_REQUIRE([AC_PROG_EGREP])
   AC_REQUIRE([LT_AC_PROG_SED])
   PHP_SUBST(EGREP)
http://cvs.php.net/diff.php/php-src/build/libtool.m4?r1=1.5r2=1.6ty=u
Index: php-src/build/libtool.m4
diff -u php-src/build/libtool.m4:1.5 php-src/build/libtool.m4:1.6
--- php-src/build/libtool.m4:1.5Sun May 29 12:34:43 2005
+++ php-src/build/libtool.m4Mon May 30 02:55:20 2005
@@ -14,6 +14,7 @@
 # -
 # Find the correct PATH separator.  Usually this is :', but
 # DJGPP uses ;' like DOS.
+AC_DEFUN([LT_AC_PATH_SEPARATOR], [
 if test X${PATH_SEPARATOR+set} != Xset; then
   UNAME=${UNAME-`uname 2/dev/null`}
   case X$UNAME in
@@ -22,6 +23,7 @@
   esac
   PATH_SEPARATOR=$lt_cv_sys_path_separator
 fi
+]) # LT_AC_PATH_SEPARATOR
 
 
 # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -33,7 +35,6 @@
 [ifdef([AC_PROVIDE_$1],
   [$2], [$3])])])
 
-
 # AC_PROG_LIBTOOL
 # ---
 AC_DEFUN([AC_PROG_LIBTOOL],
@@ -95,6 +96,7 @@
 # 
 AC_DEFUN([AC_LIBTOOL_SETUP],
 [AC_PREREQ(2.13)dnl
+AC_REQUIRE([LT_AC_PATH_SEPARATOR])dnl
 AC_REQUIRE([AC_ENABLE_SHARED])dnl
 AC_REQUIRE([AC_ENABLE_STATIC])dnl
 AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
http://cvs.php.net/diff.php/php-src/scripts/phpize.in?r1=1.20r2=1.21ty=u
Index: php-src/scripts/phpize.in
diff -u php-src/scripts/phpize.in:1.20 php-src/scripts/phpize.in:1.21
--- php-src/scripts/phpize.in:1.20  Thu Apr  7 18:03:02 2005
+++ php-src/scripts/phpize.in   Mon May 30 02:55:20 2005
@@ -114,7 +114,7 @@
  
   (cd $phpdir  cp $FILES_BUILD $builddir/build)
   (cd $phpdir  cp $FILES $builddir)
-  (cd $builddir  cat acinclude.m4 ./build/libtool.m4  aclocal.m4)
+  (cd $builddir  cat ./build/libtool.m4 acinclude.m4  aclocal.m4)
 }
 
 phpize_replace_prefix()

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-05-30 Thread Jani Taskinen

sniper  Mon May 30 06:56:16 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Use libtool also for completely static builds
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.312r2=1.313ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.312 php-src/acinclude.m4:1.313
--- php-src/acinclude.m4:1.312  Mon May 30 02:55:19 2005
+++ php-src/acinclude.m4Mon May 30 06:56:13 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.312 2005/05/30 06:55:19 sniper Exp $
+dnl $Id: acinclude.m4,v 1.313 2005/05/30 10:56:13 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -809,13 +809,13 @@
 dnl
 AC_DEFUN([PHP_BUILD_PROGRAM],[
   OVERALL_TARGET=[]ifelse($1,,php,$1)
-  php_c_pre='$(CC)'
+  php_c_pre='$(LIBTOOL) --mode=compile $(CC)'
   php_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS)'
-  php_c_post='  echo  [EMAIL PROTECTED]'
-  php_cxx_pre='$(CXX)'
+  php_c_post=
+  php_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
-  php_cxx_post='  echo  [EMAIL PROTECTED]'
-  php_lo=o
+  php_cxx_post=
+  php_lo=lo
 
   case $with_pic in
 yes) pic_setting='-prefer-pic';;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-05-29 Thread Hartmut Holzgraefe

hholzgraSun May 29 15:28:35 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  simplify flex version test
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.310r2=1.311ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.310 php-src/acinclude.m4:1.311
--- php-src/acinclude.m4:1.310  Sun May 29 14:04:34 2005
+++ php-src/acinclude.m4Sun May 29 15:28:34 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.310 2005/05/29 18:04:34 hholzgra Exp $
+dnl $Id: acinclude.m4,v 1.311 2005/05/29 19:28:34 hholzgra Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1951,6 +1951,9 @@
 dnl Search for (f)lex and check it's version
 dnl
 AC_DEFUN([PHP_PROG_LEX], [
+  # we only support certain flex versions
+  flex_version_list=2.5.4
+   
   AC_PROG_LEX
   if test -n $LEX; then
 AC_DECL_YYTEXT
@@ -1964,22 +1967,21 @@
 LEX_CFLAGS=-DYY_USE_CONST
   fi
 
-  if test $LEX ;then
+  if test $LEX; then
 AC_CACHE_CHECK([for flex version], php_cv_flex_version, [
-  flexvers=`echo  | $LEX -V -v --version 2/dev/null | $SED -e 's/^.* 
//' -e 's/\./ /g'`
-  if test ! -z $flexvers; then
-set $flexvers
-if test ${1} != 2 -o ${2} != 5 -o ${3} != 4; then
-  php_cv_flex_version=invalid
-else
-  php_cv_flex_version=${1}.${2}.${3} (ok)
+  flex_version=`$LEX -V -v --version 2/dev/null | $SED -e 's/^.* //'`
+  php_cv_flex_version=invalid
+  for flex_check_version in $flex_version_list; do
+if test $flex_version = $flex_check_version; then
+  php_cv_flex_version=$flex_check_version (ok)
 fi
-  fi
+  done
 ])
   fi
   case $php_cv_flex_version in
 |invalid[)]
-  AC_MSG_WARN([You will need flex 2.5.4 if you want to regenerate Zend/PHP 
lexical parsers.])
+  flex_msg=flex versions supported for regeneration of the Zend/PHP 
parsers: $flex_version_list  (found $flex_version).
+  AC_MSG_WARN([$flex_msg])
   LEX=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Re: [PHP-CVS] cvs: php-src / acinclude.m4

2005-05-29 Thread Antony Dovgal

On Sun, 29 May 2005 19:28:35 -
Hartmut Holzgraefe [EMAIL PROTECTED] wrote:

 hholzgra  Sun May 29 15:28:35 2005 EDT
 
   Modified files:  
 /php-src  acinclude.m4 
   Log:
   simplify flex version test
   
   
 http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.310r2=1.311ty=u
 Index: php-src/acinclude.m4
 diff -u php-src/acinclude.m4:1.310 php-src/acinclude.m4:1.311
 --- php-src/acinclude.m4:1.310Sun May 29 14:04:34 2005
 +++ php-src/acinclude.m4  Sun May 29 15:28:34 2005
 @@ -1,5 +1,5 @@
  dnl
 -dnl $Id: acinclude.m4,v 1.310 2005/05/29 18:04:34 hholzgra Exp $
 +dnl $Id: acinclude.m4,v 1.311 2005/05/29 19:28:34 hholzgra Exp $
  dnl
  dnl This file contains local autoconf functions.
  dnl
 @@ -1951,6 +1951,9 @@
  dnl Search for (f)lex and check it's version
  dnl
  AC_DEFUN([PHP_PROG_LEX], [
 +  # we only support certain flex versions

So, comments start with # or with dnl ?

-- 
Wbr, 
Antony Dovgal aka tony2001
[EMAIL PROTECTED]

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-05-21 Thread Rasmus Lerdorf

rasmus  Sat May 21 14:42:40 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Avoid syntax errors on some operating systems
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.306r2=1.307ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.306 php-src/acinclude.m4:1.307
--- php-src/acinclude.m4:1.306  Fri May  6 22:51:50 2005
+++ php-src/acinclude.m4Sat May 21 14:42:39 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.306 2005/05/07 02:51:50 sniper Exp $
+dnl $Id: acinclude.m4,v 1.307 2005/05/21 18:42:39 rasmus Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2363,7 +2363,7 @@
 done 
   else
 header_path=$1
-for header_file in $2; do
+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

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-04-29 Thread Jani Taskinen

sniper  Fri Apr 29 20:12:43 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  We do allow 2.0 now too.
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.301r2=1.302ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.301 php-src/acinclude.m4:1.302
--- php-src/acinclude.m4:1.301  Tue Apr 26 04:20:44 2005
+++ php-src/acinclude.m4Fri Apr 29 20:12:42 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.301 2005/04/26 08:20:44 sniper Exp $
+dnl $Id: acinclude.m4,v 1.302 2005/04/30 00:12:42 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1949,7 +1949,7 @@
   fi
   case $php_cv_bison_version in
 |invalid[)]
-  AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75 or 1.875 if you want 
to regenerate the Zend/PHP parsers (found ${1}.${2}).])
+  AC_MSG_WARN([You will need bison 1.28, 1.35, 1.75, 1.875 or 2.0 if you 
want to regenerate the Zend/PHP parsers (found ${1}.${2}).])
   YACC=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-04-29 Thread Jani Taskinen

sniper  Fri Apr 29 20:15:08 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  re2c 0.96 is the one that works (tm)
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.302r2=1.303ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.302 php-src/acinclude.m4:1.303
--- php-src/acinclude.m4:1.302  Fri Apr 29 20:12:42 2005
+++ php-src/acinclude.m4Fri Apr 29 20:15:07 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.302 2005/04/30 00:12:42 sniper Exp $
+dnl $Id: acinclude.m4,v 1.303 2005/04/30 00:15:07 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2007,7 +2007,7 @@
   if test -n $RE2C; then
 AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
   re2c_vernum=`echo  | re2c --vernum 2/dev/null`
-  if test -z $re2c_vernum || test $re2c_vernum -lt 904; then
+  if test -z $re2c_vernum || test $re2c_vernum -lt 906; then
 php_cv_re2c_version=invalid
   else
 php_cv_re2c_version=`echo  | re2c --version | cut -d ' ' -f 2  
2/dev/null` (ok)
@@ -2016,7 +2016,7 @@
   fi
   case $php_cv_re2c_version in
 |invalid[)]
-  AC_MSG_WARN([You will need re2c 0.94 or later if you want to regenerate 
PHP parsers.])
+  AC_MSG_WARN([You will need re2c 0.96 or later if you want to regenerate 
PHP parsers.])
   RE2C=exit 0;
   ;;
   esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2005-04-29 Thread Jani Taskinen

sniper  Fri Apr 29 21:52:24 2005 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  - No need to iterate through the options twice
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.303r2=1.304ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.303 php-src/acinclude.m4:1.304
--- php-src/acinclude.m4:1.303  Fri Apr 29 20:15:07 2005
+++ php-src/acinclude.m4Fri Apr 29 21:52:21 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.303 2005/04/30 00:15:07 sniper Exp $
+dnl $Id: acinclude.m4,v 1.304 2005/04/30 01:52:21 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2413,9 +2413,11 @@
 
   for arg in [$]0 [$]@; do
 echo '[$]arg' \\  $1
+CONFIGURE_COMMAND=$CONFIGURE_COMMAND '[$]arg'
   done
   echo '[$]@'  $1
   chmod +x $1
+  PHP_SUBST_OLD(CONFIGURE_COMMAND)
 ])
 
 dnl
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.550r2=1.551ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.550 php-src/configure.in:1.551
--- php-src/configure.in:1.550  Thu Apr 21 11:02:34 2005
+++ php-src/configure.inFri Apr 29 21:52:22 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.550 2005/04/21 15:02:34 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.551 2005/04/30 01:52:22 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -31,9 +31,6 @@
 AC_INIT(README.CVS-RULES)
 
 PHP_CONFIG_NICE(config.nice)
-for arg in $0 $@; do
-  CONFIGURE_COMMAND=$CONFIGURE_COMMAND '$arg'
-done
 
 PHP_CANONICAL_HOST_TARGET
 
@@ -1092,7 +1089,6 @@
 PHP_SUBST(CC)
 PHP_SUBST(CFLAGS)
 PHP_SUBST(CFLAGS_CLEAN)
-PHP_SUBST_OLD(CONFIGURE_COMMAND)
 PHP_SUBST(CPP)
 PHP_SUBST(CPPFLAGS)
 PHP_SUBST(CXX)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-04-26 Thread Jani Taskinen

sniper  Tue Apr 26 04:20:44 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Netware stuff
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.300r2=1.301ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.300 php-src/acinclude.m4:1.301
--- php-src/acinclude.m4:1.300  Sat Apr 23 07:30:11 2005
+++ php-src/acinclude.m4Tue Apr 26 04:20:44 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.300 2005/04/23 11:30:11 helly Exp $
+dnl $Id: acinclude.m4,v 1.301 2005/04/26 08:20:44 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -847,6 +847,10 @@
   suffix=so
   link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle 
-undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
-o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
   ;;
+*netware*[)]
+  suffix=nlm
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ -shared 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  ;;
 *[)]
   suffix=la
   link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-04-23 Thread Marcus Boerger

helly   Sat Apr 23 07:30:12 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Change bison check to positive logic and allow bison 2.0
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.299r2=1.300ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.299 php-src/acinclude.m4:1.300
--- php-src/acinclude.m4:1.299  Wed Apr 20 16:48:19 2005
+++ php-src/acinclude.m4Sat Apr 23 07:30:11 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.299 2005/04/20 20:48:19 bfrance Exp $
+dnl $Id: acinclude.m4,v 1.300 2005/04/23 11:30:11 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -1936,10 +1936,10 @@
   if test $YACC = bison -y; then
 AC_CACHE_CHECK([for bison version], php_cv_bison_version, [
   set `bison --version| grep 'GNU Bison' | cut -d ' ' -f 4 | sed -e 's/\./ 
/'|tr -d a-z`
-  if test ${1} -ne 1 -o ( ${2} != 28 -a ${2} != 35 -a ${2} 
!= 75 -a ${2} != 875 ); then 
-php_cv_bison_version=invalid
-  else
+  if test ( ${1} = 1 -a ( ${2} = 28 -o ${2} = 35 -o ${2} 
= 75 -o ${2} = 875 ) ) -o ( ${1} = 2 -a ( ${2} = 0 ) 
); then
 php_cv_bison_version=${1}.${2} (ok)
+  else
+php_cv_bison_version=invalid
   fi
 ])
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-03-10 Thread Rob Richards

rrichards   Thu Mar 10 17:35:19 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  require libxml 2.6.0 or higher
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.296r2=1.297ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.296 php-src/acinclude.m4:1.297
--- php-src/acinclude.m4:1.296  Fri Mar  4 10:13:03 2005
+++ php-src/acinclude.m4Thu Mar 10 17:35:18 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.296 2005/03/04 15:13:03 sniper Exp $
+dnl $Id: acinclude.m4,v 1.297 2005/03/10 22:35:18 rrichards Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2304,7 +2304,7 @@
 set $libxml_full_version
 IFS=$ac_IFS
 LIBXML_VERSION=`expr [$]1 \* 100 + [$]2 \* 1000 + [$]3`
-if test $LIBXML_VERSION -ge 2005010; then
+if test $LIBXML_VERSION -ge 2006000; then
   LIBXML_LIBS=`$XML2_CONFIG --libs`
   LIBXML_INCS=`$XML2_CONFIG --cflags`
   PHP_EVAL_LIBLINE($LIBXML_LIBS, $1)
@@ -2327,7 +2327,7 @@
   fi
   $2
 else
-  AC_MSG_ERROR([libxml2 version 2.5.10 or greater required.])
+  AC_MSG_ERROR([libxml2 version 2.6.0 or greater required.])
 fi
 ifelse([$3],[],,[else $3])
   fi

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-03-04 Thread Jani Taskinen

sniper  Fri Mar  4 10:13:06 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  This did not work for some reason, better revert it
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.295r2=1.296ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.295 php-src/acinclude.m4:1.296
--- php-src/acinclude.m4:1.295  Sun Feb 27 19:07:16 2005
+++ php-src/acinclude.m4Fri Mar  4 10:13:03 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.295 2005/02/28 00:07:16 helly Exp $
+dnl $Id: acinclude.m4,v 1.296 2005/03/04 15:13:03 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -763,8 +763,8 @@
 dnl
 AC_DEFUN([PHP_REQUIRE_CXX],[
   if test -z $php_cxx_done; then
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
+AC_PROG_CXX
+AC_PROG_CXXCPP
 php_cxx_done=yes
   fi
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-02-27 Thread Marcus Boerger

helly   Sun Feb 27 19:07:16 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix typo
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.294r2=1.295ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.294 php-src/acinclude.m4:1.295
--- php-src/acinclude.m4:1.294  Sun Feb 27 07:42:27 2005
+++ php-src/acinclude.m4Sun Feb 27 19:07:16 2005
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: acinclude.m4,v 1.294 2005/02/27 12:42:27 sniper Exp $
+dnl $Id: acinclude.m4,v 1.295 2005/02/28 00:07:16 helly Exp $
 dnl
 dnl This file contains local autoconf functions.
 dnl
@@ -2003,7 +2003,7 @@
   if test -n $RE2C; then
 AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [
   re2c_vernum=`echo  | re2c --vernum 2/dev/null`
-  if test -z $rec2_vernum || test $re2c_vernum -lt 904; then
+  if test -z $re2c_vernum || test $re2c_vernum -lt 904; then
 php_cv_re2c_version=invalid
   else
 php_cv_re2c_version=`echo  | re2c --version | cut -d ' ' -f 2  
2/dev/null` (ok)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-02-08 Thread Moriyoshi Koizumi

moriyoshi   Tue Feb  8 19:49:45 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Complement for Jani's fix. Likely fix the iconv issue.
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.290r2=1.291ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.290 php-src/acinclude.m4:1.291
--- php-src/acinclude.m4:1.290  Tue Jan 25 08:02:25 2005
+++ php-src/acinclude.m4Tue Feb  8 19:49:45 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.290 2005/01/25 13:02:25 sniper Exp $
+dnl $Id: acinclude.m4,v 1.291 2005/02/09 00:49:45 moriyoshi Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -293,8 +293,11 @@
   SHLIB_SUFFIX_NAME=so
   case $host_alias in
   *hpux*[)]
-   SHLIB_SUFFIX_NAME=sl
-   ;;
+SHLIB_SUFFIX_NAME=sl
+;;
+  *darwin*[)]
+SHLIB_SUFFIX_NAME=dylib
+;;
   esac
 ])
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-01-25 Thread Jani Taskinen

sniper  Tue Jan 25 08:02:26 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix macosx shared extension build
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.289r2=1.290ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.289 php-src/acinclude.m4:1.290
--- php-src/acinclude.m4:1.289  Fri Jan 21 20:31:53 2005
+++ php-src/acinclude.m4Tue Jan 25 08:02:25 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.289 2005/01/22 01:31:53 sniper Exp $
+dnl $Id: acinclude.m4,v 1.290 2005/01/25 13:02:25 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1174,14 +1174,26 @@
 dnl
 AC_DEFUN([PHP_SHARED_MODULE],[
   install_modules=install-modules
-  PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.la
+
+  case $host_alias in
+*darwin*[)]
+  suffix=so
+  link_cmd='ifelse($4,,[$(CC)],[$(CXX)]) -dynamic -flat_namespace -bundle 
-undefined suppress $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) 
-o [$]@ $(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  ;;
+*[)]
+  suffix=la
+  link_cmd='$(LIBTOOL) --mode=link ifelse($4,,[$(CC)],[$(CXX)]) 
$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o [$]@ 
-export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) 
$(EXTRA_LDFLAGS) $($2) $(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)'
+  ;;
+  esac
+
+  PHP_MODULES=$PHP_MODULES \$(phplibdir)/$1.$suffix
   PHP_SUBST($2)
   cat Makefile.objectsEOF
-\$(phplibdir)/$1.la: $3/$1.la
-   \$(LIBTOOL) --mode=install cp $3/$1.la \$(phplibdir)
+\$(phplibdir)/$1.$suffix: $3/$1.$suffix
+   \$(LIBTOOL) --mode=install cp $3/$1.$suffix \$(phplibdir)
 
-$3/$1.la: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
-   \$(LIBTOOL) --mode=link ifelse($4,,[\$(CC)],[\$(CXX)]) \$(COMMON_FLAGS) 
\$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(LDFLAGS) -o \[$]@ -export-dynamic 
-avoid-version -prefer-pic -module -rpath \$(phplibdir) \$(EXTRA_LDFLAGS) 
\$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_LIBADD)
+$3/$1.$suffix: \$($2) \$(translit($1,a-z_-,A-Z__)_SHARED_DEPENDENCIES)
+   $link_cmd
 
 EOF
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2005-01-19 Thread Jani Taskinen

sniper  Wed Jan 19 12:35:56 2005 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  - Fix the pic patch
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.287r2=1.288ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.287 php-src/acinclude.m4:1.288
--- php-src/acinclude.m4:1.287  Fri Jan  7 11:57:23 2005
+++ php-src/acinclude.m4Wed Jan 19 12:35:55 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.287 2005/01/07 16:57:23 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.288 2005/01/19 17:35:55 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -784,12 +784,17 @@
   php_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS)'
   php_cxx_post='  echo  [EMAIL PROTECTED]'
   php_lo=o
-  
+
+  case $with_pic in
+yes) pic_setting='-prefer-pic';;
+no)  pic_setting='-prefer-non-pic';;
+  esac
+
   shared_c_pre='$(LIBTOOL) --mode=compile $(CC)'
-  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -prefer-pic'
+  shared_c_meta='$(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) '$pic_setting
   shared_c_post=
   shared_cxx_pre='$(LIBTOOL) --mode=compile $(CXX)'
-  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) 
-prefer-pic'
+  shared_cxx_meta='$(COMMON_FLAGS) $(CXXFLAGS_CLEAN) $(EXTRA_CXXFLAGS) 
'$pic_setting
   shared_cxx_post=
   shared_lo=lo
 
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.536r2=1.537ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.536 php-src/configure.in:1.537
--- php-src/configure.in:1.536  Sun Jan  9 20:11:09 2005
+++ php-src/configure.inWed Jan 19 12:35:55 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.536 2005/01/10 01:11:09 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.537 2005/01/19 17:35:55 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -237,7 +237,7 @@
 AC_MSG_CHECKING([whether to force non-PIC code in shared modules])
 case $host_alias in
 i?86-*-linux*|i?86-*-freebsd*)
-if test ${with_pic+set} != set; then
+if test ${with_pic+set} != set || test $with_pic = no; then
   with_pic=no
   AC_MSG_RESULT(yes)
 else
@@ -906,9 +906,10 @@
 ;;
 shared)
 enable_static=no
-if test ${with_pic+set} != set; then
-  standard_libtool_flag='-prefer-pic'
-fi
+case $with_pic in
+  yes) standard_libtool_flag='-prefer-pic';;
+  no)  standard_libtool_flag='-prefer-non-pic';;
+esac
 EXTRA_LDFLAGS=$EXTRA_LDFLAGS -avoid-version -module
 ;;
 esac

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2005-01-07 Thread Antony Dovgal

tony2001Fri Jan  7 11:57:23 2005 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  fix PHP_CHECK_64BIT macro (finally got 64bit machine to test it)
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.286r2=1.287ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.286 php-src/acinclude.m4:1.287
--- php-src/acinclude.m4:1.286  Fri Jan  7 01:12:41 2005
+++ php-src/acinclude.m4Fri Jan  7 11:57:23 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.286 2005/01/07 06:12:41 sniper Exp $
+dnl $Id: acinclude.m4,v 1.287 2005/01/07 16:57:23 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -2027,9 +2027,9 @@
 dnl It could be useful for those external libs, that have different 
precompiled 
 dnl versions in different directories.
 AC_DEFUN([PHP_CHECK_64BIT],[
-  AC_CHECK_SIZEOF(int)
+  AC_CHECK_SIZEOF(long int)
   AC_MSG_CHECKING([checking if we're at 64-bit platform])
-  if test $ac_cv_sizeof_int = 4 ; then
+  if test $ac_cv_sizeof_long_int = 4 ; then
 AC_MSG_RESULT([no])
 $1
   else

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /scripts phpize.m4

2005-01-06 Thread Jani Taskinen

sniper  Fri Jan  7 01:12:43 2005 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/scriptsphpize.m4 
  Log:
  - Make sure $host_alias is never empty
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.285r2=1.286ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.285 php-src/acinclude.m4:1.286
--- php-src/acinclude.m4:1.285  Thu Dec 30 09:56:00 2004
+++ php-src/acinclude.m4Fri Jan  7 01:12:41 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.285 2004/12/30 14:56:00 sniper Exp $
+dnl $Id: acinclude.m4,v 1.286 2005/01/07 06:12:41 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -29,9 +29,24 @@
   [echo #define ]$1[]ifelse([$2],,[ 1],[ $2])[  
]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h]
 ])
 
+dnl PHP_CANONICAL_HOST_TARGET
+dnl
+AC_DEFUN([PHP_CANONICAL_HOST_TARGET],[
+  AC_REQUIRE([AC_CANONICAL_HOST])dnl
+  AC_REQUIRE([AC_CANONICAL_TARGET])dnl
+  dnl Make sure we do not continue if host_alias is empty.
+  if test -z $host_alias  test -n $host; then
+host_alias=$host
+  fi
+  if test -z $host_alias; then
+AC_MSG_ERROR([host_alias is not set!])
+  fi
+])
+
 dnl PHP_INIT_BUILD_SYSTEM
 dnl
 AC_DEFUN([PHP_INIT_BUILD_SYSTEM],[
+AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
 test -d include || mkdir include
  Makefile.objects
  Makefile.fragments
@@ -273,6 +288,7 @@
 ])
 
 AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
+  AC_REQUIRE([PHP_CANONICAL_HOST_TARGET])dnl
   PHP_SUBST(SHLIB_SUFFIX_NAME)
   SHLIB_SUFFIX_NAME=so
   case $host_alias in
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.533r2=1.534ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.533 php-src/configure.in:1.534
--- php-src/configure.in:1.533  Thu Dec 30 02:08:35 2004
+++ php-src/configure.inFri Jan  7 01:12:41 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.533 2004/12/30 07:08:35 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.534 2005/01/07 06:12:41 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -35,8 +35,7 @@
   CONFIGURE_COMMAND=$CONFIGURE_COMMAND '$arg'
 done
 
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
+PHP_CANONICAL_HOST_TARGET
 
 AC_CONFIG_HEADER(main/php_config.h)
 
@@ -208,11 +207,6 @@
 dnl Platform-specific compile settings.
 dnl -
 
-dnl if host_alias is empty, ac_cv_host_alias may still have the info
-if test -z $host_alias; then
-host_alias=$ac_cv_host_alias
-fi
-
 case $host_alias in
 *solaris*)
 CPPFLAGS=$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS
http://cvs.php.net/diff.php/php-src/scripts/phpize.m4?r1=1.8r2=1.9ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.8 php-src/scripts/phpize.m4:1.9
--- php-src/scripts/phpize.m4:1.8   Thu Dec 30 02:08:37 2004
+++ php-src/scripts/phpize.m4   Fri Jan  7 01:12:42 2005
@@ -2,8 +2,6 @@
 
 AC_INIT(config.m4)
 
-AC_CANONICAL_HOST
-
 PHP_INIT_BUILD_SYSTEM
 
 AC_DEFUN([PHP_WITH_PHP_CONFIG],[

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2004-12-30 Thread Jani Taskinen

sniper  Thu Dec 30 09:56:00 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fix buildconf failure with autoconf versions  2.13
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.284r2=1.285ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.284 php-src/acinclude.m4:1.285
--- php-src/acinclude.m4:1.284  Thu Dec 30 09:50:05 2004
+++ php-src/acinclude.m4Thu Dec 30 09:56:00 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.284 2004/12/30 14:50:05 sniper Exp $
+dnl $Id: acinclude.m4,v 1.285 2004/12/30 14:56:00 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -2027,7 +2027,7 @@
 dnl Replacement macro for AC_C_BIGENDIAN
 dnl
 AC_DEFUN([PHP_C_BIGENDIAN],
-[AC_CACHE_CHECK(whether byte ordering is bigendian, ac_cv_c_bigendian_php,
+[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php,
  [
   ac_cv_c_bigendian_php=unknown
   AC_TRY_RUN(
@@ -2044,9 +2044,9 @@
}
 }
   ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], 
[ac_cv_c_bigendian_php=unknown])
-  if test $ac_cv_c_bigendian_php = yes; then
-AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
-  fi
  ])
+ if test $ac_cv_c_bigendian_php = yes; then
+   AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
+ fi
 ])
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/imap config.m4 /ext/openssl config0.m4

2004-12-30 Thread Jani Taskinen

sniper  Thu Dec 30 09:50:06 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/imap   config.m4 
/php-src/ext/opensslconfig0.m4 
  Log:
  - Fixed bug #31101 (missing kerberos header file path with --with-openssl)
  
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.283r2=1.284ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.283 php-src/acinclude.m4:1.284
--- php-src/acinclude.m4:1.283  Thu Dec 30 02:08:35 2004
+++ php-src/acinclude.m4Thu Dec 30 09:50:05 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.283 2004/12/30 07:08:35 sniper Exp $
+dnl $Id: acinclude.m4,v 1.284 2004/12/30 14:50:05 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1577,6 +1577,64 @@
   ])
 ])
 
+dnl
+dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]])
+dnl
+dnl Common setup macro for kerberos
+dnl
+AC_DEFUN([PHP_SETUP_KERBEROS],[
+  found_kerberos=no
+  unset KERBEROS_CFLAGS
+  unset KERBEROS_LIBS
+
+  dnl First try to find krb5-config
+  if test -z $KRB5_CONFIG; then
+AC_PATH_PROG(KRB5_CONFIG, krb5-config, no, 
[$PATH:/usr/kerberos/bin:/usr/local/bin])
+  fi
+
+  dnl If krb5-config is found try using it
+  if test $PHP_KERBEROS = yes  test -x $KRB5_CONFIG; then
+KERBEROS_LIBS=`$KRB5_CONFIG --libs gssapi`
+KERBEROS_CFLAGS=`$KRB5_CONFIG --cflags gssapi`
+
+if test -n $KERBEROS_LIBS  test -n $KERBEROS_CFLAGS; then
+  found_kerberos=yes
+  PHP_EVAL_LIBLINE($KERBEROS_LIBS, $1)
+  PHP_EVAL_INCLINE($KERBEROS_CFLAGS)
+fi
+  fi
+
+  dnl If still not found use old skool method
+  if test $found_kerberos = no; then
+
+if test $PHP_KERBEROS = yes; then
+  PHP_KERBEROS=/usr/kerberos /usr/local /usr
+fi
+
+for i in $PHP_KERBEROS; do
+  if test -f $i/$PHP_LIBDIR/libkrb5.a || test -f 
$i/$PHP_LIBDIR/libkrb5.$SHLIB_SUFFIX_NAME; then
+PHP_KERBEROS_DIR=$i
+break
+  fi
+done
+
+if test $PHP_KERBEROS_DIR; then
+  found_kerberos=yes
+  PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
+  PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
+  PHP_ADD_LIBRARY(krb5, 1, $1)
+  PHP_ADD_LIBRARY(k5crypto, 1, $1)
+  PHP_ADD_LIBRARY(com_err,  1, $1)
+  PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
+fi
+  fi
+
+  if test $found_kerberos = yes; then
+ifelse([$2],[],:,[$2])
+ifelse([$3],[],,[else $3])
+  fi
+])
+
 dnl 
 dnl PHP_SETUP_OPENSSL(shared-add [, action-found [, action-not-found]])
 dnl
@@ -1587,13 +1645,20 @@
   unset OPENSSL_INCDIR
   unset OPENSSL_LIBDIR
 
+  dnl Fallbacks for different configure options
+  if test $PHP_OPENSSL != no; then
+PHP_OPENSSL_DIR=$PHP_OPENSSL
+  elif test $PHP_IMAP_SSL != no; then
+PHP_OPENSSL_DIR=$PHP_IMAP_SSL
+  fi
+
   dnl First try to find pkg-config
   if test -z $PKG_CONFIG; then
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
   fi
 
   dnl If pkg-config is found try using it
-  if test $PHP_OPENSSL = yes  test -x $PKG_CONFIG  $PKG_CONFIG 
--exists openssl; then
+  if test $PHP_OPENSSL_DIR = yes  test -x $PKG_CONFIG  $PKG_CONFIG 
--exists openssl; then
 if $PKG_CONFIG --atleast-version=0.9.6 openssl; then
   found_openssl=yes
   OPENSSL_LIBS=`$PKG_CONFIG --libs openssl`
@@ -1607,15 +1672,16 @@
   PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
   PHP_EVAL_INCLINE($OPENSSL_INCS)
 fi
+  fi
 
-  else 
-
-dnl If pkg-config fails for some reason, revert to the old method
-if test $PHP_OPENSSL = yes; then
-  PHP_OPENSSL=/usr/local/ssl /usr/local /usr /usr/local/openssl
+  dnl If pkg-config fails for some reason, revert to the old method
+  if test $found_openssl = no; then
+  
+if test $PHP_OPENSSL_DIR = yes; then
+  PHP_OPENSSL_DIR=/usr/local/ssl /usr/local /usr /usr/local/openssl
 fi
 
-for i in $PHP_OPENSSL; do
+for i in $PHP_OPENSSL_DIR; do
   if test -r $i/include/openssl/evp.h; then
 OPENSSL_INCDIR=$i/include
   fi
@@ -1673,11 +1739,11 @@
 PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi
 
+  if test $found_openssl = yes; then
   dnl For apache 1.3.x static build
   OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR
   AC_SUBST(OPENSSL_INCDIR_OPT)
 
-  if test $found_openssl = yes; then
 ifelse([$2],[],:,[$2])
 ifelse([$3],[],,[else $3])
   fi
http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.66r2=1.67ty=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.66 php-src/ext/imap/config.m4:1.67
--- php-src/ext/imap/config.m4:1.66 Thu Dec 30 02:08:36 2004
+++ php-src/ext/imap/config.m4  Thu Dec 30 09:50:06 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.66 2004/12/30 07:08:36 sniper Exp $
+dnl $Id: config.m4,v 1.67 2004/12/30 14:50:06 sniper Exp $
 dnl
 
 AC_DEFUN([IMAP_INC_CHK],[if test -r $i$1/c-client.h; then
@@ -43,41 +43,16 @@
 ])
 
 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

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/bcmath/libbcmath aclocal.m4 /ext/cpdf config.m4 /ext/dba config.m4 /ext/gd config.m4 /ext/imap config.m4 /ext/ldap config.m4 /ext/mcrypt config.m4 /ext/msql config.m4 /ext/mysql config.m4 /ext/oci8 config.m4 /ext/odbc config.m4 /ext/oracle config.m4 /ext/pgsql config.m4 /ext/standard config.m4 /ext/xmlrpc/libxmlrpc acinclude.m4 xmlrpc.m4 /sapi/cgi config9.m4 /sapi/cgi/libfcgi acinclude.m4 /scripts phpize.m4 TSRM acinclude.m4 threads.m4 tsrm.m4 ZendEngine2 Zend.m4 acinclude.m4

2004-12-29 Thread Jani Taskinen

sniper  Thu Dec 30 02:08:38 2004 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
/TSRM   acinclude.m4 threads.m4 tsrm.m4 
/ZendEngine2Zend.m4 acinclude.m4 
/php-src/ext/bcmath/libbcmath   aclocal.m4 
/php-src/ext/cpdf   config.m4 
/php-src/ext/dbaconfig.m4 
/php-src/ext/gd config.m4 
/php-src/ext/imap   config.m4 
/php-src/ext/ldap   config.m4 
/php-src/ext/mcrypt config.m4 
/php-src/ext/msql   config.m4 
/php-src/ext/mysql  config.m4 
/php-src/ext/oci8   config.m4 
/php-src/ext/odbc   config.m4 
/php-src/ext/oracle config.m4 
/php-src/ext/pgsql  config.m4 
/php-src/ext/standard   config.m4 
/php-src/ext/xmlrpc/libxmlrpc   acinclude.m4 xmlrpc.m4 
/php-src/sapi/cgi   config9.m4 
/php-src/sapi/cgi/libfcgi   acinclude.m4 
/php-src/scriptsphpize.m4 
  Log:
  MFB_4_3: Quote macro names in AC_DEFUN()
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.282r2=1.283ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.282 php-src/acinclude.m4:1.283
--- php-src/acinclude.m4:1.282  Tue Dec 21 10:41:22 2004
+++ php-src/acinclude.m4Thu Dec 30 02:08:35 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.282 2004/12/21 15:41:22 edink Exp $
+dnl $Id: acinclude.m4,v 1.283 2004/12/30 07:08:35 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -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;])
 ])
 
@@ -1909,7 +1909,7 @@
 dnl PHP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs [, 
extra-source]])
 dnl This macro checks whether build works and given function exists.
 dnl
-AC_DEFUN(PHP_TEST_BUILD, [
+AC_DEFUN([PHP_TEST_BUILD], [
   old_LIBS=$LIBS
   LIBS=$4 $LIBS
   AC_TRY_RUN([
@@ -1937,14 +1937,14 @@
 dnl $3 = optional: if true, it's ok for $2 to have not been configured
 dnl default is false and should halt the build.
 dnl See ADD_EXTENSION_DEP in win32 build 
-AC_DEFUN(PHP_ADD_EXTENSION_DEP, [])
+AC_DEFUN([PHP_ADD_EXTENSION_DEP], [])
 
 
 dnl PHP_CHECK_64BIT([do if 32], [do if 64])
 dnl This macro is used to detect if we're at 64-bit platform or not.
 dnl It could be useful for those external libs, that have different 
precompiled 
 dnl versions in different directories.
-AC_DEFUN(PHP_CHECK_64BIT,[
+AC_DEFUN([PHP_CHECK_64BIT],[
   AC_CHECK_SIZEOF(int)
   AC_MSG_CHECKING([checking if we're at 64-bit platform])
   if test $ac_cv_sizeof_int = 4 ; then
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.532r2=1.533ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.532 php-src/configure.in:1.533
--- php-src/configure.in:1.532  Mon Dec 20 20:07:24 2004
+++ php-src/configure.inThu Dec 30 02:08:35 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.532 2004/12/21 01:07:24 sniper Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.533 2004/12/30 07:08:35 sniper Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -47,10 +47,10 @@
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION
 
 dnl Define where extension directories are located in the configure context
-AC_DEFUN(PHP_EXT_BUILDDIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_DIR,[ext/$1])dnl
-AC_DEFUN(PHP_EXT_SRCDIR,[$abs_srcdir/ext/$1])dnl
-AC_DEFUN(PHP_ALWAYS_SHARED,[])dnl
+AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_DIR],[ext/$1])dnl
+AC_DEFUN([PHP_EXT_SRCDIR],[$abs_srcdir/ext/$1])dnl
+AC_DEFUN([PHP_ALWAYS_SHARED],[])dnl
 
 dnl Setting up the PHP version based on the information above.
 dnl -
http://cvs.php.net/diff.php/TSRM/acinclude.m4?r1=1.1r2=1.2ty=u
Index: TSRM/acinclude.m4
diff -u TSRM/acinclude.m4:1.1 TSRM/acinclude.m4:1.2
--- TSRM/acinclude.m4:1.1   Mon Oct  4 11:22:18 1999
+++ TSRM/acinclude.m4   Thu Dec 30 02:08:36 2004
@@ -1,5 +1,5 @@
 
-AC_DEFUN(AM_SET_LIBTOOL_VARIABLE,[
+AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[
   LIBTOOL='$(SHELL) $(top_builddir)/libtool $1'
 ])
 
http://cvs.php.net/diff.php/TSRM/threads.m4?r1=1.12r2=1.13ty=u
Index: TSRM/threads.m4
diff -u TSRM/threads.m4:1.12 TSRM/threads.m4:1.13
--- TSRM/threads.m4:1.12Sat Oct  5 07:26:17 2002
+++ TSRM/threads.m4 Thu Dec 30 02:08:36 2004
@@ -30,7 +30,7 @@
 dnl
 dnl Set some magic defines to achieve POSIX threads conformance
 dnl
-AC_DEFUN(PTHREADS_FLAGS,[
+AC_DEFUN([PTHREADS_FLAGS],[
   if test -z $host_alias  test -n $host; then
 host_alias=$host
   fi
@@ -65,7 +65,7 @@
 dnl
 dnl Check whether the current setup can use POSIX threads calls
 dnl
-AC_DEFUN(PTHREADS_CHECK_COMPILE, [
+AC_DEFUN([PTHREADS_CHECK_COMPILE], [
 AC_TRY_RUN( [
 #include pthread.h
 #include stddef.h
@@ -100,7 +100,7 @@
 dnl  -qthreadedAIX cc V5
 dnl  -threads

[PHP-CVS] cvs: php-src / acinclude.m4

2004-12-21 Thread Edin Kadribasic

edink   Tue Dec 21 10:41:22 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  MFB: Avoid autoheader warning
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.281r2=1.282ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.281 php-src/acinclude.m4:1.282
--- php-src/acinclude.m4:1.281  Mon Dec 20 15:37:43 2004
+++ php-src/acinclude.m4Tue Dec 21 10:41:22 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.281 2004/12/20 20:37:43 sniper Exp $
+dnl $Id: acinclude.m4,v 1.282 2004/12/21 15:41:22 edink Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1979,7 +1979,7 @@
 }
   ], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], 
[ac_cv_c_bigendian_php=unknown])
   if test $ac_cv_c_bigendian_php = yes; then
-AC_DEFINE(WORDS_BIGENDIAN)
+AC_DEFINE(WORDS_BIGENDIAN, [], [Define if processor uses big-endian word])
   fi
  ])
 ])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2004-12-11 Thread Derick Rethans

derick  Sat Dec 11 06:16:55 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Generate all iconv headers by default
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.279r2=1.280ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.279 php-src/acinclude.m4:1.280
--- php-src/acinclude.m4:1.279  Thu Dec  9 04:06:06 2004
+++ php-src/acinclude.m4Sat Dec 11 06:16:55 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.279 2004/12/09 09:06:06 derick Exp $
+dnl $Id: acinclude.m4,v 1.280 2004/12/11 11:16:55 derick Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1696,9 +1696,13 @@
   test -d ext || mkdir ext
   test -d ext/iconv || mkdir ext/iconv
 
+  echo  ext/iconv/php_have_bsd_iconv.h
+  echo  ext/iconv/php_have_glibc_iconv.h
   echo  ext/iconv/php_have_libiconv.h
   echo  ext/iconv/php_have_iconv.h
   echo  ext/iconv/php_php_iconv_impl.h
+  echo  ext/iconv/php_php_iconv_h_path.h
+  echo  ext/iconv/php_iconv_supports_errno.h
 
   dnl
   dnl Check libc first if no path is provided in --with-iconv

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2004-12-09 Thread Derick Rethans

derick  Thu Dec  9 04:06:06 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - MF43: Fixed bug #31034 (Problem with non-existing iconv header file).
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.278r2=1.279ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.278 php-src/acinclude.m4:1.279
--- php-src/acinclude.m4:1.278  Wed Dec  8 07:50:00 2004
+++ php-src/acinclude.m4Thu Dec  9 04:06:06 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.278 2004/12/08 12:50:00 jorton Exp $
+dnl $Id: acinclude.m4,v 1.279 2004/12/09 09:06:06 derick Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1698,6 +1698,7 @@
 
   echo  ext/iconv/php_have_libiconv.h
   echo  ext/iconv/php_have_iconv.h
+  echo  ext/iconv/php_php_iconv_impl.h
 
   dnl
   dnl Check libc first if no path is provided in --with-iconv

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2004-12-08 Thread Joe Orton

jorton  Wed Dec  8 07:50:00 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fix VPATH build again.
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.277r2=1.278ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.277 php-src/acinclude.m4:1.278
--- php-src/acinclude.m4:1.277  Mon Dec  6 15:39:20 2004
+++ php-src/acinclude.m4Wed Dec  8 07:50:00 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.277 2004/12/06 20:39:20 derick Exp $
+dnl $Id: acinclude.m4,v 1.278 2004/12/08 12:50:00 jorton Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1692,6 +1692,10 @@
   found_iconv=no
   unset ICONV_DIR
 
+  # Create the directories for a VPATH build:
+  test -d ext || mkdir ext
+  test -d ext/iconv || mkdir ext/iconv
+
   echo  ext/iconv/php_have_libiconv.h
   echo  ext/iconv/php_have_iconv.h
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /ext/iconv config.m4 php_iconv.h

2004-12-06 Thread Derick Rethans

derick  Mon Dec  6 15:39:20 2004 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/ext/iconv  config.m4 php_iconv.h 
  Log:
  - MF43: Install the iconv extension headers to installpath/ext/iconv so that
external extensions can use them.
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.276r2=1.277ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.276 php-src/acinclude.m4:1.277
--- php-src/acinclude.m4:1.276  Tue Nov  9 15:58:22 2004
+++ php-src/acinclude.m4Mon Dec  6 15:39:20 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.276 2004/11/09 20:58:22 andrei Exp $
+dnl $Id: acinclude.m4,v 1.277 2004/12/06 20:39:20 derick Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -21,12 +21,12 @@
 ])
 
 
-dnl PHP_DEFINE(WHAT[, value])
+dnl PHP_DEFINE(WHAT[, value[, directory]])
 dnl
 dnl Creates builddir/include/what.h and in there #define WHAT value
 dnl
 AC_DEFUN([PHP_DEFINE],[
-  [echo #define ]$1[]ifelse([$2],,[ 1],[ $2])[  
include/php_]translit($1,A-Z,a-z)[.h]
+  [echo #define ]$1[]ifelse([$2],,[ 1],[ $2])[  
]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h]
 ])
 
 dnl PHP_INIT_BUILD_SYSTEM
@@ -1692,16 +1692,19 @@
   found_iconv=no
   unset ICONV_DIR
 
+  echo  ext/iconv/php_have_libiconv.h
+  echo  ext/iconv/php_have_iconv.h
+
   dnl
   dnl Check libc first if no path is provided in --with-iconv
   dnl
   if test $PHP_ICONV = yes; then
 AC_CHECK_FUNC(iconv, [
-  PHP_DEFINE(HAVE_ICONV)
+  PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
   found_iconv=yes
 ],[
   AC_CHECK_FUNC(libiconv,[
-PHP_DEFINE(HAVE_LIBICONV)
+PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
 found_iconv=yes
   ])
 ])
@@ -1734,11 +1737,11 @@
 then
   PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
 found_iconv=yes
-PHP_DEFINE(HAVE_LIBICONV)
+PHP_DEFINE(HAVE_LIBICONV,1,[ext/iconv])
   ], [
 PHP_CHECK_LIBRARY($iconv_lib_name, iconv, [
   found_iconv=yes
-  PHP_DEFINE(HAVE_ICONV)
+  PHP_DEFINE(HAVE_ICONV,1,[ext/iconv])
 ], [], [
   -L$ICONV_DIR/$PHP_LIBDIR
 ])
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.526r2=1.527ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.526 php-src/configure.in:1.527
--- php-src/configure.in:1.526  Mon Nov 15 08:42:21 2004
+++ php-src/configure.inMon Dec  6 15:39:20 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.526 2004/11/15 13:42:21 derick Exp $ -*- autoconf 
-*-
+dnl ## $Id: configure.in,v 1.527 2004/12/06 20:39:20 derick Exp $ -*- autoconf 
-*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -981,7 +981,7 @@
 
 if test $abs_srcdir != $abs_builddir; then
   INCLUDES=$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend
-  INCLUDES=$INCLUDES -I\$(top_srcdir)/TSRM
+  INCLUDES=$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/
 fi
 
 ZEND_EXTRA_LIBS=$LIBS
http://cvs.php.net/diff.php/php-src/ext/iconv/config.m4?r1=1.28r2=1.29ty=u
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.28 php-src/ext/iconv/config.m4:1.29
--- php-src/ext/iconv/config.m4:1.28Wed Nov  3 09:32:50 2004
+++ php-src/ext/iconv/config.m4 Mon Dec  6 15:39:20 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.28 2004/11/03 14:32:50 jorton Exp $
+dnl $Id: config.m4,v 1.29 2004/12/06 20:39:20 derick Exp $
 dnl
 
 PHP_ARG_WITH(iconv, for iconv support,
@@ -65,23 +65,26 @@
   esac
 fi 
 
+echo  ext/iconv/php_have_bsd_iconv.h
+echo  ext/iconv/php_have_glibc_iconv.h
+
 case $iconv_impl_name in
   gnu_libiconv [)]
-PHP_DEFINE([PHP_ICONV_IMPL],[\libiconv\])
+PHP_DEFINE([PHP_ICONV_IMPL],[\libiconv\],[ext/iconv])
 AC_DEFINE([PHP_ICONV_IMPL],[libiconv],[Which iconv implementation to 
use])
 ;;
 
   bsd [)]
-PHP_DEFINE([HAVE_BSD_ICONV],1)
+PHP_DEFINE([HAVE_BSD_ICONV],1,[ext/iconv])
 AC_DEFINE([HAVE_BSD_ICONV],1,[Konstantin Chugeuv's iconv 
implementation])
-PHP_DEFINE([PHP_ICONV_IMPL],[\BSD iconv\])
+PHP_DEFINE([PHP_ICONV_IMPL],[\BSD iconv\],[ext/iconv])
 AC_DEFINE([PHP_ICONV_IMPL],[BSD iconv],[Which iconv implementation 
to use])
 ;;
 
   glibc [)]
-PHP_DEFINE([HAVE_GLIBC_ICONV],1)
+PHP_DEFINE([HAVE_GLIBC_ICONV],1,[ext/iconv])
 AC_DEFINE([HAVE_GLIBC_ICONV],1,[glibc's iconv implementation])
-PHP_DEFINE([PHP_ICONV_IMPL],[\glibc\])
+PHP_DEFINE([PHP_ICONV_IMPL],[\glibc\],[ext/iconv])
 AC_DEFINE([PHP_ICONV_IMPL],[glibc],[Which iconv implementation to 
use])
 ;;
 esac
@@ -106,11 +109,11 @@
 }
 ],[
   AC_MSG_RESULT(yes)
-  PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1)
+  PHP_DEFINE([ICONV_SUPPORTS_ERRNO],1,[ext/iconv])
   AC_DEFINE([ICONV_SUPPORTS_ERRNO],1,[Whether iconv supports error no or 
not])
 ],[
   AC_MSG_RESULT(no)
-

[PHP-CVS] cvs: php-src / acinclude.m4

2004-11-03 Thread Joe Orton

jorton  Wed Nov  3 08:04:11 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fix extraction of httpd version if httpd is linked against -lefence.
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.273r2=1.274ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.273 php-src/acinclude.m4:1.274
--- php-src/acinclude.m4:1.273  Sun Sep 12 02:35:51 2004
+++ php-src/acinclude.m4Wed Nov  3 08:04:10 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.273 2004/09/12 06:35:51 tony2001 Exp $
+dnl $Id: acinclude.m4,v 1.274 2004/11/03 13:04:10 jorton Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1886,7 +1886,7 @@
 dnl version for apache1/2.
 dnl
 AC_DEFUN([PHP_AP_EXTRACT_VERSION],[
-  ac_output=`$1 -v 21`
+  ac_output=`$1 -v 21 | grep version`
   ac_IFS=$IFS
 IFS=- /.
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in

2004-11-03 Thread Joe Orton

jorton  Wed Nov  3 09:07:09 2004 EDT

  Modified files:  
/php-srcacinclude.m4 configure.in 
  Log:
  Core changes to support multi-ABI platforms with libraries in
  /usr/lib64 rather than /usr/lib.
  
  * configure.in: Add --with-libdir flag; define PHP_LIBDIR.
  
  * acinclude.m4 (PHP_REMOVE_USR_LIB, PHP_RUNPATH_SWITCH,
  PHP_ADD_LIBPATH): Check for /usr/$PHP_LIBDIR rather than /usr/lib.
  (PHP_SETUP_OPENSSL, PHP_SETUP_ICONV): Use /path/to/$PHP_LIBDIR in
  place of /path/to/lib.
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.274r2=1.275ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.274 php-src/acinclude.m4:1.275
--- php-src/acinclude.m4:1.274  Wed Nov  3 08:04:10 2004
+++ php-src/acinclude.m4Wed Nov  3 09:07:09 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.274 2004/11/03 13:04:10 jorton Exp $
+dnl $Id: acinclude.m4,v 1.275 2004/11/03 14:07:09 jorton Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -176,7 +176,7 @@
   unset ac_new_flags
   for i in [$]$1; do
 case [$]i in
--L/usr/lib|-L/usr/lib/[)] ;;
+-L/usr/$PHP_LIBDIR|-L/usr/$PHP_LIBDIR/[)] ;;
 *[)] ac_new_flags=[$]ac_new_flags [$]i ;;
 esac
   done
@@ -638,7 +638,7 @@
 AC_MSG_CHECKING([if compiler supports -R])
 AC_CACHE_VAL(php_cv_cc_dashr,[
SAVE_LIBS=$LIBS
-   LIBS=-R /usr/lib $LIBS
+   LIBS=-R /usr/$PHP_LIBDIR $LIBS
AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
LIBS=$SAVE_LIBS])
 AC_MSG_RESULT([$php_cv_cc_dashr])
@@ -648,7 +648,7 @@
AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
AC_CACHE_VAL(php_cv_cc_rpath,[
SAVE_LIBS=$LIBS
-   LIBS=-Wl,-rpath,/usr/lib $LIBS
+   LIBS=-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS
AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
LIBS=$SAVE_LIBS])
AC_MSG_RESULT([$php_cv_cc_rpath])
@@ -832,7 +832,7 @@
 dnl add a library to linkpath/runpath
 dnl
 AC_DEFUN([PHP_ADD_LIBPATH],[
-  if test $1 != /usr/lib; then
+  if test $1 != /usr/$PHP_LIBDIR; then
 PHP_EXPAND_PATH($1, ai_p)
 ifelse([$2],,[
   _PHP_ADD_LIBPATH_GLOBAL([$ai_p])
@@ -1622,8 +1622,8 @@
   if test -r $i/include/openssl/evp.h; then
 OPENSSL_INCDIR=$i/include
   fi
-  if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
-OPENSSL_LIBDIR=$i/lib
+  if test -r $i/$PHP_LIBDIR/libssl.a -o -r 
$i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then
+OPENSSL_LIBDIR=$i/$PHP_LIBDIR
   fi
   test -n $OPENSSL_INCDIR  test -n $OPENSSL_LIBDIR  break
 done
@@ -1732,8 +1732,8 @@
   AC_MSG_ERROR([Please specify the install prefix of iconv with 
--with-iconv=DIR])
 fi
   
-if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a ||
-   test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
+if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a ||
+   test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
 then
   PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
 found_iconv=yes
@@ -1743,10 +1743,10 @@
   found_iconv=yes
   PHP_DEFINE(HAVE_ICONV)
 ], [], [
-  -L$ICONV_DIR/lib
+  -L$ICONV_DIR/$PHP_LIBDIR
 ])
   ], [
--L$ICONV_DIR/lib
+-L$ICONV_DIR/$PHP_LIBDIR
   ])
 fi
   fi
@@ -1754,7 +1754,7 @@
   if test $found_iconv = yes; then
 if test -n $ICONV_DIR; then
   AC_DEFINE(HAVE_ICONV, 1, [ ])
-  PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/lib, $1)
+  PHP_ADD_LIBRARY_WITH_PATH($iconv_lib_name, $ICONV_DIR/$PHP_LIBDIR, $1)
   PHP_ADD_INCLUDE($ICONV_DIR/include)
 fi
 $2
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.522r2=1.523ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.522 php-src/configure.in:1.523
--- php-src/configure.in:1.522  Fri Oct 22 06:46:42 2004
+++ php-src/configure.inWed Nov  3 09:07:09 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.522 2004/10/22 10:46:42 edink Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.523 2004/11/03 14:07:09 jorton Exp $ -*- autoconf -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -124,6 +124,11 @@
 dnl AC_PROG_CXX
 dnl AC_PROG_CXXCPP
 
+dnl Support systems with system libraries in e.g. /usr/lib64
+AC_ARG_WITH(libdir,
+[  --with-libdir=NAME Look for libraries in .../NAME rather than .../lib],
+[PHP_LIBDIR=$withval], [PHP_LIBDIR=lib])
+
 dnl check for -R, etc. switch
 PHP_RUNPATH_SWITCH
 

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2004-09-12 Thread Antony Dovgal

tony2001Sun Sep 12 02:35:51 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  add PHP_CHECK_64BIT macro to be able to detect 64-bit platform in ./configure
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.272r2=1.273ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.272 php-src/acinclude.m4:1.273
--- php-src/acinclude.m4:1.272  Sun Jul 18 08:03:51 2004
+++ php-src/acinclude.m4Sun Sep 12 02:35:51 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.272 2004/07/18 12:03:51 wez Exp $
+dnl $Id: acinclude.m4,v 1.273 2004/09/12 06:35:51 tony2001 Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1931,3 +1931,18 @@
 AC_DEFUN(PHP_ADD_EXTENSION_DEP, [])
 
 
+dnl PHP_CHECK_64BIT([do if 32], [do if 64])
+dnl This macro is used to detect if we're at 64-bit platform or not.
+dnl It could be useful for those external libs, that have different precompiled 
+dnl versions in different directories.
+AC_DEFUN(PHP_CHECK_64BIT,[
+  AC_CHECK_SIZEOF(int)
+  AC_MSG_CHECKING([checking if we're at 64-bit platform])
+  if test $ac_cv_sizeof_int = 4 ; then
+AC_MSG_RESULT([no])
+$1
+  else
+AC_MSG_RESULT([yes])
+$2
+  fi
+])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 configure.in /build genif.sh order_by_dep.awk /ext/dom config.m4 /ext/simplexml config.m4 /ext/spl config.m4 /ext/xml config.m4 /ext/xsl config.m4

2004-07-18 Thread Wez Furlong

wez Sun Jul 18 08:03:51 2004 EDT

  Added files: 
/php-src/build  order_by_dep.awk 

  Modified files:  
/php-srcacinclude.m4 configure.in 
/php-src/build  genif.sh 
/php-src/ext/domconfig.m4 
/php-src/ext/simplexml  config.m4 
/php-src/ext/splconfig.m4 
/php-src/ext/xmlconfig.m4 
/php-src/ext/xslconfig.m4 
  Log:
  Implement extension load-order deps.
  
  http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271r2=1.272ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271 php-src/acinclude.m4:1.272
--- php-src/acinclude.m4:1.271  Fri Mar 26 21:03:44 2004
+++ php-src/acinclude.m4Sun Jul 18 08:03:51 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271 2004/03/27 02:03:44 abies Exp $
+dnl $Id: acinclude.m4,v 1.272 2004/07/18 12:03:51 wez Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1920,3 +1920,14 @@
 LIBS=$old_LIBS
   ])
 ])
+
+dnl This macro is currently a placeholder in the config.m4 file
+dnl it is scanned by genif.sh when it builds the internal functions
+dnl list, so that modules can be init'd in the correct order
+dnl $1 = name of extension, $2 = extension upon which it depends
+dnl $3 = optional: if true, it's ok for $2 to have not been configured
+dnl default is false and should halt the build.
+dnl See ADD_EXTENSION_DEP in win32 build 
+AC_DEFUN(PHP_ADD_EXTENSION_DEP, [])
+
+
http://cvs.php.net/diff.php/php-src/configure.in?r1=1.514r2=1.515ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514 php-src/configure.in:1.515
--- php-src/configure.in:1.514  Tue Jul 13 15:56:48 2004
+++ php-src/configure.inSun Jul 18 08:03:51 2004
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514 2004/07/13 19:56:48 andi Exp $ -*- sh -*-
+dnl ## $Id: configure.in,v 1.515 2004/07/18 12:03:51 wez Exp $ -*- sh -*-
 dnl ## Process this file with autoconf to produce a configure script.
 
 divert(1)
@@ -130,7 +130,31 @@
 PHP_PROG_RE2C
 AC_PROG_RANLIB
 AC_PROG_LN_S
-AC_PROG_AWK
+
+dnl Some vendors force mawk before gawk; mawk is broken so we don't like that,
+dnl and check manually
+dnl AC_PROG_AWK
+AC_CHECK_PROGS(AWK, gawk nawk awk mawk, bork, /usr/xpg4/bin/:$PATH)
+case $AWK in
+   *mawk)
+   AC_MSG_WARN([mawk is known to have problems on some systems.  You 
should install GNU awk])
+   ;;
+   *gawk)
+   ;;
+   bork)
+   AC_MSG_ERROR([Could not find awk; Install GNU awk])
+   ;;
+   *)
+   AC_MSG_CHECKING([if $AWK is broken])
+   if ! $AWK 'function foo() {}' /dev/null 21 ; then
+   AC_MSG_RESULT([yes])
+   AC_MSG_ERROR([You should install GNU awk])
+   else
+   AC_MSG_RESULT([no - good!])
+   fi
+   ;;
+esac
+
 AC_PROG_YACC
 if test $YACC != bison -y; then
 AC_MSG_WARN([You will need bison if you want to regenerate the PHP parsers.])
http://cvs.php.net/diff.php/php-src/build/genif.sh?r1=1.3r2=1.4ty=u
Index: php-src/build/genif.sh
diff -u php-src/build/genif.sh:1.3 php-src/build/genif.sh:1.4
--- php-src/build/genif.sh:1.3  Fri Mar 22 05:22:41 2002
+++ php-src/build/genif.sh  Sun Jul 18 08:03:51 2004
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $Id: genif.sh,v 1.3 2002/03/22 10:22:41 sas Exp $
+# $Id: genif.sh,v 1.4 2004/07/18 12:03:51 wez Exp $
 # replacement for genif.pl
 
 infile=$1
@@ -17,13 +17,13 @@
exit 1
 fi
 
-module_ptrs=$extra_module_ptrs
 header_list=
 olddir=`pwd`
 cd $srcdir
 
+module_ptrs=$extra_module_ptrs`echo $@ | $awk -f ./build/order_by_dep.awk`
+
 for ext in ${1+$@} ; do
-   module_ptrs=   phpext_${ext}_ptr,@[EMAIL PROTECTED]
header_list=$header_list ext/$ext/*.h
 done
 
http://cvs.php.net/diff.php/php-src/ext/dom/config.m4?r1=1.15r2=1.16ty=u
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.15 php-src/ext/dom/config.m4:1.16
--- php-src/ext/dom/config.m4:1.15  Sun Dec  7 10:37:30 2003
+++ php-src/ext/dom/config.m4   Sun Jul 18 08:03:51 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.15 2003/12/07 15:37:30 sniper Exp $
+dnl $Id: config.m4,v 1.16 2004/07/18 12:03:51 wez Exp $
 dnl
 
 PHP_ARG_ENABLE(dom, whether to enable DOM support,
@@ -26,6 +26,7 @@
 typeinfo.c domerror.c domlocator.c namednodemap.c 
userdatahandler.c], 
 $ext_shared)
 PHP_SUBST(DOM_SHARED_LIBADD)
+   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/simplexml/config.m4?r1=1.7r2=1.8ty=u
Index: php-src/ext/simplexml/config.m4
diff -u php-src/ext/simplexml/config.m4:1.7 php-src/ext/simplexml/config.m4:1.8
--- php-src/ext/simplexml/config.m4:1.7 Wed Nov 12 18:42:35 2003
+++ php-src/ext/simplexml/config.m4 Sun Jul 18 08:03:51 2004
@@ -1,4 +1,4 @@
-dnl

[PHP-CVS] cvs: php-src / acinclude.m4

2004-03-26 Thread Ard Biesheuvel

abies   Fri Mar 26 21:03:44 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Put AC_DEFINE in correct place so caching will work properly
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.270r2=1.271ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.270 php-src/acinclude.m4:1.271
--- php-src/acinclude.m4:1.270  Sun Feb 22 22:24:58 2004
+++ php-src/acinclude.m4Fri Mar 26 21:03:44 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.270 2004/02/23 03:24:58 sniper Exp $
+dnl $Id: acinclude.m4,v 1.271 2004/03/27 02:03:44 abies Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1794,7 +1794,6 @@
 PHP_TEST_BUILD(xmlInitParser,
 [
   php_cv_libxml_build_works=yes
-  AC_DEFINE(HAVE_LIBXML, 1, [ ])
 ], [
   AC_MSG_RESULT(no)
   AC_MSG_ERROR([build test failed.  Please check the config.log for details.])
@@ -1802,6 +1801,9 @@
   [$]$1
 ])
   ])
+  if test $php_cv_libxml_build_works = yes; then
+AC_DEFINE(HAVE_LIBXML, 1, [ ])
+  fi
   $2
 else
   AC_MSG_ERROR([libxml2 version 2.5.10 or greater required.])

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4 /ext/imap config.m4

2004-02-22 Thread Jani Taskinen

sniper  Sun Feb 22 22:24:59 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
/php-src/ext/imap   config.m4 
  Log:
  - Added PHP_TEST_BUILD macro which can be used to test whether build 
works / would work with current LIBS (+ additional extra-libs)
  
  
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.269r2=1.270ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.269 php-src/acinclude.m4:1.270
--- php-src/acinclude.m4:1.269  Mon Jan 19 20:11:04 2004
+++ php-src/acinclude.m4Sun Feb 22 22:24:58 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.269 2004/01/20 01:11:04 sniper Exp $
+dnl $Id: acinclude.m4,v 1.270 2004/02/23 03:24:58 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1788,7 +1788,20 @@
   LIBXML_INCS=`$XML2_CONFIG --cflags`
   PHP_EVAL_LIBLINE($LIBXML_LIBS, $1)
   PHP_EVAL_INCLINE($LIBXML_INCS)
-  AC_DEFINE(HAVE_LIBXML, 1, [ ])
+
+  dnl Check that build works with given libs
+  AC_CACHE_CHECK(whether libxml build works, php_cv_libxml_build_works, [
+PHP_TEST_BUILD(xmlInitParser,
+[
+  php_cv_libxml_build_works=yes
+  AC_DEFINE(HAVE_LIBXML, 1, [ ])
+], [
+  AC_MSG_RESULT(no)
+  AC_MSG_ERROR([build test failed.  Please check the config.log for details.])
+], [
+  [$]$1
+])
+  ])
   $2
 else
   AC_MSG_ERROR([libxml2 version 2.5.10 or greater required.])
@@ -1880,3 +1893,28 @@
 
   APACHE_VERSION=`expr [$]4 \* 100 + [$]5 \* 1000 + [$]6`
 ])
+
+dnl
+dnl PHP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs [, 
extra-source]])
+dnl This macro checks whether build works and given function exists.
+dnl
+AC_DEFUN(PHP_TEST_BUILD, [
+  old_LIBS=$LIBS
+  LIBS=$4 $LIBS
+  AC_TRY_RUN([
+$5
+char $1();
+int main() {
+  $1();
+  return 0;
+}
+  ], [
+LIBS=$old_LIBS
+$2
+  ],[
+LIBS=$old_LIBS
+$3
+  ],[
+LIBS=$old_LIBS
+  ])
+])
http://cvs.php.net/diff.php/php-src/ext/imap/config.m4?r1=1.62r2=1.63ty=u
Index: php-src/ext/imap/config.m4
diff -u php-src/ext/imap/config.m4:1.62 php-src/ext/imap/config.m4:1.63
--- php-src/ext/imap/config.m4:1.62 Fri Jan 16 19:00:11 2004
+++ php-src/ext/imap/config.m4  Sun Feb 22 22:24:58 2004
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config.m4,v 1.62 2004/01/17 00:00:11 sniper Exp $
+dnl $Id: config.m4,v 1.63 2004/02/23 03:24:58 sniper Exp $
 dnl
 
 AC_DEFUN(IMAP_INC_CHK,[if test -r $i$1/c-client.h; then
@@ -20,11 +20,10 @@
   done
 ])
 
-dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok [, extra-libs])
+dnl PHP_IMAP_TEST_BUILD(function, action-if-ok, action-if-not-ok, extra-libs)
 AC_DEFUN(PHP_IMAP_TEST_BUILD, [
-  old_LIBS=$LIBS
-  LIBS=$4 $LIBS
-  AC_TRY_RUN([
+  PHP_TEST_BUILD([$1], [$2], [$3], [$4],
+  [
 void mm_log(void){}
 void mm_dlog(void){}
 void mm_flags(void){}
@@ -40,17 +39,6 @@
 void mm_exists(void){}
 void mm_searched(void){}
 void mm_expunged(void){}
-char $1();
-int main() {
-  $1();
-  return 0;
-}
-  ], [
-LIBS=$old_LIBS
-$2
-  ],[
-LIBS=$old_LIBS
-$3
   ])
 ])
 
@@ -206,7 +194,7 @@
   AC_DEFINE(HAVE_IMAP_AUTH_GSS, 1, [ ])
 ], [], $TST_LIBS)
 
-AC_MSG_CHECKING(whether IMAP works)
+AC_MSG_CHECKING(whether build with IMAP works)
 PHP_IMAP_TEST_BUILD(mail_newbody, [
   AC_MSG_RESULT(yes)
 ], [

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2004-01-19 Thread Jani Taskinen

sniper  Mon Jan 19 20:11:05 2004 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  - Fixed Bug #26969 (shared openssl build fails)
  
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.268r2=1.269ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.268 php-src/acinclude.m4:1.269
--- php-src/acinclude.m4:1.268  Fri Jan  9 18:37:29 2004
+++ php-src/acinclude.m4Mon Jan 19 20:11:04 2004
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.268 2004/01/09 23:37:29 wez Exp $
+dnl $Id: acinclude.m4,v 1.269 2004/01/20 01:11:04 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1652,7 +1652,6 @@
 CPPFLAGS=$old_CPPFLAGS
 
 PHP_ADD_INCLUDE($OPENSSL_INCDIR)
-PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   
 PHP_CHECK_LIBRARY(crypto, CRYPTO_free, [
   PHP_ADD_LIBRARY(crypto,,$1)
@@ -1673,6 +1672,8 @@
 ])
 LIBS=$old_LIBS
 PHP_ADD_LIBRARY(ssl,,$1)
+
+PHP_ADD_LIBPATH($OPENSSL_LIBDIR, $1)
   fi
 
   dnl For apache 1.3.x static build

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[PHP-CVS] cvs: php-src / acinclude.m4

2003-12-11 Thread Jani Taskinen

sniper  Fri Dec 12 00:19:31 2003 EDT

  Modified files:  
/php-srcacinclude.m4 
  Log:
  Fixed bug #26461 (-lssl missing from LIBS)
  
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.266 php-src/acinclude.m4:1.267
--- php-src/acinclude.m4:1.266  Thu Dec  4 10:57:55 2003
+++ php-src/acinclude.m4Fri Dec 12 00:19:30 2003
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.266 2003/12/04 15:57:55 sniper Exp $
+dnl $Id: acinclude.m4,v 1.267 2003/12/12 05:19:30 sniper Exp $
 dnl
 dnl This file contains local autoconf functions.
 
@@ -1663,7 +1663,6 @@
 old_LIBS=$LIBS
 LIBS=$LIBS -lcrypto
 PHP_CHECK_LIBRARY(ssl, SSL_CTX_set_ssl_version, [
-  PHP_ADD_LIBRARY(ssl,,$1)
   found_openssl=yes
 ],[
   AC_MSG_ERROR([libssl not found!])
@@ -1671,6 +1670,7 @@
   -L$OPENSSL_LIBDIR
 ])
 LIBS=$old_LIBS
+PHP_ADD_LIBRARY(ssl,,$1)
   fi
 
   dnl For apache 1.3.x static build

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

1 2 >

1 - 100 of 117 matches

Mail list logo