From a94e477f7fb924c4fc5db3bfc9089f8a65bffa58 Mon Sep 17 00:00:00 2001 From: Sam Hocevar Date: Fri, 11 Aug 2017 19:07:37 +0200 Subject: [PATCH] Parse build.config in configure.ac. This gives us a reasonably cross-platform way to to build options. Works well with LolRemez, where we no longer depend on GUI libraries. --- build/autotools/m4/lol-subproject.m4 | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/build/autotools/m4/lol-subproject.m4 b/build/autotools/m4/lol-subproject.m4 index 30c2df2f..bef18e40 100644 --- a/build/autotools/m4/lol-subproject.m4 +++ b/build/autotools/m4/lol-subproject.m4 @@ -15,12 +15,30 @@ dnl # --------------------- AC_DEFUN([LOL_AC_SUBPROJECT], [ +dnl +dnl Parse build.config if present +dnl + +AC_MSG_WARN([${srcdir}]) +ac_lol_configure_args="" +if test -f ${srcdir}/build.config; then + for x in `sed -ne 's,.*@:>@*\)>\(@<:@^<@:>@*\)@:>@*>.*,\1=\2,p' ${srcdir}/build.config`; do + eval "enable_${x}" + case ${x} in + *=no) arg="--disable-${x%=no}" ;; + *=yes) arg="--enable-${x%=yes}" ;; + *) arg="" ;; + esac + ac_lol_configure_args="${ac_lol_configure_args} ${arg}" + done +fi + dnl dnl Build and configure Lol Engine before our repository dnl Ensure $lol_srcdir and $lol_builddir are properly set dnl -ac_configure_args="${ac_configure_args} --enable-subproject $1" +ac_configure_args="${ac_configure_args} --enable-subproject ${ac_lol_configure_args} $1" AC_CONFIG_SUBDIRS([lol]) AC_SUBST(lol_srcdir, '${top_srcdir}/lol') AC_SUBST(lol_builddir, '${top_builddir}/lol')