diff options
| author | Dan Williams <dcbw@redhat.com> | 2012-01-27 15:13:42 -0600 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2012-01-27 15:14:30 -0600 |
| commit | 4fd6264848944035b13047079a63fd29fc6a11d7 (patch) | |
| tree | 7d6c2adc9b172cd901b23a5a97218a66068d89d4 /libwmc | |
| parent | 5fc4e866c2f6453dae546f9c78ef5aa32d67ef87 (diff) | |
build: more libwmc and libqcdm standalone fixes
Make it pass distcheck.
Diffstat (limited to 'libwmc')
| -rw-r--r-- | libwmc/configure.ac | 11 | ||||
| -rw-r--r-- | libwmc/tests/Makefile.am | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/libwmc/configure.ac b/libwmc/configure.ac index 667d644e..4d2b90c6 100644 --- a/libwmc/configure.ac +++ b/libwmc/configure.ac @@ -26,19 +26,18 @@ AC_PROG_LIBTOOL dnl dnl Tests dnl -AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build libqcdm tests])) +AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build libwmc tests])) AM_CONDITIONAL(WITH_TESTS, test "x$with_tests" = "xyes") case $with_tests in yes) - with_tests=yes PKG_CHECK_MODULES(MM, glib-2.0 >= 2.20) + AC_SUBST(MM_CFLAGS) + AC_SUBST(MM_LIBS) ;; - *) - with_tests=no - ;; + *) ;; esac -AM_CONDITIONAL(STANDALONE, test "yes" = "yes") +AM_CONDITIONAL(WMC_STANDALONE, test "yes" = "yes") AC_CONFIG_FILES([ Makefile diff --git a/libwmc/tests/Makefile.am b/libwmc/tests/Makefile.am index f1791be6..ee988871 100644 --- a/libwmc/tests/Makefile.am +++ b/libwmc/tests/Makefile.am @@ -1,3 +1,5 @@ +if WITH_TESTS + INCLUDES = \ -I$(top_srcdir)/libwmc/src \ -I$(top_srcdir)/src @@ -20,14 +22,12 @@ test_wmc_CPPFLAGS = \ test_wmc_LDADD = $(MM_LIBS) -if STANDALONE +if WMC_STANDALONE test_wmc_LDADD += $(top_builddir)/src/libwmc.la else test_wmc_LDADD += $(top_builddir)/libwmc/src/libwmc.la endif -if WITH_TESTS - check-local: test-wmc $(abs_builddir)/test-wmc |