From b34b02e25cf875fb4af958185417ef7c2178be18 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 17 Feb 2006 13:32:10 +0000 Subject: [PATCH] (HOST_ARCH): determine HOST_ARCH in configure. --- ChangeLog | 2 ++ config.make.in | 4 ++++ configure.in | 3 +++ stepmake/stepmake/generic-vars.make | 4 ---- 4 files changed, 9 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 418140340e..d8dd124bef 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2006-02-17 Han-Wen Nienhuys + * configure.in (HOST_ARCH): determine HOST_ARCH in configure. + * lily/relocate.cc (setup_paths): oops. 2006-02-17 Heikki Junes diff --git a/config.make.in b/config.make.in index bd28f57cee..9da7a9d1ef 100644 --- 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 7ca07e8c9d..92e53a0515 100644 --- 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 2d36dd8435..249ddc82bb 100644 --- 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 -- 2.39.2