Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

add minor changes to config.options.irg, and make sure broken gsl doe…

…sn't break build
  • Loading branch information...
commit 9cf0409bf3d499f3f2e64f53ccb849a00df49f7d 1 parent 4b8cc8d
@novas0x2a novas0x2a authored
Showing with 3 additions and 6 deletions.
  1. +2 −6 config.options.irg
  2. +1 −0  configure.ac
View
8 config.options.irg
@@ -21,10 +21,6 @@ VW_INSTALL=$PREFIX
# need this for qmake
QT_PATH=$IRGPKG_DIR/qt-4/bin
-## Use this for speed
-#HAVE_PKG_CLAPACK=no
-#HAVE_PKG_SLAPACK=/usr
-
# Use this if it should run on every irg machine
HAVE_PKG_CLAPACK=$IRGPKG_DIR/LAPACK
@@ -32,14 +28,14 @@ HAVE_PKG_BOOST=$IRGPKG_DIR/boost
HAVE_PKG_GEOS=$IRGPKG_DIR/geos
HAVE_PKG_GSL=$IRGPKG_DIR/gsl
HAVE_PKG_ISIS=$IRGPKG_DIR/isis3/isis
-HAVE_PKG_MBA10=$PWD/thirdparty/MBA_1.0_gpl
+HAVE_PKG_MBA=$PWD/thirdparty/MBA-1.1
HAVE_PKG_OPENSCENEGRAPH=$IRGPKG_DIR/OpenSceneGraph
HAVE_PKG_QT=$IRGPKG_DIR/qt-4
HAVE_PKG_QT_CORE=$IRGPKG_DIR/qt-4
HAVE_PKG_QT_GUI=$IRGPKG_DIR/qt-4
HAVE_PKG_QT_INCLUDE=$IRGPKG_DIR/qt-4
HAVE_PKG_QT_SQL=$IRGPKG_DIR/qt-4
-HAVE_PKG_QWT_PLAIN=$IRGPKG_DIR/qwt
+HAVE_PKG_QWT=$IRGPKG_DIR/qwt
HAVE_PKG_SPICE=$IRGPKG_DIR/cspice
HAVE_PKG_SUPERLU=$IRGPKG_DIR/superlu
HAVE_PKG_VW_CAMERA=$VW_INSTALL
View
1  configure.ac
@@ -176,6 +176,7 @@ AX_PKG_ONE_OF(QWT,
AX_PKG_ONE_OF(GSL,
GSL_HASBLAS, [AX_PKG(GSL_HASBLAS, [LAPACK], [-lgsl])],
+ GSL_ASNEEDED, [AX_PKG(GSL_ASNEEDED, [LAPACK], [-Wl,-no-as-needed,-lgsl,-lgslcblas,-as-needed])],
GSL_NEEDBLAS, [AX_PKG(GSL_NEEDBLAS, [LAPACK], [-lgsl -lgslcblas])])
if test x"$host_vendor" = "xapple"; then
Please sign in to comment.
Something went wrong with that request. Please try again.