Mercurial > octave-antonio

changeset 19828:13bc2737177c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix incorrect reporting of OpenMP use by configure (bug #44346). * configure.ac: Check whether ax_openmp found compiler options before reporting that OpenMP was used.
author Rik <rik@octave.org>
date Sun, 22 Feb 2015 15:50:21 -0800
parents 2e556954ced8
children 290adbbe95bd
files configure.ac
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sun Feb 22 18:12:57 2015 -0500
+++ b/configure.ac	Sun Feb 22 15:50:21 2015 -0800
@@ -532,8 +532,12 @@
   AC_LANG_PUSH(C++)
   AX_OPENMP
   AC_LANG_POP(C++)
-  CFLAGS="$CFLAGS $OPENMP_CFLAGS"
-  CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+  if test -n "$OPENMP_CFLAGS" && test -n "OPENMP_CXXFLAGS"; then
+    CFLAGS="$CFLAGS $OPENMP_CFLAGS"
+    CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS"
+  else
+    USE_OPENMP=no 
+  fi
 fi
 
 ### Defaults for cross compiling.  BUILD_CC and BUILD_CXX are