Prepare our autoconf setup for autoconf 2.14a and for cross-compiling

PR:	6379
Submitted by:	"R�diger" Kuhlmann <Tadu@gmx.de>
Reviewed by:	Ryan Bloom

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86398 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index fcab8ed1b5464696fc14e9b391cc11fa11e24627..e30640cb7c101496e2052630fdf4e19a516aae57 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -318,7 +318,7 @@ AC_DEFUN(APACHE_MODULE,[
       fi
       shared="";;
     esac
-    ifelse($6,,:,$6)
+    ifelse([$6],,:,[$6])
     APACHE_MODPATH_ADD($1, $shared, $3)
   fi
 ])dnl
@@ -339,7 +339,7 @@ AC_DEFUN(APACHE_LAYOUT,[
       -e "s/[  ]*$/'/g" \
       $1 > $pldconf
   changequote([,])
-  layout_name=$name
+  layout_name=$2
   . $pldconf
   rm $pldconf
   for var in prefix exec_prefix bindir sbindir libexecdir mandir \

diff --git a/configure.in b/configure.in
index 45fbd017fed76e91520b07dd9a4541ec7cf67ba6..ce030ce173417a48cd03686778cb2c2337ce3e2b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -30,6 +30,8 @@ if test "$abs_builddir" != "$abs_srcdir"; then
   USE_VPATH=1
 fi
 
+AC_CANONICAL_SYSTEM
+
 dnl
 dnl ## Preload our OS configuration
 APR_PRELOAD

diff --git a/modules/aaa/config.m4 b/modules/aaa/config.m4
index c05dc9d7e093758a51bdb872d439976e28c5dca8..486feb5ba86e80f7b7393b70a917fcf75beb672c 100644 (file)
--- a/modules/aaa/config.m4
+++ b/modules/aaa/config.m4
@@ -4,7 +4,7 @@ dnl AC_DEFUN(modulename, modulestructname, defaultonoroff, configmacros)
 dnl XXX - Need to allow --enable-module to fail if optional config fails
 
 AC_DEFUN(APACHE_CHECK_STANDARD_MODULE, [
-  APACHE_MODULE($1,$2,,$3,$4,$5)
+  APACHE_MODULE([$1],[$2],,[$3],[$4],[$5])
 ])
 
 APACHE_MODPATH_INIT(standard)

diff --git a/os/config.m4 b/os/config.m4
index 00c7ff659937591ce0026ced653caea054485359..586940142198f6aee076ce8299b304f69a519e78 100644 (file)
--- a/os/config.m4
+++ b/os/config.m4
@@ -1,7 +1,7 @@
 AC_MSG_CHECKING(for target platform)
 
 #PLATFORM=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`
-PLATFORM=`$ac_config_guess`
+PLATFORM=$host
 LIBPRE=lib
 
 case "$PLATFORM" in