diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-10 08:40:11 -0700 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2012-05-10 08:40:11 -0700 |
| commit | c34906923fc80f89302a764a967eb75fa04a317b (patch) | |
| tree | 3d60c1c18851b893af0506aa8108556802e67199 | |
| parent | 64647b10a945c5aa6c8be7ba91c661d0ce8a9bed (diff) | |
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.
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 9 insertions, 0 deletions
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 |