From b97ecd1fb7c84672df18552504e7c81e22e2dc00 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 8 May 2002 15:19:45 +0000 Subject: [PATCH] fixed yesterdays fix for cross compiling: simply check the variable 2002-05-08 Michael Natterer * configure.in: fixed yesterdays fix for cross compiling: simply check the variable "cross_compiling" which gets set by autoconf. --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ configure.in | 4 ++-- 8 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8afb0c0c..88af495e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b8afb0c0c..88af495e2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index b8afb0c0c..88af495e2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b8afb0c0c..88af495e2 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b8afb0c0c..88af495e2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b8afb0c0c..88af495e2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b8afb0c0c..88af495e2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2002-05-08 Michael Natterer + + * configure.in: fixed yesterdays fix for cross compiling: simply + check the variable "cross_compiling" which gets set by autoconf. + 2002-05-07 Matthias Clasen * glib/gmarkup.c (unescape_text): Report unfinished entity diff --git a/configure.in b/configure.in index 36301b5d5..bde7089ac 100644 --- a/configure.in +++ b/configure.in @@ -1586,9 +1586,9 @@ dnl ****************************************************************** dnl *** Look for glib-genmarshal in PATH if we are cross-compiling *** dnl ****************************************************************** -AM_CONDITIONAL(CROSS_COMPILING, test $build != $host) +AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -if test $CROSS_COMPILING; then +if test $cross_compiling = yes; then AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal, no) if test x$GLIB_GENMARSHAL = xno; then AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)