diff options
| author | Kristian Rietveld <kris@imendio.com> | 2008-06-26 15:30:30 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2008-06-26 15:30:30 +0000 |
| commit | 19310cc0352abfa87fd071d7af58b1ff4b417d21 (patch) | |
| tree | 692de3b63964ffee0a3d4786a17494701d619d1b | |
| parent | 2efd9ed8388de38586dc644e9d5c30d938652ff1 (diff) | |
| download | pango-19310cc0352abfa87fd071d7af58b1ff4b417d21.tar.gz | |
require glib trunk (for newer glib-mkenums).
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.
svn path=/trunk/; revision=2660
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pango/Makefile.am | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +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. + 2008-06-24 Behdad Esfahbod <behdad@gnome.org> Bug 540036 – Doesn't link to fontconfig diff --git a/configure.in b/configure.in index da22d2a6..26dcfd01 100644 --- a/configure.in +++ b/configure.in @@ -421,7 +421,7 @@ fi # # 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, :, diff --git a/pango/Makefile.am b/pango/Makefile.am index 31a92956..4f405c1f 100644 --- a/pango/Makefile.am +++ b/pango/Makefile.am @@ -131,7 +131,7 @@ s-enum-types-h: @REBUILD@ $(pango_headers) Makefile ( 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 ) \ |