diff options
| author | Simon McVittie <smcv@debian.org> | 2016-07-28 12:02:28 +0100 |
|---|---|---|
| committer | Richard Hughes <richard@hughsie.com> | 2016-07-28 12:02:28 +0100 |
| commit | 284c54de42e95fbda366835bb618092cf38b2ebc (patch) | |
| tree | 12015552ed0de23d2e780795b1990cecb0246b75 | |
| parent | ef0f9b6cb3e3ff5f34e710f7c83f9dc991b47e5d (diff) | |
| download | appstream-glib-284c54de42e95fbda366835bb618092cf38b2ebc.tar.gz | |
Avoid unsatisfiable development dependency when built without libgcab (#122)
pkg-config checks that all declared Requires.private are available
(they are needed for static linking and potentially for their CFLAGS).
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libappstream-glib/appstream-glib.pc.in | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 18ecffd..f9aa97e 100644 --- a/configure.ac +++ b/configure.ac @@ -138,10 +138,13 @@ if test x$enable_firmware != xno; then PKG_CHECK_MODULES(GCAB, libgcab-1.0) AC_DEFINE(HAVE_GCAB,[1], [Use gcab]) enable_firmware=yes + GCAB_DEPENDENCY=libgcab-1.0 else enable_firmware=no + GCAB_DEPENDENCY= fi AM_CONDITIONAL(HAVE_GCAB, test x$enable_firmware = xyes) +AC_SUBST([GCAB_DEPENDENCY]) # font support (default enabled) AC_ARG_ENABLE(firmware, AS_HELP_STRING([--disable-fonts],[Disable font support]), enable_fonts=$enableval) diff --git a/libappstream-glib/appstream-glib.pc.in b/libappstream-glib/appstream-glib.pc.in index 75b70b6..c1d7ef7 100644 --- a/libappstream-glib/appstream-glib.pc.in +++ b/libappstream-glib/appstream-glib.pc.in @@ -6,7 +6,7 @@ includedir=@includedir@ Name: appstream-glib Description: Objects and helper methods to help reading and writing AppStream metadata Version: @VERSION@ -Requires.private: libarchive, libgcab-1.0, uuid +Requires.private: libarchive uuid @GCAB_DEPENDENCY@ Requires: glib-2.0, gobject-2.0, gdk-pixbuf-2.0 Libs: -L${libdir} -lappstream-glib Cflags: -I${includedir}/libappstream-glib |