pango r2660 - in trunk: . pango

[kristian svn gnome org]

Author: kristian
Date: Thu Jun 26 15:30:30 2008
New Revision: 2660
URL: http://svn.gnome.org/viewvc/pango?rev=2660&view=rev

Log:
2008-06-26  Kristian Rietveld  <kris imendio com>

	* configure.in: require glib trunk (for newer glib-mkenums).

	* pango/Makefile.am: when generating pango-enum-types.h use
	@ENUMPREFIX@ instead of hard coding the prefix.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/pango/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Jun 26 15:30:30 2008
@@ -421,7 +421,7 @@
 #
 # Checks for GLib
 #
-GLIB_REQUIRED_VERSION=2.14.0
+GLIB_REQUIRED_VERSION=2.17.3
 GLIB_MODULES="glib-2.0 >= $GLIB_REQUIRED_VERSION gobject-2.0 gmodule-no-export-2.0"
 
 PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :,

Modified: trunk/pango/Makefile.am
==============================================================================
--- trunk/pango/Makefile.am	(original)
+++ trunk/pango/Makefile.am	Thu Jun 26 15:30:30 2008
@@ -131,7 +131,7 @@
 	( cd $(srcdir) && glib-mkenums \
 			--fhead "#ifndef __PANGO_ENUM_TYPES_H__\n#define __PANGO_ENUM_TYPES_H__\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 			--fprod "/* enumerations from \"@filename \" */\n" \
-			--vhead "GType @enum_name _get_type (void);\n#define PANGO_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
+			--vhead "GType @enum_name _get_type (void);\n#define @ENUMPREFIX _TYPE_@ENUMSHORT@ (@enum_name _get_type())\n" 	\
 			--ftail "G_END_DECLS\n\n#endif /* __PANGO_ENUM_TYPES_H__ */" \
 		$(pango_headers) ) > tmp-pango-enum-types.h \
 	&& (cmp -s tmp-pango-enum-types.h pango-enum-types.h || cp tmp-pango-enum-types.h pango-enum-types.h ) \