mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-23 09:54:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Nuke more quotes

Browse Source
This commit is contained in:
Sascha Schumann 2001-05-12 11:09:05 +00:00
parent 9982ff568a
commit afdaee9e47
38 changed files with 143 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
acinclude.m4
View File

@ -70,7 +70,7 @@ dnl notation.
dnl
AC_DEFUN(PHP_EVAL_LIBLINE,[
for ac_i in $1; do
case "$ac_i" in
case $ac_i in
-l*)
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_LIBRARY($ac_ii,,$2)
@ -90,7 +90,7 @@ dnl build system which are only given in compiler notation.
dnl
AC_DEFUN(PHP_EVAL_INCLINE,[
for ac_i in $1; do
case "$ac_i" in
case $ac_i in
-I*)
ac_ii=`echo $ac_i|cut -c 3-`
PHP_ADD_INCLUDE($ac_ii)
@ -142,7 +142,7 @@ int readdir_r(DIR *, struct dirent *);
ac_cv_what_readdir_r=none
])
])
case "$ac_cv_what_readdir_r" in
case $ac_cv_what_readdir_r in
POSIX)
AC_DEFINE(HAVE_POSIX_READDIR_R,1,[whether you have POSIX readdir_r]);;
old-style)
@ -154,7 +154,7 @@ int readdir_r(DIR *, struct dirent *);
AC_DEFUN(PHP_SHLIB_SUFFIX_NAME,[
PHP_SUBST(SHLIB_SUFFIX_NAME)
SHLIB_SUFFIX_NAME=so
case "$host_alias" in
case $host_alias in
*hpux*)
SHLIB_SUFFIX_NAME=sl
;;
@ -230,7 +230,7 @@ AC_DEFUN(PHP_LIBGCC_LIBPATH,[
])
AC_DEFUN(PHP_ARG_ANALYZE,[
case "[$]$1" in
case [$]$1 in
shared,*)
ext_output="yes, shared"
ext_shared=yes
@ -612,7 +612,7 @@ dnl
dnl add a library to the link line
dnl
AC_DEFUN(PHP_ADD_LIBRARY,[
case "$1" in
case $1 in
c|c_r|pthread*) ;;
*)
ifelse($3,,[
@ -811,9 +811,9 @@ AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
AC_MSG_CHECKING(whether -fPIC is required)
if test -n "$EXT_SHARED"; then
os=`uname -sr 2>/dev/null`
case "$os" in
case $os in
"SunOS 5.6"|"SunOS 5.7")
case "$CC" in
case $CC in
gcc*|egcs*) CFLAGS="$CFLAGS -fPIC";;
*) CFLAGS="$CFLAGS -fpic";;
esac

4
configure.in
View File

@ -93,7 +93,7 @@ AC_AIX
BSD_MAKEFILE=no
case "$host_alias" in
case $host_alias in
*solaris*)
CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
if test "${enable_libgcc+set}" != "set" && test "$GCC" = "yes"; then
@ -653,7 +653,7 @@ divert(6)
enable_shared=yes
enable_static=yes
case "$php_build_target" in
case $php_build_target in
program)
enable_shared=no
;;

4
ext/ccvs/config.m4
View File

