| @@ -20,7 +20,7 @@ dnl Build and configure Lol Engine before our repository | |||||
| dnl Ensure $lol_srcdir and $lol_builddir are properly set up | dnl Ensure $lol_srcdir and $lol_builddir are properly set up | ||||
| dnl | dnl | ||||
| ac_configure_args="${ac_configure_args} --disable-test --disable-doc --disable-tutorial --disable-samples" | |||||
| ac_configure_args="${ac_configure_args} --disable-test --disable-doc --disable-tutorial --disable-samples --disable-tools" | |||||
| AC_CONFIG_SUBDIRS([lol]) | AC_CONFIG_SUBDIRS([lol]) | ||||
| AC_SUBST(lol_srcdir, '${top_srcdir}/lol') | AC_SUBST(lol_srcdir, '${top_srcdir}/lol') | ||||
| AC_SUBST(lol_builddir, '${top_builddir}/lol') | AC_SUBST(lol_builddir, '${top_builddir}/lol') | ||||
| @@ -83,6 +83,8 @@ AC_ARG_ENABLE(experimental, | |||||
| AC_ARG_ENABLE(test, | AC_ARG_ENABLE(test, | ||||
| [ --enable-test build test suite (default yes)]) | [ --enable-test build test suite (default yes)]) | ||||
| AC_ARG_ENABLE(tools, | |||||
| [ --enable-tools build miscellaneous tools (default yes)]) | |||||
| AC_ARG_ENABLE(tutorial, | AC_ARG_ENABLE(tutorial, | ||||
| [ --enable-tutorial build tutorial applications (default yes)]) | [ --enable-tutorial build tutorial applications (default yes)]) | ||||
| AC_ARG_ENABLE(samples, | AC_ARG_ENABLE(samples, | ||||
| @@ -230,6 +232,7 @@ AM_CONDITIONAL(BUILD_NEERCS, test "${ac_cv_my_have_caca}" != "no") | |||||
| dnl Optional features | dnl Optional features | ||||
| AM_CONDITIONAL(BUILD_TEST, test "${enable_test}" != "no") | AM_CONDITIONAL(BUILD_TEST, test "${enable_test}" != "no") | ||||
| AM_CONDITIONAL(BUILD_TOOLS, test "${enable_tools}" != "no") | |||||
| AM_CONDITIONAL(BUILD_TUTORIAL, test "${enable_tutorial}" != "no") | AM_CONDITIONAL(BUILD_TUTORIAL, test "${enable_tutorial}" != "no") | ||||
| AM_CONDITIONAL(BUILD_SAMPLES, test "${enable_samples}" != "no") | AM_CONDITIONAL(BUILD_SAMPLES, test "${enable_samples}" != "no") | ||||
| @@ -7,7 +7,9 @@ SUBDIRS += lolunit | |||||
| SUBDIRS += vimlol | SUBDIRS += vimlol | ||||
| SUBDIRS += vslol | SUBDIRS += vslol | ||||
| if BUILD_TOOLS | |||||
| noinst_PROGRAMS = $(make_font) | noinst_PROGRAMS = $(make_font) | ||||
| endif | |||||
| make_font_SOURCES = make-font.cpp | make_font_SOURCES = make-font.cpp | ||||
| make_font_CPPFLAGS = @CACA_CFLAGS@ | make_font_CPPFLAGS = @CACA_CFLAGS@ | ||||
| @@ -3,7 +3,9 @@ include $(top_srcdir)/build/autotools/common.am | |||||
| EXTRA_DIST += NEWS.txt lolremez.sln lolremez.vcxproj lolremez.vcxproj.filters | EXTRA_DIST += NEWS.txt lolremez.sln lolremez.vcxproj lolremez.vcxproj.filters | ||||
| if BUILD_TOOLS | |||||
| noinst_PROGRAMS = lolremez | noinst_PROGRAMS = lolremez | ||||
| endif | |||||
| lolremez_SOURCES = \ | lolremez_SOURCES = \ | ||||
| lolremez.cpp solver.cpp solver.h matrix.h | lolremez.cpp solver.cpp solver.h matrix.h | ||||