@@ -470,6 +470,11 @@ PKG_CHECK_MODULES(GLIB, $GLIB_MODULES, :, *** Glib $GLIB_REQUIRED_VERSION or better is required. The latest version of *** Glib is always available from ftp://ftp.gtk.org/.])) +# Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled. +GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` +AC_SUBST(GLIB_MKENUMS) + + # Add in gthread-2.0 to CFLAGS but not to LIBS so we get any # necesary defines for thread-safety. GLIB_CFLAGS=`$PKG_CONFIG --cflags $GLIB_MODULES gthread-2.0` configure.in @@ -133,7 +133,7 @@ pangoinclude_HEADERS = \ pango-enum-types.h: s-enum-types-h $(AM_V_GEN) true s-enum-types-h: @REBUILD@ $(pango_headers) Makefile - $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \ + $(AM_V_GEN) ( 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 @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ @@ -146,7 +146,7 @@ s-enum-types-h: @REBUILD@ $(pango_headers) Makefile pango-enum-types.c: s-enum-types-c $(AM_V_GEN) true s-enum-types-c: @REBUILD@ $(pango_headers) Makefile - $(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \ + $(AM_V_GEN) ( cd $(srcdir) && $(GLIB_MKENUMS) \ --fhead "#include <pango.h>" \ --fprod "\n/* enumerations from \"@filename@\" */" \ --vhead "GType\n@enum_name@_get_type (void)\n{\n static GType etype = 0;\n if (etype == 0) {\n static const G@Type@Value values[] = {" \ pango/Makefile.am 72b3642ec8f689eee5463ae8675323d91496238e Behdad Esfahbod behdad@behdad.org http://github.com/phuang/pango/commit/1038b7959944dd25d7c2a76a3c769eb26b5fd6a2 1038b7959944dd25d7c2a76a3c769eb26b5fd6a2 2009-10-22T14:24:21-07:00 2009-10-22T14:24:21-07:00 Allow using uninstalled glib Reported by mpsuzuki on gtk-i18n-list on 2009-10-09. edcf29ea49fd04154c54f7cd0ef5a6b272bca69e Behdad Esfahbod behdad@behdad.org