@ -8,8 +8,8 @@ AC_ARG_WITH(ccvs,
[
if test "$withval" != "no"; then
CCVS_DIR="$withval"
test -f $withval/include/cv_api.h && CCVS_INCLUDE_DIR="$withval/include"
test -f $withval/lib/libccvs.a && CCVS_LIB_DIR="$withval/lib"
test -f $withval/include/cv_api.h && CCVS_INCLUDE_DIR=$withval/include
test -f $withval/lib/libccvs.a && CCVS_LIB_DIR=$withval/lib
if test -n "$CCVS_DIR"; then
AC_MSG_RESULT(yes)

8
ext/cpdf/config.m4
View File

@ -6,7 +6,7 @@ AC_ARG_WITH(cpdflib,
DIR is the cpdfllib install directory,
defaults to /usr.],
[
case "$withval" in
case $withval in
no)
AC_MSG_RESULT(no) ;;
yes)
@ -19,7 +19,7 @@ AC_ARG_WITH(cpdflib,
PHP_ADD_LIBRARY(jpeg)
;;
*)
test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE="$withval/include"
test -f $withval/include/cpdflib.h && CPDFLIB_INCLUDE=$withval/include
if test -n "$CPDFLIB_INCLUDE" ; then
AC_MSG_RESULT(yes)
PHP_EXTENSION(cpdf)
@ -31,7 +31,7 @@ AC_ARG_WITH(cpdflib,
[ --with-jpeg-dir[=DIR] jpeg dir for cpdflib 2.x],[
AC_MSG_RESULT(yes)
if test -z $withval; then
withval="/usr/local"
withval=/usr/local
fi
LIBS="$LIBS -L$withval/lib"
AC_CHECK_LIB(jpeg,jpeg_read_header, ,[AC_MSG_RESULT(no)],)
@ -46,7 +46,7 @@ AC_ARG_WITH(cpdflib,
[ --with-tiff-dir[=DIR] tiff dir for cpdflib 2.x],[
AC_MSG_RESULT(yes)
if test -z $withval; then
withval="/usr/local"
withval=/usr/local
fi
LIBS="$LIBS -L$withval/lib"
AC_CHECK_LIB(tiff,TIFFOpen, ,[AC_MSG_RESULT(no)],)

8
ext/cybercash/config.m4
View File

@ -7,16 +7,16 @@ AC_ARG_WITH(cybercash,
install directory.],
[
if test "$withval" != "no"; then
test -f $withval/mckcrypt.h && MCK_DIR="$withval"
test -f $withval/c-api/mckcrypt.h && MCK_DIR="$withval/c-api"
test -f $withval/mckcrypt.h && MCK_DIR=$withval
test -f $withval/c-api/mckcrypt.h && MCK_DIR=$withval/c-api
if test -n "$MCK_DIR"; then
AC_MSG_RESULT(yes)
PHP_EXTENSION(cybercash)
old_LIBS="$LIBS"
old_LIBS=$LIBS
LIBS="$LIBS -L$MCK_DIR/lib"
AC_CHECK_LIB(mckcrypto,base64_encode,[AC_DEFINE(HAVE_MCK,1,[ ])],
[AC_MSG_ERROR(Please reinstall the CyberCash MCK - cannot find mckcrypto lib)])
LIBS="$old_LIBS"
LIBS=$old_LIBS
PHP_ADD_LIBRARY_WITH_PATH(mckcrypto, $MCK_DIR/lib)
PHP_ADD_INCLUDE($MCK_DIR)
else

4
ext/db/config.m4
View File

@ -33,9 +33,9 @@ if test "$PHP_DB" != "no"; then
if test "$DBM_LIB" = "-lgdbm"; then
AC_CHECK_HEADER(gdbm.h, [ GDBM_INCLUDE="" ], [
AC_MSG_RESULT("Try /usr/local/include/gdbm.h");
AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE="-I/usr/local/include" ],[
AC_CHECK_HEADER(/usr/local/include/gdbm.h, [ GDBM_INCLUDE=-I/usr/local/include ],[
AC_MSG_RESULT("Try /opt/local/include/gdbm.h");
AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE="-I/opt/local/include" ],[
AC_CHECK_HEADER(/opt/local/include/gdbm.h, [ GDBM_INCLUDE=-I/opt/local/include ],[
dnl if in /usr/pkg/include, do not add anything. See above.
AC_MSG_RESULT("Try /usr/pkg/include/gdbm.h");
AC_CHECK_HEADER(/usr/pkg/include/gdbm.h, [ GDBM_INCLUDE="" ],[

6
ext/domxml/config.m4
View File

@ -3,7 +3,7 @@ dnl config.m4 for extension domxml
AC_DEFUN(PHP_DOM_CHECK_VERSION,[
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="-I$DOMXML_DIR/include"
CPPFLAGS=-I$DOMXML_DIR/include
AC_MSG_CHECKING(for libxml version)
AC_EGREP_CPP(yes,[
#include <libxml/xmlversion.h>
@ -47,9 +47,9 @@ if test "$PHP_DOM" != "no"; then
PHP_ADD_INCLUDE($DOMXML_DIR/include)
if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.s? ; then
DOM_LIBNAME="xml2"
DOM_LIBNAME=xml2
else
DOM_LIBNAME="xml"
DOM_LIBNAME=xml
fi
PHP_SUBST(DOMXML_SHARED_LIBADD)

2
ext/fbsql/config.m4
View File

@ -14,7 +14,7 @@ if test "$PHP_FBSQL" != "no"; then
for i in /Local/Library /usr /usr/local /opt /Library; do
if test -f $i/FrontBase/include/FBCAccess/FBCAccess.h; then
FBSQL_INSTALLATION_DIR="$i/FrontBase"
FBSQL_INSTALLATION_DIR=$i/FrontBase
break
fi
done

6
ext/fribidi/config.m4
View File

@ -17,7 +17,7 @@ dnl if module was requested with default path of fribidi installation then
dnl $PHP_FRIBIDI will be "yes"
if test "$PHP_FRIBIDI" = "yes"; then
PHP_FRIBIDI="/usr/local"
PHP_FRIBIDI=/usr/local
fi
@ -26,7 +26,7 @@ dnl $PHP_FRIBIDI will be "yes"
AC_MSG_CHECKING([for header files in "$PHP_FRIBIDI/include/fribidi"])
if test -f $PHP_FRIBIDI/include/fribidi/fribidi.h && test -f $PHP_FRIBIDI/include/fribidi/fribidi_types.h && test -f $PHP_FRIBIDI/include/fribidi/fribidi_char_sets.h; then
FRIBIDI_INCDIR="$PHP_FRIBIDI/include/fribidi/"
FRIBIDI_INCDIR=$PHP_FRIBIDI/include/fribidi/
AC_MSG_RESULT([found all])
else
AC_MSG_RESULT([missing])
@ -38,7 +38,7 @@ dnl $PHP_FRIBIDI will be "yes"
AC_MSG_CHECKING([for libfribidi.so file in "$PHP_FRIBIDI/lib/"])
if test -f "$PHP_FRIBIDI/lib/libfribidi.so" ; then
FRIBIDI_LIBDIR="$PHP_FRIBIDI/lib/"
FRIBIDI_LIBDIR=$PHP_FRIBIDI/lib/
AC_MSG_RESULT([found])
else
AC_MSG_RESULT([missing])

24
ext/gd/config.m4
View File

@ -76,12 +76,12 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
if test -n "$PHP_TTF" ; then
for i in /usr /usr/local "$PHP_TTF" ; do
if test -f "$i/include/freetype.h" ; then
TTF_DIR="$i"
TTF_DIR=$i
unset TTF_INC_DIR
fi
if test -f "$i/include/freetype/freetype.h"; then
TTF_DIR="$i"
TTF_INC_DIR="$i/include/freetype"
TTF_DIR=$i
TTF_INC_DIR=$i/include/freetype
fi
done
fi
@ -90,7 +90,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)
fi
if test -z "$TTF_INC_DIR"; then
TTF_INC_DIR="$TTF_DIR/include"
TTF_INC_DIR=$TTF_DIR/include
fi
PHP_ADD_INCLUDE($TTF_INC_DIR)
else
@ -106,8 +106,8 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
if test "$PHP_FREETYPE_DIR" != "no"; then
for i in /usr /usr/local "$PHP_FREETYPE_DIR" ; do
if test -f "$i/include/freetype2/freetype/freetype.h"; then
FREETYPE2_DIR="$i"
FREETYPE2_INC_DIR="$i/include/freetype2/freetype"
FREETYPE2_DIR=$i
FREETYPE2_INC_DIR=$i/include/freetype2/freetype
fi
done
@ -131,7 +131,7 @@ AC_DEFUN(PHP_GD_T1LIB,[
if test "$PHP_T1LIB" != "no"; then
for i in /usr/local /usr $PHP_T1LIB; do
if test -f "$i/include/t1lib.h"; then
T1_DIR="$i"
T1_DIR=$i
fi
done
@ -192,7 +192,7 @@ dnl Various checks for GD features
PHP_GD_FREETYPE1
PHP_GD_T1LIB
case "$PHP_GD" in
case $PHP_GD in
yes)
PHP_ADD_LIBRARY(gd,, GD_SHARED_LIBADD)
PHP_GD_CHECK_VERSION
@ -201,11 +201,11 @@ dnl Various checks for GD features
*)
dnl A whole whack of possible places where these might be
for i in include/gd1.3 include/gd include gd1.3 gd ""; do
test -f $PHP_GD/$i/gd.h && GD_INCLUDE="$PHP_GD/$i"
test -f $PHP_GD/$i/gd.h && GD_INCLUDE=$PHP_GD/$i
done
for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do
test -f $PHP_GD/$i/libgd.so -o -f $PHP_GD/$i/libgd.a && GD_LIB="$PHP_GD/$i"
test -f $PHP_GD/$i/libgd.so -o -f $PHP_GD/$i/libgd.a && GD_LIB=$PHP_GD/$i
done
if test -n "$GD_INCLUDE" && test -n "$GD_LIB" ; then
@ -220,12 +220,12 @@ dnl A whole whack of possible places where these might be
dnl NetBSD package structure
if test -f /usr/pkg/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
GD_INCLUDE="/usr/pkg/include/gd"
GD_INCLUDE=/usr/pkg/include/gd
fi
dnl SuSE 6.x package structure
if test -f /usr/include/gd/gd.h -a -z "$GD_INCLUDE" ; then
GD_INCLUDE="/usr/include/gd"
GD_INCLUDE=/usr/include/gd
fi
PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE)

6
ext/gettext/config.m4
View File

@ -20,14 +20,14 @@ if test "$PHP_GETTEXT" != "no"; then
GETTEXT_LIBDIR=$GETTEXT_DIR/lib
GETTEXT_INCDIR=$GETTEXT_DIR/include
O_LDFLAGS="$LDFLAGS"
O_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS="intl",[
AC_CHECK_LIB(intl, bindtextdomain, GETTEXT_LIBS=intl,[
AC_CHECK_LIB(c, bindtextdomain, GETTEXT_LIBS= ,[
AC_MSG_ERROR(Unable to find required gettext library)
])
])
LDFLAGS="$O_LDFLAGS"
LDFLAGS=$O_LDFLAGS
AC_DEFINE(HAVE_LIBINTL,1,[ ])
PHP_EXTENSION(gettext, $ext_shared)

12
ext/informix/config.m4
View File

@ -20,7 +20,7 @@ WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
PHP_ADD_LIBPATH($INFORMIXDIR/lib, INFORMIX_SHARED_LIBADD)
PHP_ADD_LIBPATH($INFORMIXDIR/lib/esql, INFORMIX_SHARED_LIBADD)
else
IFX_LIBDIR="$IFX_LIBDIR"
IFX_LIBDIR=$IFX_LIBDIR
fi
else
IFX_INCDIR=$PHP_INFORMIX/incl/esql
@ -28,7 +28,7 @@ WARNING: You asked for Informix support, but don't have \\\$INFORMIXDIR
PHP_ADD_LIBPATH($PHP_INFORMIX/lib, INFORMIX_SHARED_LIBADD)
PHP_ADD_LIBPATH($PHP_INFORMIX/lib/esql, INFORMIX_SHARED_LIBADD)
else
IFX_LIBDIR="$IFX_LIBDIR"
IFX_LIBDIR=$IFX_LIBDIR
fi
if test "$PHP_INFORMIX" != "$INFORMIXDIR"; then
INFORMIX_WARNING="
@ -52,7 +52,7 @@ WARNING: You specified Informix base install directory that is different
CPPFLAGS="$CPPFLAGS $IFX_INCLUDE"
LDFLAGS="$LDFLAGS $IFX_LFLAGS"
case "$host_alias" in
case $host_alias in
*aix*)
CPPFLAGS="$CPPFLAGS -D__H_LOCALEDEF";;
esac
@ -62,16 +62,16 @@ WARNING: You specified Informix base install directory that is different
IFX_VERSION=[`esql -V | sed -ne '1 s/^[^0-9]*\([0-9]\)\.\([0-9]*\).*/\1\2/p'`]
if test $IFX_VERSION -ge "900"; then
AC_DEFINE(HAVE_IFX_IUS,1,[ ])
IFX_ESQL_FLAGS="-EDHAVE_IFX_IUS"
IFX_ESQL_FLAGS=-EDHAVE_IFX_IUS
else
IFX_ESQL_FLAGS="-EUHAVE_IFX_IUS"
IFX_ESQL_FLAGS=-EUHAVE_IFX_IUS
fi
PHP_SUBST(IFX_ESQL_FLAGS)
PHP_SUBST(INFORMIX_SHARED_LIBADD)
AC_DEFINE_UNQUOTED(IFX_VERSION, $IFX_VERSION, [ ])
PHP_EXTENSION(informix, $ext_shared)
for i in $IFX_LIBS; do
case "$i" in
case $i in
*.o)
PHP_ADD_LIBPATH($abs_builddir/ext/informix, INFORMIX_SHARED_LIBADD)
PHP_ADD_LIBRARY(php_ifx, 1, INFORMIX_SHARED_LIBADD)

32
ext/java/config.m4
View File

@ -8,13 +8,13 @@ AC_ARG_WITH(java,
be built as a shared dl.],
[
if test "$withval" != "no"; then
JAVA_SHARED="libphp_java.la"
JAVA_SHARED=libphp_java.la
pltform=`uname -s 2>/dev/null`
java_libext="libjava.so"
case "$pltform" in
AIX) java_libext="libjava.a" ;;
HP-UX) java_libext="libjava.sl" ;;
java_libext=libjava.so
case $pltform in
AIX) java_libext=libjava.a ;;
HP-UX) java_libext=libjava.sl ;;
esac
# substitute zip for systems which don't have jar in the PATH
if JAVA_JAR=`which jar 2>/dev/null`; then
@ -31,7 +31,7 @@ AC_ARG_WITH(java,
PHP_ADD_LIBPATH($withval/lib)
PHP_ADD_LIBPATH($withval/lib/kaffe)
JAVA_CFLAGS="-DKAFFE"
JAVA_CFLAGS=-DKAFFE
JAVA_INCLUDE=-I$withval/include/kaffe
JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar
JAVA_LIB=kaffevm
@ -48,11 +48,11 @@ AC_ARG_WITH(java,
elif test -f $withval/lib/$java_libext; then
JAVA_LIB=java
JAVA_LIBPATH=$withval/lib
JAVA_INCLUDE="-I$withval/include"
test -f $withval/lib/classes.zip && JAVA_CFLAGS="-DJNI_11"
test -f $withval/lib/jvm.jar && JAVA_CFLAGS="-DJNI_12"
test -f $withval/lib/classes.zip && JAVA_CLASSPATH="$withval/lib/classes.zip"
test -f $withval/lib/jvm.jar && JAVA_CLASSPATH="$withval/lib/jvm.jar"
JAVA_INCLUDE=-I$withval/include
test -f $withval/lib/classes.zip && JAVA_CFLAGS=-DJNI_11
test -f $withval/lib/jvm.jar && JAVA_CFLAGS=-DJNI_12
test -f $withval/lib/classes.zip && JAVA_CLASSPATH=$withval/lib/classes.zip
test -f $withval/lib/jvm.jar && JAVA_CLASSPATH=$withval/lib/jvm.jar
for i in $JAVA_INCLUDE/*; do
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
done
@ -60,15 +60,15 @@ AC_ARG_WITH(java,
else
for i in `find $withval/include -type d`; do
test -f $i/jni.h && JAVA_INCLUDE="-I$i"
test -f $i/jni.h && JAVA_INCLUDE=-I$i
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
done
for i in `find $withval -type d`; do
test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11"
test -f $i/rt.jar && JAVA_CFLAGS="-DJNI_12"
test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip"
test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar"
test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
test -f $i/rt.jar && JAVA_CFLAGS=-DJNI_12
test -f $i/classes.zip && JAVA_CLASSPATH=$i/classes.zip
test -f $i/rt.jar && JAVA_CLASSPATH=$i/rt.jar
if test -f $i/$java_libext; then
JAVA_LIB=java

2
ext/ldap/config.m4
View File

@ -42,7 +42,7 @@ if test "$PHP_LDAP" != "no"; then
dnl Is this really necessary? -Troels Arvin
if test `uname` = "Linux"; then
LDAP_PTHREAD="pthread"
LDAP_PTHREAD=pthread
else
LDAP_PTHREAD=
fi

2
ext/msql/config.m4
View File

@ -13,7 +13,7 @@ AC_DEFUN(PHP_MSQL_VERSION,[
MSQL_VERSION="2.0 or newer"
],[
AC_DEFINE(MSQL1,1,[ ])
MSQL_VERSION="1.0"
MSQL_VERSION=1.0
])
CPPFLAGS=$ac_php_oldcppflags
AC_MSG_RESULT($MSQL_VERSION)

10
ext/mysql/config.m4
View File

@ -9,7 +9,7 @@ AC_DEFUN(MYSQL_LIB_CHK,[
str="$MYSQL_DIR/$1/libmysqlclient.*"
for j in `echo $str`; do
if test -r $j; then
MYSQL_LIB_DIR="$MYSQL_DIR/$1"
MYSQL_LIB_DIR=$MYSQL_DIR/$1
break 2
fi
done
@ -52,7 +52,7 @@ if test "$PHP_MYSQL" = "yes"; then
PHP_SUBST(MYSQL_SUBDIRS)
LIB_BUILD($ext_builddir/libmysql,$ext_shared,yes)
PHP_ADD_INCLUDE($ext_srcdir/libmysql)
MYSQL_MODULE_TYPE="builtin"
MYSQL_MODULE_TYPE=builtin
elif test "$PHP_MYSQL" != "no"; then
for i in $PHP_MYSQL; do
if test -r $i/include/mysql/mysql.h; then
@ -68,7 +68,7 @@ elif test "$PHP_MYSQL" != "no"; then
AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL)
fi
MYSQL_MODULE_TYPE="external"
MYSQL_MODULE_TYPE=external
for i in lib lib/mysql; do
MYSQL_LIB_CHK($i)
@ -85,7 +85,7 @@ elif test "$PHP_MYSQL" != "no"; then
AC_DEFINE_UNQUOTED(MYSQL_UNIX_ADDR, "`$MYSQL_DIR/bin/mysql_config --socket`", [Default mysql unix socket])
else
MYSQL_LIBS="-L$MYSQL_LIB_DIR -lmysqlclient"
MYSQL_INCLUDE="-I$MYSQL_INC_DIR"
MYSQL_INCLUDE=-I$MYSQL_INC_DIR
PHP_MYSQL_SOCK
fi
@ -93,7 +93,7 @@ elif test "$PHP_MYSQL" != "no"; then
PHP_EVAL_INCLINE($MYSQL_INCLUDE)
else
MYSQL_MODULE_TYPE="none"
MYSQL_MODULE_TYPE=none
fi
PHP_SUBST(MYSQL_SHARED_LIBADD)

4
ext/oci8/config.m4
View File

@ -28,9 +28,9 @@ PHP_ARG_WITH(oci8, for Oracle-OCI8 support,
if test "$PHP_OCI8" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir])
if test "$PHP_OCI8" = "yes"; then
OCI8_DIR="$ORACLE_HOME"
OCI8_DIR=$ORACLE_HOME
else
OCI8_DIR="$PHP_OCI8"
OCI8_DIR=$PHP_OCI8
fi
AC_MSG_RESULT($OCI8_DIR)

10
ext/odbc/config.m4
View File

@ -98,8 +98,8 @@ AC_ARG_WITH(adabas,
if test "$withval" != "no"; then
PHP_ADD_INCLUDE($withval/incl)
PHP_ADD_LIBPATH($withval/lib)
ODBC_OBJS="$withval/lib/odbclib.a"
ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
ODBC_OBJS=$withval/lib/odbclib.a
ODBC_LIB=$abs_builddir/ext/odbc/libodbc_adabas.a
$srcdir/build/shtool mkdir -f -p ext/odbc
rm -f "$ODBC_LIB"
cp "$ODBC_OBJS" "$ODBC_LIB"
@ -194,7 +194,7 @@ AC_ARG_WITH(ibm-db2,
ODBC_INCLUDE=-I$ODBC_INCDIR
ODBC_LFLAGS=-L$ODBC_LIBDIR
ODBC_TYPE=db2
ODBC_LIBS="-ldb2"
ODBC_LIBS=-ldb2
AC_DEFINE(HAVE_IBMDB2,1,[ ])
AC_MSG_RESULT(yes)
@ -507,12 +507,12 @@ AC_ARG_WITH(dbmaker,
if test "$shared" = "yes"; then
AC_MSG_RESULT(yes (shared))
ODBC_LIBS="-ldmapic -lc -lm"
ODBC_SHARED="odbc.la"
ODBC_SHARED=odbc.la
else
AC_MSG_RESULT(yes (static))
PHP_ADD_LIBRARY_WITH_PATH(dmapic, $ODBC_LIBDIR)
PHP_ADD_INCLUDE($ODBC_INCDIR)
ODBC_STATIC="libphpext_odbc.la"
ODBC_STATIC=libphpext_odbc.la
fi
AC_MSG_RESULT(yes)

4
ext/oracle/config.m4
View File

@ -28,9 +28,9 @@ PHP_ARG_WITH(oracle, for Oracle-ORACLE support,
if test "$PHP_ORACLE" != "no"; then
AC_MSG_CHECKING([Oracle Install-Dir])
if test "$PHP_ORACLE" = "yes"; then
ORACLE_DIR="$ORACLE_HOME"
ORACLE_DIR=$ORACLE_HOME
else
ORACLE_DIR="$PHP_ORACLE"
ORACLE_DIR=$PHP_ORACLE
fi
AC_MSG_RESULT($ORACLE_DIR)

4
ext/pcre/config.m4
View File

@ -43,8 +43,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_ERROR(The PCRE extension requires PCRE library version >= 2.08)
fi
test -f $PHP_PCRE_REGEX/libpcre.a && PCRE_LIBDIR="$PHP_PCRE_REGEX"
test -f $PHP_PCRE_REGEX/lib/libpcre.a && PCRE_LIBDIR="$PHP_PCRE_REGEX/lib"
test -f $PHP_PCRE_REGEX/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX
test -f $PHP_PCRE_REGEX/lib/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX/lib
if test -z "$PCRE_LIBDIR" ; then
AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX)

4
ext/pcre/config0.m4
View File

@ -43,8 +43,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_ERROR(The PCRE extension requires PCRE library version >= 2.08)
fi
test -f $PHP_PCRE_REGEX/libpcre.a && PCRE_LIBDIR="$PHP_PCRE_REGEX"
test -f $PHP_PCRE_REGEX/lib/libpcre.a && PCRE_LIBDIR="$PHP_PCRE_REGEX/lib"
test -f $PHP_PCRE_REGEX/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX
test -f $PHP_PCRE_REGEX/lib/libpcre.a && PCRE_LIBDIR=$PHP_PCRE_REGEX/lib
if test -z "$PCRE_LIBDIR" ; then
AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX)

4
ext/pdf/config.m4
View File

@ -13,7 +13,7 @@ if test "$PHP_PDFLIB" != "no"; then
PHP_SUBST(PDFLIB_SHARED_LIBADD)
PHP_EXTENSION(pdf, $ext_shared)
case "$PHP_PDFLIB" in
case $PHP_PDFLIB in
yes)
AC_CHECK_LIB(pdf, PDF_show_boxed, [
AC_DEFINE(HAVE_PDFLIB,1,[ ])
@ -30,7 +30,7 @@ if test "$PHP_PDFLIB" != "no"; then
PHP_ADD_LIBRARY(z,, PDFLIB_SHARED_LIBADD)
;;
*)
test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE="$PHP_PDFLIB/include"
test -f $PHP_PDFLIB/include/pdflib.h && PDFLIB_INCLUDE=$PHP_PDFLIB/include
if test -n "$PDFLIB_INCLUDE" ; then
if test "$PHP_ZLIB" = "no"; then

10
ext/pgsql/config.m4
View File

@ -21,19 +21,19 @@ if test "$PHP_PGSQL" != "no"; then
AC_MSG_RESULT(Cannot find libpq-fe.h. Please specify the installation path of PostgreSQL)
fi
PGSQL_INCLUDE="-I$PGSQL_INCDIR"
PGSQL_INCLUDE=-I$PGSQL_INCDIR
PGSQL_LIBDIR=$PGSQL_DIR/lib
test -d $PGSQL_DIR/lib/pgsql && PGSQL_LIBDIR=$PGSQL_DIR/lib/pgsql
old_LIBS="$LIBS"
old_LDFLAGS="$LDFLAGS"
old_LIBS=$LIBS
old_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS -L$PGSQL_LIBDIR"
AC_CHECK_LIB(pq, PQcmdTuples,AC_DEFINE(HAVE_PQCMDTUPLES,1,[ ]))
AC_CHECK_LIB(pq, PQoidValue,AC_DEFINE(HAVE_PQOIDVALUE,1,[ ]))
AC_CHECK_LIB(pq, PQclientEncoding,AC_DEFINE(HAVE_PQCLIENTENCODING,1,[ ]))
AC_CHECK_LIB(pq, pg_encoding_to_char,AC_DEFINE(HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT,1,[ ]))
LIBS="$old_LIBS"
LDFLAGS="$old_LDFLAGS"
LIBS=$old_LIBS
LDFLAGS=$old_LDFLAGS
AC_DEFINE(HAVE_PGSQL,1,[ ])

2
ext/qtdom/config.m4
View File

@ -6,7 +6,7 @@ AC_MSG_CHECKING(whether to include QDOM support)
AC_ARG_WITH(qtdom,
[ --with-qtdom Include QtDOM support (requires Qt >= 2.2.0).],
[
case "$withval" in
case $withval in
no)
AC_MSG_RESULT(no) ;;
yes)

8
ext/recode/config.m4
View File

@ -31,8 +31,8 @@ PHP_ARG_WITH(recode,for recode support,
AC_MSG_ERROR(I cannot find recode.h anywhere below $RECODE_LIST. Is it installed?)
fi
old_LDFLAGS="$LDFLAGS"
old_LIBS="$LIBS"
old_LDFLAGS=$LDFLAGS
old_LIBS=$LIBS
LDFLAGS="$LDFLAGS -L$RECODE_DIR/$RECODE_LIB"
LIBS="$LIBS -lrecode"
AC_TRY_LINK([
@ -42,8 +42,8 @@ recode_format_table();
],[],[
AC_MSG_ERROR(I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?)
])
LIBS="$old_LIBS"
LDFLAGS="$old_LDFLAGS"
LIBS=$old_LIBS
LDFLAGS=$old_LDFLAGS
if test "$RECODE_LIB" = ""; then
AC_MSG_ERROR(Please reinstall recode - I cannot find librecode.a)

32
ext/rpc/java/config.m4
View File

@ -8,13 +8,13 @@ AC_ARG_WITH(java,
be built as a shared dl.],
[
if test "$withval" != "no"; then
JAVA_SHARED="libphp_java.la"
JAVA_SHARED=libphp_java.la
pltform=`uname -s 2>/dev/null`
java_libext="libjava.so"
case "$pltform" in
AIX) java_libext="libjava.a" ;;
HP-UX) java_libext="libjava.sl" ;;
java_libext=libjava.so
case $pltform in
AIX) java_libext=libjava.a ;;
HP-UX) java_libext=libjava.sl ;;
esac
# substitute zip for systems which don't have jar in the PATH
if JAVA_JAR=`which jar 2>/dev/null`; then
@ -31,7 +31,7 @@ AC_ARG_WITH(java,
PHP_ADD_LIBPATH($withval/lib)
PHP_ADD_LIBPATH($withval/lib/kaffe)
JAVA_CFLAGS="-DKAFFE"
JAVA_CFLAGS=-DKAFFE
JAVA_INCLUDE=-I$withval/include/kaffe
JAVA_CLASSPATH=$withval/share/kaffe/Klasses.jar
JAVA_LIB=kaffevm
@ -48,11 +48,11 @@ AC_ARG_WITH(java,
elif test -f $withval/lib/$java_libext; then
JAVA_LIB=java
JAVA_LIBPATH=$withval/lib
JAVA_INCLUDE="-I$withval/include"
test -f $withval/lib/classes.zip && JAVA_CFLAGS="-DJNI_11"
test -f $withval/lib/jvm.jar && JAVA_CFLAGS="-DJNI_12"
test -f $withval/lib/classes.zip && JAVA_CLASSPATH="$withval/lib/classes.zip"
test -f $withval/lib/jvm.jar && JAVA_CLASSPATH="$withval/lib/jvm.jar"
JAVA_INCLUDE=-I$withval/include
test -f $withval/lib/classes.zip && JAVA_CFLAGS=-DJNI_11
test -f $withval/lib/jvm.jar && JAVA_CFLAGS=-DJNI_12
test -f $withval/lib/classes.zip && JAVA_CLASSPATH=$withval/lib/classes.zip
test -f $withval/lib/jvm.jar && JAVA_CLASSPATH=$withval/lib/jvm.jar
for i in $JAVA_INCLUDE/*; do
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE $i"
done
@ -60,15 +60,15 @@ AC_ARG_WITH(java,
else
for i in `find $withval/include -type d`; do
test -f $i/jni.h && JAVA_INCLUDE="-I$i"
test -f $i/jni.h && JAVA_INCLUDE=-I$i
test -f $i/jni_md.h && JAVA_INCLUDE="$JAVA_INCLUDE -I$i"
done
for i in `find $withval -type d`; do
test -f $i/classes.zip && JAVA_CFLAGS="-DJNI_11"
test -f $i/rt.jar && JAVA_CFLAGS="-DJNI_12"
test -f $i/classes.zip && JAVA_CLASSPATH="$i/classes.zip"
test -f $i/rt.jar && JAVA_CLASSPATH="$i/rt.jar"
test -f $i/classes.zip && JAVA_CFLAGS=-DJNI_11
test -f $i/rt.jar && JAVA_CFLAGS=-DJNI_12
test -f $i/classes.zip && JAVA_CLASSPATH=$i/classes.zip
test -f $i/rt.jar && JAVA_CLASSPATH=$i/rt.jar
if test -f $i/$java_libext; then
JAVA_LIB=java

2
ext/session/config.m4
View File

@ -12,7 +12,7 @@ PHP_ARG_ENABLE(session, whether to enable session support,
if test "$PHP_MM" != "no"; then
for i in /usr/local /usr $PHP_MM; do
if test -f "$i/include/mm.h"; then
MM_DIR="$i"
MM_DIR=$i
fi
done

6
ext/snmp/config.m4
View File

@ -29,7 +29,7 @@ PHP_ARG_WITH(snmp,for SNMP support,
AC_DEFINE(HAVE_SNMP,1,[ ])
PHP_ADD_INCLUDE($SNMP_INCDIR)
PHP_ADD_LIBRARY_WITH_PATH(snmp, $SNMP_LIBDIR, SNMP_SHARED_LIBADD)
old_CPPFLAGS="$CPPFLAGS"
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$INCLUDES $CPPFLAGS"
AC_CHECK_HEADERS(default_store.h)
if test "$ac_cv_header_default_store_h" = "yes"; then
@ -48,13 +48,13 @@ main() { exit(USE_OPENSSL != 1); }
PHP_SETUP_OPENSSL
fi
fi
CPPFLAGS="$old_CPPFLAGS"
CPPFLAGS=$old_CPPFLAGS
PHP_EXTENSION(snmp,$ext_shared)
PHP_SUBST(SNMP_SHARED_LIBADD)
AC_CHECK_LIB(kstat, kstat_read, [
PHP_ADD_LIBRARY(kstat,,SNMP_SHARED_LIBADD)
])
SNMP_INCLUDE="-I$SNMP_INCDIR"
SNMP_INCLUDE=-I$SNMP_INCDIR
fi
PHP_SUBST(SNMP_LIBDIR)
PHP_SUBST(SNMP_INCLUDE)

6
ext/standard/config.m4
View File

@ -42,11 +42,11 @@ int main(int argc, char **argv)
exit(result);
}
],[
ac_cv_flush_io="no"
ac_cv_flush_io=no
],[
ac_cv_flush_io="yes"
ac_cv_flush_io=yes
],[
ac_cv_flush_io="no"
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.])

6
ext/xml/config.m4
View File

@ -20,9 +20,9 @@ if test "$PHP_XML" != "no"; then
AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
AC_DEFINE(HAVE_LIBEXPAT_BUNDLED, 1, [ ])
CPPFLAGS="$CPPFLAGS -DXML_BYTE_ORDER=$order"
EXPAT_INTERNAL_LIBADD="expat/libexpat.la"
EXPAT_INTERNAL_LIBADD=expat/libexpat.la
PHP_SUBST(EXPAT_INTERNAL_LIBADD)
EXPAT_SUBDIRS="expat"
EXPAT_SUBDIRS=expat
PHP_SUBST(EXPAT_SUBDIRS)
PHP_SUBST(EXPAT_SHARED_LIBADD)
PHP_EXTENSION(xml, $ext_shared)
@ -30,7 +30,7 @@ if test "$PHP_XML" != "no"; then
PHP_ADD_INCLUDE($ext_srcdir/expat)
PHP_FAST_OUTPUT($ext_builddir/expat/Makefile)
else
EXPAT_DIR="$withval"
EXPAT_DIR=$withval
if test -f $EXPAT_DIR/lib/libexpat.a -o -f $EXPAT_DIR/lib/libexpat.so ; then
AC_DEFINE(HAVE_LIBEXPAT, 1, [ ])
PHP_ADD_INCLUDE($EXPAT_DIR/include)

2
ext/yp/config.m4
View File

@ -8,7 +8,7 @@ PHP_ARG_ENABLE(yp,whether to include YP support,
if test "$PHP_YP" != "no"; then
AC_DEFINE(HAVE_YP,1,[ ])
PHP_EXTENSION(yp, $ext_shared)
case "$host_alias" in
case $host_alias in
*solaris*)
AC_DEFINE(SOLARIS_YP,1,[ ]) ;;
esac

2
ext/zlib/config0.m4
View File

@ -44,7 +44,7 @@ if test "$PHP_ZLIB" != "no" -o "$PHP_ZLIB_DIR" != "no"; then
if test "$PHP_ZLIB" != "yes"; then
PHP_ZLIB_DIR=$PHP_ZLIB
else
PHP_ZLIB_DIR="/usr/local"
PHP_ZLIB_DIR=/usr/local
fi
fi

2
sapi/aolserver/config.m4
View File

@ -11,7 +11,7 @@ AC_MSG_RESULT($PHP_AOLSERVER)
if test "$PHP_AOLSERVER" != "no"; then
if test -d "$PHP_AOLSERVER/include"; then
PHP_AOLSERVER_SRC="$PHP_AOLSERVER"
PHP_AOLSERVER_SRC=$PHP_AOLSERVER
fi
if test -z "$PHP_AOLSERVER_SRC" || test ! -d $PHP_AOLSERVER_SRC/include; then
AC_MSG_ERROR(Please specify the path to the source distribution of AOLserver using --with-aolserver-src=DIR)

2
sapi/apache/config.m4
View File

@ -204,7 +204,7 @@ INCLUDES="$INCLUDES $APACHE_INCLUDE"
fi
if test "x$APXS" != "x" -a "`uname -sv`" = "AIX 4" -a "$GCC" != "yes"; then
APXS_EXP="-bE:sapi/apache/mod_php4.exp"
APXS_EXP=-bE:sapi/apache/mod_php4.exp
fi
PHP_SUBST(APXS_EXP)

14
sapi/caudium/config.m4
View File

@ -16,15 +16,15 @@ AC_ARG_WITH(caudium,
fi
fi
if test -f $withval/bin/caudium; then
PIKE="$withval/bin/caudium"
PIKE=$withval/bin/caudium
elif test -f $withval/bin/pike; then
PIKE="$withval/bin/pike"
PIKE=$withval/bin/pike
else
AC_MSG_ERROR(Couldn't find a pike in $withval/bin/)
fi
if $PIKE -e 'float v; int rel;sscanf(version(), "Pike v%f release %d", v, rel);v += rel/10000.0; if(v < 7.0268) exit(1); exit(0);'; then
PIKE_MODULE_DIR="`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`"
PIKE_INCLUDE_DIR="`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' `"
PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,' `
if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then
AC_MSG_ERROR(Failed to figure out Pike module and include directories)
fi
@ -39,11 +39,11 @@ AC_ARG_WITH(caudium,
write(combine_path(dirname(orig), pike)); '`
PHP_ADD_INCLUDE($PIKE_INCLUDE_DIR)
if test "$prefix" != "NONE"; then
PIKE_C_INCLUDE=$prefix/include/`basename ${PIKE}`
PIKE_C_INCLUDE=$prefix/include/`basename $PIKE`
else
PIKE_C_INCLUDE=/usr/local/include/`basename ${PIKE}`
PIKE_C_INCLUDE=/usr/local/include/`basename $PIKE`
fi
AC_MSG_CHECKING(for C includes in ${PIKE_C_INCLUDE})
AC_MSG_CHECKING(for C includes in $PIKE_C_INCLUDE)
if test -f $PIKE_C_INCLUDE/version.h; then
PIKE_TEST_VER=`$PIKE -e 'string v; int rel;sscanf(version(), "Pike v%s release %d", v, rel); write(v+"."+rel);'`
###### VERSION MATCH CHECK #######

4
sapi/fastcgi/config.m4
View File

@ -13,10 +13,10 @@ AC_ARG_WITH(fastcgi,
PHP_ADD_INCLUDE($FASTCGIPATH/include)
EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a"
INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_FASTCGI"
RESULT="yes"
RESULT=yes
PHP_SUBST(FASTCGI_LIBADD)
PHP_SUBST(EXT_PROGRAM_LDADD)
],[
RESULT="no"
RESULT=no
])
AC_MSG_RESULT($RESULT)

10
sapi/roxen/config.m4
View File

@ -10,15 +10,15 @@ AC_ARG_WITH(roxen,
AC_MSG_ERROR(You did not specify a directory)
fi
if test -f $withval/bin/roxen; then
PIKE="$withval/bin/roxen"
PIKE=$withval/bin/roxen
elif test -f $withval/bin/pike; then
PIKE="$withval/bin/pike"
PIKE=$withval/bin/pike
else
AC_MSG_ERROR(Couldn't find a pike in $withval/bin/)
fi
if $PIKE -e 'float v; catch(v = __VERSION__ + (__BUILD__/10000.0)); if(v < 0.7079) exit(1); exit(0);'; then
PIKE_MODULE_DIR="`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`"
PIKE_INCLUDE_DIR="`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'`"
PIKE_MODULE_DIR=`$PIKE --show-paths 2>&1| grep '^Module' | sed -e 's/.*: //'`
PIKE_INCLUDE_DIR=`echo $PIKE_MODULE_DIR | sed -e 's,lib/pike/modules,include/pike,' -e 's,lib/modules,include/pike,'`
if test -z "$PIKE_INCLUDE_DIR" -o -z "$PIKE_MODULE_DIR"; then
AC_MSG_ERROR(Failed to figure out Pike module and include directories)
fi
@ -47,7 +47,7 @@ if test "$RESULT" != "no" ; then
[
PHP_BUILD_THREAD_SAFE
AC_DEFINE(ROXEN_USE_ZTS,1,[Whether to use Roxen in ZTS mode])
RESULT="yes"
RESULT=yes
])
AC_MSG_RESULT($RESULT)

2
sapi/thttpd/config.m4
View File

@ -15,7 +15,7 @@ AC_ARG_WITH(thttpd,
PHP_BUILD_STATIC
PHP_SAPI=thttpd
],[
PHP_THTTPD="no"
PHP_THTTPD=no
])
AC_MSG_CHECKING(for thttpd)