diff options
| author | Jens Georg <jensg@openismus.com> | 2012-12-12 22:06:56 +0100 |
|---|---|---|
| committer | Jens Georg <jensg@openismus.com> | 2012-12-12 22:06:58 +0100 |
| commit | bdd1a9ce835cd64112e540d0dc9d318b12045e16 (patch) | |
| tree | 423885158023b1f799e793129c144669295a60b0 /configure.ac | |
| parent | 9015a2eef0cdd528aba2b4aa19e33dcd09107079 (diff) | |
| download | rygel-bdd1a9ce835cd64112e540d0dc9d318b12045e16.tar.gz | |
build: Don't fail on missing gtk+3
We already know it's not there, there's no need to fail there as it's an
optional dependency.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 4c894348..6a505434 100644 --- a/configure.ac +++ b/configure.ac @@ -225,16 +225,20 @@ if test x$try_ui = xyes ; then PKG_CHECK_MODULES([RYGEL_UI_DEPS], [$RYGEL_BASE_MODULES gtk+-3.0 >= $GTK_REQUIRED gssdp-1.0 >= $GSSDP_REQUIRED gee-0.8 >= $GEE_REQUIRED], [ RYGEL_CHECK_PACKAGES([gtk+-3.0], [HAVE_GTK=yes]) + RYGEL_UI_DEPS_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gtk+-3.0 --pkg gssdp-1.0 --pkg gee-0.8" + AC_SUBST([RYGEL_UI_DEPS_VALAFLAGS]) + + PKG_CHECK_MODULES([EXAMPLE_UI_DEPS], + [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED + gssdp-1.0 >= $GSSDP_REQUIRED + gstreamer-video-1.0 >= $GSTREAMER_REQUIRED + gtk+-3.0 >= $GTK_REQUIRED]) ], [ AC_MSG_WARN([UI dependencies not found.]) AC_MSG_WARN([UI applications will not be built.]) ]) - RYGEL_UI_DEPS_VALAFLAGS="$RYGEL_BASE_MODULES_VALAFLAGS --pkg gtk+-3.0 --pkg gssdp-1.0 --pkg gee-0.8" - AC_SUBST([RYGEL_UI_DEPS_VALAFLAGS]) - - PKG_CHECK_MODULES([EXAMPLE_UI_DEPS], [$RYGEL_COMMON_MODULES gio-2.0 >= $GIO_REQUIRED gssdp-1.0 >= $GSSDP_REQUIRED gstreamer-video-1.0 >= $GSTREAMER_REQUIRED gtk+-3.0 >= $GTK_REQUIRED]) else AC_MSG_NOTICE([UI applications disabled.]) fi |