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 | |
parent | 5fc4e866c2f6453dae546f9c78ef5aa32d67ef87 (diff) | |
download | ModemManager-4fd6264848944035b13047079a63fd29fc6a11d7.tar.gz |
build: more libwmc and libqcdm standalone fixes
Make it pass distcheck.
-rw-r--r-- | configure.ac | 6 | ||||
-rw-r--r-- | libqcdm/configure.ac | 9 | ||||
-rw-r--r-- | libqcdm/tests/Makefile.am | 6 | ||||
-rw-r--r-- | libwmc/configure.ac | 11 | ||||
-rw-r--r-- | libwmc/tests/Makefile.am | 6 |
5 files changed, 21 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac index 567ccf5f2..1f9dd344b 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,8 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) IT_PROG_INTLTOOL([0.35.0]) PKG_CHECK_MODULES(MM, dbus-glib-1 >= 0.86 glib-2.0 >= 2.18 gmodule-2.0 gobject-2.0) +AC_SUBST(MM_CFLAGS) +AC_SUBST(MM_LIBS) PKG_CHECK_MODULES(GUDEV, gudev-1.0) AC_SUBST(GUDEV_CFLAGS) @@ -137,6 +139,10 @@ if ! test x"$ac_distver" = x""; then AC_DEFINE_UNQUOTED(MM_DIST_VERSION, "$ac_distver", [Define the distribution version string]) fi +# Not building protocol libs standalone +AM_CONDITIONAL(QCDM_STANDALONE, test "yes" = "no") +AM_CONDITIONAL(WMC_STANDALONE, test "yes" = "no") + AC_CONFIG_FILES([ Makefile marshallers/Makefile diff --git a/libqcdm/configure.ac b/libqcdm/configure.ac index 8e3d40293..cc9acee3e 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 ca2839e43..322e016ff 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 diff --git a/libwmc/configure.ac b/libwmc/configure.ac index 667d644e2..4d2b90c68 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 f1791be68..ee9888719 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 |