[librsvg] Get glib-mkenums path from pkg-config.



commit cb6172513b9ff3446c97629dc5f9de3d76ff6440
Author: Hiroyuki Ikezoe <poincare ikezoe net>
Date:   Mon Apr 12 18:45:27 2010 +0900

    Get glib-mkenums path from pkg-config.
    
    Fix for bug #597873.

 Makefile.am  |    4 ++--
 configure.in |    3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 3f24b79..67e6411 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -153,7 +153,7 @@ librsvg-enum-types.h: s-enum-types-h
 	@true
 
 s-enum-types-h: $(headers) Makefile
-	( cd $(srcdir) && glib-mkenums \
+	( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#ifndef __LIBRSVG_ENUM_TYPES_H__\n#define __LIBRSVG_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 RSVG_TYPE_ ENUMSHORT@ (@enum_name _get_type())\n" 	\
@@ -167,7 +167,7 @@ librsvg-enum-types.c: s-enum-types-c librsvg-enum-types.h
 	@true
 
 s-enum-types-c: $(headers) Makefile
-	( cd $(srcdir) && glib-mkenums \
+	( cd $(srcdir) && $(GLIB_MKENUMS) \
 			--fhead "#include \"librsvg-enum-types.h\"\n#include \"rsvg.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[] = {" 	\
diff --git a/configure.in b/configure.in
index 9d9d896..6e102ae 100644
--- a/configure.in
+++ b/configure.in
@@ -87,6 +87,9 @@ PKG_CHECK_MODULES(GLIB, \
 AC_SUBST(GLIB_LIBS)
 AC_SUBST(GLIB_CFLAGS)	
 
+GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
+AC_SUBST(GLIB_MKENUMS)
+
 PKG_CHECK_MODULES(LIBRSVG, \
 	gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
 	glib-2.0 >= $GLIB_REQUIRED \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]