forked from boostorg/config
Added some more fixes for calling config script from an alien directory
[SVN r13563]
This commit is contained in:
+7
-12
@@ -90,8 +90,10 @@ AC_ARG_WITH(boost,
|
||||
]
|
||||
)
|
||||
if test "x$boost_base" = "x"; then
|
||||
boost_base=`expr "x$0" : 'x\(.*\)/[^/]*' \| '.'`
|
||||
#echo '$0 = ' $0
|
||||
boost_base=`expr "x$0" : 'x\(.*\)/@<:@/@:>@*' \| '.'`
|
||||
boost_base="$boost_base/../.."
|
||||
#echo boost_base=$boost_base
|
||||
if test -f "$boost_base/boost/config.hpp"; then
|
||||
if test -f "$boost_base/libs/config/configure"; then :; else
|
||||
boost_base=
|
||||
@@ -100,17 +102,6 @@ if test "x$boost_base" = "x"; then
|
||||
boost_base=
|
||||
fi
|
||||
fi
|
||||
if test "x$boost_base" = "x"; then
|
||||
for d in /usr/local /usr/local/lib /usr/local/src $HOME $HOME/lib $HOME/src ./ ../ ../../
|
||||
do
|
||||
if test -f "$d/boost/config.hpp"; then
|
||||
if test -f "$d/libs/config/configure"; then
|
||||
boost_base="$d"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
if test "x$boost_base" != "x"; then
|
||||
AC_MSG_RESULT([$boost_base])
|
||||
else
|
||||
@@ -361,6 +352,8 @@ else
|
||||
|
||||
date_string=`date`
|
||||
|
||||
echo boost_base=$boost_base
|
||||
|
||||
cat > user.hpp << EOF
|
||||
// (C) Copyright Boost.org 2001.
|
||||
// Do not check in modified versions of this file,
|
||||
@@ -446,3 +439,5 @@ fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user