summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-11 10:57:23 +0200
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2014-07-11 10:57:23 +0200
commit361fc12cd8d266a01298bce7fcf0b52ce23e7cf2 (patch)
tree84c05b29d76db28364db66845cd0a54420eb9281 /scilab/configure.ac
parent5281e5033e50ff16e8c65c1e2ef3c4cc01b3ba79 (diff)
parentafe150ae2756eef80000b519de439b6a7d562757 (diff)
downloadscilab-361fc12cd8d266a01298bce7fcf0b52ce23e7cf2.zip
scilab-361fc12cd8d266a01298bce7fcf0b52ce23e7cf2.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/configure scilab/modules/core/src/c/tmpdir.c scilab/modules/elementary_functions/sci_gateway/fortran/sci_f_kron.f scilab/modules/fileio/etc/fileio.start scilab/modules/javasci/Makefile.in scilab/modules/overloading/macros/%s_pow.sci Change-Id: Ib756fbd620b6cca56b9d67bdc2a17d5462202e6c
Diffstat (limited to 'scilab/configure.ac')
-rw-r--r--scilab/configure.ac5
1 files changed, 2 insertions, 3 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 2ed48de..a21b084 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -562,8 +562,7 @@ case "$CC" in
562 562
563 if test "$enable_debug_C" = yes; then 563 if test "$enable_debug_C" = yes; then
564 DEBUG_CFLAGS="-pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3 -Wunsafe-loop-optimizations" 564 DEBUG_CFLAGS="-pipe -Wformat -Wshadow -Wfloat-equal -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-noreturn -Wendif-labels -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wwrite-strings -Winline -Wredundant-decls -Wall -Wchar-subscripts -Wextra -Wuninitialized -Wno-format-y2k -Wmissing-format-attribute -Wno-missing-field-initializers -Wno-strict-aliasing -Wold-style-definition -g3 -Wunsafe-loop-optimizations"
565 # used to be -O 565 # used to be -O0
566 # -D_FORTIFY_SOURCE=2
567 case "$host" in 566 case "$host" in
568 *-linux-gnu ) 567 *-linux-gnu )
569 # Only doing that under Linux 568 # Only doing that under Linux
@@ -1456,7 +1455,7 @@ if test "$with_openmp" != no; then
1456# AC_OPENMP 1455# AC_OPENMP
1457 OPENMP_CFLAGS="-fopenmp" 1456 OPENMP_CFLAGS="-fopenmp"
1458 OPENMP_CXXFLAGS="-fopenmp" 1457 OPENMP_CXXFLAGS="-fopenmp"
1459 OPENMP_LIBS="-lgomp" 1458 OPENMP_LIBS="-lgomp -lstdc++" # Force -lstdc++ because some compilers do not add it automatically.
1460 1459
1461 AC_CHECK_HEADERS([omp.h], [], 1460 AC_CHECK_HEADERS([omp.h], [],
1462 [AC_MSG_ERROR([Could not find omp.h])]) 1461 [AC_MSG_ERROR([Could not find omp.h])])