From 9c77b676b2c22c647ccf4870c82cf83152fc2a9a Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Mon, 1 Nov 2010 17:17:39 +0000 Subject: [PATCH] Removed the matlab toolbox requirement from gtsam and myconfigure files. --- configure.ac | 16 ++++++++-------- myconfigure | 2 +- myconfigure.overo | 2 +- myconfigure.profiling | 2 +- myconfigure.timing | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) mode change 100755 => 100644 myconfigure mode change 100755 => 100644 myconfigure.overo mode change 100755 => 100644 myconfigure.profiling mode change 100755 => 100644 myconfigure.timing diff --git a/configure.ac b/configure.ac index a6b954c45..d8f540ab4 100644 --- a/configure.ac +++ b/configure.ac @@ -132,14 +132,14 @@ AC_CHECK_FUNCS([pow sqrt]) AX_BOOST_BASE([1.40]) # ask for toolbox directory -AC_ARG_WITH([toolbox], - [AS_HELP_STRING([--with-toolbox], - [specify the matlab toolbox directory for installation (mandatory)])], - [toolbox=$withval], - [AC_MSG_FAILURE( - [--with-toolbox has to be specified]) - ]) -AC_SUBST([toolbox]) +#AC_ARG_WITH([toolbox], +# [AS_HELP_STRING([--with-toolbox], +# [specify the matlab toolbox directory for installation (mandatory)])], +# [toolbox=$withval], +# [AC_MSG_FAILURE( +# [--with-toolbox has to be specified]) +# ]) +#AC_SUBST([toolbox]) # ask for boost directory #AC_ARG_WITH([boost], diff --git a/myconfigure b/myconfigure old mode 100755 new mode 100644 index 64ed7079c..7ebdcbea3 --- a/myconfigure +++ b/myconfigure @@ -1,4 +1,4 @@ -../configure --prefix=$HOME --with-toolbox=$HOME/toolbox/ CFLAGS="-fno-inline -g -Wall" CXXFLAGS="-fno-inline -g -Wall" CPPFLAGS="-D_GLIBCXX_DEBUG" LDFLAGS="-fno-inline -g -Wall" --disable-static --enable-blas --enable-lapack --disable-fast-install +../configure --prefix=$HOME CFLAGS="-fno-inline -g -Wall" CXXFLAGS="-fno-inline -g -Wall" CPPFLAGS="-D_GLIBCXX_DEBUG" LDFLAGS="-fno-inline -g -Wall" --disable-static --enable-blas --enable-lapack --disable-fast-install #../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CPP="/opt/local/bin/cpp-mp-4.5" CC="/opt/local/bin/gcc-mp-4.5" CXX="/usr/local/bin/gfilt" CXXFLAGS="-fno-inline -g -Wall -D_GLIBCXX_DEBUG -DNDEBUG" CFLAGS="-fno-inline -g -Wall -D_GLIBCXX_DEBUG -DNDEBUG" LDFLAGS="-fno-inline -g -Wall" --disable-static --enable-blas --enable-lapack --disable-fast-install #cd build && ../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CXXFLAGS="-fno-inline -g -DNDEBUG -O3" CFLAGS="-fno-inline -g -DNDEBUG -O3" LDFLAGS="-fno-inline -g -DNDEBUG -O3" --disable-static --enable-blas --enable-lapack #cd build && ../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CXXFLAGS="-DNDEBUG -O3" CFLAGS="-g -DNDEBUG -O3" LDFLAGS="-DNDEBUG -O3" --disable-static --enable-blas --enable-lapack diff --git a/myconfigure.overo b/myconfigure.overo old mode 100755 new mode 100644 index 1bb803148..c3889973f --- a/myconfigure.overo +++ b/myconfigure.overo @@ -1 +1 @@ -GCC=/home/uuv/overo-oe/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-gcc CXX=$OVEROTOP/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-g++ CC=$OVEROTOP/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-gcc LD=$OVEROTOP/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-ld ./configure --prefix=$HOME --build=i686-pc-linux-gnu --host=arm-angstrom-linux-gnueabi --with-toolbox=$HOME/toolbox/ --with-boost=$OVERO_ROOT/usr/include CXXFLAGS="--sysroot=$OVEROTOP/tmp/staging/armv7a-angstrom-linux-gnueabi -g -O3 -DNDEBUG" CCFLAGS="--sysroot=$OVEROTOP/tmp/staging/armv7a-angstrom-linux-gnueabi -g -O3 -DNDEBUG" --disable-static +GCC=/home/uuv/overo-oe/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-gcc CXX=$OVEROTOP/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-g++ CC=$OVEROTOP/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-gcc LD=$OVEROTOP/tmp/cross/armv7a/bin/arm-angstrom-linux-gnueabi-ld ./configure --prefix=$HOME --build=i686-pc-linux-gnu --host=arm-angstrom-linux-gnueabi --with-boost=$OVERO_ROOT/usr/include CXXFLAGS="--sysroot=$OVEROTOP/tmp/staging/armv7a-angstrom-linux-gnueabi -g -O3 -DNDEBUG" CCFLAGS="--sysroot=$OVEROTOP/tmp/staging/armv7a-angstrom-linux-gnueabi -g -O3 -DNDEBUG" --disable-static diff --git a/myconfigure.profiling b/myconfigure.profiling old mode 100755 new mode 100644 index cf57da28f..3b85da964 --- a/myconfigure.profiling +++ b/myconfigure.profiling @@ -1,3 +1,3 @@ #../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CXXFLAGS="-fno-inline -g -DNDEBUG -O3" CFLAGS="-fno-inline -g -DNDEBUG -O3" LDFLAGS="-fno-inline -g -DNDEBUG -O3" --disable-static --enable-blas --enable-lapack #../configure --disable-fast-install --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CXXFLAGS="-fno-inline -g -D_GLIBCXX_DEBUG -DNDEBUG" CFLAGS="-fno-inline -g -D_GLIBCXX_DEBUG -DNDEBUG" LDFLAGS="-fno-inline -g " --disable-static --enable-blas --enable-lapack -../configure --prefix=$HOME/borg --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CPPFLAGS="-g -DNDEBUG -O3" LDFLAGS="-g -DNDEBUG -O3" --disable-static --enable-blas --enable-lapack +../configure --prefix=$HOME/borg --with-boost=/opt/local/include/ CPPFLAGS="-g -DNDEBUG -O3" LDFLAGS="-g -DNDEBUG -O3" --disable-static --enable-blas --enable-lapack diff --git a/myconfigure.timing b/myconfigure.timing old mode 100755 new mode 100644 index 6ae568444..067da7efd --- a/myconfigure.timing +++ b/myconfigure.timing @@ -1,2 +1,2 @@ ../configure --prefix=$HOME --with-toolbox=$HOME/toolbox/ CPP="/opt/local/bin/cpp-mp-4.5" CC="/opt/local/bin/gcc-mp-4.5" CXX="/opt/local/bin/g++-mp-4.5" CPPFLAGS="-DENABLE_TIMING -DNDEBUG -O3" LDFLAGS="-DNDEBUG -O3" --disable-static --enable-blas --enable-lapack -#../configure --prefix=$HOME/borg-simplelinear --with-toolbox=$HOME/toolbox/ --with-boost=/opt/local/include/ CPP="/opt/local/bin/cpp-mp-4.5" CC="/opt/local/bin/gcc-mp-4.5" CXX="/opt/local/bin/g++-mp-4.5" CXXFLAGS="-DNDEBUG -g" CFLAGS="-DNDEBUG -g" LDFLAGS="-DNDEBUG -g" --disable-static --enable-blas --enable-lapack +#../configure --prefix=$HOME/borg-simplelinear --with-boost=/opt/local/include/ CPP="/opt/local/bin/cpp-mp-4.5" CC="/opt/local/bin/gcc-mp-4.5" CXX="/opt/local/bin/g++-mp-4.5" CXXFLAGS="-DNDEBUG -g" CFLAGS="-DNDEBUG -g" LDFLAGS="-DNDEBUG -g" --disable-static --enable-blas --enable-lapack