gnome-build r530 - in trunk: . src/gbf

[jhs svn gnome org]

Author: jhs
Date: Fri Feb 29 17:48:02 2008
New Revision: 530
URL: http://svn.gnome.org/viewvc/gnome-build?rev=530&view=rev

Log:
2008-02-29  Johannes Schmid <jhs gnome org>

        * configure.in
        * src/gbf/Makefile.am:
        Fixed #515997 â Fails to build from source



Removed:
   trunk/install-sh
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/gbf/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Feb 29 17:48:02 2008
@@ -55,8 +55,15 @@
 AC_SUBST(LIBGLADE_REQUIRED)
 AC_SUBST(GDL_REQUIRED)
 
+AC_PATH_PROG(PKG_CONFIG, pkg-config,no)
+if test x$PKG_CONFIG = xno; then
+  AC_MSG_ERROR(Please install the pkg-config package from http://www.freedesktop.org/software/pkgconfig/)
+fi
+
+
 # Pull marshal generator
-AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
+GLIB_GENMARSHAL="`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`"
+AC_SUBST(GLIB_GENMARSHAL)
 
 PKG_CHECK_MODULES(GBF,
 	gtk+-2.0 >= $GTK_REQUIRED 

Modified: trunk/src/gbf/Makefile.am
==============================================================================
--- trunk/src/gbf/Makefile.am	(original)
+++ trunk/src/gbf/Makefile.am	Fri Feb 29 17:48:02 2008
@@ -68,13 +68,13 @@
 	libgbf-widgets-1.la	\
 	$(GBF_LIBS)
 
-libgbfmarshal.h: $(srcdir)/libgbfmarshal.list $(GLIB_GENMARSHAL)
+libgbfmarshal.h: $(srcdir)/libgbfmarshal.list
 	@GLIB_GENMARSHAL@ \
 		--prefix=gbf_marshal $(srcdir)/libgbfmarshal.list --header > xgen-gmc \
 	&& cp xgen-gmc $(@F) \
 	&& rm -f xgen-gmc
 
-libgbfmarshal.c: $(srcdir)/libgbfmarshal.list $(GLIB_GENMARSHAL)
+libgbfmarshal.c: $(srcdir)/libgbfmarshal.list
 	echo "#include \"libgbfmarshal.h\"" > xgen-gmc \
 	&& @GLIB_GENMARSHAL@ \
 		--prefix=gbf_marshal $(srcdir)/libgbfmarshal.list --body >> xgen-gmc \