--- 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)