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 /libqcdm | |
| parent | 5fc4e866c2f6453dae546f9c78ef5aa32d67ef87 (diff) | |
build: more libwmc and libqcdm standalone fixes
Make it pass distcheck.
Diffstat (limited to 'libqcdm')
| -rw-r--r-- | libqcdm/configure.ac | 9 | ||||
| -rw-r--r-- | libqcdm/tests/Makefile.am | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libqcdm/configure.ac b/libqcdm/configure.ac index 8e3d4029..cc9acee3 100644 --- a/libqcdm/configure.ac +++ b/libqcdm/configure.ac @@ -30,15 +30,14 @@ AC_ARG_WITH(tests, AS_HELP_STRING([--with-tests], [Build libqcdm 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.18) + AC_SUBST(MM_CFLAGS) + AC_SUBST(MM_LIBS) ;; - *) - with_tests=no - ;; + *) ;; esac -AM_CONDITIONAL(STANDALONE, test "yes" = "yes") +AM_CONDITIONAL(QCDM_STANDALONE, test "yes" = "yes") AC_CONFIG_FILES([ Makefile diff --git a/libqcdm/tests/Makefile.am b/libqcdm/tests/Makefile.am index ca2839e4..322e016f 100644 --- a/libqcdm/tests/Makefile.am +++ b/libqcdm/tests/Makefile.am @@ -1,3 +1,5 @@ +if WITH_TESTS + INCLUDES = \ -I$(top_srcdir)/libqcdm/src \ -I$(top_srcdir)/src @@ -21,14 +23,12 @@ test_qcdm_CPPFLAGS = $(MM_CFLAGS) test_qcdm_LDADD = $(MM_LIBS) -if STANDALONE +if QCDM_STANDALONE test_qcdm_LDADD += $(top_builddir)/src/libqcdm.la else test_qcdm_LDADD += $(top_builddir)/libqcdm/src/libqcdm.la endif -if WITH_TESTS - check-local: test-qcdm $(abs_builddir)/test-qcdm |