|
Line
Link Here
|
| 0 |
-- |
0 |
++ configure.in |
| 1 |
-- configure.in |
|
|
|
Lines 58-63
Link Here
|
| 58 |
GTK_API_VERSION=2.0 |
58 |
GTK_API_VERSION=2.0 |
| 59 |
GTK_REQUIRED=2.20.0 |
59 |
GTK_REQUIRED=2.20.0 |
| 60 |
GLADE_API_VERSION=1.0 |
60 |
GLADE_API_VERSION=1.0 |
|
|
61 |
GDK_TARGETS=$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION) |
| 61 |
;; |
62 |
;; |
| 62 |
3.0) VTE_API_VERSION=2.90 |
63 |
3.0) VTE_API_VERSION=2.90 |
| 63 |
VTE_API_MAJOR_VERSION=2 |
64 |
VTE_API_MAJOR_VERSION=2 |
|
Lines 68-73
Link Here
|
| 68 |
GTK_API_VERSION=3.0 |
69 |
GTK_API_VERSION=3.0 |
| 69 |
GTK_REQUIRED=3.0.0 |
70 |
GTK_REQUIRED=3.0.0 |
| 70 |
GLADE_API_VERSION=2.0 |
71 |
GLADE_API_VERSION=2.0 |
|
|
72 |
GDK_TARGETS=$($PKG_CONFIG --variable targets gdk-$GTK_API_VERSION) |
| 71 |
;; |
73 |
;; |
| 72 |
esac |
74 |
esac |
| 73 |
|
75 |
|
|
Lines 412-423
Link Here
|
| 412 |
|
414 |
|
| 413 |
# We have a direct dependency on X11 on gdk-x11, see bug #613525 |
415 |
# We have a direct dependency on X11 on gdk-x11, see bug #613525 |
| 414 |
AC_MSG_CHECKING([for GDK target]) |
416 |
AC_MSG_CHECKING([for GDK target]) |
| 415 |
GDK_TARGET="$($PKG_CONFIG --variable target gdk-$GTK_API_VERSION)" |
417 |
AC_MSG_RESULT([$GDK_TARGETS]) |
| 416 |
AC_MSG_RESULT([$GDK_TARGET]) |
418 |
PLATFORM_PKGS= |
| 417 |
case "$GDK_TARGET" in |
419 |
for i in $GDK_TARGETS; do |
| 418 |
x11) PLATFORM_PKGS="x11 cairo-xlib" ;; |
420 |
if test "$i" = "x11"; then |
| 419 |
*) PLATFORM_PKGS="" ;; |
421 |
PLATFORM_PKGS="$PLATFORM_PKGS x11 cairo-xlib" |
| 420 |
esac |
422 |
fi |
|
|
423 |
done |
| 421 |
|
424 |
|
| 422 |
VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gobject-2.0 gio-2.0 gio-unix-2.0 $PLATFORM_PKGS" |
425 |
VTE_PKGS="glib-2.0 >= $GLIB_REQUIRED gobject-2.0 pango >= $PANGO_REQUIRED gtk+-$GTK_API_VERSION >= $GTK_REQUIRED gobject-2.0 gio-2.0 gio-unix-2.0 $PLATFORM_PKGS" |
| 423 |
PKG_CHECK_MODULES([VTE],[$VTE_PKGS]) |
426 |
PKG_CHECK_MODULES([VTE],[$VTE_PKGS]) |
