From f47b23aa9f9c9bdf531c818c54be2f9e0219ce8f Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <bonzini@gnu.org>
Date: Sun, 3 Feb 2008 09:58:16 +0100
Subject: [PATCH] add --with-lightning-prefix option to lightning.m4

2008-02-03  Paolo Bonzini  <bonzini@gnu.org>

	* 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 d8af41479..4bea87648 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-03  Paolo Bonzini  <bonzini@gnu.org>
+
+	* build-aux/lightning.m4: Add --with-lightning-prefix option, suggested
+	by Sam Steingold.
+
 2008-01-14  Paolo Bonzini  <bonzini@gnu.org>
 
 	* lightning/i386/core-64.h: Use CALLsr, not CALLLsr.
diff --git a/THANKS b/THANKS
index e44f869cd..0276167b7 100644
--- a/THANKS
+++ b/THANKS
@@ -3,8 +3,9 @@ improving GNU lightning:
 
 Eli Barzilay                    <eli@barzilay.org>
 Ludovic Courtes                 <ludo@chbouib.org>
+Matthew Flatt			<mflatt@cs.utah.edu>
 Laurent Michel                  <ldm@thorgal.homelinux.org>
 Basile Starynkevitch            <basile@starynkevitch.net>
+Sam Steingold			<sds@gnu.org>
 Jens Troeger                    <savage@light-speed.de>
 Tom Tromey                      <tromey@redhat.com>
-Matthew Flatt			<mflatt@cs.utah.edu>
diff --git a/build-aux/lightning.m4 b/build-aux/lightning.m4
index 105aaf2d4..b612d7c15 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 95b649f61..bbcbdc5f8 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