From 3be1534915ddd7c1b891134bb495b46eeb1792e0 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 8 Aug 2008 03:03:11 -0400
Subject: Don't overwrite PYTHON_HOME or PYTHON_VERSION if defined in the
 environment.

---
 acprep | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/acprep b/acprep
index fa3142df..f60d46f6 100755
--- a/acprep
+++ b/acprep
@@ -25,18 +25,24 @@ autoreconf --force --install
 
 SWITCHES="--enable-python"	# always build with Python support
 
-PYTHON_HOME="/usr"
+if [ -z "$PYTHON_HOME" ]; then
+    PYTHON_HOME="/usr"
+fi
+if [ -z "$PYTHON_VERSION" ]; then
+    PYTHON_VERSION="2.5"
+fi
+
 BOOST_SUFFIX=""
 
 INCDIRS="-isystem /usr/local/include"
 INCDIRS="$INCDIRS -isystem /opt/local/include"
 INCDIRS="$INCDIRS -isystem /opt/local/include/libofx"
 INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35"
-INCDIRS="$INCDIRS -isystem $PYTHON_HOME/include/python2.5"
+INCDIRS="$INCDIRS -isystem $PYTHON_HOME/include/python$PYTHON_VERSION"
 
 LDFLAGS=""
 LIBDIRS="-L/usr/local/lib -L/opt/local/lib"
-LIBDIRS="$LIBDIRS -L$PYTHON_HOME/lib/python2.5/config"
+LIBDIRS="$LIBDIRS -L$PYTHON_HOME/lib/python$PYTHON_VERSION/config"
 
 ARCHFLAGS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk"
 
-- 
cgit v1.2.3