Updated acprep to reflect a more modern OS X system.
This commit is contained in:
parent
2aff35215f
commit
544f69108b
1 changed files with 9 additions and 11 deletions
20
acprep
20
acprep
|
|
@ -26,32 +26,30 @@ cat configure.tmpl | \
|
||||||
|
|
||||||
autoreconf --force --install
|
autoreconf --force --install
|
||||||
|
|
||||||
INCDIRS="-I/sw/include -I/opt/local/include"
|
INCDIRS="-I/usr/local/include -I/opt/local/include"
|
||||||
INCDIRS="$INCDIRS -I/usr/local/include"
|
|
||||||
INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35"
|
INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35"
|
||||||
INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35/boost"
|
|
||||||
INCDIRS="$INCDIRS -isystem /usr/local/include/boost-1_35/boost/type_traits"
|
|
||||||
|
|
||||||
LIBDIRS="-L/sw/lib -L/opt/local/lib"
|
LIBDIRS="-L/usr/local/lib -L/opt/local/lib"
|
||||||
LIBDIRS="$LIBDIRS -L/usr/local/lib"
|
|
||||||
|
|
||||||
PYTHON_HOME="/usr"
|
PYTHON_HOME="/usr"
|
||||||
|
|
||||||
|
# Use the latest g++, if it's been installed (with Xcode 3.1 on OS X)
|
||||||
if [ -x /usr/bin/g++-4.2 ]; then
|
if [ -x /usr/bin/g++-4.2 ]; then
|
||||||
CXX=g++-4.2
|
CXX=g++-4.2
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
SYSTEM=`uname -s`
|
SYSTEM=$(uname -s)
|
||||||
|
|
||||||
if [ $SYSTEM = Linux ]; then
|
if [ $SYSTEM = Linux ]; then
|
||||||
CXXFLAGS="-pthread"
|
CXXFLAGS="-pthread"
|
||||||
elif [ $SYSTEM = Solaris ]; then
|
elif [ $SYSTEM = Solaris ]; then
|
||||||
CXXFLAGS="-pthreads"
|
CXXFLAGS="-pthreads"
|
||||||
elif [ $SYSTEM = Darwin ]; then
|
elif [ $SYSTEM = Darwin ]; then
|
||||||
#CXXFLAGS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
|
#CXXFLAGS="-arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
||||||
CXXFLAGS="$CXXFLAGS -Wno-long-double"
|
#CXXFLAGS="$CXXFLAGS -Wno-long-double"
|
||||||
#LIBDIRS="$LIBDIRS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
|
#LIBDIRS="$LIBDIRS -arch i386 -arch ppc -isysroot /Developer/SDKs/MacOSX10.5.sdk"
|
||||||
|
CXXFLAGS=""
|
||||||
else
|
else
|
||||||
CXXFLAGS=""
|
CXXFLAGS=""
|
||||||
fi
|
fi
|
||||||
|
|
@ -61,7 +59,7 @@ fi
|
||||||
# that is built again anyway by Xcode).
|
# that is built again anyway by Xcode).
|
||||||
SWITCHES=""
|
SWITCHES=""
|
||||||
CPPFLAGS="$INCDIRS"
|
CPPFLAGS="$INCDIRS"
|
||||||
CXXFLAGS="-pipe"
|
CXXFLAGS="$CXXFLAGS -pipe"
|
||||||
LDFLAGS="$LIBDIRS"
|
LDFLAGS="$LIBDIRS"
|
||||||
LOCAL=false
|
LOCAL=false
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue