From c34906923fc80f89302a764a967eb75fa04a317b Mon Sep 17 00:00:00 2001 From: Dan Nicholson Date: Thu, 10 May 2012 08:40:11 -0700 Subject: Make sure dist is only run --with-internal-glib Since there's no DIST_CONFIGURE_FLAGS, the best we can do to not require glib's configure to always be run is to error on dist when we haven't configured --with-internal-glib. This is a hack, but I think it's slightly nicer than overriding dist and re-running configure with different options than were specified by the user. --- Makefile.am | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 3509721..bbc5075 100644 --- a/Makefile.am +++ b/Makefile.am @@ -51,4 +51,13 @@ pkg_config_SOURCES= \ parse.h \ parse.c \ main.c + +# Since we can't always have glib in DIST_SUBDIRS, we need to make sure +# glib is configured when we want to run dist. Unfortunately, there's no +# DIST_CONFIGURE_FLAGS. DISTCHECK_CONFIGURE_FLAGS = --with-installed-popt --with-internal-glib +if !INTERNAL_GLIB +dist-hook: + @echo "error: --with-internal-glib is required to include glib in dist" + @exit 1 +endif -- cgit v1.2.1