diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-06-26 13:01:39 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-08-29 17:14:47 +0200 |
| commit | dc8d9dfdb9456c3aae466d4f2168c1b0e24d8c16 (patch) | |
| tree | d591550b0c9b91e0a48c51431599d89e76494815 | |
| parent | f1e711e01bd08cfb68fbfbda0119913ed123f8b4 (diff) | |
build: fix definitions of cflags/libs
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | libmm-glib/Makefile.am | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index ec4be9ed..0d1ff7f4 100644 --- a/configure.ac +++ b/configure.ac @@ -63,6 +63,9 @@ PKG_CHECK_MODULES(LIBMM_COMMON, 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 @@ -72,12 +75,12 @@ PKG_CHECK_MODULES(MM, AC_SUBST(MM_CFLAGS) AC_SUBST(MM_LIBS) -PKG_CHECK_MODULES(LIBMM, +PKG_CHECK_MODULES(LIBMM_GLIB, glib-2.0 >= 2.30.2 gobject-2.0 gio-2.0) -AC_SUBST(LIBMM_CFLAGS) -AC_SUBST(LIBMM_LIBS) +AC_SUBST(LIBMM_GLIB_CFLAGS) +AC_SUBST(LIBMM_GLIB_LIBS) PKG_CHECK_MODULES(MMCLI, glib-2.0 >= 2.30.2 diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am index 73defaac..5982ca86 100644 --- a/libmm-glib/Makefile.am +++ b/libmm-glib/Makefile.am @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libmm-glib.la libmm_glib_la_CPPFLAGS = \ - $(LIBMM_CFLAGS) \ + $(LIBMM_GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -41,7 +41,7 @@ libmm_glib_la_SOURCES = \ libmm_glib_la_LIBADD = \ $(top_builddir)/libmm-common/libmm-common.la \ - $(LIBMM_LIBS) + $(LIBMM_GLIB_LIBS) includedir = @includedir@/libmm-glib include_HEADERS = \ |