diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-02 15:08:46 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-04 10:17:05 +0200 |
| commit | b6d628b3a10bf183b918c7afe89a5b260eb87760 (patch) | |
| tree | 8d87e92f2d8b7da99e6a0e41e49a6aa0ebbf55bd /configure.ac | |
| parent | 624fdb6ab4544a82774e9805332cc242c1068b0f (diff) | |
| download | ModemManager-b6d628b3a10bf183b918c7afe89a5b260eb87760.tar.gz | |
build: merge libmm-common into libmm-glib
It's pointless to have libmm-common around, just merge it into libmm-glib and
make ModemManager depend on libmm-glib directly. At the end, the non-common
stuff in libmm-glib is really minimal.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index d32ca7c1b..d32525693 100644 --- a/configure.ac +++ b/configure.ac @@ -58,14 +58,6 @@ GETTEXT_PACKAGE=ModemManager AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) -PKG_CHECK_MODULES(LIBMM_COMMON, - glib-2.0 >= 2.30.2 - gobject-2.0 - gio-2.0 - gio-unix-2.0) -AC_SUBST(LIBMM_COMMON_CFLAGS) -AC_SUBST(LIBMM_COMMON_LIBS) - PKG_CHECK_MODULES(MM, glib-2.0 >= 2.30.2 gmodule-2.0 @@ -78,7 +70,8 @@ AC_SUBST(MM_LIBS) PKG_CHECK_MODULES(LIBMM_GLIB, glib-2.0 >= 2.30.2 gobject-2.0 - gio-2.0) + gio-2.0 + gio-unix-2.0) AC_SUBST(LIBMM_GLIB_CFLAGS) AC_SUBST(LIBMM_GLIB_LIBS) @@ -222,12 +215,9 @@ AC_CONFIG_FILES([ Makefile data/Makefile data/ModemManager.pc -data/mm-common.pc data/mm-glib.pc include/Makefile build-aux/Makefile -libmm-common/Makefile -libmm-common/tests/Makefile libqcdm/Makefile libqcdm/src/Makefile libqcdm/tests/Makefile @@ -250,6 +240,8 @@ docs/reference/api/version.xml docs/reference/libmm-glib/Makefile docs/reference/libmm-glib/version.xml libmm-glib/Makefile +libmm-glib/generated/Makefile +libmm-glib/tests/Makefile cli/Makefile ]) AC_OUTPUT |