[gnome-games] build: Declare GUILE and GUILE_CONFIG as precious
- From: Christian Persch <chpe src gnome org>
- To: svn-commits-list gnome org
- Subject: [gnome-games] build: Declare GUILE and GUILE_CONFIG as precious
- Date: Sun, 12 Jul 2009 13:07:49 +0000 (UTC)
commit eeca6b05ce04db345e366a90c6005a6e4f7cd396
Author: Christian Persch <chpe gnome org>
Date: Sun Jul 12 15:06:56 2009 +0200
build: Declare GUILE and GUILE_CONFIG as precious
This allows to set the GUILE and GUILE_CONFIG env vars and have
configure pick them up, so one can install both guile 1.6 and 1.8 and
choose which to use.
configure.in | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/configure.in b/configure.in
index 841a680..8a0ec50 100644
--- a/configure.in
+++ b/configure.in
@@ -899,19 +899,23 @@ AC_SUBST([GNOME_GAMES_GGZ_INTLTOOL_ROOM_RULE])
have_guile=no
have_guile_1_8=no
if test "$need_guile" = "yes"; then
- AC_PATH_PROG([GUILE],[guile])
+ AC_ARG_VAR([GUILE],[path to guile])
+ if test "$ac_cv_env_GUILE_set" != "set"; then
+ AC_PATH_TOOL([GUILE],[guile])
+ fi
+
if test -z "$GUILE" ; then
AC_MSG_ERROR([guile not found; install guile development headers or use --enable-omitgames=aisleriot])
fi
- AC_PATH_PROG([GUILE_CONFIG],[guile-config])
+ AC_ARG_VAR([GUILE_CONFIG],[path to guile-config])
+ if test "$ac_cv_env_GUILE_CONFIG_set" != "set"; then
+ AC_PATH_TOOL([GUILE_CONFIG],[guile-config])
+ fi
if test -z "$GUILE_CONFIG"; then
AC_MSG_ERROR([guile not found; install guile development headers or use --enable-omitgames=aisleriot])
fi
- AC_SUBST([GUILE])
- AC_SUBST([GUILE_CONFIG])
-
GUILE_CFLAGS=`$GUILE_CONFIG compile`
GUILE_LIBS=`$GUILE_CONFIG link`
AC_SUBST([GUILE_CFLAGS])
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]