(HOST_ARCH): determine HOST_ARCH in configure.

diff --git a/ChangeLog b/ChangeLog
index 418140340e6b3490737b86b217d82bb23a169615..d8dd124befbd08bdb015fbb09f8aecd116a4b4b3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-02-17  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * configure.in (HOST_ARCH): determine HOST_ARCH in configure.
+
        * lily/relocate.cc (setup_paths): oops.
 
 2006-02-17  Heikki Junes  <hjunes@cc.hut.fi>

diff --git a/config.make.in b/config.make.in
index bd28f57ceebc35a39fec45168db5d2b10b0596ee..9da7a9d1ef546a8d1fc85dbd3c71766d56c72e5e 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -35,6 +35,8 @@ PACKAGE = @PACKAGE@
 package = @package@
 PACKAGE_NAME = @PACKAGE_NAME@
 
+HOST_ARCH=@HOST_ARCH@
+
 ################################################################
 ## FILESYSTEM
 ################################################################
@@ -141,3 +143,5 @@ WINDRES = @WINDRES@
 YACC = @YACC@
 ZIP = @ZIP@
 
+
+

diff --git a/configure.in b/configure.in
index 7ca07e8c9d85bbe76b5ae536a39984619bd40b0b..92e53a0515b60248432b49ee6b306dee702a322c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -126,6 +126,9 @@ fi
 AC_MSG_RESULT($NCSB_DIR)
 AC_SUBST(NCSB_DIR)
 
+HOST_ARCH=`$CC -dumpmachine`
+AC_SUBST(HOST_ARCH)
+
 STEPMAKE_PANGO_FT2(pangoft2, REQUIRED, 1.6.0)
 #STEPMAKE_PANGO(pango, REQUIRED, 1.6.0)
 STEPMAKE_FONTCONFIG(fontconfig, REQUIRED, 2.2.0)

diff --git a/stepmake/stepmake/generic-vars.make b/stepmake/stepmake/generic-vars.make
index 2d36dd8435a99c0753c54e728c00d53e4f7085d0..249ddc82bbd8a52420fc236c38b18a63627fe5fc 100644 (file)
--- a/stepmake/stepmake/generic-vars.make
+++ b/stepmake/stepmake/generic-vars.make
@@ -98,10 +98,6 @@ OUTIN_FILES = $(addprefix $(outdir)/, $(IN_FILES:%.in=%))
 
 ALL_SOURCES = $(SOURCE_FILES)
 
-# Check if we are building for Cygwin
-#
-HOST_ARCH=$(shell $(CC) -dumpmachine)
-
 ifeq (cygwin,$(findstring cygwin,$(HOST_ARCH)))
 CYGWIN_BUILD = yes
 endif