gatuno
/
gatuno-terminal
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

configure: Fix GDK_TARGET and PLATFORM_DEPS for Gtk+3

master-1.22
infirit 2014-12-11 16:08:26 +01:00
parent 30f1d23ea4
commit b531d651d3
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@ -58,20 +58,26 @@ AC_MSG_RESULT([$with_gtk])
case "$with_gtk" in case "$with_gtk" in
2.0) GTK_API_VERSION=2.0 2.0) GTK_API_VERSION=2.0
GTK_REQUIRED=2.24.0 GTK_REQUIRED=2.24.0
GDK_TARGETS="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)"
VTE_PC_VERSION= VTE_PC_VERSION=
;; ;;
3.0) GTK_API_VERSION=3.0 3.0) GTK_API_VERSION=3.0
GTK_REQUIRED=2.91.1 GTK_REQUIRED=2.91.1
GDK_TARGETS="$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION)"
VTE_PC_VERSION=-2.90 VTE_PC_VERSION=-2.90
;; ;;
esac esac
GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" PLATFORM_DEPS=
for target in $GDK_TARGETS; do
case "$GDK_TARGET" in case "$target" in
x11) PLATFORM_DEPS="x11" ;; x11) PLATFORM_DEPS="x11" ;;
*) PLATFORM_DEPS="" ;; broadway) ;;
esac wayland) ;;
win32|quartz) AC_MSG_WARN([unsupported GDK backend $target]) ;;
*) AC_MSG_WARN([unknown GDK backend $target]) ;;
esac
done
PKG_CHECK_MODULES([TERM], PKG_CHECK_MODULES([TERM],
[vte$VTE_PC_VERSION >= $VTE_REQUIRED [vte$VTE_PC_VERSION >= $VTE_REQUIRED
@ -91,9 +97,9 @@ AC_MSG_CHECKING([which smclient backend to use])
AC_ARG_WITH([smclient], AC_ARG_WITH([smclient],
[AS_HELP_STRING([--with-smclient-backend],[which smclient backend to use (xsmp/win32/quartz)])], [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" ;; x11) with_smclient=xsmp SMCLIENT_PKGS="sm" ;;
win32|quartz) with_smclient=$GDK_TARGET ;; win32|quartz) with_smclient=$PLATFORM_DEPS ;;
*) with_smclient=no ;; *) with_smclient=no ;;
esac]) esac])
AC_MSG_RESULT([$with_smclient]) AC_MSG_RESULT([$with_smclient])