wingo pushed a commit to branch lightning
in repository guile.
commit f47b23aa9f9c9bdf531c818c54be2f9e0219ce8f
Author: Paolo Bonzini <[email protected]>
Date: Sun Feb 3 09:58:16 2008 +0100
add --with-lightning-prefix option to lightning.m4
2008-02-03 Paolo Bonzini <[email protected]>
* build-aux/lightning.m4: Add --with-lightning-prefix option, suggested
by Sam Steingold.
---
ChangeLog | 5 +++++
THANKS | 3 ++-
build-aux/lightning.m4 | 13 +++++++++++++
doc/version.texi | 4 ++--
4 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index d8af414..4bea876 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-03 Paolo Bonzini <[email protected]>
+
+ * build-aux/lightning.m4: Add --with-lightning-prefix option, suggested
+ by Sam Steingold.
+
2008-01-14 Paolo Bonzini <[email protected]>
* lightning/i386/core-64.h: Use CALLsr, not CALLLsr.
diff --git a/THANKS b/THANKS
index e44f869..0276167 100644
--- a/THANKS
+++ b/THANKS
@@ -3,8 +3,9 @@ improving GNU lightning:
Eli Barzilay <[email protected]>
Ludovic Courtes <[email protected]>
+Matthew Flatt <[email protected]>
Laurent Michel <[email protected]>
Basile Starynkevitch <[email protected]>
+Sam Steingold <[email protected]>
Jens Troeger <[email protected]>
Tom Tromey <[email protected]>
-Matthew Flatt <[email protected]>
diff --git a/build-aux/lightning.m4 b/build-aux/lightning.m4
index 105aaf2..b612d7c 100644
--- a/build-aux/lightning.m4
+++ b/build-aux/lightning.m4
@@ -44,7 +44,20 @@ AC_SUBST_FILE(lightning_frag)
AC_DEFUN([LIGHTNING_CONFIGURE_IF_NOT_FOUND], [
AC_REQUIRE([AC_PROG_LN_S])dnl
AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+AC_ARG_WITH(lightning-prefix,
+AS_HELP_STRING([--with-lightning-prefix=PFX], [Prefix where GNU lightning is
installed]),
+[], [with_lightning_prefix=])
+saveCFLAGS="$CFLAGS"
+if test "x$with_lightning_prefix" != x; then
+ INCLIGHTNING="-I${with_lightning_prefix}/include"
+ CFLAGS="$CFLAGS $INCLIGHTNING"
+else
+ INCLIGHTNING=
+fi
AC_CHECK_HEADER(lightning.h)
+CFLAGS="$saveCFLAGS"
+
AM_CONDITIONAL(LIGHTNING_MAIN, (exit 1))
AM_CONDITIONAL(HAVE_INSTALLED_LIGHTNING, test "$ac_cv_header_lightning_h" =
yes)
diff --git a/doc/version.texi b/doc/version.texi
index 95b649f..bbcbdc5 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 25 October 2006
-@set UPDATED-MONTH October 2006
+@set UPDATED 9 January 2008
+@set UPDATED-MONTH January 2008
@set EDITION 1.2c
@set VERSION 1.2c
