summaryrefslogtreecommitdiffstats
path: root/scilab/configure.ac
diff options
context:
space:
mode:
authorVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-01-08 17:13:53 +0100
committerVincent COUVERT <vincent.couvert@scilab-enterprises.com>2015-01-08 17:14:00 +0100
commit269d420df9ad90542c564143f1a1d66581d34a16 (patch)
tree20e703f3ef6801ce1632d06cf0d33a2e182f593c /scilab/configure.ac
parentb6b8b086ddddb97171b938071e4d6066bd547160 (diff)
parent60c407a56e891f447a3e33ff06b653490cc39e80 (diff)
downloadscilab-269d420df9ad90542c564143f1a1d66581d34a16.zip
scilab-269d420df9ad90542c564143f1a1d66581d34a16.tar.gz
Merge remote-tracking branch 'origin/master' into YaSp
Conflicts: scilab/configure scilab/configure.ac scilab/modules/fileio/Makefile.am scilab/modules/fileio/Makefile.in Change-Id: I7b1bab1dee637e1aa7a7e80cf7cc7f1805b39dd3
Diffstat (limited to 'scilab/configure.ac')
-rw-r--r--scilab/configure.ac22
1 files changed, 21 insertions, 1 deletions
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 46abfaa..c0681cc 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -24,6 +24,18 @@ SCI_BUILDDIR="`pwd`"
24SCI_SRCDIR="$srcdir" 24SCI_SRCDIR="$srcdir"
25SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`" 25SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
26 26
27if test -d "$SCI_SRCDIR_FULL/usr"; then
28 WITH_DEVTOOLS=true
29 DEVTOOLS_BINDIR="$SCI_SRCDIR_FULL/usr/bin"
30 DEVTOOLS_INCDIR="$SCI_SRCDIR_FULL/usr/include"
31 DEVTOOLS_LIBDIR="$SCI_SRCDIR_FULL/usr/lib"
32else
33 WITH_DEVTOOLS=false
34 DEVTOOLS_BINDIR=
35 DEVTOOLS_INCDIR=
36 DEVTOOLS_LIBDIR=
37fi
38
27SCILAB_VERSION_MAJOR=6 39SCILAB_VERSION_MAJOR=6
28SCILAB_VERSION_MINOR=0 40SCILAB_VERSION_MINOR=0
29SCILAB_VERSION_MAINTENANCE=0 41SCILAB_VERSION_MAINTENANCE=0
@@ -1675,7 +1687,12 @@ if test "$with_matio" != no; then
1675 MATIO_CFLAGS="$with_matio_include" 1687 MATIO_CFLAGS="$with_matio_include"
1676 MATIO_LIBS="$with_matio_library -lm -lz -lmatio -lhdf5" 1688 MATIO_LIBS="$with_matio_library -lm -lz -lmatio -lhdf5"
1677 else 1689 else
1678 PKG_CHECK_MODULES(MATIO, [matio >= 1.5.0]) 1690 if $WITH_DEVTOOLS; then # Scilab thirdparties
1691 MATIO_CFLAGS="-I$DEVTOOLS_INCDIR"
1692 MATIO_LIBS="-L$DEVTOOLS_LIBDIR -lm -lz -lmatio -lhdf5"
1693 else
1694 PKG_CHECK_MODULES(MATIO, [matio >= 1.5.0])
1695 fi
1679 fi 1696 fi
1680 1697
1681 save_CFLAGS="$CFLAGS" 1698 save_CFLAGS="$CFLAGS"
@@ -2121,6 +2138,8 @@ echo " Compilation tests (--enable-compilation-tests) ... = $COMPILATION_TESTS"
2121echo " Make the package relocatable (--enable-relocatable)= $RELOCATABLE" 2138echo " Make the package relocatable (--enable-relocatable)= $RELOCATABLE"
2122echo " Use FFTW (--without-fftw) ........................ = $with_fftw" 2139echo " Use FFTW (--without-fftw) ........................ = $with_fftw"
2123echo " Use MATIO (--without-matio) ...................... = $with_matio" 2140echo " Use MATIO (--without-matio) ...................... = $with_matio"
2141echo ""
2142echo " Compile with Scilab thirdparties ................. = $WITH_DEVTOOLS"
2124 2143
2125echo "" 2144echo ""
2126if test "$with_gui" = no; then 2145if test "$with_gui" = no; then
@@ -2409,5 +2428,6 @@ echo " F77 ............ = $F77"
2409echo " FFLAGS ......... = $FFLAGS" 2428echo " FFLAGS ......... = $FFLAGS"
2410echo " SCI_FFLAGS ..... = $SCI_FFLAGS" 2429echo " SCI_FFLAGS ..... = $SCI_FFLAGS"
2411echo " F77_LDFLAGS .... = $F77_LDFLAGS" 2430echo " F77_LDFLAGS .... = $F77_LDFLAGS"
2431echo " FLIBS...... .... = $FLIBS"
2412echo " TERMCAP_LIB .... = $TERMCAP_LIB" 2432echo " TERMCAP_LIB .... = $TERMCAP_LIB"
2413echo "" 2433echo ""