Commit 5fc8698f3c638875578e81c0a2f80ecb096291e8
Merge remote-tracking branch 'origin/release' into devel
Conflicts: configure.ac
Showing
1 changed file
with
3 additions
and
3 deletions
configure.ac
| @@ -763,8 +763,8 @@ if test "x$openmp_ok" = "xyes"; then | @@ -763,8 +763,8 @@ if test "x$openmp_ok" = "xyes"; then | ||
| 763 | # dynamically | 763 | # dynamically |
| 764 | if test "$OPENMP_CXXFLAGS" = "-fopenmp" -a "$ac_sys_system" = "Linux"; then | 764 | if test "$OPENMP_CXXFLAGS" = "-fopenmp" -a "$ac_sys_system" = "Linux"; then |
| 765 | AC_MSG_CHECKING(whether we can dynamically load libgomp) | 765 | AC_MSG_CHECKING(whether we can dynamically load libgomp) |
| 766 | - SAVED_LDFLAGS=$LDFLAGS | ||
| 767 | - LDFLAGS="$LDFLAGS -ldl" | 766 | + SAVED_LIBS=$LIBS |
| 767 | + LIBS="-ldl" | ||
| 768 | AC_TRY_RUN(AC_LANG_PROGRAM([#include <dlfcn.h>], | 768 | AC_TRY_RUN(AC_LANG_PROGRAM([#include <dlfcn.h>], |
| 769 | [if (dlopen("libgomp.so.1", RTLD_NOW) == 0) return 1;]), | 769 | [if (dlopen("libgomp.so.1", RTLD_NOW) == 0) return 1;]), |
| 770 | [AC_MSG_RESULT(yes)], | 770 | [AC_MSG_RESULT(yes)], |
| @@ -772,7 +772,7 @@ if test "x$openmp_ok" = "xyes"; then | @@ -772,7 +772,7 @@ if test "x$openmp_ok" = "xyes"; then | ||
| 772 | AC_MSG_RESULT(no) | 772 | AC_MSG_RESULT(no) |
| 773 | AC_MSG_WARN([OpenMP detected but shared libgomp.so.1 library cannot be dlopen()ed.]) | 773 | AC_MSG_WARN([OpenMP detected but shared libgomp.so.1 library cannot be dlopen()ed.]) |
| 774 | AC_MSG_WARN([If you use a gcc 4.2.x compiler, this is a known feature. Try to use gcc >= 4.3.])]) | 774 | AC_MSG_WARN([If you use a gcc 4.2.x compiler, this is a known feature. Try to use gcc >= 4.3.])]) |
| 775 | - LDFLAGS=$SAVED_LDFLAGS | 775 | + LIBS=$SAVED_LIBS |
| 776 | fi | 776 | fi |
| 777 | 777 | ||
| 778 | # Special Darwin test to see whether OpenMP compiles without adding the | 778 | # Special Darwin test to see whether OpenMP compiles without adding the |