Moved GTK_CONFIG detection to ghc subdirectory (untested).
fi
dnl --------------------------------------------------
-dnl * test for GTK+
-dnl --------------------------------------------------
-
-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
-AC_SUBST([GTK_CONFIG])
-
-dnl --------------------------------------------------
dnl * Miscellaneous feature tests
dnl --------------------------------------------------
# Check whether this GHC has readline installed
FP_GHC_HAS_READLINE
+# test for GTK+
+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
+AC_SUBST([GTK_CONFIG])
+
# Write the results...
AC_CONFIG_FILES([ghc.spec VERSION docs/users_guide/ug-book.xml mk/config.mk mk/version.mk])
AC_OUTPUT
+# -*-makefile-*-
+# @configure_input@
# -----------------------------------------------------------------------------
#
# GHC project configuration
# Set to YES if $(GHC) has the readline package installed
GhcHasReadline = @GhcHasReadline@
+# GTK+
+GTK_CONFIG = @GTK_CONFIG@
+
include $(GhcMainDir)/mk/version.mk
HavePosixRegex = @HavePosixRegex@
#-----------------------------------------------------------------------------
-# GTK+
-
-GTK_CONFIG = @GTK_CONFIG@
-
-#-----------------------------------------------------------------------------
# Flex (currently unused, could be moved to glafp-utils)
# FLEX = @LEX@