From: panne <unknown>
Date: Sat, 4 Dec 2004 14:07:27 +0000 (+0000)
Subject: [project @ 2004-12-04 14:07:25 by panne]
X-Git-Tag: Initial_conversion_from_CVS_complete~1357
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=5ad32b4208fdf32d67a27a285616dfa18840bb2f

[project @ 2004-12-04 14:07:25 by panne]
Moved GTK_CONFIG detection to ghc subdirectory (untested).
---

diff --git a/configure.ac b/configure.ac
index e95fb9f..75ab52c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1220,20 +1220,6 @@ else
 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 --------------------------------------------------
 
diff --git a/ghc/configure.ac b/ghc/configure.ac
index cc5eaa1..0099027 100644
--- a/ghc/configure.ac
+++ b/ghc/configure.ac
@@ -23,6 +23,17 @@ FP_GCC_NEEDS_NO_OMIT_LFPTR
 # 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
diff --git a/ghc/mk/config.mk.in b/ghc/mk/config.mk.in
index 711c90b..ba6be78 100644
--- a/ghc/mk/config.mk.in
+++ b/ghc/mk/config.mk.in
@@ -1,3 +1,5 @@
+# -*-makefile-*-
+# @configure_input@
 # -----------------------------------------------------------------------------
 #
 # GHC project configuration
@@ -24,4 +26,7 @@ GhcBinDistLinks = ghc ghci ghc-pkg
 # Set to YES if $(GHC) has the readline package installed
 GhcHasReadline	= @GhcHasReadline@
 
+# GTK+
+GTK_CONFIG = @GTK_CONFIG@
+
 include $(GhcMainDir)/mk/version.mk
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 68a4fd2..b9033be 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -763,11 +763,6 @@ HaveFrameworkHaskellSupport = @HaveFrameworkHaskellSupport@
 HavePosixRegex  = @HavePosixRegex@
 
 #-----------------------------------------------------------------------------
-# GTK+
-
-GTK_CONFIG		= @GTK_CONFIG@
-
-#-----------------------------------------------------------------------------
 # Flex (currently unused, could be moved to glafp-utils)
 
 # FLEX			= @LEX@