diff options
| author | U. Artie Eoff <ullysses.a.eoff@intel.com> | 2017-07-26 09:53:10 -0700 |
|---|---|---|
| committer | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2017-07-26 19:18:05 +0200 |
| commit | a77209ad540456bc7f267d8b8495fdff3349cca6 (patch) | |
| tree | 8532813ab5948efac238debb32670267f676f6bc | |
| parent | 85856c29a70d6de4aea5b708e04e9eb418190623 (diff) | |
configure: do not break configure if gtk+-3.0 devel missing
Fix PKG_CHECK_MODULES rule for with_gtk=check condition to
set USE_GTK=0 if gtk+-3.0 is not available.
Since commit 85856c29a70d6de4aea5b708e04e9eb418190623
Author: Hyunjun Ko <zzoon@igalia.com>
Date: Wed Jul 5 15:59:43 2017 +0900
tests: elements: add testsuite of vaapi context
...configure fails if gtk+-3.0 development files are missing.
The "with_gtk" option defaults to "check" in configure.ac
which implies that if it is not explicitly requested then
configure will only enable it if it's available on the system.
However, the PKG_CHECK_MODULES rule that get's activated on
"check" condition did not provide default when gtk+-3.0 devel
packages are not found on the system. Thus, it resulted in
configure failure.
Signed-off-by: U. Artie Eoff <ullysses.a.eoff@intel.com>
https://bugzilla.gnome.org/show_bug.cgi?id=785452
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2e8c703c..73b6473e 100644 --- a/configure.ac +++ b/configure.ac @@ -490,7 +490,7 @@ AS_IF([test "x$BUILD_EXAMPLES" = "xyes" -a $USE_X11 -eq 1], [AS_CASE([$with_gtk], [yes], [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [USE_GTK=1])], [no], [], - [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [USE_GTK=1])])]) + [PKG_CHECK_MODULES([GTK3], [gtk+-3.0], [USE_GTK=1], [USE_GTK=0])])]) AS_IF([test $USE_GTK -eq 1], [ saved_CPPFLAGS="$CPPFLAGS" |