sniper Fri Jan 7 01:19:54 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src acinclude.m4 configure.in
/php-src/scripts phpize.m4
Log:
MFH: - Make sure $host_alias is never empty
http://cvs.php.net/diff.php/php-src/acinclude.m4?r1=1.271.2.9&r2=1.271.2.10&ty=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.271.2.9 php-src/acinclude.m4:1.271.2.10
--- php-src/acinclude.m4:1.271.2.9 Thu Dec 30 09:56:23 2004
+++ php-src/acinclude.m4 Fri Jan 7 01:19:54 2005
@@ -1,4 +1,4 @@
-dnl $Id: acinclude.m4,v 1.271.2.9 2004/12/30 14:56:23 sniper Exp $ -*-
autoconf -*-
+dnl $Id: acinclude.m4,v 1.271.2.10 2005/01/07 06:19:54 sniper Exp $ -*-
autoconf -*-
dnl
dnl This file contains local autoconf functions.
@@ -29,9 +29,23 @@
[echo "#define ]$1[]ifelse([$2],,[ 1],[ $2])[" >
]ifelse([$3],,[include],[$3])[/php_]translit($1,A-Z,a-z)[.h]
])
+dnl PHP_CANONICAL_HOST
+dnl
+AC_DEFUN([PHP_CANONICAL_HOST],[
+ AC_REQUIRE([AC_CANONICAL_HOST])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])dnl
test -d include || mkdir include
> Makefile.objects
> Makefile.fragments
@@ -273,6 +287,7 @@
])
AC_DEFUN([PHP_SHLIB_SUFFIX_NAME],[
+ AC_REQUIRE([PHP_CANONICAL_HOST])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.514.2.29&r2=1.514.2.30&ty=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.514.2.29 php-src/configure.in:1.514.2.30
--- php-src/configure.in:1.514.2.29 Thu Dec 30 02:04:09 2004
+++ php-src/configure.in Fri Jan 7 01:19:54 2005
@@ -1,4 +1,4 @@
-dnl ## $Id: configure.in,v 1.514.2.29 2004/12/30 07:04:09 sniper Exp $ -*- sh
-*-
+dnl ## $Id: configure.in,v 1.514.2.30 2005/01/07 06:19:54 sniper Exp $ -*- sh
-*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -35,7 +35,7 @@
CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
done
-AC_CANONICAL_HOST
+PHP_CANONICAL_HOST
AC_CONFIG_HEADER(main/php_config.h)
MAJOR_VERSION=5
@@ -177,11 +177,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.7.2.1&r2=1.7.2.2&ty=u
Index: php-src/scripts/phpize.m4
diff -u php-src/scripts/phpize.m4:1.7.2.1 php-src/scripts/phpize.m4:1.7.2.2
--- php-src/scripts/phpize.m4:1.7.2.1 Thu Dec 30 02:04:11 2004
+++ php-src/scripts/phpize.m4 Fri Jan 7 01:19:54 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
