From 9d4241b7c7eaaf347b7807907eec8115a8f8ee42 Mon Sep 17 00:00:00 2001
From: Marius Vollmer <mvo@src.gnome.org>
Date: Sun, 11 Oct 1998 13:21:53 +0000
Subject: Check for "guile-config" and then for "build-guile", if guile-config

* gnome-guile-checks.m4: Check for "guile-config" and then for
"build-guile", if guile-config couldn't be found.  Do not
explicitely include output from "info libdir", it is already
included in "link".  Use "compile" instead of "info includedir".  Do
not include "1.2" in error message when Guile can't be found at
all.

svn path=/trunk/; revision=440
---
 macros/ChangeLog             |  9 +++++++++
 macros/gnome-guile-checks.m4 | 38 ++++++++++++++++++++++++++++----------
 2 files changed, 37 insertions(+), 10 deletions(-)

(limited to 'macros')

diff --git a/macros/ChangeLog b/macros/ChangeLog
index 8f23bbcd7a..112eed80ca 100644
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,12 @@
+1998-10-11  Marius Vollmer  <mvo@zagadka.ping.de>
+
+	* gnome-guile-checks.m4: Check for "guile-config" and then for
+	"build-guile", if guile-config couldn't be found.  Do not
+	explicitely include output from "info libdir", it is already
+	included in "link".  Use "compile" instead of "info includedir".  Do
+	not include "1.2" in error message when Guile can't be found at
+	all.
+	
 1998-10-11  Martin Baulig  <martin@home-of-linux.org>
 
 	* gnome-libgtop-check.m4 (GNOME_INIT_LIBGTOP): Added optional
diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4
index 3414e6a7ea..f56cb96abf 100644
--- a/macros/gnome-guile-checks.m4
+++ b/macros/gnome-guile-checks.m4
@@ -24,30 +24,48 @@ AC_DEFUN([GNOME_CHECK_GUILE],
 	AC_SUBST(READLINE_LIB)
 
 	if test "x$cross_compiling" = "xyes" ; then
-	  name_build_guile="$target_alias-build-guile"
+	  name_build_guile="$target_alias-guile-config"
 	else
-	  name_build_guile="build-guile"
+	  name_build_guile="guile-config"
 	fi
 
 	AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
 
 	if test "x$BUILD_GUILE" = "xyes"; then
-		AC_MSG_CHECKING(whether build-guile works)
-		if test x`build-guile --version >/dev/null 2>&1 || \
-				echo no` = xno; then
-			BUILD_GUILE=no
+	    AC_MSG_CHECKING(whether $name_build_guile works)
+	    if test x`$name_build_guile --version >/dev/null 2>&1 || \
+		echo no` = xno; then
+		BUILD_GUILE=no
+	    fi
+	    AC_MSG_RESULT($BUILD_GUILE)
+	else
+
+	    if test "x$cross_compiling" = "xyes" ; then
+		name_build_guile="$target_alias-build-guile"
+	    else	
+		name_build_guile="build-guile"
+	    fi
+
+	    AC_CHECK_PROG(BUILD_GUILE, $name_build_guile, yes, no)
+
+	    if test "x$BUILD_GUILE" = "xyes"; then
+		AC_MSG_CHECKING(whether $name_build_guile works)
+		if test x`$name_build_guile --version >/dev/null 2>&1 || \
+	 	    echo no` = xno; then
+		    BUILD_GUILE=no
 		fi
 		AC_MSG_RESULT($BUILD_GUILE)
+	    fi
 	fi
 
 	AC_CHECK_LIB(m, sin)
 
 	if test "x$BUILD_GUILE" = "xyes"; then
 		AC_MSG_CHECKING(for guile libraries)
-		GUILE_LIBS="-L`build-guile info libdir` `build-guile link`"
+		GUILE_LIBS="`$name_build_guile link`"
 		AC_MSG_RESULT($GUILE_LIBS)
 		AC_MSG_CHECKING(for guile headers)
-		GUILE_INCS="-I`build-guile info includedir`"
+		GUILE_INCS="`$name_build_guile compile`"
 		AC_MSG_RESULT($GUILE_INCS)
 	else
 		GUILE_LIBS="$GNOME_LIBDIR"
@@ -83,9 +101,9 @@ AC_DEFUN([GNOME_CHECK_GUILE],
 
 	if test x$ac_cv_guile_found = xno ; then
 		if test x$1 = xfail ; then
-		  AC_MSG_ERROR(Can not find Guile 1.2 on this system)
+		  AC_MSG_ERROR(Can not find Guile on this system)
 		else
-		  AC_MSG_WARN(Can not find Guile 1.2 on this system)
+		  AC_MSG_WARN(Can not find Guile on this system)
 		fi
 		ac_cv_guile_found=no
 	fi
-- 
cgit