diff options
| author | infirit <[email protected]> | 2014-12-11 16:08:26 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-11 16:08:26 +0100 |
| commit | b531d651d35fac33f25ee6e1f979db1266a77398 (patch) | |
| tree | 99447d55e28e960d435558b0c27a4f048c068851 | |
| parent | 30f1d23ea40e13acbca4b7d4c5eac2750d845a7a (diff) | |
| download | mate-terminal-b531d651d35fac33f25ee6e1f979db1266a77398.tar.bz2 mate-terminal-b531d651d35fac33f25ee6e1f979db1266a77398.tar.xz | |
configure: Fix GDK_TARGET and PLATFORM_DEPS for Gtk+3
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index d156641..b6cdbf1 100644 --- a/configure.ac +++ b/configure.ac @@ -58,20 +58,26 @@ AC_MSG_RESULT([$with_gtk]) case "$with_gtk" in 2.0) GTK_API_VERSION=2.0 GTK_REQUIRED=2.24.0 + GDK_TARGETS="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" VTE_PC_VERSION= ;; 3.0) GTK_API_VERSION=3.0 GTK_REQUIRED=2.91.1 + GDK_TARGETS="$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)" VTE_PC_VERSION=-2.90 ;; esac -GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" - -case "$GDK_TARGET" in - x11) PLATFORM_DEPS="x11" ;; - *) PLATFORM_DEPS="" ;; -esac +PLATFORM_DEPS= +for target in $GDK_TARGETS; do + case "$target" in + x11) PLATFORM_DEPS="x11" ;; + broadway) ;; + wayland) ;; + win32|quartz) AC_MSG_WARN([unsupported GDK backend $target]) ;; + *) AC_MSG_WARN([unknown GDK backend $target]) ;; + esac +done PKG_CHECK_MODULES([TERM], [vte$VTE_PC_VERSION >= $VTE_REQUIRED @@ -91,9 +97,9 @@ AC_MSG_CHECKING([which smclient backend to use]) AC_ARG_WITH([smclient], [AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])], [], - [case "$GDK_TARGET" in + [case "$PLATFORM_DEPS" in x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;; - win32|quartz) with_smclient=$GDK_TARGET ;; + win32|quartz) with_smclient=$PLATFORM_DEPS ;; *) with_smclient=no ;; esac]) AC_MSG_RESULT([$with_smclient]) |