diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2014-06-30 17:27:10 +0100 |
|---|---|---|
| committer | Olivier Crête <olivier.crete@collabora.com> | 2014-07-07 15:47:02 -0400 |
| commit | 46fd481b5a1cb7746e9d5c5d16695a6fb7f1de76 (patch) | |
| tree | 75b7d6c4e7ce49bd38b6567de9492c5ec3146272 /configure.ac | |
| parent | 44c0b98cb162511e01c129f5d07e8a36ee8b653a (diff) | |
| download | libnice-46fd481b5a1cb7746e9d5c5d16695a6fb7f1de76.tar.gz | |
nice: Auto-substitute pkg-config requirements in nice.pc.in
The requirements in the pkg-config file were outdated and incomplete. It
makes a lot more sense to automatically substitute them in from the
checks in configure.ac.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 29 |
1 files changed, 22 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 91210a2..b915249 100644 --- a/configure.ac +++ b/configure.ac @@ -181,12 +181,15 @@ AC_CHECK_LIB(rt, clock_gettime, [LIBRT="-lrt"], [LIBRT=""]) AC_CHECK_FUNCS([poll]) AC_SUBST(LIBRT) -PKG_CHECK_MODULES(GLIB, [dnl - glib-2.0 >= $GLIB_REQ dnl - gobject-2.0 >= $GLIB_REQ dnl - gthread-2.0 >= $GLIB_REQ dnl - gio-2.0 >= $GLIB_REQ dnl - ]) +# Dependencies +NICE_PACKAGES_PUBLIC="glib-2.0 >= $GLIB_REQ gio-2.0 >= $GLIB_REQ gobject-2.0 >= $GLIB_REQ" +NICE_PACKAGES_PRIVATE="gthread-2.0" +NICE_PACKAGES="$NICE_PACKAGES_PUBLIC $NICE_PACKAGES_PRIVATE" +AC_SUBST([NICE_PACKAGES_PUBLIC]) +AC_SUBST([NICE_PACKAGES_PRIVATE]) +AC_SUBST([NICE_PACKAGES]) + +PKG_CHECK_MODULES(GLIB, [$NICE_PACKAGES]) AC_ARG_WITH(gstreamer, AS_HELP_STRING([--with-gstreamer],[build GStreamer plugin]), @@ -255,9 +258,13 @@ AC_ARG_ENABLE([gupnp], esac], WANT_GUPNP=test) +GUPNP_PACKAGES_PUBLIC="" +GUPNP_PACKAGES_PRIVATE="gupnp-igd-1.0 >= $GUPNP_IGD_REQUIRED" +GUPNP_PACKAGES="$GUPNP_PACKAGES_PUBLIC $GUPNP_PACKAGES_PRIVATE" + HAVE_GUPNP=no if test "x$WANT_GUPNP" != "xno"; then - PKG_CHECK_MODULES(GUPNP, gupnp-igd-1.0 >= $GUPNP_IGD_REQUIRED, + PKG_CHECK_MODULES(GUPNP, [$GUPNP_PACKAGES], [ HAVE_GUPNP=yes ], [ HAVE_GUPNP=no ]) fi @@ -267,8 +274,16 @@ fi if test "x$HAVE_GUPNP" = "xyes"; then AC_DEFINE(HAVE_GUPNP,,[Have the GUPnP IGD library]) +else + GUPNP_PACKAGES_PUBLIC="" + GUPNP_PACKAGES_PRIVATE="" + GUPNP_PACKAGES="" fi +AC_SUBST([GUPNP_PACKAGES_PUBLIC]) +AC_SUBST([GUPNP_PACKAGES_PRIVATE]) +AC_SUBST([GUPNP_PACKAGES]) + AC_SUBST(HAVE_GUPNP) dnl Test coverage |