From 2a299ebca397576a98a5af64355bc61c694e8eae Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Fri, 8 Aug 2008 04:18:40 -0400
Subject: [PATCH] Pass the boost suffix down when using --build with acprep.

---
 acprep | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/acprep b/acprep
index 544e986e..4b29d489 100755
--- a/acprep
+++ b/acprep
@@ -280,10 +280,11 @@ if [ ! "$BUILD_DIR" = "false" ]; then
     cd "$BUILD_DIR" || (echo "Cannot change to $BUILD_DIR"; exit 1)
 fi
 
+SWITCHES="$SWITCHES --with-boost-suffix='$BOOST_SUFFIX'"
+
 "$HERE/configure" --srcdir="$HERE" CXX="$CXX" \
     CPPFLAGS="$CPPFLAGS" CXXFLAGS="$CXXFLAGS $local_cxxflags" \
-    LDFLAGS="$LDFLAGS" LIBS="$LIBS" $SWITCHES \
-        --with-boost-suffix="$BOOST_SUFFIX"
+    LDFLAGS="$LDFLAGS" LIBS="$LIBS" $SWITCHES
 
 # Alter the Makefile so that it's not nearly so verbose.  This makes errors
 # and warnings much easier to spot.
@@ -298,6 +299,6 @@ fi
 # options.
 
 if [ $DO_BUILD = true ]; then
-    echo "make ARCHFLAGS=\"$ARCHFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\" CXXFLAGS=\"$CXXFLAGS\" DISTCHECK_CONFIGURE_FLAGS=\"--disable-dependency-tracking\" $@" > make.sh
+    echo "make ARCHFLAGS=\"$ARCHFLAGS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\" CXXFLAGS=\"$CXXFLAGS\" DISTCHECK_CONFIGURE_FLAGS=\"$SWITCHES\" $@" > make.sh
     sh -x make.sh
 fi