vte r2131 - in trunk: . src

[chpe svn gnome org]

Author: chpe
Date: Thu Oct 23 08:39:50 2008
New Revision: 2131
URL: http://svn.gnome.org/viewvc/vte?rev=2131&view=rev

Log:
Use glib-genmarshal --internal directly instead of checking the glib
version, since we now depend on a glib version that provides this.

Modified:
   trunk/configure.in
   trunk/src/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct 23 08:39:50 2008
@@ -618,9 +618,6 @@
 AC_PATH_PROG([GLIB_GENMARSHAL],[glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
-PKG_CHECK_EXISTS([glib-2.0 >= 2.14],[GLIB_GENMARSHAL_INTERNAL="--internal"],[GLIB_GENMARSHAL_INTERNAL=""])
-AC_SUBST([GLIB_GENMARSHAL_INTERNAL])
-
 ################################################################################
 # Glade catalogue
 ################################################################################

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Oct 23 08:39:50 2008
@@ -132,8 +132,8 @@
 CLEANFILES = marshal.c marshal.h vtetypebuiltins.c vtetypebuiltins.h stamp-vtetypebuiltins.h
 
 marshal.c marshal.h: marshal.list
-	$(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --body $(GLIB_GENMARSHAL_INTERNAL) $^ > marshal.c
-	$(GLIB_GENMARSHAL) --prefix=_vte_marshal --header $(GLIB_GENMARSHAL_INTERNAL) $^ > marshal.h
+	$(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --body --internal $^ > marshal.c
+	$(GLIB_GENMARSHAL) --prefix=_vte_marshal --header --internal $^ > marshal.h
 
 vtetypebuiltins.h: stamp-vtetypebuiltins.h
 	@true