From 3eef3d790a8d94f823778dc81fbdfdfca97b8d4a Mon Sep 17 00:00:00 2001 From: Dave Davenport Date: Tue, 31 Oct 2017 19:31:58 +0100 Subject: [PATCH] Use AM_PATH_GLIB_2_0 to figure out where glib-compile-resource is. --- Makefile.am | 4 ++-- configure.ac | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index c24d028c..df9c2294 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,11 +28,11 @@ BUILT_SOURCES=\ $(top_builddir)/resources/resources.c: $(top_srcdir)/resources/resources.xml mkdir -p $(top_builddir)/resources/ - glib-compile-resources $< --generate-source --target=$@ --sourcedir=$(top_srcdir) + $(GLIB_COMPILE_RESOURCES) $< --generate-source --target=$@ --sourcedir=$(top_srcdir) $(top_builddir)/resources/resources.h: $(top_srcdir)/resources/resources.xml mkdir -p $(top_builddir)/resources/ - glib-compile-resources $< --generate-header --target=$@ --sourcedir=$(top_srcdir) + $(GLIB_COMPILE_RESOURCES) $< --generate-header --target=$@ --sourcedir=$(top_srcdir) $(top_builddir)/lexer/theme-lexer.c: $(top_srcdir)/lexer/theme-lexer.l diff --git a/configure.ac b/configure.ac index bed5d388..9357964e 100644 --- a/configure.ac +++ b/configure.ac @@ -135,6 +135,11 @@ AS_IF([test "x${enable_check}" != "xno"], [ PKG_CHECK_MODULES([check],[check >= AM_CONDITIONAL([USE_CHECK], [test "x${enable_check}" != "xno" && test "$HAVE_CHECK" -eq 1]) +dnl --------------------------------------------------------------------- +dnl Gets the resource compile tool path. +dnl --------------------------------------------------------------------- +AM_PATH_GLIB_2_0 + dnl --------------------------------------------------------------------- dnl Add extra compiler flags