From bbf5ab5e77cc8810fdc453d354c3e16e5175d77c Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Tue, 15 May 2007 13:34:11 +0100
Subject: [PATCH] Treat SWIGFLAGS correctly in the configure script for
 astromap

---
 .bzrignore                   | 17 +++++++++++++++++
 astromap/README              | 10 ++++++++++
 astromap/plot/config/swig.am |  2 +-
 astromap/plot/configure.ac   |  2 ++
 bnlib/README                 |  6 ++++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/.bzrignore b/.bzrignore
index 6302b70..9f3f27a 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -101,3 +101,20 @@ CVS
 ./bnlib/config/depcomp
 ./bnlib/config/config.sub
 ./bnlib/config/config.guess
+./bnfits/pybind/config/ltmain.sh
+./bnfits/pybind/config/depcomp
+./bnfits/pybind/config/config.sub
+./bnfits/pybind/config/config.guess
+./bnfits/config/ltmain.sh
+./bnfits/config/depcomp
+./bnfits/config/config.sub
+./bnfits/config/config.guess
+./astromap/plot/config/ltmain.sh
+./astromap/plot/config/depcomp
+./astromap/plot/config/config.sub
+./astromap/plot/config/config.guess
+./astromap/config/ltmain.sh
+./astromap/config/depcomp
+./astromap/config/config.sub
+./astromap/config/config.guess
+./astromap/config/compile
diff --git a/astromap/README b/astromap/README
index 5becb5d..46398be 100644
--- a/astromap/README
+++ b/astromap/README
@@ -30,3 +30,13 @@ on hathor:
  	CFLAGS="${CFLAGS}  -I${HOME}/p/bnlib/include  -I${HOME}/p/bnfits/include -g" \
 	LDFLAGS="${LDFLAGS} -L${HOME}/p/bnlib/lib -L${HOME}/p/bnfits/lib"  \
 	--prefix=${HOME}/p/astromap 
+
+
+More notes:
+	export PYTHON=python2.4
+	./configure 	CPPFLAGS="-I${BNPREFIX}/include" \
+			CFLAGS="-I${BNPREFIX}/include" \
+			SWIGFLAGS="-I${BNPREFIX}/include" \
+			LDFLAGS="-L${BNPREFIX}/lib"\
+			 --prefix=${BNPREFIX} 
+
diff --git a/astromap/plot/config/swig.am b/astromap/plot/config/swig.am
index 6c3d559..e929a0a 100644
--- a/astromap/plot/config/swig.am
+++ b/astromap/plot/config/swig.am
@@ -1,2 +1,2 @@
 %.cxx %.py:  %.i 
-	@SWIG@  -o $@ ${SWIGFLAGS} -c++ -python $<
+	@SWIG@  -o $@ @SWIGFLAGS@ -c++ -python $<
diff --git a/astromap/plot/configure.ac b/astromap/plot/configure.ac
index a7d8f7d..cb23477 100644
--- a/astromap/plot/configure.ac
+++ b/astromap/plot/configure.ac
@@ -22,7 +22,9 @@ AC_PATH_X()
 AC_PATH_XTRA()
 
 AM_CHECK_PYTHON_HEADERS()
+
 AC_PATH_PROGS([SWIG],[swig])
+AC_SUBST(SWIGFLAGS)
 
 
 AC_OUTPUT(Makefile
diff --git a/bnlib/README b/bnlib/README
index 36fba52..a475e3e 100644
--- a/bnlib/README
+++ b/bnlib/README
@@ -11,3 +11,9 @@ configure as:
 
  	./configure --prefix=${HOME}/p/bnlib
 
+Or, even better: define prefix as:
+export set BNPREFIX=/home/bn204/d/p/bnprog-devel-main
+
+and then 
+	
+	./configure --prefix=${BNPREFIX}