Mercurial > octave-antonio
comparison configure.ac @ 19828:13bc2737177c
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 | bc3e6e96da81 |
children | d0c7b5346d55 |
comparison
equal
deleted
inserted
replaced
19827:2e556954ced8 | 19828:13bc2737177c |
---|---|
530 AX_OPENMP | 530 AX_OPENMP |
531 AC_LANG_POP(C) | 531 AC_LANG_POP(C) |
532 AC_LANG_PUSH(C++) | 532 AC_LANG_PUSH(C++) |
533 AX_OPENMP | 533 AX_OPENMP |
534 AC_LANG_POP(C++) | 534 AC_LANG_POP(C++) |
535 CFLAGS="$CFLAGS $OPENMP_CFLAGS" | 535 if test -n "$OPENMP_CFLAGS" && test -n "OPENMP_CXXFLAGS"; then |
536 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" | 536 CFLAGS="$CFLAGS $OPENMP_CFLAGS" |
537 CXXFLAGS="$CXXFLAGS $OPENMP_CXXFLAGS" | |
538 else | |
539 USE_OPENMP=no | |
540 fi | |
537 fi | 541 fi |
538 | 542 |
539 ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are | 543 ### Defaults for cross compiling. BUILD_CC and BUILD_CXX are |
540 ### the compilers that we use for building tools on the build system. | 544 ### the compilers that we use for building tools on the build system. |
541 ### For now, we assume that the only cross compiling we can do is | 545 ### For now, we assume that the only cross compiling we can do is |