aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--macros/ChangeLog5
-rw-r--r--macros/gnome-support.m43
2 files changed, 7 insertions, 1 deletions
diff --git a/macros/ChangeLog b/macros/ChangeLog
index 098109e22b..707055b9c4 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,8 @@
+1998-06-11 Raja R Harinath <harinath@cs.umn.edu>
+
+ * gnome-support.m4 (AC_PROG_AWK): Look for awk.
+ (CROSS_COMPILING): Remove conditional.
+
Wed Jun 10 14:19:39 EDT 1998 Gregory McLean <gregm@comstar.net>
* gnome-x-checks.m4: more tweeks to make building against gtk 1.0 and
diff --git a/macros/gnome-support.m4 b/macros/gnome-support.m4
index 83eb37089b..fe063ffbda 100644
--- a/macros/gnome-support.m4
+++ b/macros/gnome-support.m4
@@ -6,6 +6,8 @@ dnl or "no". Also sets up the Automake BUILD_GNOME_SUPPORT
dnl conditional. This should only be used when building the Gnome
dnl libs; Gnome clients should not need this macro.
AC_DEFUN([GNOME_SUPPORT_CHECKS],[
+ # we need an `awk' to build `gnomesupport.h'
+ AC_REQUIRE([AC_PROG_AWK])
need_gnome_support=no
save_LIBOBJS="$LIBOBJS"
LIBOBJS=
@@ -90,5 +92,4 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[
LIBOBJS="$save_LIBOBJS"
AM_CONDITIONAL(BUILD_GNOME_SUPPORT, test "$need_gnome_support" = yes)
- AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = yes)
])