blob: 913290970516c82bb8ef0eb18e6dad9a3c1a3f01 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
=== modified file 'configure.ac'
--- configure.ac 2012-06-02 20:11:32 +0000
+++ configure.ac 2012-06-02 20:11:44 +0000
@@ -79,15 +79,20 @@
else
dnl gtk2 checks
- $PKGCONFIG --exists gtkextra-2.0
+ GTKEXTRAMOD="gtkextra-2.0"
+ $PKGCONFIG --exists $GTKEXTRAMOD
if test $? != 0; then
- AC_MSG_ERROR(Cannot find gtkextra-2.0 package)
+ GTKEXTRAMOD="gtkextra-3.0"
+ $PKGCONFIG --exists $GTKEXTRAMOD
+ if test $? != 0; then
+ AC_MSG_ERROR(Cannot find gtkextra-2.0 or gtkextra-3.0 package)
+ fi
fi
X_LDFLAGS=`$PKGCONFIG --libs gtk+-2.0 gthread-2.0`
X_CFLAGS=`$PKGCONFIG --cflags gtk+-2.0`
- Y_LDFLAGS=`$PKGCONFIG --libs gtkextra-2.0`
- Y_CFLAGS=`$PKGCONFIG --cflags gtkextra-2.0`
+ Y_LDFLAGS=`$PKGCONFIG --libs $GTKEXTRAMOD`
+ Y_CFLAGS=`$PKGCONFIG --cflags $GTKEXTRAMOD`
GTK_VERSION_T=`$PKGCONFIG --modversion gtk+-2.0`
echo linking with gtk-$GTK_VERSION_T
AC_DEFINE_UNQUOTED([GTK_VERSION],"$GTK_VERSION_T",[gtk version])
|
GitWeb
