summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfoobar <sniper@php.net>2001-09-06 20:55:24 +0000
committerfoobar <sniper@php.net>2001-09-06 20:55:24 +0000
commitacb7d69ff797a9be9678deca9d5659d41940a0c5 (patch)
tree6ac86d13e1abcb053dbd5a12d7d18d4d0f7b0580
parent95ff1ab10f6587223ae76f178bfe56813746ef82 (diff)
downloadphp-git-acb7d69ff797a9be9678deca9d5659d41940a0c5.tar.gz
Always quote the messages.
-rw-r--r--acinclude.m458
-rw-r--r--configure.in46
-rw-r--r--ext/gd/config.m428
3 files changed, 66 insertions, 66 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index 771f48e55f..468fa0e47b 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -48,21 +48,21 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
done
if test -z "$OPENSSL_DIR"; then
- AC_MSG_ERROR(Cannot find OpenSSL's <evp.h>)
+ AC_MSG_ERROR([Cannot find OpenSSL's <evp.h>])
fi
old_CPPFLAGS=$CPPFLAGS
CPPFLAGS=-I$OPENSSL_INC
- AC_MSG_CHECKING(for OpenSSL version)
+ AC_MSG_CHECKING([for OpenSSL version])
AC_EGREP_CPP(yes,[
#include <openssl/opensslv.h>
#if OPENSSL_VERSION_NUMBER >= 0x0090500fL
yes
#endif
],[
- AC_MSG_RESULT(>= 0.9.5)
+ AC_MSG_RESULT([>= 0.9.5])
],[
- AC_MSG_ERROR(OpenSSL version 0.9.5 or greater required.)
+ AC_MSG_ERROR([OpenSSL version 0.9.5 or greater required.])
])
CPPFLAGS=$old_CPPFLAGS
@@ -71,13 +71,13 @@ AC_DEFUN(PHP_SETUP_OPENSSL,[
AC_CHECK_LIB(crypto, CRYPTO_free, [
PHP_ADD_LIBRARY(crypto)
],[
- AC_MSG_ERROR(libcrypto not found!)
+ AC_MSG_ERROR([libcrypto not found!])
])
AC_CHECK_LIB(ssl, SSL_CTX_set_ssl_version, [
PHP_ADD_LIBRARY(ssl)
],[
- AC_MSG_ERROR(libssl not found!)
+ AC_MSG_ERROR([libssl not found!])
])
PHP_ADD_INCLUDE($OPENSSL_INC)
])
@@ -280,7 +280,7 @@ AC_DEFUN(PHP_MISSING_PWRITE_DECL,[
])
AC_DEFUN(PHP_MISSING_TIME_R_DECL,[
- AC_MSG_CHECKING(for missing declarations of reentrant functions)
+ AC_MSG_CHECKING([for missing declarations of reentrant functions])
AC_TRY_COMPILE([#include <time.h>],[struct tm *(*func)() = localtime_r],[
:
],[
@@ -306,7 +306,7 @@ AC_DEFUN(PHP_MISSING_TIME_R_DECL,[
],[
AC_DEFINE(MISSING_STRTOK_R_DECL,1,[Whether strtok_r is declared])
])
- AC_MSG_RESULT(done)
+ AC_MSG_RESULT([done])
])
dnl
@@ -347,7 +347,7 @@ if test "$php_always_shared" = "yes"; then
test "[$]$1" = "no" && $1=yes
fi
-AC_MSG_RESULT($ext_output)
+AC_MSG_RESULT([$ext_output])
])
dnl
@@ -361,7 +361,7 @@ PHP_REAL_ARG_WITH([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z0-9-,A-Z0-9_))
])
AC_DEFUN(PHP_REAL_ARG_WITH,[
-AC_MSG_CHECKING($2)
+AC_MSG_CHECKING([$2])
AC_ARG_WITH($1,[$3],$5=[$]withval,$5=ifelse($4,,no,$4))
PHP_ARG_ANALYZE($5)
])
@@ -377,7 +377,7 @@ PHP_REAL_ARG_ENABLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_))
])
AC_DEFUN(PHP_REAL_ARG_ENABLE,[
-AC_MSG_CHECKING($2)
+AC_MSG_CHECKING([$2])
AC_ARG_ENABLE($1,[$3],$5=[$]enableval,$5=ifelse($4,,no,$4))
PHP_ARG_ANALYZE($5)
])
@@ -511,7 +511,7 @@ dnl PHP_CONFIGURE_PART(MESSAGE)
dnl Idea borrowed from mm
AC_DEFUN(PHP_CONFIGURE_PART,[
AC_MSG_RESULT()
- AC_MSG_RESULT(${T_MD}$1${T_ME})
+ AC_MSG_RESULT([${T_MD}$1${T_ME}])
])
AC_DEFUN(PHP_PROG_SENDMAIL,[
@@ -523,13 +523,13 @@ fi
AC_DEFUN(PHP_RUNPATH_SWITCH,[
dnl check for -R, etc. switch
-AC_MSG_CHECKING(if compiler supports -R)
+AC_MSG_CHECKING([if compiler supports -R])
AC_CACHE_VAL(php_cv_cc_dashr,[
SAVE_LIBS=$LIBS
LIBS="-R /usr/lib $LIBS"
AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
LIBS=$SAVE_LIBS])
-AC_MSG_RESULT($php_cv_cc_dashr)
+AC_MSG_RESULT([$php_cv_cc_dashr])
if test $php_cv_cc_dashr = "yes"; then
ld_runpath_switch=-R
else
@@ -539,7 +539,7 @@ else
LIBS="-Wl,-rpath,/usr/lib $LIBS"
AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
LIBS=$SAVE_LIBS])
- AC_MSG_RESULT($php_cv_cc_rpath)
+ AC_MSG_RESULT([$php_cv_cc_rpath])
if test $php_cv_cc_rpath = "yes"; then
ld_runpath_switch=-Wl,-rpath,
else
@@ -600,7 +600,7 @@ dnl
AC_DEFUN(PHP_BUILD_THREAD_SAFE,[
enable_experimental_zts=yes
if test "$pthreads_working" != "yes"; then
- AC_MSG_ERROR(ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.)
+ AC_MSG_ERROR([ZTS currently requires working POSIX threads. We were unable to verify that your system supports Pthreads.])
fi
])
@@ -826,14 +826,14 @@ AC_DEFUN(PHP_CHECK_CC_OPTION,[
ac_php_compile="${CC-cc} -$opt -o conftest $CFLAGS $CPPFLAGS conftest.$ac_ext 2>&1"
if eval $ac_php_compile 2>&1 | egrep "$opt" > /dev/null 2>&1 ; then
eval php_cc_$var=no
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
else
if eval ./conftest 2>/dev/null ; then
eval php_cc_$var=yes
- AC_MSG_RESULT(yes)
+ AC_MSG_RESULT([yes])
else
eval php_cc_$var=no
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
fi
fi
])
@@ -850,8 +850,8 @@ elif test "$REGEX_TYPE" = "system"; then
AC_DEFINE(REGEX,0,[ ])
fi
-AC_MSG_CHECKING(which regex library to use)
-AC_MSG_RESULT($REGEX_TYPE)
+AC_MSG_CHECKING([which regex library to use])
+AC_MSG_RESULT([$REGEX_TYPE])
PHP_SUBST(REGEX_DIR)
PHP_SUBST(REGEX_LIB)
@@ -865,10 +865,10 @@ AC_DEFUN(PHP_MISSING_FCLOSE_DECL,[
AC_MSG_CHECKING([for fclose declaration])
AC_TRY_COMPILE([#include <stdio.h>],[int (*func)() = fclose],[
AC_DEFINE(MISSING_FCLOSE_DECL,0,[ ])
- AC_MSG_RESULT(ok)
+ AC_MSG_RESULT([ok])
],[
AC_DEFINE(MISSING_FCLOSE_DECL,1,[ ])
- AC_MSG_RESULT(missing)
+ AC_MSG_RESULT([missing])
])
])
@@ -936,7 +936,7 @@ dnl Must be run after all --with-NN options that let the user
dnl choose dynamic extensions, and after the gcc test.
dnl
AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
- AC_MSG_CHECKING(whether -fPIC is required)
+ AC_MSG_CHECKING([whether -fPIC is required])
if test -n "$EXT_SHARED"; then
os=`uname -sr 2>/dev/null`
case $os in
@@ -945,12 +945,12 @@ AC_DEFUN(PHP_SOLARIS_PIC_WEIRDNESS,[
gcc*|egcs*) CFLAGS="$CFLAGS -fPIC";;
*) CFLAGS="$CFLAGS -fpic";;
esac
- AC_MSG_RESULT(yes);;
+ AC_MSG_RESULT([yes]);;
*)
- AC_MSG_RESULT(no);;
+ AC_MSG_RESULT([no]);;
esac
else
- AC_MSG_RESULT(no)
+ AC_MSG_RESULT([no])
fi
])
@@ -990,7 +990,7 @@ AC_DEFUN(PHP_SYS_LFS,
[dnl
# If available, prefer support for large files unless the user specified
# one of the CPPFLAGS, LDFLAGS, or LIBS variables.
- AC_MSG_CHECKING(whether large file support needs explicit enabling)
+ AC_MSG_CHECKING([whether large file support needs explicit enabling])
ac_getconfs=''
ac_result=yes
ac_set=''
@@ -1012,7 +1012,7 @@ AC_DEFUN(PHP_SYS_LFS,
case "$ac_result$ac_set" in
yes?*) ac_result="yes, but $ac_set is already set, so use its settings"
esac
- AC_MSG_RESULT($ac_result)
+ AC_MSG_RESULT([$ac_result])
case $ac_result in
yes)
for ac_shellvar in $ac_shellvars; do
diff --git a/configure.in b/configure.in
index dc1d045896..3072e4e52c 100644
--- a/configure.in
+++ b/configure.in
@@ -8,11 +8,11 @@ AC_INIT(README.CVS-RULES)
PHP_FAST_OUTPUT(sapi/Makefile ext/Makefile Makefile pear/Makefile main/Makefile)
if test "$with_shared_apache" != "no" && test -n "$with_shared_apache" ; then
- AC_MSG_ERROR(--with-shared-apache is not supported. Please refer to the documentation for using APXS)
+ AC_MSG_ERROR([--with-shared-apache is not supported. Please refer to the documentation for using APXS])
fi
if test -n "$with_apache" && test -n "$with_apxs"; then
- AC_MSG_ERROR(--with-apache and --with-apxs cannot be used together)
+ AC_MSG_ERROR([--with-apache and --with-apxs cannot be used together])
fi
cwd=`pwd`
@@ -76,16 +76,16 @@ dnl Checks for programs.
AC_PROG_AWK
AC_PROG_YACC
if test "$YACC" != "bison -y"; then
- AC_MSG_WARN(You will need bison if you want to regenerate the PHP parsers.)
+ AC_MSG_WARN([You will need bison if you want to regenerate the PHP parsers.])
else
- AC_MSG_CHECKING(bison version)
+ AC_MSG_CHECKING([bison version])
oldIFS=$IFS; IFS=.
set `bison -V | sed -e 's/^GNU Bison version //'`
IFS=$oldIFS
if test "$1" = "1" -a "$2" -lt "25"; then
- AC_MSG_WARN(Bison 1.25 or newer needed to regenerate parsers (found $1.$2).)
+ AC_MSG_WARN([Bison 1.25 or newer needed to regenerate parsers (found $1.$2).])
fi
- AC_MSG_RESULT($1.$2 (ok))
+ AC_MSG_RESULT([$1.$2 (ok)])
fi
AC_PROG_CC
@@ -158,8 +158,8 @@ PHP_CONFIGURE_PART(Configuring SAPI modules)
esyscmd(./scripts/config-stubs sapi)
-AC_MSG_CHECKING(for chosen SAPI module)
-AC_MSG_RESULT($PHP_SAPI)
+AC_MSG_CHECKING([for chosen SAPI module])
+AC_MSG_RESULT([$PHP_SAPI])
if test "$enable_experimental_zts" = "yes"; then
PTHREADS_ASSIGN_VARS
@@ -173,13 +173,13 @@ PHP_CONFIGURE_PART(Running system checks)
PHP_MISSING_TIME_R_DECL
dnl check for -R, etc. switch
-AC_MSG_CHECKING(whether compiler supports -R)
+AC_MSG_CHECKING([whether compiler supports -R])
AC_CACHE_VAL(php_cv_cc_dashr,[
SAVE_LIBS=$LIBS
LIBS="-R /usr/lib $LIBS"
AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
LIBS=$SAVE_LIBS])
-AC_MSG_RESULT($php_cv_cc_dashr)
+AC_MSG_RESULT([$php_cv_cc_dashr])
if test $php_cv_cc_dashr = "yes"; then
ld_runpath_switch=-R
else
@@ -189,7 +189,7 @@ else
LIBS="-Wl,-rpath,/usr/lib $LIBS"
AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
LIBS=$SAVE_LIBS])
- AC_MSG_RESULT($php_cv_cc_rpath)
+ AC_MSG_RESULT([$php_cv_cc_rpath])
if test $php_cv_cc_rpath = "yes"; then
ld_runpath_switch=-Wl,-rpath,
else
@@ -344,7 +344,7 @@ dnl The WARNING_LEVEL required because cc in QNX hates -w option without an argu
if test "`uname -s 2>/dev/null`" != "QNX"; then
AC_STRUCT_ST_BLOCKS
else
- AC_MSG_WARN(warnings level for cc set to 0)
+ AC_MSG_WARN([warnings level for cc set to 0])
WARNING_LEVEL=0
fi
AC_STRUCT_ST_RDEV
@@ -446,7 +446,7 @@ PHP_TIME_R_TYPE
PHP_READDIR_R_TYPE
dnl AIX keeps in_addr_t in /usr/include/netinet/in.h
-dnl AC_MSG_CHECKING(for in_addr_t)
+dnl AC_MSG_CHECKING([for in_addr_t])
AC_CACHE_VAL(ac_cv_type_$1,
[AC_EGREP_CPP(dnl
changequote(<<,>>)dnl
@@ -460,7 +460,7 @@ changequote([,]), [#include <sys/types.h>
#include <netinet/in.h>
#endif], ac_cv_type_in_addr_t=yes, ac_cv_type_in_addr_t=no)])dnl
-dnl AC_MSG_RESULT($ac_cv_type_in_addr_t)
+dnl AC_MSG_RESULT([$ac_cv_type_in_addr_t])
if test $ac_cv_type_in_addr_t = no; then
AC_DEFINE(in_addr_t, u_int, [ ])
fi
@@ -530,7 +530,7 @@ else
AC_DEFINE(PHP_SAFE_MODE,0,[ ])
fi
-AC_MSG_CHECKING(for safe mode exec dir)
+AC_MSG_CHECKING([for safe mode exec dir])
AC_ARG_WITH(exec-dir,
[ --with-exec-dir[=DIR] Only allow executables in DIR when in safe mode
defaults to /usr/local/php/bin],
@@ -538,18 +538,18 @@ AC_ARG_WITH(exec-dir,
if test "$withval" != "no"; then
if test "$withval" = "yes"; then
AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
- AC_MSG_RESULT(/usr/local/php/bin)
+ AC_MSG_RESULT([/usr/local/php/bin])
else
AC_DEFINE_UNQUOTED(PHP_SAFE_MODE_EXEC_DIR,"$withval", [ ])
- AC_MSG_RESULT($withval)
+ AC_MSG_RESULT([$withval])
fi
else
AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
- AC_MSG_RESULT(/usr/local/php/bin)
+ AC_MSG_RESULT([/usr/local/php/bin])
fi
],[
AC_DEFINE(PHP_SAFE_MODE_EXEC_DIR,"/usr/local/php/bin", [ ])
- AC_MSG_RESULT(/usr/local/php/bin)
+ AC_MSG_RESULT([/usr/local/php/bin])
])
PHP_ARG_WITH(openssl,for OpenSSL support,
@@ -590,7 +590,7 @@ PHP_ARG_ENABLE(libgcc, whether to explicitly link against libgcc,
if test "$PHP_LIBGCC" = "yes"; then
PHP_LIBGCC_LIBPATH(gcc)
if test -z "$libgcc_libpath"; then
- AC_MSG_ERROR(Cannot locate libgcc. Make sure that gcc is in your path)
+ AC_MSG_ERROR([Cannot locate libgcc. Make sure that gcc is in your path])
fi
PHP_ADD_LIBPATH($libgcc_libpath)
PHP_ADD_LIBRARY(gcc, yes)
@@ -616,7 +616,7 @@ if test "$PHP_DMALLOC" = "yes"; then
AC_DEFINE(HAVE_DMALLOC,1,[Whether you have dmalloc])
CPPFLAGS="$CPPFLAGS -DDMALLOC_FUNC_CHECK"
], [
- AC_MSG_ERROR(Problem with enabling dmalloc. Please check config.log for details.)
+ AC_MSG_ERROR([Problem with enabling dmalloc. Please check config.log for details.])
])
fi
@@ -644,7 +644,7 @@ esyscmd(./scripts/config-stubs ext)
PHP_FAST_OUTPUT(sapi/$PHP_SAPI/Makefile)
-AC_MSG_CHECKING(whether to enable versioning)
+AC_MSG_CHECKING([whether to enable versioning])
AC_ARG_ENABLE(versioning,
[ --enable-versioning Export only required symbols.
See INSTALL for more information],[
@@ -652,7 +652,7 @@ AC_ARG_ENABLE(versioning,
],[
PHP_VERSIONING=no
])
-AC_MSG_RESULT($PHP_VERSIONING)
+AC_MSG_RESULT([$PHP_VERSIONING])
if test "$PHP_VERSIONING" = "yes"; then
test -z "$PHP_SYM_FILE" && PHP_SYM_FILE="$abs_srcdir/sapi/$PHP_SAPI/php.sym"
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4
index 50da269a68..2bb17f84c5 100644
--- a/ext/gd/config.m4
+++ b/ext/gd/config.m4
@@ -13,19 +13,19 @@ AC_DEFUN(PHP_GD_JPEG,[
done
if test -z "$GD_JPEG_DIR"; then
- AC_MSG_ERROR(libjpeg.(a|so) not found.)
+ AC_MSG_ERROR([libjpeg.(a|so) not found.])
fi
PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
[
PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)
],[
- AC_MSG_ERROR(Problem with libjpeg.(a|so). Please check config.log for more information.)
+ AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.])
],[
-L$GD_JPEG_DIR/lib
])
else
- AC_MSG_RESULT(If configure fails try --with-jpeg-dir=<DIR>)
+ AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
fi
])
@@ -40,11 +40,11 @@ AC_DEFUN(PHP_GD_PNG,[
done
if test -z "$GD_PNG_DIR"; then
- AC_MSG_ERROR(libpng.(a|so) not found.)
+ AC_MSG_ERROR([libpng.(a|so) not found.])
fi
if test "$PHP_ZLIB_DIR" = "no"; then
- AC_MSG_ERROR(PNG support requires ZLIB. Use --with-zlib-dir=<DIR>)
+ AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
fi
PHP_CHECK_LIBRARY(png,png_info_init,
@@ -52,13 +52,13 @@ AC_DEFUN(PHP_GD_PNG,[
PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)
],[
- AC_MSG_ERROR(Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.)
+ AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.])
],[
-L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib
])
else
- AC_MSG_RESULT(If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>)
+ AC_MSG_RESULT([If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>])
fi
])
@@ -73,7 +73,7 @@ AC_DEFUN(PHP_GD_XPM,[
done
if test -z "$GD_XPM_DIR"; then
- AC_MSG_ERROR(libXpm.(a|so) not found.)
+ AC_MSG_ERROR([libXpm.(a|so) not found.])
fi
PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
@@ -81,7 +81,7 @@ AC_DEFUN(PHP_GD_XPM,[
PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)
],[
- AC_MSG_ERROR(Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.)
+ AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.])
],[
-L$GD_XPM_DIR/lib -lX11
])
@@ -117,7 +117,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[
fi
PHP_ADD_INCLUDE($TTF_INC_DIR)
else
- AC_MSG_RESULT(no - FreeType 2.x is to be used instead)
+ AC_MSG_RESULT([no - FreeType 2.x is to be used instead])
fi
fi
])
@@ -140,10 +140,10 @@ AC_DEFUN(PHP_GD_FREETYPE2,[
AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
else
- AC_MSG_ERROR(freetype2 not found!)
+ AC_MSG_ERROR([freetype2 not found!])
fi
else
- AC_MSG_RESULT(If configure fails try --with-freetype-dir=<DIR>)
+ AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
fi
])
@@ -158,7 +158,7 @@ AC_DEFUN(PHP_GD_T1LIB,[
done
if test -z "$GD_T1_DIR"; then
- AC_MSG_ERROR(Your t1lib distribution is not installed correctly. Please reinstall it.)
+ AC_MSG_ERROR([Your t1lib distribution is not installed correctly. Please reinstall it.])
fi
PHP_CHECK_LIBRARY(t1, T1_LoadFont,
@@ -167,7 +167,7 @@ AC_DEFUN(PHP_GD_T1LIB,[
PHP_ADD_INCLUDE("$GD_T1_DIR/include")
PHP_ADD_LIBRARY_WITH_PATH(t1, "$GD_T1_DIR/lib", GD_SHARED_LIBADD)
],[
- AC_MSG_ERROR(Problem with libt1.(a|so). Please check config.log for more information.)
+ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.])
],[
-L$GD_T1_DIR/lib
])