From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 10 Mar 2010 00:59:06 +0000 (-0800)
Subject: configure: Check for glib-genmarshal program at configure time.
X-Git-Tag: v0.7.5~119
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c141780c99e0aee7a50734d4a56e2adf6f16c909;p=pspp-builds.git

configure: Check for glib-genmarshal program at configure time.

The GUI build cannot succeed without glib-genmarshal, so it seems like a
good idea to fail earlier.

Related to bug #28959, reported by Harry Thijssen.
---

diff --git a/configure.ac b/configure.ac
index 8f4ca63b..a3a07a87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -76,6 +76,12 @@ AM_CONDITIONAL([HAVE_GUI],
 if test "$with_cairo" != no && test "$with_gui" != "no"; then
   PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.12], [],
     [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.12 or later (or use --without-gui)])])
+
+  AC_ARG_VAR([GLIB_GENMARSHAL])
+  AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
+  if test "x$GLIB_GENMARSHAL" = x; then
+    PSPP_REQUIRED_PREREQ([glib-genmarshal (or use --without-gui)])
+  fi
 fi
 
 dnl Checks needed for psql reader
diff --git a/src/ui/gui/automake.mk b/src/ui/gui/automake.mk
index 5485d886..003437bf 100644
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -256,10 +256,10 @@ AM_CPPFLAGS += -Isrc
 
 src/ui/gui/psppire-marshal.c: src/ui/gui/marshaller-list
 	echo '#include <config.h>' > $@
-	glib-genmarshal --body --prefix=psppire_marshal $? >> $@
+	$(GLIB_GENMARSHAL) --body --prefix=psppire_marshal $? >> $@
 
 src/ui/gui/psppire-marshal.h: src/ui/gui/marshaller-list
-	glib-genmarshal --header --prefix=psppire_marshal $? > $@
+	$(GLIB_GENMARSHAL) --header --prefix=psppire_marshal $? > $@
 
 SUFFIXES += .glade .ui
 .glade.ui: