aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog9
-rw-r--r--macros/gnome-support.m42
2 files changed, 9 insertions, 2 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 9a13321c84..91d28db316 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,9 +1,14 @@
-1998-06-07 Martin Baulig <martin@home-of-linux.org>
+1998-06-08 Martin Baulig <martin@home-of-linux.org>
+
+ * gnome-support.m4 (CROSS_COMPILING): New automake conditional;
+ (need_gnome_support): added `AC_SUBST(need_gnome_support)'.
+
+1998-06-07 Martin Baulig <martin@home-of-linux.org>
* gnome-guile-checks.m4 (GNOME_CHECK_GUILE): When
cross-compiling, we now check for `$host_alias-buile-guile'.
-1998-06-03 Martin Baulig <martin@home-of-linux.org>
+1998-06-03 Martin Baulig <martin@home-of-linux.org>
* gnome-guile-checks.m4 (GNOME_CHECK_GUILE): Looks also
in $GNOME_LIBDIR; added failflag: GNOME_CHECK_GUILE(fail)
diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4
index 4d5bc41527..83eb37089b 100644
--- a/macros/gnome-support.m4
+++ b/macros/gnome-support.m4
@@ -85,8 +85,10 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[
# Turn our LIBOBJS into libtool objects. This is gross, but it
# requires changes to autoconf before it goes away.
LTLIBOBJS=`echo "$LIBOBJS" | sed 's/\.o/.lo/g'`
+ AC_SUBST(need_gnome_support)
AC_SUBST(LTLIBOBJS)
LIBOBJS="$save_LIBOBJS"
AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
+ AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = yes)
])