[project @ 2003-11-16 11:42:34 by panne]

* Cleaned up test for GTK_CONFIG
* Nuked unused GTK_VERSION

diff --git a/configure.ac b/configure.ac
index 4cc728e..c2b79d6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1364,25 +1364,15 @@ dnl --------------------------------------------------
 dnl * test for GTK+
 dnl --------------------------------------------------
 
-AC_PATH_PROGS(GTK_CONFIG, gtk-config gtk12-config)
-if test "$GTK_CONFIG" != ""; then
-   AC_CACHE_CHECK([for version of GTK+], fptools_cv_gtk_version, [
-       fptools_cv_gtk_version=`$GTK_CONFIG --version`
-    ])
-    GTK_VERSION=$fptools_cv_gtk_version
-else
-    GTK_VERSION=
+AC_PATH_PROGS([GTK_CONFIG], [gtk-config gtk12-config])
+if test -n "$GTK_CONFIG"; then
+  AC_CACHE_CHECK([for version of GTK+], [fp_cv_gtk_version],
+    [fp_cv_gtk_version=`$GTK_CONFIG --version`])
+  FP_COMPARE_VERSIONS([$fp_cv_gtk_version], [-lt], [1.2],
+    [AC_MSG_WARN([GTK+ not usable, need at least version 1.2])
+     GTK_CONFIG=])
 fi
-
-case $fptools_cv_gtk_version in
-  1.[[23]].*) ;;
-  *) AC_MSG_WARN([GTK+ not usable; need at least version 1.2])
-     GTK_CONFIG=
-     ;;
-esac
-
-AC_SUBST(GTK_CONFIG)
-AC_SUBST(GTK_VERSION)
+AC_SUBST([GTK_CONFIG])
 
 dnl --------------------------------------------------
 dnl * Miscellaneous feature tests

diff --git a/mk/config.mk.in b/mk/config.mk.in
index caa2da5..7aa1976 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -759,7 +759,6 @@ HavePosixRegex  = @HavePosixRegex@
 # GTK+
 
 GTK_CONFIG             = @GTK_CONFIG@
-GTK_VERSION            = @GTK_VERSION@
 
 #-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)