blob: df9f41261c7ef41211a671e616b2451ead6203d1 (
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
|
--- configure.in
+++ configure.in
@@ -19,21 +19,10 @@
AC_CHECK_PROG(XML2_LIBS,xml2-config,`xml2-config --libs`)
AC_CHECK_PROG(PKGCONFIG,pkg-config,`pkg-config --version`)
-AC_ARG_WITH(gtk-version, --with-gtk-version=VER Version of GTK+ to link,GTK_VERSION=${withval})
-
-if test "x${PKGCONFIG}" = 'x'; then
- AM_PATH_GTK(1.2.0, ,
- AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?))
-else
- #insert gtk-config replacement
- if test "x${GTK_VERSION}" = 'x'; then
- GTK_STRING="gtk+"
- else
- GTK_STRING="gtk+-${GTK_VERSION}"
- fi
- GTK_CFLAGS=`pkg-config --cflags ${GTK_STRING}`
- GTK_LIBS=`pkg-config --libs ${GTK_STRING}`
-fi
+GTK_CFLAGS=`pkg-config gtk+-2.0 --cflags`
+GTK_LIBS=`pkg-config gtk+-2.0 --libs`
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
AC_SUBST(XML2_CFLAGS)
AC_SUBST(XML2_LIBS)
|
GitWeb
