Changeset 2656

Timestamp:

Nov 28, 2012 1:35:58 PM (7 years ago)

Author:

stefan

Message:

fix disabling scip-threadsafe and corresponding warning message

Location:

ThirdParty/SCIP/trunk

Files:

• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

ThirdParty/SCIP/trunk/configure

@@ -23490 +23490 @@
 
 else
-  if test $scip_threadsafe = auto ; then
-                  { { echo "$as_me:$LINENO: error: --enable-cbc-parallel selected, but -lpthreads unavailable" >&5
-echo "$as_me: error: --enable-cbc-parallel selected, but -lpthreads unavailable" >&2;}
+  if test $scip_threadsafe = yes ; then
+                  { { echo "$as_me:$LINENO: error: --scip-threadsafe selected, but -lpthreads unavailable" >&5
+echo "$as_me: error: --scip-threadsafe selected, but -lpthreads unavailable" >&2;}
    { (exit 1); exit 1; }; }
                 else

ThirdParty/SCIP/trunk/configure.ac

@@ -203 +203 @@
                 SCIPLIB_PCLIBS="-lpthread $SCIPLIB_PCLIBS"
                ],
-               [if test $scip_threadsafe = auto ; then
-                  AC_MSG_ERROR([--enable-cbc-parallel selected, but -lpthreads unavailable])
+               [if test $scip_threadsafe = yes ; then
+                  AC_MSG_ERROR([--scip-threadsafe selected, but -lpthreads unavailable])
                 else
                   AC_MSG_NOTICE([no pthreads, SCIP will not be threadsafe])