Commit cb617251 authored by Hiroyuki Ikezoe's avatar Hiroyuki Ikezoe

Get glib-mkenums path from pkg-config.

Fix for bug #597873.
parent 829eea48
...@@ -153,7 +153,7 @@ librsvg-enum-types.h: s-enum-types-h ...@@ -153,7 +153,7 @@ librsvg-enum-types.h: s-enum-types-h
@true @true
s-enum-types-h: $(headers) Makefile 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" \ --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" \ --fprod "/* enumerations from \"@filename@\" */\n" \
--vhead "GType @enum_name@_get_type (void);\n#define RSVG_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\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 ...@@ -167,7 +167,7 @@ librsvg-enum-types.c: s-enum-types-c librsvg-enum-types.h
@true @true
s-enum-types-c: $(headers) Makefile s-enum-types-c: $(headers) Makefile
( cd $(srcdir) && glib-mkenums \ ( cd $(srcdir) && $(GLIB_MKENUMS) \
--fhead "#include \"librsvg-enum-types.h\"\n#include \"rsvg.h\"" \ --fhead "#include \"librsvg-enum-types.h\"\n#include \"rsvg.h\"" \
--fprod "\n/* enumerations from \"@filename@\" */" \ --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[] = {" \ --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[] = {" \
......
...@@ -87,6 +87,9 @@ PKG_CHECK_MODULES(GLIB, \ ...@@ -87,6 +87,9 @@ PKG_CHECK_MODULES(GLIB, \
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS) AC_SUBST(GLIB_CFLAGS)
GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
AC_SUBST(GLIB_MKENUMS)
PKG_CHECK_MODULES(LIBRSVG, \ PKG_CHECK_MODULES(LIBRSVG, \
gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \ gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED \
glib-2.0 >= $GLIB_REQUIRED \ glib-2.0 >= $GLIB_REQUIRED \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment