41 matlab threads (toastpp#57)

* configure: thread support is now default (must be disabled with --disable-threads). toastpp#41: matlab build now recognises thread flag

* adjusted travis.yml to new configure options

.travis.yml

@@ -12,15 +12,15 @@ matrix:
             - csh
             - python-numpy
       env:
-        - CONFIGOPTS=
+        - CONFIGOPTS="--disable-threads"
     - os: linux
       addons:
         apt:
           packages:
             - gfortran
             - csh
             - python-numpy      
-      env: CONFIGOPTS="--enable-threads --enable-fdot"
+      env: CONFIGOPTS="--enable-fdot"
     - os: osx
       osx_image: xcode7.3
 

Makefile.incl.in

@@ -206,5 +206,8 @@ MEXFLAGS =
 ifeq ($(BUILD_FDOT),1)
       MEXFLAGS += -DMESA_SUPPORT
 endif
+ifeq ($(ENABLE_PTHREAD),yes)
+     MEXFLAGS += -DTOAST_THREAD
+endif
 MEXINC = $(INCLUDE)
 MEXLIB = $(STOASTLIB) -llbfgs

configure

@@ -1439,7 +1439,7 @@ Optional Features:
   --enable-debug          build debug version
   --enable-prof           build profiling version
   --enable-zoltan         build with Zoltan load-balancing support
-  --enable-threads        build pthreads parallel version
+  --disable-threads        do not build multithreaded version
   --enable-mpi            build MPI distributed version
   --enable-cuda           enable CUDA GPU support
   --disable-shared        do not build shared TOAST libraries
@@ -7124,8 +7124,8 @@ if test -f /usr/lib/NextStep/software_version; then
 else
     system=`uname -s`-`uname -r`
     if test "$?" -ne 0 ; then
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (can't find uname command)" >&5
-$as_echo "unknown (can't find uname command)" >&6; }
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: unknown (cannot find uname command)" >&5
+$as_echo "unknown (cannot find uname command)" >&6; }
 	system=unknown
     else
 	# Special check for weird MP-RAS system (uname returns weird
@@ -7420,12 +7420,12 @@ fi
 
 # Check whether --enable-threads was given.
 if test "${enable_threads+set}" = set; then :
-  enableval=$enable_threads; isok=$enableval
+  enableval=$enable_threads; isok=yes
 else
   isok=no
 fi
 
-if test "$isok" = "yes" ; then
+if test "$isok" = "no" ; then
     CXXFLAGS="${CXXFLAGS} -DTOAST_THREAD"
     MATLAB_TOASTFLAGS="-DTOAST_THREAD"
     NEED_PTHREAD=yes

configure.ac

@@ -307,7 +307,7 @@ if test -f /usr/lib/NextStep/software_version; then
 else
     system=`uname -s`-`uname -r`
     if test "$?" -ne 0 ; then
-	AC_MSG_RESULT([unknown (can't find uname command)])
+	AC_MSG_RESULT([unknown (cannot find uname command)])
 	system=unknown
     else
 	# Special check for weird MP-RAS system (uname returns weird
@@ -522,9 +522,9 @@ AC_SUBST(ZOLTANLIBDIR)
 # Check whether user wants to build a threaded version
 
 AC_ARG_ENABLE(threads,
-    [  --enable-threads        build pthreads parallel version],
-    [isok=$enableval], [isok=no])
-if test "$isok" = "yes" ; then
+    [  --disable-threads        do not build multithreaded version],
+    [isok=yes], [isok=no])
+if test "$isok" = "no" ; then
     CXXFLAGS="${CXXFLAGS} -DTOAST_THREAD"
     MATLAB_TOASTFLAGS="-DTOAST_THREAD"
     NEED_PTHREAD=yes