From 3a93e584ba3173b2fb2a3e4b5d734f4826df6eb9 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 29 Sep 2009 13:35:53 +0200
Subject: Update boost import stub

---
 build/import/libboost/configure | 48 +++++++++++++----------------------------
 1 file changed, 15 insertions(+), 33 deletions(-)

(limited to 'build/import/libboost/configure')

diff --git a/build/import/libboost/configure b/build/import/libboost/configure
index 9bb9085..2c62d45 100755
--- a/build/import/libboost/configure
+++ b/build/import/libboost/configure
@@ -2,7 +2,7 @@
 
 # file      : build/import/libboost/configure
 # author    : Boris Kolpackov <boris@kolpackov.net>
-# copyright : Copyright (c) 2005-2009 Boris Kolpackov
+# copyright : Copyright (c) 2005-2008 Boris Kolpackov
 # license   : GNU GPL v2; see accompanying LICENSE file
 
 
@@ -26,30 +26,13 @@ $echo
 
 installed=`read_y_n y`
 
-path=
-type=
-
 if [ "$installed" = "n" ]; then
 
-  version=
-
-  while [ -z "$version" ]; do
-
-    $echo
-    $echo "Please enter the 'boost' root directory."
-    $echo
-
-    root=`read_path --directory --exist`
-
-    version=`sed -e 's/^#define BOOST_LIB_VERSION "\(.*\)"[ ]*$/\1/' -e t -e d \
-$root/boost/version.hpp 2>/dev/null`
-
-    if [ $? != 0 -o -z "$version" ]; then
+  $echo
+  $echo "Please enter the 'boost' root directory."
+  $echo
 
-      version=
-      echo "Unable to read version information from $root/boost/version.hpp"
-    fi
-  done
+  root=`read_path --directory --exist`
 
   $echo
   $echo "Please select the library type you would like to use:"
@@ -59,25 +42,24 @@ $root/boost/version.hpp 2>/dev/null`
   $echo
 
   type=`read_option "archive shared" "shared"`
+fi
 
-  $echo
-  $echo "For boost 1.34.0 and later, please enter the toolset version"
-  $echo "that is embedded into the library names. For example, for"
-  $echo "gcc34 enter 34. For previous versions of boost leave this"
-  $echo "field blank."
-  $echo
+$echo
+$echo "Please enter optional suffix that may be embedded into the"
+$echo "boost library names. For example, if your library names are in"
+$echo "the libboost_regex-gcc41-mt-d.so form, then enter -gcc41-mt-d"
+$echo "Otherwise leave this field blank."
+$echo
 
-  toolset=
-  read -e -p "[]: " toolset
-fi
+suffix=
+read -e -p "[]: " suffix
 
 echo libboost_installed := $installed   >$1
+echo libboost_suffix    := $suffix      >>$1
 
 if [ "$installed" = "n" ]; then
 
   echo libboost_root    := $root    >>$1
   echo libboost_type    := $type    >>$1
-  echo libboost_version := $version >>$1
-  echo libboost_toolset := $toolset >>$1
 
 fi
-- 
cgit v1.1