Merge remote-tracking branch 'origin/master' into YaSp

[scilab.git] / scilab / configure.ac

diff --git a/scilab/configure.ac b/scilab/configure.ac
index 1dd2960..1b24ab4 100644 (file)
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -15,7 +15,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 
 AC_REVISION($Revision$)dnl
-AC_INIT([Scilab],[5],[http://bugzilla.scilab.org/])
+AC_INIT([Scilab],[6],[http://bugzilla.scilab.org/])
 AC_PREREQ(2.68)
 AC_CONFIG_MACRO_DIR([m4/])
 
@@ -23,8 +23,8 @@ SCI_BUILDDIR="`pwd`"
 SCI_SRCDIR="$srcdir"
 SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
 
-SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=5
+SCILAB_VERSION_MAJOR=6
+SCILAB_VERSION_MINOR=0
 SCILAB_VERSION_MAINTENANCE=0
 AC_SUBST(SCILAB_VERSION_MAJOR)
 AC_SUBST(SCILAB_VERSION_MINOR)
@@ -140,6 +140,9 @@ AC_ARG_ENABLE(build-swig,
 AC_ARG_ENABLE(build-giws,
     AC_HELP_STRING([--enable-build-giws],[Regenerate C/C++ => Java wrappers produces by Giws (A Java Development Kit (JDK) is mandatory for this option)]))
 
+AC_ARG_ENABLE(build-parser,
+    AC_HELP_STRING([--enable-build-parser],[Regenerate code for the parser (Lex & YACC)]))
+
 
 ################################################
 ########## compilator & misc programs detection
@@ -328,8 +331,7 @@ AC_PROG_F77_C_O
 
 # If this option is provided, enable the debug on C & C++
 if test "$enable_stop_on_warning" = yes; then
-   enable_debug_C=yes
-   enable_debug_CXX=yes
+   enable_debug=yes
 fi
 
 if test "$enable_debug" = yes; then
@@ -699,6 +701,7 @@ if test "$enable_code_coverage" = yes; then
    CODE_COVERAGE_LDFLAGS="-coverage"
 fi
 AM_CONDITIONAL(CODE_COVERAGE, test "$enable_code_coverage" = yes)
+AM_CONDITIONAL(ENABLE_DEBUG, test "$enable_debug" = yes)
 
 # flag for possible compilations in configure
 SCILIBS_CFLAGS=''
@@ -735,6 +738,33 @@ esac
 #######################
 AC_CHECK_UNDERSCORE_FORTRAN()
 
+###############################
+### Regenerate the parser files
+### Flex & Yacc
+###############################
+
+if test "$enable_build_parser" = yes; then
+
+   AC_PROG_LEX
+   if test -z "$LEX" -o "$LEX" = ":"; then
+         AC_MSG_ERROR([No implementation of Lex (flex, lex) detected. Please install it (package flex)])
+   fi
+
+   AC_PROG_YACC
+   if test -z "$YACC"; then
+         AC_MSG_ERROR([No implementation of Yacc (bison, yacc) detected. Please install it (package bison)])
+  fi
+# Actually, AC_PROG_YACC is lying. It sometimes put yacc into $YACC even it
+# hasn't been able to find it.
+#  AC_CHECK_PROG(YACC_PRESENT, $YACC, AC_MSG_ERROR([No implementation of Yacc (bison, yacc) detected. Please install it (package bison)]) )
+
+   AC_CHECK_PROG(yacc_present, $YACC, "yes","no")
+   if test "x$yacc_present" != "xyes"; then
+      AC_MSG_ERROR([No implementation of Yacc (bison, yacc) detected. Please install it (package bison)])
+   fi
+
+fi
+AM_CONDITIONAL(BUILD_PARSER, test "$enable_build_parser" = yes)
 
 #################
 ## HDF5
@@ -1025,7 +1055,7 @@ interface for JOGL2 - or libGL (OpenGL library) are installed and if the version
                 JLATEXMATH=$PACKAGE_JAR_FILE
                 AC_SUBST(JLATEXMATH)
 
-                AC_JAVA_CHECK_VERSION_PACKAGE([jlatexmath],[import org.scilab.forge.jlatexmath.TeXFormula;],$JLATEXMATH,[1.0.0],[TeXFormula.VERSION])
+                AC_JAVA_CHECK_VERSION_PACKAGE([jlatexmath],[import org.scilab.forge.jlatexmath.TeXFormula;],$JLATEXMATH,[0.9.7],[TeXFormula.VERSION])
 
                 AC_DEFINE([WITH_GUI],[],[With the JAVA stuff (GUI, Console, JOGL...)])
 
@@ -1328,6 +1358,13 @@ AM_CONDITIONAL(FFTW, test "$with_fftw" != no)
 
 
 #################
+## EIGEN
+#################
+
+AC_EIGEN()
+
+
+#################
 ## MPI
 #################
 
@@ -1754,11 +1791,17 @@ AH_BOTTOM([
 #endif
 #define DIR_SEPARATOR "/"
 
+#ifdef DIR_SEPARATORW
+          #undef DIR_SEPARATORW
+#endif
+#define DIR_SEPARATORW L"/"
+
 #endif /* MACHINE_H  */
 ])
 
 # Define the standard extension of a dynamic library
 AC_DEFINE_UNQUOTED([SHARED_LIB_EXT],["$shrext_cmds"],[Extension of a shared library])
+AC_DEFINE_UNQUOTED([SHARED_LIB_EXTW],[L"$shrext_cmds"],[Extension of a shared library ( wide string )])
 
 #################
 ## stop on warning
@@ -1793,6 +1836,12 @@ libs/libst/Makefile
 contrib/Makefile
 desktop/images/icons/Makefile
 desktop/Makefile
+modules/threads/Makefile
+modules/ast/Makefile
+modules/parse/Makefile
+modules/symbol/Makefile
+modules/functions_manager/Makefile
+modules/system_env/Makefile
 modules/helptools/Makefile
 modules/data_structures/Makefile
 modules/differential_equations/Makefile
@@ -1814,12 +1863,10 @@ modules/symbolic/Makefile
 modules/signal_processing/Makefile
 modules/arnoldi/Makefile
 modules/interpolation/Makefile
-modules/intersci/Makefile
 modules/localization/Makefile
 modules/cacsd/Makefile
 modules/boolean/Makefile
 modules/integer/Makefile
-modules/double/Makefile
 modules/fileio/Makefile
 modules/spreadsheet/Makefile
 modules/string/Makefile
@@ -1857,6 +1904,7 @@ modules/genetic_algorithms/Makefile
 modules/simulated_annealing/Makefile
 modules/parameters/Makefile
 modules/matio/Makefile
+modules/operations/Makefile
 modules/atoms/Makefile
 modules/xcos/Makefile
 modules/scinotes/Makefile
@@ -2034,6 +2082,10 @@ else
 fi
 
 echo ""
+echo "Eigen3 Configuration:"
+echo "  EIGEN CPPFLAGS ...... = $EIGEN_CPPFLAGS"
+
+echo ""
 if test $MATIO_ENABLE = yes;  then
    echo "MATIO Configuration:"
    echo "  MATIO LIBS .......... = $MATIO_LIBS"
@@ -2190,6 +2242,15 @@ echo "  PCRE_CFLAGS ........ = $PCRE_CFLAGS"
 echo "  PCRE_LIBS .......... = $PCRE_LIBS"
 echo "  PCRE_VERSION ....... = $PCRE_VERSION"
 
+echo ""
+echo "Regenerate Scilab's parser"
+if test "$enable_build_parser" != no; then
+echo "  YACC ............... = $YACC"
+echo "  LEX ................ = $LEX"
+echo "  YFLAGS ............. = $YFLAGS"
+else
+echo "  Regenerate parser disabled (will use embedded sources)"
+fi
 
 echo ""
 echo "SWIG Configuration:"