summaryrefslogtreecommitdiffstats
path: root/scilab
diff options
context:
space:
mode:
authorSylvestre Ledru <sylvestre.ledru@scilab.org>2010-10-28 11:05:03 +0200
committerSylvestre Ledru <sylvestre.ledru@scilab.org>2010-12-01 09:59:39 +0100
commit94ccab615358f6e447363a6e6969c10628ba9a86 (patch)
treeeb2f50d9d32815dfeeb39174557a4c2750109b34 /scilab
parent1984fcecff151f0c2a5179c55a926ac923aaee16 (diff)
downloadscilab-94ccab615358f6e447363a6e6969c10628ba9a86.zip
scilab-94ccab615358f6e447363a6e6969c10628ba9a86.tar.gz
* Add the detection of Javadoc
* Add target "make javadoc" Change-Id: I039e66abd6b2d6ff68881258d0723561648b8911
Diffstat (limited to 'scilab')
-rw-r--r--scilab/Makefile.am6
-rw-r--r--scilab/Makefile.in6
-rw-r--r--scilab/aclocal.m4383
-rwxr-xr-xscilab/configure357
-rw-r--r--scilab/configure.ac1
-rw-r--r--scilab/contrib/Makefile.in1
-rw-r--r--scilab/libs/MALLOC/Makefile.in1
-rw-r--r--scilab/libs/Makefile.in1
-rw-r--r--scilab/libs/doublylinkedlist/Makefile.in1
-rw-r--r--scilab/libs/dynamiclibrary/Makefile.in1
-rw-r--r--scilab/libs/hashtable/Makefile.in1
-rw-r--r--scilab/libs/libst/Makefile.in1
-rw-r--r--scilab/m4/java.m44
-rw-r--r--scilab/modules/Makefile.in1
-rw-r--r--scilab/modules/action_binding/Makefile.in1
-rw-r--r--scilab/modules/api_scilab/Makefile.in1
-rw-r--r--scilab/modules/arnoldi/Makefile.in1
-rw-r--r--scilab/modules/atoms/Makefile.in1
-rw-r--r--scilab/modules/boolean/Makefile.in1
-rw-r--r--scilab/modules/cacsd/Makefile.in1
-rw-r--r--scilab/modules/call_scilab/Makefile.in1
-rw-r--r--scilab/modules/commons/Makefile.in1
-rw-r--r--scilab/modules/compatibility_functions/Makefile.in1
-rw-r--r--scilab/modules/completion/Makefile.in1
-rw-r--r--scilab/modules/console/Makefile.in1
-rw-r--r--scilab/modules/core/Makefile.in1
-rw-r--r--scilab/modules/data_structures/Makefile.in1
-rw-r--r--scilab/modules/demo_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/Makefile.in1
-rw-r--r--scilab/modules/development_tools/src/fake/Makefile.in1
-rw-r--r--scilab/modules/differential_equations/Makefile.in1
-rw-r--r--scilab/modules/double/Makefile.in1
-rw-r--r--scilab/modules/dynamic_link/Makefile.in1
-rw-r--r--scilab/modules/elementary_functions/Makefile.in1
-rw-r--r--scilab/modules/fftw/Makefile.in1
-rw-r--r--scilab/modules/fileio/Makefile.in1
-rw-r--r--scilab/modules/functions/Makefile.in1
-rw-r--r--scilab/modules/genetic_algorithms/Makefile.in1
-rw-r--r--scilab/modules/graph/Makefile.in1
-rw-r--r--scilab/modules/graphic_export/Makefile.in1
-rw-r--r--scilab/modules/graphics/Makefile.in1
-rw-r--r--scilab/modules/gui/Makefile.in1
-rw-r--r--scilab/modules/hdf5/Makefile.in1
-rw-r--r--scilab/modules/helptools/Makefile.in1
-rw-r--r--scilab/modules/history_browser/Makefile.in1
-rw-r--r--scilab/modules/history_manager/Makefile.in1
-rw-r--r--scilab/modules/integer/Makefile.in1
-rw-r--r--scilab/modules/interpolation/Makefile.in1
-rw-r--r--scilab/modules/intersci/Makefile.in1
-rw-r--r--scilab/modules/io/Makefile.in1
-rw-r--r--scilab/modules/javasci/Makefile.in1
-rw-r--r--scilab/modules/jvm/Makefile.in1
-rw-r--r--scilab/modules/linear_algebra/Makefile.in1
-rw-r--r--scilab/modules/localization/Makefile.in1
-rw-r--r--scilab/modules/m2sci/Makefile.in1
-rw-r--r--scilab/modules/maple2scilab/Makefile.in1
-rw-r--r--scilab/modules/matio/Makefile.in1
-rw-r--r--scilab/modules/mexlib/Makefile.in1
-rw-r--r--scilab/modules/modules_manager/Makefile.in1
-rw-r--r--scilab/modules/optimization/Makefile.in1
-rw-r--r--scilab/modules/output_stream/Makefile.in1
-rw-r--r--scilab/modules/overloading/Makefile.in1
-rw-r--r--scilab/modules/parallel/Makefile.in1
-rw-r--r--scilab/modules/parameters/Makefile.in1
-rw-r--r--scilab/modules/polynomials/Makefile.in1
-rw-r--r--scilab/modules/pvm/Makefile.in1
-rw-r--r--scilab/modules/randlib/Makefile.in1
-rw-r--r--scilab/modules/renderer/Makefile.in1
-rw-r--r--scilab/modules/scicos/Makefile.in1
-rw-r--r--scilab/modules/scicos_blocks/Makefile.in1
-rw-r--r--scilab/modules/scinotes/Makefile.in1
-rw-r--r--scilab/modules/shell/Makefile.in1
-rw-r--r--scilab/modules/signal_processing/Makefile.in1
-rw-r--r--scilab/modules/simulated_annealing/Makefile.in1
-rw-r--r--scilab/modules/sound/Makefile.in1
-rw-r--r--scilab/modules/sparse/Makefile.in1
-rw-r--r--scilab/modules/special_functions/Makefile.in1
-rw-r--r--scilab/modules/spreadsheet/Makefile.in1
-rw-r--r--scilab/modules/statistics/Makefile.in1
-rw-r--r--scilab/modules/string/Makefile.in1
-rw-r--r--scilab/modules/symbolic/Makefile.in1
-rw-r--r--scilab/modules/tclsci/Makefile.in1
-rw-r--r--scilab/modules/texmacs/Makefile.in1
-rw-r--r--scilab/modules/time/Makefile.in1
-rw-r--r--scilab/modules/types/Makefile.in1
-rw-r--r--scilab/modules/ui_data/Makefile.in1
-rw-r--r--scilab/modules/umfpack/Makefile.in1
-rw-r--r--scilab/modules/windows_tools/Makefile.in1
-rw-r--r--scilab/modules/xcos/Makefile.in1
89 files changed, 643 insertions, 197 deletions
diff --git a/scilab/Makefile.am b/scilab/Makefile.am
index 426f182..02aa32e 100644
--- a/scilab/Makefile.am
+++ b/scilab/Makefile.am
@@ -144,7 +144,11 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
144 echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \ 144 echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
145 $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce) 145 $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce)
146 146
147doc:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli 147javadoc:
148 $(JAVADOC) -noindex -nohelp -nonavbar -notree -d $(top_builddir)/modules/helptools/javaHelp/scilab_en_US_help/javadoc -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java org.scilab.modules.javasci org.scilab.modules.types
149
150
151doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
148if BUILD_HELP 152if BUILD_HELP
149 -@if test -x $(top_builddir)/scilab-bin; then \ 153 -@if test -x $(top_builddir)/scilab-bin; then \
150 cd $(top_builddir);\ 154 cd $(top_builddir);\
diff --git a/scilab/Makefile.in b/scilab/Makefile.in
index dcf1b6c..cf67fd5 100644
--- a/scilab/Makefile.in
+++ b/scilab/Makefile.in
@@ -393,6 +393,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
393JAR = @JAR@ 393JAR = @JAR@
394JAVA = @JAVA@ 394JAVA = @JAVA@
395JAVAC = @JAVAC@ 395JAVAC = @JAVAC@
396JAVADOC = @JAVADOC@
396JAVAH = @JAVAH@ 397JAVAH = @JAVAH@
397JAVASCI_ENABLE = @JAVASCI_ENABLE@ 398JAVASCI_ENABLE = @JAVASCI_ENABLE@
398JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 399JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
@@ -1651,7 +1652,10 @@ macros:$(top_builddir)/scilab-cli-bin $(top_builddir)/bin/scilab-cli
1651 echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \ 1652 echo "$(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce" ; \
1652 $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce) 1653 $(top_builddir)/bin/scilab-cli -ns -f modules/functions/scripts/buildmacros/buildmacros.sce)
1653 1654
1654doc:$(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli 1655javadoc:
1656 $(JAVADOC) -noindex -nohelp -nonavbar -notree -d $(top_builddir)/modules/helptools/javaHelp/scilab_en_US_help/javadoc -sourcepath $(top_srcdir)/modules/javasci/src/java:$(top_srcdir)/modules/types/src/java org.scilab.modules.javasci org.scilab.modules.types
1657
1658doc: javadoc $(top_builddir)/scilab-bin $(top_builddir)/bin/scilab-adv-cli
1655@BUILD_HELP_TRUE@ -@if test -x $(top_builddir)/scilab-bin; then \ 1659@BUILD_HELP_TRUE@ -@if test -x $(top_builddir)/scilab-bin; then \
1656@BUILD_HELP_TRUE@ cd $(top_builddir);\ 1660@BUILD_HELP_TRUE@ cd $(top_builddir);\
1657@BUILD_HELP_TRUE@ echo "-- Building documentation (English) --"; \ 1661@BUILD_HELP_TRUE@ echo "-- Building documentation (English) --"; \
diff --git a/scilab/aclocal.m4 b/scilab/aclocal.m4
index de8b1ab..bbec5a1 100644
--- a/scilab/aclocal.m4
+++ b/scilab/aclocal.m4
@@ -19,8 +19,8 @@ You have another version of autoconf. It may work, but is not guaranteed to.
19If you have problems, you may need to regenerate the build system entirely. 19If you have problems, you may need to regenerate the build system entirely.
20To do so, use the procedure documented by the package, typically `autoreconf'.])]) 20To do so, use the procedure documented by the package, typically `autoreconf'.])])
21 21
22# gettext.m4 serial 60 (gettext-0.17) 22# gettext.m4 serial 63 (gettext-0.18)
23dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. 23dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
24dnl This file is free software; the Free Software Foundation 24dnl This file is free software; the Free Software Foundation
25dnl gives unlimited permission to copy and/or distribute it, 25dnl gives unlimited permission to copy and/or distribute it,
26dnl with or without modifications, as long as this notice is preserved. 26dnl with or without modifications, as long as this notice is preserved.
@@ -36,7 +36,7 @@ dnl They are *not* in the public domain.
36 36
37dnl Authors: 37dnl Authors:
38dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 38dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
39dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. 39dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
40 40
41dnl Macro to add for using GNU gettext. 41dnl Macro to add for using GNU gettext.
42 42
@@ -81,6 +81,8 @@ AC_DEFUN([AM_GNU_GETTEXT],
81 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , 81 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], ,
82 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT 82 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
83])])])])]) 83])])])])])
84 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
85 [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])])
84 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , 86 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
85 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT 87 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
86])])])]) 88])])])])
@@ -144,11 +146,11 @@ AC_DEFUN([AM_GNU_GETTEXT],
144 gt_use_preinstalled_gnugettext=no 146 gt_use_preinstalled_gnugettext=no
145 ifelse(gt_included_intl, yes, [ 147 ifelse(gt_included_intl, yes, [
146 AC_MSG_CHECKING([whether included gettext is requested]) 148 AC_MSG_CHECKING([whether included gettext is requested])
147 AC_ARG_WITH(included-gettext, 149 AC_ARG_WITH([included-gettext],
148 [ --with-included-gettext use the GNU gettext library included here], 150 [ --with-included-gettext use the GNU gettext library included here],
149 nls_cv_force_use_gnu_gettext=$withval, 151 nls_cv_force_use_gnu_gettext=$withval,
150 nls_cv_force_use_gnu_gettext=no) 152 nls_cv_force_use_gnu_gettext=no)
151 AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) 153 AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
152 154
153 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" 155 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
154 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then 156 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
@@ -288,7 +290,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
288 290
289 if test "$gt_use_preinstalled_gnugettext" = "yes" \ 291 if test "$gt_use_preinstalled_gnugettext" = "yes" \
290 || test "$nls_cv_use_gnu_gettext" = "yes"; then 292 || test "$nls_cv_use_gnu_gettext" = "yes"; then
291 AC_DEFINE(ENABLE_NLS, 1, 293 AC_DEFINE([ENABLE_NLS], [1],
292 [Define to 1 if translation of program messages to the user's native language 294 [Define to 1 if translation of program messages to the user's native language
293 is requested.]) 295 is requested.])
294 else 296 else
@@ -322,9 +324,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
322 fi 324 fi
323 325
324 dnl For backward compatibility. Some packages may be using this. 326 dnl For backward compatibility. Some packages may be using this.
325 AC_DEFINE(HAVE_GETTEXT, 1, 327 AC_DEFINE([HAVE_GETTEXT], [1],
326 [Define if the GNU gettext() function is already present or preinstalled.]) 328 [Define if the GNU gettext() function is already present or preinstalled.])
327 AC_DEFINE(HAVE_DCGETTEXT, 1, 329 AC_DEFINE([HAVE_DCGETTEXT], [1],
328 [Define if the GNU dcgettext() function is already present or preinstalled.]) 330 [Define if the GNU dcgettext() function is already present or preinstalled.])
329 fi 331 fi
330 332
@@ -340,9 +342,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
340 fi 342 fi
341 343
342 dnl Make all variables we use known to autoconf. 344 dnl Make all variables we use known to autoconf.
343 AC_SUBST(BUILD_INCLUDED_LIBINTL) 345 AC_SUBST([BUILD_INCLUDED_LIBINTL])
344 AC_SUBST(USE_INCLUDED_LIBINTL) 346 AC_SUBST([USE_INCLUDED_LIBINTL])
345 AC_SUBST(CATOBJEXT) 347 AC_SUBST([CATOBJEXT])
346 348
347 dnl For backward compatibility. Some configure.ins may be using this. 349 dnl For backward compatibility. Some configure.ins may be using this.
348 nls_cv_header_intl= 350 nls_cv_header_intl=
@@ -350,36 +352,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a
350 352
351 dnl For backward compatibility. Some Makefiles may be using this. 353 dnl For backward compatibility. Some Makefiles may be using this.
352 DATADIRNAME=share 354 DATADIRNAME=share
353 AC_SUBST(DATADIRNAME) 355 AC_SUBST([DATADIRNAME])
354 356
355 dnl For backward compatibility. Some Makefiles may be using this. 357 dnl For backward compatibility. Some Makefiles may be using this.
356 INSTOBJEXT=.mo 358 INSTOBJEXT=.mo
357 AC_SUBST(INSTOBJEXT) 359 AC_SUBST([INSTOBJEXT])
358 360
359 dnl For backward compatibility. Some Makefiles may be using this. 361 dnl For backward compatibility. Some Makefiles may be using this.
360 GENCAT=gencat 362 GENCAT=gencat
361 AC_SUBST(GENCAT) 363 AC_SUBST([GENCAT])
362 364
363 dnl For backward compatibility. Some Makefiles may be using this. 365 dnl For backward compatibility. Some Makefiles may be using this.
364 INTLOBJS= 366 INTLOBJS=
365 if test "$USE_INCLUDED_LIBINTL" = yes; then 367 if test "$USE_INCLUDED_LIBINTL" = yes; then
366 INTLOBJS="\$(GETTOBJS)" 368 INTLOBJS="\$(GETTOBJS)"
367 fi 369 fi
368 AC_SUBST(INTLOBJS) 370 AC_SUBST([INTLOBJS])
369 371
370 dnl Enable libtool support if the surrounding package wishes it. 372 dnl Enable libtool support if the surrounding package wishes it.
371 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix 373 INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix
372 AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) 374 AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX])
373 ]) 375 ])
374 376
375 dnl For backward compatibility. Some Makefiles may be using this. 377 dnl For backward compatibility. Some Makefiles may be using this.
376 INTLLIBS="$LIBINTL" 378 INTLLIBS="$LIBINTL"
377 AC_SUBST(INTLLIBS) 379 AC_SUBST([INTLLIBS])
378 380
379 dnl Make all documented variables known to autoconf. 381 dnl Make all documented variables known to autoconf.
380 AC_SUBST(LIBINTL) 382 AC_SUBST([LIBINTL])
381 AC_SUBST(LTLIBINTL) 383 AC_SUBST([LTLIBINTL])
382 AC_SUBST(POSUB) 384 AC_SUBST([POSUB])
383]) 385])
384 386
385 387
@@ -401,8 +403,8 @@ AC_DEFUN([AM_GNU_GETTEXT_NEED],
401dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version]) 403dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
402AC_DEFUN([AM_GNU_GETTEXT_VERSION], []) 404AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
403 405
404# iconv.m4 serial AM6 (gettext-0.17) 406# iconv.m4 serial 11 (gettext-0.18.1)
405dnl Copyright (C) 2000-2002, 2007 Free Software Foundation, Inc. 407dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc.
406dnl This file is free software; the Free Software Foundation 408dnl This file is free software; the Free Software Foundation
407dnl gives unlimited permission to copy and/or distribute it, 409dnl gives unlimited permission to copy and/or distribute it,
408dnl with or without modifications, as long as this notice is preserved. 410dnl with or without modifications, as long as this notice is preserved.
@@ -437,7 +439,7 @@ AC_DEFUN([AM_ICONV_LINK],
437 am_save_CPPFLAGS="$CPPFLAGS" 439 am_save_CPPFLAGS="$CPPFLAGS"
438 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) 440 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
439 441
440 AC_CACHE_CHECK([for iconv], am_cv_func_iconv, [ 442 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
441 am_cv_func_iconv="no, consider installing GNU libiconv" 443 am_cv_func_iconv="no, consider installing GNU libiconv"
442 am_cv_lib_iconv=no 444 am_cv_lib_iconv=no
443 AC_TRY_LINK([#include <stdlib.h> 445 AC_TRY_LINK([#include <stdlib.h>
@@ -445,7 +447,7 @@ AC_DEFUN([AM_ICONV_LINK],
445 [iconv_t cd = iconv_open("",""); 447 [iconv_t cd = iconv_open("","");
446 iconv(cd,NULL,NULL,NULL,NULL); 448 iconv(cd,NULL,NULL,NULL,NULL);
447 iconv_close(cd);], 449 iconv_close(cd);],
448 am_cv_func_iconv=yes) 450 [am_cv_func_iconv=yes])
449 if test "$am_cv_func_iconv" != yes; then 451 if test "$am_cv_func_iconv" != yes; then
450 am_save_LIBS="$LIBS" 452 am_save_LIBS="$LIBS"
451 LIBS="$LIBS $LIBICONV" 453 LIBS="$LIBS $LIBICONV"
@@ -454,14 +456,14 @@ AC_DEFUN([AM_ICONV_LINK],
454 [iconv_t cd = iconv_open("",""); 456 [iconv_t cd = iconv_open("","");
455 iconv(cd,NULL,NULL,NULL,NULL); 457 iconv(cd,NULL,NULL,NULL,NULL);
456 iconv_close(cd);], 458 iconv_close(cd);],
457 am_cv_lib_iconv=yes 459 [am_cv_lib_iconv=yes]
458 am_cv_func_iconv=yes) 460 [am_cv_func_iconv=yes])
459 LIBS="$am_save_LIBS" 461 LIBS="$am_save_LIBS"
460 fi 462 fi
461 ]) 463 ])
462 if test "$am_cv_func_iconv" = yes; then 464 if test "$am_cv_func_iconv" = yes; then
463 AC_CACHE_CHECK([for working iconv], am_cv_func_iconv_works, [ 465 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
464 dnl This tests against bugs in AIX 5.1 and HP-UX 11.11. 466 dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10.
465 am_save_LIBS="$LIBS" 467 am_save_LIBS="$LIBS"
466 if test $am_cv_lib_iconv = yes; then 468 if test $am_cv_lib_iconv = yes; then
467 LIBS="$LIBS $LIBICONV" 469 LIBS="$LIBS $LIBICONV"
@@ -490,6 +492,25 @@ int main ()
490 return 1; 492 return 1;
491 } 493 }
492 } 494 }
495 /* Test against Solaris 10 bug: Failures are not distinguishable from
496 successful returns. */
497 {
498 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
499 if (cd_ascii_to_88591 != (iconv_t)(-1))
500 {
501 static const char input[] = "\263";
502 char buf[10];
503 const char *inptr = input;
504 size_t inbytesleft = strlen (input);
505 char *outptr = buf;
506 size_t outbytesleft = sizeof (buf);
507 size_t res = iconv (cd_ascii_to_88591,
508 (char **) &inptr, &inbytesleft,
509 &outptr, &outbytesleft);
510 if (res == 0)
511 return 1;
512 }
513 }
493#if 0 /* This bug could be worked around by the caller. */ 514#if 0 /* This bug could be worked around by the caller. */
494 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ 515 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
495 { 516 {
@@ -537,7 +558,7 @@ int main ()
537 am_func_iconv=no am_cv_lib_iconv=no 558 am_func_iconv=no am_cv_lib_iconv=no
538 fi 559 fi
539 if test "$am_func_iconv" = yes; then 560 if test "$am_func_iconv" = yes; then
540 AC_DEFINE(HAVE_ICONV, 1, 561 AC_DEFINE([HAVE_ICONV], [1],
541 [Define if you have the iconv() function and it works.]) 562 [Define if you have the iconv() function and it works.])
542 fi 563 fi
543 if test "$am_cv_lib_iconv" = yes; then 564 if test "$am_cv_lib_iconv" = yes; then
@@ -550,16 +571,31 @@ int main ()
550 LIBICONV= 571 LIBICONV=
551 LTLIBICONV= 572 LTLIBICONV=
552 fi 573 fi
553 AC_SUBST(LIBICONV) 574 AC_SUBST([LIBICONV])
554 AC_SUBST(LTLIBICONV) 575 AC_SUBST([LTLIBICONV])
555]) 576])
556 577
557AC_DEFUN([AM_ICONV], 578dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
579dnl avoid warnings like
580dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
581dnl This is tricky because of the way 'aclocal' is implemented:
582dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
583dnl Otherwise aclocal's initial scan pass would miss the macro definition.
584dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
585dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
586dnl warnings.
587m4_define([gl_iconv_AC_DEFUN],
588 m4_version_prereq([2.64],
589 [[AC_DEFUN_ONCE(
590 [$1], [$2])]],
591 [[AC_DEFUN(
592 [$1], [$2])]]))
593gl_iconv_AC_DEFUN([AM_ICONV],
558[ 594[
559 AM_ICONV_LINK 595 AM_ICONV_LINK
560 if test "$am_cv_func_iconv" = yes; then 596 if test "$am_cv_func_iconv" = yes; then
561 AC_MSG_CHECKING([for iconv declaration]) 597 AC_MSG_CHECKING([for iconv declaration])
562 AC_CACHE_VAL(am_cv_proto_iconv, [ 598 AC_CACHE_VAL([am_cv_proto_iconv], [
563 AC_TRY_COMPILE([ 599 AC_TRY_COMPILE([
564#include <stdlib.h> 600#include <stdlib.h>
565#include <iconv.h> 601#include <iconv.h>
@@ -572,18 +608,18 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si
572#else 608#else
573size_t iconv(); 609size_t iconv();
574#endif 610#endif
575], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") 611], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"])
576 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) 612 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
577 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` 613 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
578 AC_MSG_RESULT([$]{ac_t:- 614 AC_MSG_RESULT([
579 }[$]am_cv_proto_iconv) 615 $am_cv_proto_iconv])
580 AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, 616 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
581 [Define as const if the declaration of iconv() needs const.]) 617 [Define as const if the declaration of iconv() needs const.])
582 fi 618 fi
583]) 619])
584 620
585# intlmacosx.m4 serial 1 (gettext-0.17) 621# intlmacosx.m4 serial 3 (gettext-0.18)
586dnl Copyright (C) 2004-2007 Free Software Foundation, Inc. 622dnl Copyright (C) 2004-2010 Free Software Foundation, Inc.
587dnl This file is free software; the Free Software Foundation 623dnl This file is free software; the Free Software Foundation
588dnl gives unlimited permission to copy and/or distribute it, 624dnl gives unlimited permission to copy and/or distribute it,
589dnl with or without modifications, as long as this notice is preserved. 625dnl with or without modifications, as long as this notice is preserved.
@@ -603,7 +639,7 @@ AC_DEFUN([gt_INTL_MACOSX],
603[ 639[
604 dnl Check for API introduced in MacOS X 10.2. 640 dnl Check for API introduced in MacOS X 10.2.
605 AC_CACHE_CHECK([for CFPreferencesCopyAppValue], 641 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
606 gt_cv_func_CFPreferencesCopyAppValue, 642 [gt_cv_func_CFPreferencesCopyAppValue],
607 [gt_save_LIBS="$LIBS" 643 [gt_save_LIBS="$LIBS"
608 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 644 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
609 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], 645 AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>],
@@ -612,11 +648,11 @@ AC_DEFUN([gt_INTL_MACOSX],
612 [gt_cv_func_CFPreferencesCopyAppValue=no]) 648 [gt_cv_func_CFPreferencesCopyAppValue=no])
613 LIBS="$gt_save_LIBS"]) 649 LIBS="$gt_save_LIBS"])
614 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then 650 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
615 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, 651 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
616 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) 652 [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
617 fi 653 fi
618 dnl Check for API introduced in MacOS X 10.3. 654 dnl Check for API introduced in MacOS X 10.3.
619 AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, 655 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
620 [gt_save_LIBS="$LIBS" 656 [gt_save_LIBS="$LIBS"
621 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" 657 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
622 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], 658 AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();],
@@ -624,7 +660,7 @@ AC_DEFUN([gt_INTL_MACOSX],
624 [gt_cv_func_CFLocaleCopyCurrent=no]) 660 [gt_cv_func_CFLocaleCopyCurrent=no])
625 LIBS="$gt_save_LIBS"]) 661 LIBS="$gt_save_LIBS"])
626 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then 662 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
627 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, 663 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
628 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) 664 [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
629 fi 665 fi
630 INTL_MACOSX_LIBS= 666 INTL_MACOSX_LIBS=
@@ -634,15 +670,15 @@ AC_DEFUN([gt_INTL_MACOSX],
634 AC_SUBST([INTL_MACOSX_LIBS]) 670 AC_SUBST([INTL_MACOSX_LIBS])
635]) 671])
636 672
637# lib-link.m4 serial 13 (gettext-0.17) 673# lib-link.m4 serial 21 (gettext-0.18)
638dnl Copyright (C) 2001-2007 Free Software Foundation, Inc. 674dnl Copyright (C) 2001-2010 Free Software Foundation, Inc.
639dnl This file is free software; the Free Software Foundation 675dnl This file is free software; the Free Software Foundation
640dnl gives unlimited permission to copy and/or distribute it, 676dnl gives unlimited permission to copy and/or distribute it,
641dnl with or without modifications, as long as this notice is preserved. 677dnl with or without modifications, as long as this notice is preserved.
642 678
643dnl From Bruno Haible. 679dnl From Bruno Haible.
644 680
645AC_PREREQ(2.54) 681AC_PREREQ([2.54])
646 682
647dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and 683dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
648dnl the libraries corresponding to explicit and implicit dependencies. 684dnl the libraries corresponding to explicit and implicit dependencies.
@@ -654,9 +690,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
654[ 690[
655 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 691 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
656 AC_REQUIRE([AC_LIB_RPATH]) 692 AC_REQUIRE([AC_LIB_RPATH])
657 define([Name],[translit([$1],[./-], [___])]) 693 pushdef([Name],[translit([$1],[./-], [___])])
658 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 694 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
659 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 695 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
660 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ 696 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
661 AC_LIB_LINKFLAGS_BODY([$1], [$2]) 697 AC_LIB_LINKFLAGS_BODY([$1], [$2])
662 ac_cv_lib[]Name[]_libs="$LIB[]NAME" 698 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
@@ -675,16 +711,17 @@ AC_DEFUN([AC_LIB_LINKFLAGS],
675 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the 711 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
676 dnl results of this search when this library appears as a dependency. 712 dnl results of this search when this library appears as a dependency.
677 HAVE_LIB[]NAME=yes 713 HAVE_LIB[]NAME=yes
678 undefine([Name]) 714 popdef([NAME])
679 undefine([NAME]) 715 popdef([Name])
680]) 716])
681 717
682dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) 718dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
683dnl searches for libname and the libraries corresponding to explicit and 719dnl searches for libname and the libraries corresponding to explicit and
684dnl implicit dependencies, together with the specified include files and 720dnl implicit dependencies, together with the specified include files and
685dnl the ability to compile and link the specified testcode. If found, it 721dnl the ability to compile and link the specified testcode. The missing-message
686dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and 722dnl defaults to 'no' and may contain additional hints for the user.
687dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and 723dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
724dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
688dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs 725dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
689dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. 726dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
690dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname 727dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
@@ -693,9 +730,9 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
693[ 730[
694 AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) 731 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
695 AC_REQUIRE([AC_LIB_RPATH]) 732 AC_REQUIRE([AC_LIB_RPATH])
696 define([Name],[translit([$1],[./-], [___])]) 733 pushdef([Name],[translit([$1],[./-], [___])])
697 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 734 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
698 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 735 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
699 736
700 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME 737 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
701 dnl accordingly. 738 dnl accordingly.
@@ -709,13 +746,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
709 746
710 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ 747 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
711 ac_save_LIBS="$LIBS" 748 ac_save_LIBS="$LIBS"
712 LIBS="$LIBS $LIB[]NAME" 749 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
713 AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) 750 dnl because these -l options might require -L options that are present in
751 dnl LIBS. -l options benefit only from the -L options listed before it.
752 dnl Otherwise, add it to the front of LIBS, because it may be a static
753 dnl library that depends on another static library that is present in LIBS.
754 dnl Static libraries benefit only from the static libraries listed after
755 dnl it.
756 case " $LIB[]NAME" in
757 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
758 *) LIBS="$LIB[]NAME $LIBS" ;;
759 esac
760 AC_TRY_LINK([$3], [$4],
761 [ac_cv_lib[]Name=yes],
762 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
714 LIBS="$ac_save_LIBS" 763 LIBS="$ac_save_LIBS"
715 ]) 764 ])
716 if test "$ac_cv_lib[]Name" = yes; then 765 if test "$ac_cv_lib[]Name" = yes; then
717 HAVE_LIB[]NAME=yes 766 HAVE_LIB[]NAME=yes
718 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) 767 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
719 AC_MSG_CHECKING([how to link with lib[]$1]) 768 AC_MSG_CHECKING([how to link with lib[]$1])
720 AC_MSG_RESULT([$LIB[]NAME]) 769 AC_MSG_RESULT([$LIB[]NAME])
721 else 770 else
@@ -731,8 +780,8 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
731 AC_SUBST([LIB]NAME) 780 AC_SUBST([LIB]NAME)
732 AC_SUBST([LTLIB]NAME) 781 AC_SUBST([LTLIB]NAME)
733 AC_SUBST([LIB]NAME[_PREFIX]) 782 AC_SUBST([LIB]NAME[_PREFIX])
734 undefine([Name]) 783 popdef([NAME])
735 undefine([NAME]) 784 popdef([Name])
736]) 785])
737 786
738dnl Determine the platform dependent parameters needed to use rpath: 787dnl Determine the platform dependent parameters needed to use rpath:
@@ -750,7 +799,7 @@ AC_DEFUN([AC_LIB_RPATH],
750 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld 799 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
751 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host 800 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
752 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir 801 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
753 AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ 802 AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
754 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ 803 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
755 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh 804 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
756 . ./conftest.sh 805 . ./conftest.sh
@@ -767,11 +816,32 @@ AC_DEFUN([AC_LIB_RPATH],
767 acl_hardcode_direct="$acl_cv_hardcode_direct" 816 acl_hardcode_direct="$acl_cv_hardcode_direct"
768 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" 817 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
769 dnl Determine whether the user wants rpath handling at all. 818 dnl Determine whether the user wants rpath handling at all.
770 AC_ARG_ENABLE(rpath, 819 AC_ARG_ENABLE([rpath],
771 [ --disable-rpath do not hardcode runtime library paths], 820 [ --disable-rpath do not hardcode runtime library paths],
772 :, enable_rpath=yes) 821 :, enable_rpath=yes)
773]) 822])
774 823
824dnl AC_LIB_FROMPACKAGE(name, package)
825dnl declares that libname comes from the given package. The configure file
826dnl will then not have a --with-libname-prefix option but a
827dnl --with-package-prefix option. Several libraries can come from the same
828dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
829dnl macro call that searches for libname.
830AC_DEFUN([AC_LIB_FROMPACKAGE],
831[
832 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
833 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
834 define([acl_frompackage_]NAME, [$2])
835 popdef([NAME])
836 pushdef([PACK],[$2])
837 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
838 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
839 define([acl_libsinpackage_]PACKUP,
840 m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1])
841 popdef([PACKUP])
842 popdef([PACK])
843])
844
775dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and 845dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
776dnl the libraries corresponding to explicit and implicit dependencies. 846dnl the libraries corresponding to explicit and implicit dependencies.
777dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. 847dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
@@ -780,19 +850,23 @@ dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
780AC_DEFUN([AC_LIB_LINKFLAGS_BODY], 850AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
781[ 851[
782 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) 852 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
783 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], 853 pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
784 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) 854 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
855 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
856 pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-],
857 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
858 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
785 dnl Autoconf >= 2.61 supports dots in --with options. 859 dnl Autoconf >= 2.61 supports dots in --with options.
786 define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])]) 860 pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)])
787 dnl By default, look in $includedir and $libdir. 861 dnl By default, look in $includedir and $libdir.
788 use_additional=yes 862 use_additional=yes
789 AC_LIB_WITH_FINAL_PREFIX([ 863 AC_LIB_WITH_FINAL_PREFIX([
790 eval additional_includedir=\"$includedir\" 864 eval additional_includedir=\"$includedir\"
791 eval additional_libdir=\"$libdir\" 865 eval additional_libdir=\"$libdir\"
792 ]) 866 ])
793 AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix], 867 AC_ARG_WITH(P_A_C_K[-prefix],
794[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib 868[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
795 --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir], 869 --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
796[ 870[
797 if test "X$withval" = "Xno"; then 871 if test "X$withval" = "Xno"; then
798 use_additional=no 872 use_additional=no
@@ -805,6 +879,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
805 else 879 else
806 additional_includedir="$withval/include" 880 additional_includedir="$withval/include"
807 additional_libdir="$withval/$acl_libdirstem" 881 additional_libdir="$withval/$acl_libdirstem"
882 if test "$acl_libdirstem2" != "$acl_libdirstem" \
883 && ! test -d "$withval/$acl_libdirstem"; then
884 additional_libdir="$withval/$acl_libdirstem2"
885 fi
808 fi 886 fi
809 fi 887 fi
810]) 888])
@@ -814,6 +892,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
814 LTLIB[]NAME= 892 LTLIB[]NAME=
815 INC[]NAME= 893 INC[]NAME=
816 LIB[]NAME[]_PREFIX= 894 LIB[]NAME[]_PREFIX=
895 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
896 dnl computed. So it has to be reset here.
897 HAVE_LIB[]NAME=
817 rpathdirs= 898 rpathdirs=
818 ltrpathdirs= 899 ltrpathdirs=
819 names_already_handled= 900 names_already_handled=
@@ -963,7 +1044,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
963 dnl Linking with a shared library. We attempt to hardcode its 1044 dnl Linking with a shared library. We attempt to hardcode its
964 dnl directory into the executable's runpath, unless it's the 1045 dnl directory into the executable's runpath, unless it's the
965 dnl standard /usr/lib. 1046 dnl standard /usr/lib.
966 if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then 1047 if test "$enable_rpath" = no \
1048 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
1049 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
967 dnl No hardcoding is needed. 1050 dnl No hardcoding is needed.
968 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" 1051 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
969 else 1052 else
@@ -1051,7 +1134,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
1051 case "$found_dir" in 1134 case "$found_dir" in
1052 */$acl_libdirstem | */$acl_libdirstem/) 1135 */$acl_libdirstem | */$acl_libdirstem/)
1053 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` 1136 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
1054 LIB[]NAME[]_PREFIX="$basedir" 1137 if test "$name" = '$1'; then
1138 LIB[]NAME[]_PREFIX="$basedir"
1139 fi
1140 additional_includedir="$basedir/include"
1141 ;;
1142 */$acl_libdirstem2 | */$acl_libdirstem2/)
1143 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
1144 if test "$name" = '$1'; then
1145 LIB[]NAME[]_PREFIX="$basedir"
1146 fi
1055 additional_includedir="$basedir/include" 1147 additional_includedir="$basedir/include"
1056 ;; 1148 ;;
1057 esac 1149 esac
@@ -1112,9 +1204,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
1112 dnl 3. if it's already present in $LDFLAGS or the already 1204 dnl 3. if it's already present in $LDFLAGS or the already
1113 dnl constructed $LIBNAME, 1205 dnl constructed $LIBNAME,
1114 dnl 4. if it doesn't exist as a directory. 1206 dnl 4. if it doesn't exist as a directory.
1115 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then 1207 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
1208 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
1116 haveit= 1209 haveit=
1117 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then 1210 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
1211 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
1118 if test -n "$GCC"; then 1212 if test -n "$GCC"; then
1119 case $host_os in 1213 case $host_os in
1120 linux* | gnu* | k*bsd*-gnu) haveit=yes;; 1214 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -1245,6 +1339,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
1245 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" 1339 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
1246 done 1340 done
1247 fi 1341 fi
1342 popdef([P_A_C_K])
1343 popdef([PACKLIBS])
1344 popdef([PACKUP])
1345 popdef([PACK])
1346 popdef([NAME])
1248]) 1347])
1249 1348
1250dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, 1349dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
@@ -1290,7 +1389,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1290 if test -n "$next"; then 1389 if test -n "$next"; then
1291 dir="$next" 1390 dir="$next"
1292 dnl No need to hardcode the standard /usr/lib. 1391 dnl No need to hardcode the standard /usr/lib.
1293 if test "X$dir" != "X/usr/$acl_libdirstem"; then 1392 if test "X$dir" != "X/usr/$acl_libdirstem" \
1393 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
1294 rpathdirs="$rpathdirs $dir" 1394 rpathdirs="$rpathdirs $dir"
1295 fi 1395 fi
1296 next= 1396 next=
@@ -1299,7 +1399,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1299 -L) next=yes ;; 1399 -L) next=yes ;;
1300 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` 1400 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
1301 dnl No need to hardcode the standard /usr/lib. 1401 dnl No need to hardcode the standard /usr/lib.
1302 if test "X$dir" != "X/usr/$acl_libdirstem"; then 1402 if test "X$dir" != "X/usr/$acl_libdirstem" \
1403 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
1303 rpathdirs="$rpathdirs $dir" 1404 rpathdirs="$rpathdirs $dir"
1304 fi 1405 fi
1305 next= ;; 1406 next= ;;
@@ -1344,8 +1445,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
1344 AC_SUBST([$1]) 1445 AC_SUBST([$1])
1345]) 1446])
1346 1447
1347# lib-prefix.m4 serial 5 (gettext-0.15) 1448# lib-prefix.m4 serial 7 (gettext-0.18)
1348dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. 1449dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc.
1349dnl This file is free software; the Free Software Foundation 1450dnl This file is free software; the Free Software Foundation
1350dnl gives unlimited permission to copy and/or distribute it, 1451dnl gives unlimited permission to copy and/or distribute it,
1351dnl with or without modifications, as long as this notice is preserved. 1452dnl with or without modifications, as long as this notice is preserved.
@@ -1499,39 +1600,79 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
1499 prefix="$acl_save_prefix" 1600 prefix="$acl_save_prefix"
1500]) 1601])
1501 1602
1502dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing 1603dnl AC_LIB_PREPARE_MULTILIB creates
1503dnl the basename of the libdir, either "lib" or "lib64". 1604dnl - a variable acl_libdirstem, containing the basename of the libdir, either
1605dnl "lib" or "lib64" or "lib/64",
1606dnl - a variable acl_libdirstem2, as a secondary possible value for
1607dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
1608dnl "lib/amd64".
1504AC_DEFUN([AC_LIB_PREPARE_MULTILIB], 1609AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
1505[ 1610[
1506 dnl There is no formal standard regarding lib and lib64. The current 1611 dnl There is no formal standard regarding lib and lib64.
1507 dnl practice is that on a system supporting 32-bit and 64-bit instruction 1612 dnl On glibc systems, the current practice is that on a system supporting
1508 dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit 1613 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
1509 dnl libraries go under $prefix/lib. We determine the compiler's default 1614 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine
1510 dnl mode by looking at the compiler's library search path. If at least 1615 dnl the compiler's default mode by looking at the compiler's library search
1511 dnl of its elements ends in /lib64 or points to a directory whose absolute 1616 dnl path. If at least one of its elements ends in /lib64 or points to a
1512 dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the 1617 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
1513 dnl default, namely "lib". 1618 dnl Otherwise we use the default, namely "lib".
1619 dnl On Solaris systems, the current practice is that on a system supporting
1620 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
1621 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
1622 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
1623 AC_REQUIRE([AC_CANONICAL_HOST])
1514 acl_libdirstem=lib 1624 acl_libdirstem=lib
1515 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` 1625 acl_libdirstem2=
1516 if test -n "$searchpath"; then 1626 case "$host_os" in
1517 acl_save_IFS="${IFS= }"; IFS=":" 1627 solaris*)
1518 for searchdir in $searchpath; do 1628 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
1519 if test -d "$searchdir"; then 1629 dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>.
1520 case "$searchdir" in 1630 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
1521 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; 1631 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
1522 *) searchdir=`cd "$searchdir" && pwd` 1632 dnl symlink is missing, so we set acl_libdirstem2 too.
1523 case "$searchdir" in 1633 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
1524 */lib64 ) acl_libdirstem=lib64 ;; 1634 [AC_EGREP_CPP([sixtyfour bits], [
1525 esac ;; 1635#ifdef _LP64
1636sixtyfour bits
1637#endif
1638 ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no])
1639 ])
1640 if test $gl_cv_solaris_64bit = yes; then
1641 acl_libdirstem=lib/64
1642 case "$host_cpu" in
1643 sparc*) acl_libdirstem2=lib/sparcv9 ;;
1644 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
1526 esac 1645 esac
1527 fi 1646 fi
1528 done 1647 ;;
1529 IFS="$acl_save_IFS" 1648 *)
1530 fi 1649 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
1650 if test -n "$searchpath"; then
1651 acl_save_IFS="${IFS= }"; IFS=":"
1652 for searchdir in $searchpath; do
1653 if test -d "$searchdir"; then
1654 case "$searchdir" in
1655 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
1656 */../ | */.. )
1657 # Better ignore directories of this form. They are misleading.
1658 ;;
1659 *) searchdir=`cd "$searchdir" && pwd`
1660 case "$searchdir" in
1661 */lib64 ) acl_libdirstem=lib64 ;;
1662 esac ;;
1663 esac
1664 fi
1665 done
1666 IFS="$acl_save_IFS"
1667 fi
1668 ;;
1669 esac
1670 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
1531]) 1671])
1532 1672
1533# nls.m4 serial 3 (gettext-0.15) 1673# nls.m4 serial 5 (gettext-0.18)
1534dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. 1674dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
1675dnl Inc.
1535dnl This file is free software; the Free Software Foundation 1676dnl This file is free software; the Free Software Foundation
1536dnl gives unlimited permission to copy and/or distribute it, 1677dnl gives unlimited permission to copy and/or distribute it,
1537dnl with or without modifications, as long as this notice is preserved. 1678dnl with or without modifications, as long as this notice is preserved.
@@ -1549,21 +1690,21 @@ dnl Authors:
1549dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 1690dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1550dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 1691dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1551 1692
1552AC_PREREQ(2.50) 1693AC_PREREQ([2.50])
1553 1694
1554AC_DEFUN([AM_NLS], 1695AC_DEFUN([AM_NLS],
1555[ 1696[
1556 AC_MSG_CHECKING([whether NLS is requested]) 1697 AC_MSG_CHECKING([whether NLS is requested])
1557 dnl Default is enabled NLS 1698 dnl Default is enabled NLS
1558 AC_ARG_ENABLE(nls, 1699 AC_ARG_ENABLE([nls],
1559 [ --disable-nls do not use Native Language Support], 1700 [ --disable-nls do not use Native Language Support],
1560 USE_NLS=$enableval, USE_NLS=yes) 1701 USE_NLS=$enableval, USE_NLS=yes)
1561 AC_MSG_RESULT($USE_NLS) 1702 AC_MSG_RESULT([$USE_NLS])
1562 AC_SUBST(USE_NLS) 1703 AC_SUBST([USE_NLS])
1563]) 1704])
1564 1705
1565# po.m4 serial 15 (gettext-0.17) 1706# po.m4 serial 17 (gettext-0.18)
1566dnl Copyright (C) 1995-2007 Free Software Foundation, Inc. 1707dnl Copyright (C) 1995-2010 Free Software Foundation, Inc.
1567dnl This file is free software; the Free Software Foundation 1708dnl This file is free software; the Free Software Foundation
1568dnl gives unlimited permission to copy and/or distribute it, 1709dnl gives unlimited permission to copy and/or distribute it,
1569dnl with or without modifications, as long as this notice is preserved. 1710dnl with or without modifications, as long as this notice is preserved.
@@ -1581,7 +1722,7 @@ dnl Authors:
1581dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. 1722dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1582dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. 1723dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1583 1724
1584AC_PREREQ(2.50) 1725AC_PREREQ([2.50])
1585 1726
1586dnl Checks for all prerequisites of the po subdirectory. 1727dnl Checks for all prerequisites of the po subdirectory.
1587AC_DEFUN([AM_PO_SUBDIRS], 1728AC_DEFUN([AM_PO_SUBDIRS],
@@ -1593,7 +1734,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
1593 1734
1594 dnl Release version of the gettext macros. This is used to ensure that 1735 dnl Release version of the gettext macros. This is used to ensure that
1595 dnl the gettext macros and po/Makefile.in.in are in sync. 1736 dnl the gettext macros and po/Makefile.in.in are in sync.
1596 AC_SUBST([GETTEXT_MACRO_VERSION], [0.17]) 1737 AC_SUBST([GETTEXT_MACRO_VERSION], [0.18])
1597 1738
1598 dnl Perform the following tests also if --disable-nls has been given, 1739 dnl Perform the following tests also if --disable-nls has been given,
1599 dnl because they are needed for "make dist" to work. 1740 dnl because they are needed for "make dist" to work.
@@ -1605,7 +1746,7 @@ AC_DEFUN([AM_PO_SUBDIRS],
1605 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && 1746 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
1606 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], 1747 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
1607 :) 1748 :)
1608 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) 1749 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
1609 1750
1610 dnl Test whether it is GNU msgfmt >= 0.15. 1751 dnl Test whether it is GNU msgfmt >= 0.15.
1611changequote(,)dnl 1752changequote(,)dnl
@@ -2012,8 +2153,8 @@ AC_DEFUN([AM_XGETTEXT_OPTION],
2012 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" 2153 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
2013]) 2154])
2014 2155
2015# progtest.m4 serial 4 (gettext-0.14.2) 2156# progtest.m4 serial 6 (gettext-0.18)
2016dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. 2157dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc.
2017dnl This file is free software; the Free Software Foundation 2158dnl This file is free software; the Free Software Foundation
2018dnl gives unlimited permission to copy and/or distribute it, 2159dnl gives unlimited permission to copy and/or distribute it,
2019dnl with or without modifications, as long as this notice is preserved. 2160dnl with or without modifications, as long as this notice is preserved.
@@ -2030,7 +2171,7 @@ dnl They are *not* in the public domain.
2030dnl Authors: 2171dnl Authors:
2031dnl Ulrich Drepper <drepper@cygnus.com>, 1996. 2172dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
2032 2173
2033AC_PREREQ(2.50) 2174AC_PREREQ([2.50])
2034 2175
2035# Search path for a program which passes the given test. 2176# Search path for a program which passes the given test.
2036 2177
@@ -2069,7 +2210,7 @@ rm -f conf$$.file
2069# Extract the first word of "$2", so it can be a program name with args. 2210# Extract the first word of "$2", so it can be a program name with args.
2070set dummy $2; ac_word=[$]2 2211set dummy $2; ac_word=[$]2
2071AC_MSG_CHECKING([for $ac_word]) 2212AC_MSG_CHECKING([for $ac_word])
2072AC_CACHE_VAL(ac_cv_path_$1, 2213AC_CACHE_VAL([ac_cv_path_$1],
2073[case "[$]$1" in 2214[case "[$]$1" in
2074 [[\\/]]* | ?:[[\\/]]*) 2215 [[\\/]]* | ?:[[\\/]]*)
2075 ac_cv_path_$1="[$]$1" # Let the user override the test with a path. 2216 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
@@ -2098,11 +2239,11 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
2098esac])dnl 2239esac])dnl
2099$1="$ac_cv_path_$1" 2240$1="$ac_cv_path_$1"
2100if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then 2241if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
2101 AC_MSG_RESULT([$]$1) 2242 AC_MSG_RESULT([$][$1])
2102else 2243else
2103 AC_MSG_RESULT(no) 2244 AC_MSG_RESULT([no])
2104fi 2245fi
2105AC_SUBST($1)dnl 2246AC_SUBST([$1])dnl
2106]) 2247])
2107 2248
2108# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 2249# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
diff --git a/scilab/configure b/scilab/configure
index d2ce831..e4fadd0 100755
--- a/scilab/configure
+++ b/scilab/configure
@@ -771,6 +771,7 @@ FLEXDOCK
771JGRAPHX 771JGRAPHX
772ANT 772ANT
773JDB 773JDB
774JAVADOC
774JAR 775JAR
775JAVAH 776JAVAH
776JAVA_G 777JAVA_G
@@ -9916,7 +9917,7 @@ $as_echo "$ac_java_classpath" >&6; }
9916$as_echo_n "checking to see if the java compiler works... " >&6; } 9917$as_echo_n "checking to see if the java compiler works... " >&6; }
9917 9918
9918 cat << \EOF > conftest.java 9919 cat << \EOF > conftest.java
9919// #line 9919 "configure" 9920// #line 9920 "configure"
9920 9921
9921 9922
9922public class conftest { 9923public class conftest {
@@ -9982,7 +9983,7 @@ $as_echo_n "checking type of jvm... " >&6; }
9982 if test "x$ac_java_jvm_name" = "x" ; then 9983 if test "x$ac_java_jvm_name" = "x" ; then
9983 9984
9984 cat << \EOF > conftest.java 9985 cat << \EOF > conftest.java
9985// #line 9985 "configure" 9986// #line 9986 "configure"
9986import gnu.java.io.EncodingManager; 9987import gnu.java.io.EncodingManager;
9987 9988
9988public class conftest { 9989public class conftest {
@@ -10046,7 +10047,7 @@ $as_echo_n "checking java API version... " >&6; }
10046 10047
10047 10048
10048 cat << \EOF > conftest.java 10049 cat << \EOF > conftest.java
10049// #line 10049 "configure" 10050// #line 10050 "configure"
10050import java.nio.charset.Charset; 10051import java.nio.charset.Charset;
10051 10052
10052public class conftest { 10053public class conftest {
@@ -10091,7 +10092,7 @@ EOF
10091 10092
10092 10093
10093 cat << \EOF > conftest.java 10094 cat << \EOF > conftest.java
10094// #line 10094 "configure" 10095// #line 10095 "configure"
10095import java.lang.StringBuilder; 10096import java.lang.StringBuilder;
10096 10097
10097public class conftest { 10098public class conftest {
@@ -11030,6 +11031,97 @@ fi
11030 11031
11031 11032
11032 11033
11034 # Don't error if javadoc can not be found
11035
11036 if test "$cross_compiling" = "yes" ; then
11037 # Extract the first word of "javadoc", so it can be a program name with args.
11038set dummy javadoc; ac_word=$2
11039{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11040$as_echo_n "checking for $ac_word... " >&6; }
11041if test "${ac_cv_path_JAVADOC+set}" = set; then :
11042 $as_echo_n "(cached) " >&6
11043else
11044 case $JAVADOC in
11045 [\\/]* | ?:[\\/]*)
11046 ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path.
11047 ;;
11048 *)
11049 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11050for as_dir in $PATH
11051do
11052 IFS=$as_save_IFS
11053 test -z "$as_dir" && as_dir=.
11054 for ac_exec_ext in '' $ac_executable_extensions; do
11055 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11056 ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
11057 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11058 break 2
11059 fi
11060done
11061 done
11062IFS=$as_save_IFS
11063
11064 ;;
11065esac
11066fi
11067JAVADOC=$ac_cv_path_JAVADOC
11068if test -n "$JAVADOC"; then
11069 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
11070$as_echo "$JAVADOC" >&6; }
11071else
11072 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11073$as_echo "no" >&6; }
11074fi
11075
11076
11077 else
11078 # Extract the first word of "javadoc", so it can be a program name with args.
11079set dummy javadoc; ac_word=$2
11080{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
11081$as_echo_n "checking for $ac_word... " >&6; }
11082if test "${ac_cv_path_JAVADOC+set}" = set; then :
11083 $as_echo_n "(cached) " >&6
11084else
11085 case $JAVADOC in
11086 [\\/]* | ?:[\\/]*)
11087 ac_cv_path_JAVADOC="$JAVADOC" # Let the user override the test with a path.
11088 ;;
11089 *)
11090 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
11091for as_dir in $ac_java_jvm_dir/bin
11092do
11093 IFS=$as_save_IFS
11094 test -z "$as_dir" && as_dir=.
11095 for ac_exec_ext in '' $ac_executable_extensions; do
11096 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
11097 ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext"
11098 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11099 break 2
11100 fi
11101done
11102 done
11103IFS=$as_save_IFS
11104
11105 ;;
11106esac
11107fi
11108JAVADOC=$ac_cv_path_JAVADOC
11109if test -n "$JAVADOC"; then
11110 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5
11111$as_echo "$JAVADOC" >&6; }
11112else
11113 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
11114$as_echo "no" >&6; }
11115fi
11116
11117
11118 fi
11119
11120 # Check to see if JAVADOC could not be found
11121
11122
11123
11124
11033 # Don't error if jdb can not be found 11125 # Don't error if jdb can not be found
11034 11126
11035 if test "$cross_compiling" = "yes" ; then 11127 if test "$cross_compiling" = "yes" ; then
@@ -11366,7 +11458,7 @@ $as_echo_n "checking jgraphx... " >&6; }
11366 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11458 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11367 11459
11368 cat << \EOF > conftest.java 11460 cat << \EOF > conftest.java
11369// #line 11369 "configure" 11461// #line 11461 "configure"
11370import com.mxgraph.model.mxCell; 11462import com.mxgraph.model.mxCell;
11371 11463
11372public class conftest { 11464public class conftest {
@@ -11460,7 +11552,7 @@ $as_echo_n "checking minimal version (1.4.1.0) of jgraphx... " >&6; }
11460 if test "x=" == "x"; then 11552 if test "x=" == "x"; then
11461 11553
11462 cat << \EOF > conftest.java 11554 cat << \EOF > conftest.java
11463// #line 11463 "configure" 11555// #line 11555 "configure"
11464import com.mxgraph.view.mxGraph; 11556import com.mxgraph.view.mxGraph;
11465 11557
11466public class conftest { 11558public class conftest {
@@ -11511,7 +11603,7 @@ EOF
11511 else 11603 else
11512 11604
11513 cat << \EOF > conftest.java 11605 cat << \EOF > conftest.java
11514// #line 11514 "configure" 11606// #line 11606 "configure"
11515import com.mxgraph.view.mxGraph; 11607import com.mxgraph.view.mxGraph;
11516 11608
11517public class conftest { 11609public class conftest {
@@ -11584,7 +11676,7 @@ $as_echo_n "checking flexdock... " >&6; }
11584 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11676 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11585 11677
11586 cat << \EOF > conftest.java 11678 cat << \EOF > conftest.java
11587// #line 11587 "configure" 11679// #line 11679 "configure"
11588import org.flexdock.docking.DockingManager; 11680import org.flexdock.docking.DockingManager;
11589 11681
11590public class conftest { 11682public class conftest {
@@ -11678,7 +11770,7 @@ $as_echo_n "checking minimal version (0.5.2) of flexdock... " >&6; }
11678 if test "x" == "x"; then 11770 if test "x" == "x"; then
11679 11771
11680 cat << \EOF > conftest.java 11772 cat << \EOF > conftest.java
11681// #line 11681 "configure" 11773// #line 11773 "configure"
11682import org.flexdock.util.Utilities; 11774import org.flexdock.util.Utilities;
11683 11775
11684public class conftest { 11776public class conftest {
@@ -11729,7 +11821,7 @@ EOF
11729 else 11821 else
11730 11822
11731 cat << \EOF > conftest.java 11823 cat << \EOF > conftest.java
11732// #line 11732 "configure" 11824// #line 11824 "configure"
11733import org.flexdock.util.Utilities; 11825import org.flexdock.util.Utilities;
11734 11826
11735public class conftest { 11827public class conftest {
@@ -11802,7 +11894,7 @@ $as_echo_n "checking looks... " >&6; }
11802 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 11894 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11803 11895
11804 cat << \EOF > conftest.java 11896 cat << \EOF > conftest.java
11805// #line 11805 "configure" 11897// #line 11897 "configure"
11806import com.jgoodies.looks.common.RenderingUtils; 11898import com.jgoodies.looks.common.RenderingUtils;
11807 11899
11808public class conftest { 11900public class conftest {
@@ -11909,7 +12001,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
11909 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12001 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
11910 12002
11911 cat << \EOF > conftest.java 12003 cat << \EOF > conftest.java
11912// #line 11912 "configure" 12004// #line 12004 "configure"
11913import com.jgoodies.looks.common.RenderingUtils; 12005import com.jgoodies.looks.common.RenderingUtils;
11914 12006
11915public class conftest { 12007public class conftest {
@@ -12017,7 +12109,7 @@ $as_echo_n "checking skinlf... " >&6; }
12017 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12109 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12018 12110
12019 cat << \EOF > conftest.java 12111 cat << \EOF > conftest.java
12020// #line 12020 "configure" 12112// #line 12112 "configure"
12021import com.l2fprod.util.AccessUtils; 12113import com.l2fprod.util.AccessUtils;
12022 12114
12023public class conftest { 12115public class conftest {
@@ -12124,7 +12216,7 @@ $as_echo_n "checking jogl... " >&6; }
12124 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12216 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12125 12217
12126 cat << \EOF > conftest.java 12218 cat << \EOF > conftest.java
12127// #line 12127 "configure" 12219// #line 12219 "configure"
12128import javax.media.opengl.glu.GLUnurbs; 12220import javax.media.opengl.glu.GLUnurbs;
12129 12221
12130public class conftest { 12222public class conftest {
@@ -12334,7 +12426,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
12334 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12426 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12335 12427
12336 cat << \EOF > conftest.java 12428 cat << \EOF > conftest.java
12337// #line 12337 "configure" 12429// #line 12429 "configure"
12338import com.sun.gluegen.runtime.CPU; 12430import com.sun.gluegen.runtime.CPU;
12339 12431
12340public class conftest { 12432public class conftest {
@@ -12496,7 +12588,7 @@ $as_echo_n "checking jhall... " >&6; }
12496 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12588 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12497 12589
12498 cat << \EOF > conftest.java 12590 cat << \EOF > conftest.java
12499// #line 12499 "configure" 12591// #line 12591 "configure"
12500import javax.help.JHelp; 12592import javax.help.JHelp;
12501 12593
12502public class conftest { 12594public class conftest {
@@ -12603,7 +12695,7 @@ $as_echo_n "checking javahelp2... " >&6; }
12603 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12695 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12604 12696
12605 cat << \EOF > conftest.java 12697 cat << \EOF > conftest.java
12606// #line 12606 "configure" 12698// #line 12698 "configure"
12607import javax.help.JHelp; 12699import javax.help.JHelp;
12608 12700
12609public class conftest { 12701public class conftest {
@@ -12711,7 +12803,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
12711 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12803 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12712 12804
12713 cat << \EOF > conftest.java 12805 cat << \EOF > conftest.java
12714// #line 12714 "configure" 12806// #line 12806 "configure"
12715import com.artenum.rosetta.interfaces.core.ConsoleConfiguration; 12807import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
12716 12808
12717public class conftest { 12809public class conftest {
@@ -12818,7 +12910,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
12818 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 12910 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12819 12911
12820 cat << \EOF > conftest.java 12912 cat << \EOF > conftest.java
12821// #line 12821 "configure" 12913// #line 12913 "configure"
12822import com.artenum.rosetta.core.action.AbstractConsoleAction; 12914import com.artenum.rosetta.core.action.AbstractConsoleAction;
12823 12915
12824public class conftest { 12916public class conftest {
@@ -12927,7 +13019,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
12927 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13019 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
12928 13020
12929 cat << \EOF > conftest.java 13021 cat << \EOF > conftest.java
12930// #line 12930 "configure" 13022// #line 13022 "configure"
12931import net.sourceforge.jeuclid.LayoutContext; 13023import net.sourceforge.jeuclid.LayoutContext;
12932 13024
12933public class conftest { 13025public class conftest {
@@ -13036,7 +13128,7 @@ $as_echo_n "checking fop... " >&6; }
13036 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13128 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13037 13129
13038 cat << \EOF > conftest.java 13130 cat << \EOF > conftest.java
13039// #line 13039 "configure" 13131// #line 13131 "configure"
13040import org.apache.fop.pdf.PDFInfo; 13132import org.apache.fop.pdf.PDFInfo;
13041 13133
13042public class conftest { 13134public class conftest {
@@ -13143,7 +13235,7 @@ $as_echo_n "checking batik-all... " >&6; }
13143 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13235 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13144 13236
13145 cat << \EOF > conftest.java 13237 cat << \EOF > conftest.java
13146// #line 13146 "configure" 13238// #line 13238 "configure"
13147import org.apache.batik.parser.Parser; 13239import org.apache.batik.parser.Parser;
13148 13240
13149public class conftest { 13241public class conftest {
@@ -13250,7 +13342,7 @@ $as_echo_n "checking batik... " >&6; }
13250 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13342 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13251 13343
13252 cat << \EOF > conftest.java 13344 cat << \EOF > conftest.java
13253// #line 13253 "configure" 13345// #line 13345 "configure"
13254import org.apache.batik.parser.Parser; 13346import org.apache.batik.parser.Parser;
13255 13347
13256public class conftest { 13348public class conftest {
@@ -13344,7 +13436,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
13344 if test "x" == "x"; then 13436 if test "x" == "x"; then
13345 13437
13346 cat << \EOF > conftest.java 13438 cat << \EOF > conftest.java
13347// #line 13347 "configure" 13439// #line 13439 "configure"
13348import org.apache.batik.Version; 13440import org.apache.batik.Version;
13349 13441
13350public class conftest { 13442public class conftest {
@@ -13395,7 +13487,7 @@ EOF
13395 else 13487 else
13396 13488
13397 cat << \EOF > conftest.java 13489 cat << \EOF > conftest.java
13398// #line 13398 "configure" 13490// #line 13490 "configure"
13399import org.apache.batik.Version; 13491import org.apache.batik.Version;
13400 13492
13401public class conftest { 13493public class conftest {
@@ -13468,7 +13560,7 @@ $as_echo_n "checking commons-io... " >&6; }
13468 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13560 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13469 13561
13470 cat << \EOF > conftest.java 13562 cat << \EOF > conftest.java
13471// #line 13471 "configure" 13563// #line 13563 "configure"
13472import org.apache.commons.io.output.CountingOutputStream; 13564import org.apache.commons.io.output.CountingOutputStream;
13473 13565
13474public class conftest { 13566public class conftest {
@@ -13575,7 +13667,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
13575 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13667 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13576 13668
13577 cat << \EOF > conftest.java 13669 cat << \EOF > conftest.java
13578// #line 13578 "configure" 13670// #line 13670 "configure"
13579import org.apache.xmlgraphics.util.Service; 13671import org.apache.xmlgraphics.util.Service;
13580 13672
13581public class conftest { 13673public class conftest {
@@ -13682,7 +13774,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
13682 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13774 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13683 13775
13684 cat << \EOF > conftest.java 13776 cat << \EOF > conftest.java
13685// #line 13685 "configure" 13777// #line 13777 "configure"
13686import org.apache.avalon.framework.configuration.ConfigurationException; 13778import org.apache.avalon.framework.configuration.ConfigurationException;
13687 13779
13688public class conftest { 13780public class conftest {
@@ -13789,7 +13881,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
13789 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13881 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13790 13882
13791 cat << \EOF > conftest.java 13883 cat << \EOF > conftest.java
13792// #line 13792 "configure" 13884// #line 13884 "configure"
13793import org.w3c.dom.svg.SVGDocument; 13885import org.w3c.dom.svg.SVGDocument;
13794 13886
13795public class conftest { 13887public class conftest {
@@ -13896,7 +13988,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
13896 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 13988 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
13897 13989
13898 cat << \EOF > conftest.java 13990 cat << \EOF > conftest.java
13899// #line 13899 "configure" 13991// #line 13991 "configure"
13900import org.w3c.dom.svg.SVGDocument; 13992import org.w3c.dom.svg.SVGDocument;
13901 13993
13902public class conftest { 13994public class conftest {
@@ -14007,7 +14099,7 @@ $as_echo_n "checking commons-logging... " >&6; }
14007 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14099 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14008 14100
14009 cat << \EOF > conftest.java 14101 cat << \EOF > conftest.java
14010// #line 14010 "configure" 14102// #line 14102 "configure"
14011import org.apache.commons.logging.LogFactory; 14103import org.apache.commons.logging.LogFactory;
14012 14104
14013public class conftest { 14105public class conftest {
@@ -14114,7 +14206,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
14114 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14206 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14115 14207
14116 cat << \EOF > conftest.java 14208 cat << \EOF > conftest.java
14117// #line 14117 "configure" 14209// #line 14209 "configure"
14118import org.scilab.forge.jlatexmath.TeXFormula; 14210import org.scilab.forge.jlatexmath.TeXFormula;
14119 14211
14120public class conftest { 14212public class conftest {
@@ -14208,7 +14300,7 @@ $as_echo_n "checking minimal version (0.9.3) of jlatexmath... " >&6; }
14208 if test "x" == "x"; then 14300 if test "x" == "x"; then
14209 14301
14210 cat << \EOF > conftest.java 14302 cat << \EOF > conftest.java
14211// #line 14211 "configure" 14303// #line 14303 "configure"
14212import org.scilab.forge.jlatexmath.TeXFormula; 14304import org.scilab.forge.jlatexmath.TeXFormula;
14213 14305
14214public class conftest { 14306public class conftest {
@@ -14259,7 +14351,7 @@ EOF
14259 else 14351 else
14260 14352
14261 cat << \EOF > conftest.java 14353 cat << \EOF > conftest.java
14262// #line 14262 "configure" 14354// #line 14354 "configure"
14263import org.scilab.forge.jlatexmath.TeXFormula; 14355import org.scilab.forge.jlatexmath.TeXFormula;
14264 14356
14265public class conftest { 14357public class conftest {
@@ -14338,7 +14430,7 @@ $as_echo_n "checking checkstyle... " >&6; }
14338 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14430 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14339 14431
14340 cat << \EOF > conftest.java 14432 cat << \EOF > conftest.java
14341// #line 14341 "configure" 14433// #line 14433 "configure"
14342import com.puppycrawl.tools.checkstyle.CheckStyleTask; 14434import com.puppycrawl.tools.checkstyle.CheckStyleTask;
14343 14435
14344public class conftest { 14436public class conftest {
@@ -14445,7 +14537,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
14445 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14537 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14446 14538
14447 cat << \EOF > conftest.java 14539 cat << \EOF > conftest.java
14448// #line 14448 "configure" 14540// #line 14540 "configure"
14449import org.apache.commons.beanutils.Converter; 14541import org.apache.commons.beanutils.Converter;
14450 14542
14451public class conftest { 14543public class conftest {
@@ -14552,7 +14644,7 @@ $as_echo_n "checking antlr... " >&6; }
14552 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14644 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14553 14645
14554 cat << \EOF > conftest.java 14646 cat << \EOF > conftest.java
14555// #line 14555 "configure" 14647// #line 14647 "configure"
14556import antlr.TokenStreamException; 14648import antlr.TokenStreamException;
14557 14649
14558public class conftest { 14650public class conftest {
@@ -14659,7 +14751,7 @@ $as_echo_n "checking testng... " >&6; }
14659 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14751 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14660 14752
14661 cat << \EOF > conftest.java 14753 cat << \EOF > conftest.java
14662// #line 14662 "configure" 14754// #line 14754 "configure"
14663import org.testng.TestNG; 14755import org.testng.TestNG;
14664 14756
14665public class conftest { 14757public class conftest {
@@ -14766,7 +14858,7 @@ $as_echo_n "checking qdox... " >&6; }
14766 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14858 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14767 14859
14768 cat << \EOF > conftest.java 14860 cat << \EOF > conftest.java
14769// #line 14769 "configure" 14861// #line 14861 "configure"
14770import com.thoughtworks.qdox.tools.QDoxTester; 14862import com.thoughtworks.qdox.tools.QDoxTester;
14771 14863
14772public class conftest { 14864public class conftest {
@@ -14873,7 +14965,7 @@ $as_echo_n "checking bsh... " >&6; }
14873 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 14965 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14874 14966
14875 cat << \EOF > conftest.java 14967 cat << \EOF > conftest.java
14876// #line 14876 "configure" 14968// #line 14968 "configure"
14877import bsh.Console; 14969import bsh.Console;
14878 14970
14879public class conftest { 14971public class conftest {
@@ -14980,7 +15072,7 @@ $as_echo_n "checking junit... " >&6; }
14980 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 15072 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
14981 15073
14982 cat << \EOF > conftest.java 15074 cat << \EOF > conftest.java
14983// #line 14983 "configure" 15075// #line 15075 "configure"
14984import junit.framework.Assert; 15076import junit.framework.Assert;
14985 15077
14986public class conftest { 15078public class conftest {
@@ -16378,7 +16470,7 @@ $as_echo "$USE_NLS" >&6; }
16378 16470
16379 16471
16380 16472
16381 GETTEXT_MACRO_VERSION=0.17 16473 GETTEXT_MACRO_VERSION=0.18
16382 16474
16383 16475
16384 16476
@@ -16679,23 +16771,70 @@ fi
16679 prefix="$acl_save_prefix" 16771 prefix="$acl_save_prefix"
16680 16772
16681 16773
16682 acl_libdirstem=lib 16774
16683 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` 16775 acl_libdirstem=lib
16684 if test -n "$searchpath"; then 16776 acl_libdirstem2=
16685 acl_save_IFS="${IFS= }"; IFS=":" 16777 case "$host_os" in
16686 for searchdir in $searchpath; do 16778 solaris*)
16687 if test -d "$searchdir"; then 16779 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5
16688 case "$searchdir" in 16780$as_echo_n "checking for 64-bit host... " >&6; }
16689 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; 16781if test "${gl_cv_solaris_64bit+set}" = set; then :
16690 *) searchdir=`cd "$searchdir" && pwd` 16782 $as_echo_n "(cached) " >&6
16691 case "$searchdir" in 16783else
16692 */lib64 ) acl_libdirstem=lib64 ;; 16784 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
16693 esac ;; 16785/* end confdefs.h. */
16786
16787#ifdef _LP64
16788sixtyfour bits
16789#endif
16790
16791_ACEOF
16792if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
16793 $EGREP "sixtyfour bits" >/dev/null 2>&1; then :
16794 gl_cv_solaris_64bit=yes
16795else
16796 gl_cv_solaris_64bit=no
16797fi
16798rm -f conftest*
16799
16800
16801fi
16802{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5
16803$as_echo "$gl_cv_solaris_64bit" >&6; }
16804 if test $gl_cv_solaris_64bit = yes; then
16805 acl_libdirstem=lib/64
16806 case "$host_cpu" in
16807 sparc*) acl_libdirstem2=lib/sparcv9 ;;
16808 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
16694 esac 16809 esac
16695 fi 16810 fi
16696 done 16811 ;;
16697 IFS="$acl_save_IFS" 16812 *)
16698 fi 16813 searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
16814 if test -n "$searchpath"; then
16815 acl_save_IFS="${IFS= }"; IFS=":"
16816 for searchdir in $searchpath; do
16817 if test -d "$searchdir"; then
16818 case "$searchdir" in
16819 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
16820 */../ | */.. )
16821 # Better ignore directories of this form. They are misleading.
16822 ;;
16823 *) searchdir=`cd "$searchdir" && pwd`
16824 case "$searchdir" in
16825 */lib64 ) acl_libdirstem=lib64 ;;
16826 esac ;;
16827 esac
16828 fi
16829 done
16830 IFS="$acl_save_IFS"
16831 fi
16832 ;;
16833 esac
16834 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
16835
16836
16837
16699 16838
16700 16839
16701 16840
@@ -16741,6 +16880,10 @@ if test "${with_libiconv_prefix+set}" = set; then :
16741 else 16880 else
16742 additional_includedir="$withval/include" 16881 additional_includedir="$withval/include"
16743 additional_libdir="$withval/$acl_libdirstem" 16882 additional_libdir="$withval/$acl_libdirstem"
16883 if test "$acl_libdirstem2" != "$acl_libdirstem" \
16884 && ! test -d "$withval/$acl_libdirstem"; then
16885 additional_libdir="$withval/$acl_libdirstem2"
16886 fi
16744 fi 16887 fi
16745 fi 16888 fi
16746 16889
@@ -16750,6 +16893,7 @@ fi
16750 LTLIBICONV= 16893 LTLIBICONV=
16751 INCICONV= 16894 INCICONV=
16752 LIBICONV_PREFIX= 16895 LIBICONV_PREFIX=
16896 HAVE_LIBICONV=
16753 rpathdirs= 16897 rpathdirs=
16754 ltrpathdirs= 16898 ltrpathdirs=
16755 names_already_handled= 16899 names_already_handled=
@@ -16892,7 +17036,9 @@ fi
16892 if test "X$found_dir" != "X"; then 17036 if test "X$found_dir" != "X"; then
16893 LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" 17037 LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name"
16894 if test "X$found_so" != "X"; then 17038 if test "X$found_so" != "X"; then
16895 if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then 17039 if test "$enable_rpath" = no \
17040 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
17041 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
16896 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" 17042 LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so"
16897 else 17043 else
16898 haveit= 17044 haveit=
@@ -16959,7 +17105,16 @@ fi
16959 case "$found_dir" in 17105 case "$found_dir" in
16960 */$acl_libdirstem | */$acl_libdirstem/) 17106 */$acl_libdirstem | */$acl_libdirstem/)
16961 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` 17107 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
16962 LIBICONV_PREFIX="$basedir" 17108 if test "$name" = 'iconv'; then
17109 LIBICONV_PREFIX="$basedir"
17110 fi
17111 additional_includedir="$basedir/include"
17112 ;;
17113 */$acl_libdirstem2 | */$acl_libdirstem2/)
17114 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
17115 if test "$name" = 'iconv'; then
17116 LIBICONV_PREFIX="$basedir"
17117 fi
16963 additional_includedir="$basedir/include" 17118 additional_includedir="$basedir/include"
16964 ;; 17119 ;;
16965 esac 17120 esac
@@ -17008,9 +17163,11 @@ fi
17008 case "$dep" in 17163 case "$dep" in
17009 -L*) 17164 -L*)
17010 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` 17165 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
17011 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then 17166 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
17167 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
17012 haveit= 17168 haveit=
17013 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then 17169 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
17170 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
17014 if test -n "$GCC"; then 17171 if test -n "$GCC"; then
17015 case $host_os in 17172 case $host_os in
17016 linux* | gnu* | k*bsd*-gnu) haveit=yes;; 17173 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -17160,6 +17317,12 @@ fi
17160 17317
17161 17318
17162 17319
17320
17321
17322
17323
17324
17325
17163 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 17326 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5
17164$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } 17327$as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; }
17165if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then : 17328if test "${gt_cv_func_CFPreferencesCopyAppValue+set}" = set; then :
@@ -17432,6 +17595,25 @@ int main ()
17432 return 1; 17595 return 1;
17433 } 17596 }
17434 } 17597 }
17598 /* Test against Solaris 10 bug: Failures are not distinguishable from
17599 successful returns. */
17600 {
17601 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
17602 if (cd_ascii_to_88591 != (iconv_t)(-1))
17603 {
17604 static const char input[] = "\263";
17605 char buf[10];
17606 const char *inptr = input;
17607 size_t inbytesleft = strlen (input);
17608 char *outptr = buf;
17609 size_t outbytesleft = sizeof (buf);
17610 size_t res = iconv (cd_ascii_to_88591,
17611 (char **) &inptr, &inbytesleft,
17612 &outptr, &outbytesleft);
17613 if (res == 0)
17614 return 1;
17615 }
17616 }
17435#if 0 /* This bug could be worked around by the caller. */ 17617#if 0 /* This bug could be worked around by the caller. */
17436 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ 17618 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
17437 { 17619 {
@@ -17510,6 +17692,9 @@ $as_echo "$LIBICONV" >&6; }
17510 17692
17511 17693
17512 17694
17695
17696
17697
17513 use_additional=yes 17698 use_additional=yes
17514 17699
17515 acl_save_prefix="$prefix" 17700 acl_save_prefix="$prefix"
@@ -17546,6 +17731,10 @@ if test "${with_libintl_prefix+set}" = set; then :
17546 else 17731 else
17547 additional_includedir="$withval/include" 17732 additional_includedir="$withval/include"
17548 additional_libdir="$withval/$acl_libdirstem" 17733 additional_libdir="$withval/$acl_libdirstem"
17734 if test "$acl_libdirstem2" != "$acl_libdirstem" \
17735 && ! test -d "$withval/$acl_libdirstem"; then
17736 additional_libdir="$withval/$acl_libdirstem2"
17737 fi
17549 fi 17738 fi
17550 fi 17739 fi
17551 17740
@@ -17555,6 +17744,7 @@ fi
17555 LTLIBINTL= 17744 LTLIBINTL=
17556 INCINTL= 17745 INCINTL=
17557 LIBINTL_PREFIX= 17746 LIBINTL_PREFIX=
17747 HAVE_LIBINTL=
17558 rpathdirs= 17748 rpathdirs=
17559 ltrpathdirs= 17749 ltrpathdirs=
17560 names_already_handled= 17750 names_already_handled=
@@ -17697,7 +17887,9 @@ fi
17697 if test "X$found_dir" != "X"; then 17887 if test "X$found_dir" != "X"; then
17698 LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" 17888 LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name"
17699 if test "X$found_so" != "X"; then 17889 if test "X$found_so" != "X"; then
17700 if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then 17890 if test "$enable_rpath" = no \
17891 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
17892 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
17701 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" 17893 LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so"
17702 else 17894 else
17703 haveit= 17895 haveit=
@@ -17764,7 +17956,16 @@ fi
17764 case "$found_dir" in 17956 case "$found_dir" in
17765 */$acl_libdirstem | */$acl_libdirstem/) 17957 */$acl_libdirstem | */$acl_libdirstem/)
17766 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` 17958 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
17767 LIBINTL_PREFIX="$basedir" 17959 if test "$name" = 'intl'; then
17960 LIBINTL_PREFIX="$basedir"
17961 fi
17962 additional_includedir="$basedir/include"
17963 ;;
17964 */$acl_libdirstem2 | */$acl_libdirstem2/)
17965 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
17966 if test "$name" = 'intl'; then
17967 LIBINTL_PREFIX="$basedir"
17968 fi
17768 additional_includedir="$basedir/include" 17969 additional_includedir="$basedir/include"
17769 ;; 17970 ;;
17770 esac 17971 esac
@@ -17813,9 +18014,11 @@ fi
17813 case "$dep" in 18014 case "$dep" in
17814 -L*) 18015 -L*)
17815 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` 18016 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
17816 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then 18017 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
18018 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
17817 haveit= 18019 haveit=
17818 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then 18020 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
18021 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
17819 if test -n "$GCC"; then 18022 if test -n "$GCC"; then
17820 case $host_os in 18023 case $host_os in
17821 linux* | gnu* | k*bsd*-gnu) haveit=yes;; 18024 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
@@ -17941,6 +18144,11 @@ fi
17941 done 18144 done
17942 fi 18145 fi
17943 18146
18147
18148
18149
18150
18151
17944 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 18152 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5
17945$as_echo_n "checking for GNU gettext in libintl... " >&6; } 18153$as_echo_n "checking for GNU gettext in libintl... " >&6; }
17946if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then : 18154if { as_var=$gt_func_gnugettext_libintl; eval "test \"\${$as_var+set}\" = set"; }; then :
@@ -18893,7 +19101,7 @@ $as_echo_n "checking jhdf5... " >&6; }
18893 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 19101 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
18894 19102
18895 cat << \EOF > conftest.java 19103 cat << \EOF > conftest.java
18896// #line 18896 "configure" 19104// #line 19104 "configure"
18897import ncsa.hdf.hdf5lib.HDF5Constants; 19105import ncsa.hdf.hdf5lib.HDF5Constants;
18898 19106
18899public class conftest { 19107public class conftest {
@@ -19042,7 +19250,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
19042 if test "x" == "x"; then 19250 if test "x" == "x"; then
19043 19251
19044 cat << \EOF > conftest.java 19252 cat << \EOF > conftest.java
19045// #line 19045 "configure" 19253// #line 19253 "configure"
19046import ncsa.hdf.hdf5lib.H5; 19254import ncsa.hdf.hdf5lib.H5;
19047 19255
19048public class conftest { 19256public class conftest {
@@ -19097,7 +19305,7 @@ EOF
19097 else 19305 else
19098 19306
19099 cat << \EOF > conftest.java 19307 cat << \EOF > conftest.java
19100// #line 19100 "configure" 19308// #line 19308 "configure"
19101import ncsa.hdf.hdf5lib.H5; 19309import ncsa.hdf.hdf5lib.H5;
19102 19310
19103public class conftest { 19311public class conftest {
@@ -23682,7 +23890,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
23682{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5 23890{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
23683$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; } 23891$as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
23684cat > conftest.$ac_ext <<EOF 23892cat > conftest.$ac_ext <<EOF
23685#line 23685 "configure" 23893#line 23893 "configure"
23686#include "confdefs.h" 23894#include "confdefs.h"
23687 23895
23688#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME" 23896#include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -23994,7 +24202,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
23994$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; } 24202$as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
23995 24203
23996cat > conftest.$ac_ext <<EOF 24204cat > conftest.$ac_ext <<EOF
23997#line 23997 "configure" 24205#line 24205 "configure"
23998#include "confdefs.h" 24206#include "confdefs.h"
23999 24207
24000#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME" 24208#include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -24578,7 +24786,7 @@ $as_echo_n "checking saxon... " >&6; }
24578 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24786 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
24579 24787
24580 cat << \EOF > conftest.java 24788 cat << \EOF > conftest.java
24581// #line 24581 "configure" 24789// #line 24789 "configure"
24582import com.icl.saxon.Loader; 24790import com.icl.saxon.Loader;
24583 24791
24584public class conftest { 24792public class conftest {
@@ -24685,7 +24893,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
24685 export ac_java_classpath="$jar_resolved:$ac_java_classpath" 24893 export ac_java_classpath="$jar_resolved:$ac_java_classpath"
24686 24894
24687 cat << \EOF > conftest.java 24895 cat << \EOF > conftest.java
24688// #line 24688 "configure" 24896// #line 24896 "configure"
24689import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj; 24897import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
24690 24898
24691public class conftest { 24899public class conftest {
@@ -30986,7 +31194,7 @@ else
30986 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31194 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
30987 lt_status=$lt_dlunknown 31195 lt_status=$lt_dlunknown
30988 cat > conftest.$ac_ext <<_LT_EOF 31196 cat > conftest.$ac_ext <<_LT_EOF
30989#line 30989 "configure" 31197#line 31197 "configure"
30990#include "confdefs.h" 31198#include "confdefs.h"
30991 31199
30992#if HAVE_DLFCN_H 31200#if HAVE_DLFCN_H
@@ -31092,7 +31300,7 @@ else
31092 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 31300 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
31093 lt_status=$lt_dlunknown 31301 lt_status=$lt_dlunknown
31094 cat > conftest.$ac_ext <<_LT_EOF 31302 cat > conftest.$ac_ext <<_LT_EOF
31095#line 31095 "configure" 31303#line 31303 "configure"
31096#include "confdefs.h" 31304#include "confdefs.h"
31097 31305
31098#if HAVE_DLFCN_H 31306#if HAVE_DLFCN_H
@@ -40531,6 +40739,7 @@ echo " JAVA_JNI_INCLUDE .... = $JAVA_JNI_INCLUDE"
40531echo " JAVA_JNI_LIBS ....... = $JAVA_JNI_LIBS" 40739echo " JAVA_JNI_LIBS ....... = $JAVA_JNI_LIBS"
40532echo " JAVA_JNI_LIBS_PRELOAD = $JAVA_JNI_LIBS_PRELOAD" 40740echo " JAVA_JNI_LIBS_PRELOAD = $JAVA_JNI_LIBS_PRELOAD"
40533echo " JAVA ................ = $JAVA" 40741echo " JAVA ................ = $JAVA"
40742echo " JAVADOC ............. = $JAVADOC"
40534echo " JAR ................. = $JAR" 40743echo " JAR ................. = $JAR"
40535echo " ANT ................. = $ANT" 40744echo " ANT ................. = $ANT"
40536else 40745else
diff --git a/scilab/configure.ac b/scilab/configure.ac
index 18b63c9..d0e406f 100644
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -1974,6 +1974,7 @@ echo " JAVA_JNI_INCLUDE .... = $JAVA_JNI_INCLUDE"
1974echo " JAVA_JNI_LIBS ....... = $JAVA_JNI_LIBS" 1974echo " JAVA_JNI_LIBS ....... = $JAVA_JNI_LIBS"
1975echo " JAVA_JNI_LIBS_PRELOAD = $JAVA_JNI_LIBS_PRELOAD" 1975echo " JAVA_JNI_LIBS_PRELOAD = $JAVA_JNI_LIBS_PRELOAD"
1976echo " JAVA ................ = $JAVA" 1976echo " JAVA ................ = $JAVA"
1977echo " JAVADOC ............. = $JAVADOC"
1977echo " JAR ................. = $JAR" 1978echo " JAR ................. = $JAR"
1978echo " ANT ................. = $ANT" 1979echo " ANT ................. = $ANT"
1979else 1980else
diff --git a/scilab/contrib/Makefile.in b/scilab/contrib/Makefile.in
index 1ee5dec..856a5ef 100644
--- a/scilab/contrib/Makefile.in
+++ b/scilab/contrib/Makefile.in
@@ -136,6 +136,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
136JAR = @JAR@ 136JAR = @JAR@
137JAVA = @JAVA@ 137JAVA = @JAVA@
138JAVAC = @JAVAC@ 138JAVAC = @JAVAC@
139JAVADOC = @JAVADOC@
139JAVAH = @JAVAH@ 140JAVAH = @JAVAH@
140JAVASCI_ENABLE = @JAVASCI_ENABLE@ 141JAVASCI_ENABLE = @JAVASCI_ENABLE@
141JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 142JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/libs/MALLOC/Makefile.in b/scilab/libs/MALLOC/Makefile.in
index a2a4868..4986883 100644
--- a/scilab/libs/MALLOC/Makefile.in
+++ b/scilab/libs/MALLOC/Makefile.in
@@ -205,6 +205,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
205JAR = @JAR@ 205JAR = @JAR@
206JAVA = @JAVA@ 206JAVA = @JAVA@
207JAVAC = @JAVAC@ 207JAVAC = @JAVAC@
208JAVADOC = @JAVADOC@
208JAVAH = @JAVAH@ 209JAVAH = @JAVAH@
209JAVASCI_ENABLE = @JAVASCI_ENABLE@ 210JAVASCI_ENABLE = @JAVASCI_ENABLE@
210JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 211JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/libs/Makefile.in b/scilab/libs/Makefile.in
index 8d55b18..229ebce 100644
--- a/scilab/libs/Makefile.in
+++ b/scilab/libs/Makefile.in
@@ -174,6 +174,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
174JAR = @JAR@ 174JAR = @JAR@
175JAVA = @JAVA@ 175JAVA = @JAVA@
176JAVAC = @JAVAC@ 176JAVAC = @JAVAC@
177JAVADOC = @JAVADOC@
177JAVAH = @JAVAH@ 178JAVAH = @JAVAH@
178JAVASCI_ENABLE = @JAVASCI_ENABLE@ 179JAVASCI_ENABLE = @JAVASCI_ENABLE@
179JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 180JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/libs/doublylinkedlist/Makefile.in b/scilab/libs/doublylinkedlist/Makefile.in
index 3e9d527..7fa0f0d 100644
--- a/scilab/libs/doublylinkedlist/Makefile.in
+++ b/scilab/libs/doublylinkedlist/Makefile.in
@@ -207,6 +207,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
207JAR = @JAR@ 207JAR = @JAR@
208JAVA = @JAVA@ 208JAVA = @JAVA@
209JAVAC = @JAVAC@ 209JAVAC = @JAVAC@
210JAVADOC = @JAVADOC@
210JAVAH = @JAVAH@ 211JAVAH = @JAVAH@
211JAVASCI_ENABLE = @JAVASCI_ENABLE@ 212JAVASCI_ENABLE = @JAVASCI_ENABLE@
212JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 213JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/libs/dynamiclibrary/Makefile.in b/scilab/libs/dynamiclibrary/Makefile.in
index 7610862..b4d03b4 100644
--- a/scilab/libs/dynamiclibrary/Makefile.in
+++ b/scilab/libs/dynamiclibrary/Makefile.in
@@ -207,6 +207,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
207JAR = @JAR@ 207JAR = @JAR@
208JAVA = @JAVA@ 208JAVA = @JAVA@
209JAVAC = @JAVAC@ 209JAVAC = @JAVAC@
210JAVADOC = @JAVADOC@
210JAVAH = @JAVAH@ 211JAVAH = @JAVAH@
211JAVASCI_ENABLE = @JAVASCI_ENABLE@ 212JAVASCI_ENABLE = @JAVASCI_ENABLE@
212JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 213JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/libs/hashtable/Makefile.in b/scilab/libs/hashtable/Makefile.in
index 8167ffe..fa2e45f 100644
--- a/scilab/libs/hashtable/Makefile.in
+++ b/scilab/libs/hashtable/Makefile.in
@@ -205,6 +205,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
205JAR = @JAR@ 205JAR = @JAR@
206JAVA = @JAVA@ 206JAVA = @JAVA@
207JAVAC = @JAVAC@ 207JAVAC = @JAVAC@
208JAVADOC = @JAVADOC@
208JAVAH = @JAVAH@ 209JAVAH = @JAVAH@
209JAVASCI_ENABLE = @JAVASCI_ENABLE@ 210JAVASCI_ENABLE = @JAVASCI_ENABLE@
210JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 211JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/libs/libst/Makefile.in b/scilab/libs/libst/Makefile.in
index d860f99..69353c3 100644
--- a/scilab/libs/libst/Makefile.in
+++ b/scilab/libs/libst/Makefile.in
@@ -201,6 +201,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
201JAR = @JAR@ 201JAR = @JAR@
202JAVA = @JAVA@ 202JAVA = @JAVA@
203JAVAC = @JAVAC@ 203JAVAC = @JAVAC@
204JAVADOC = @JAVADOC@
204JAVAH = @JAVAH@ 205JAVAH = @JAVAH@
205JAVASCI_ENABLE = @JAVASCI_ENABLE@ 206JAVASCI_ENABLE = @JAVASCI_ENABLE@
206JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 207JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/m4/java.m4 b/scilab/m4/java.m4
index 77dc35f..fa26150 100644
--- a/scilab/m4/java.m4
+++ b/scilab/m4/java.m4
@@ -731,6 +731,7 @@ AC_DEFUN([AC_JAVA_WITH_JDK], [
731# JAVAH 731# JAVAH
732# JAR 732# JAR
733# JDB 733# JDB
734# JAVADOC
734# 735#
735# DEPENDS ON: 736# DEPENDS ON:
736# This macro must be run after the AC_JAVA_DETECT_JVM macro as 737# This macro must be run after the AC_JAVA_DETECT_JVM macro as
@@ -762,6 +763,9 @@ AC_DEFUN([AC_JAVA_TOOLS], [
762 763
763 AC_JAVA_TOOLS_CHECK(JAR, jar, $ac_java_jvm_bin_dir) 764 AC_JAVA_TOOLS_CHECK(JAR, jar, $ac_java_jvm_bin_dir)
764 765
766 # Don't error if javadoc can not be found
767 AC_JAVA_TOOLS_CHECK(JAVADOC, javadoc, $ac_java_jvm_dir/bin, 1)
768
765 # Don't error if jdb can not be found 769 # Don't error if jdb can not be found
766 AC_JAVA_TOOLS_CHECK(JDB, jdb, $ac_java_jvm_bin_dir, 1) 770 AC_JAVA_TOOLS_CHECK(JDB, jdb, $ac_java_jvm_bin_dir, 1)
767 771
diff --git a/scilab/modules/Makefile.in b/scilab/modules/Makefile.in
index 75fff28..5c39990 100644
--- a/scilab/modules/Makefile.in
+++ b/scilab/modules/Makefile.in
@@ -264,6 +264,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
264JAR = @JAR@ 264JAR = @JAR@
265JAVA = @JAVA@ 265JAVA = @JAVA@
266JAVAC = @JAVAC@ 266JAVAC = @JAVAC@
267JAVADOC = @JAVADOC@
267JAVAH = @JAVAH@ 268JAVAH = @JAVAH@
268JAVASCI_ENABLE = @JAVASCI_ENABLE@ 269JAVASCI_ENABLE = @JAVASCI_ENABLE@
269JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 270JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/action_binding/Makefile.in b/scilab/modules/action_binding/Makefile.in
index 49194b7..267928f 100644
--- a/scilab/modules/action_binding/Makefile.in
+++ b/scilab/modules/action_binding/Makefile.in
@@ -253,6 +253,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
253JAR = @JAR@ 253JAR = @JAR@
254JAVA = @JAVA@ 254JAVA = @JAVA@
255JAVAC = @JAVAC@ 255JAVAC = @JAVAC@
256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
258JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 259JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/api_scilab/Makefile.in b/scilab/modules/api_scilab/Makefile.in
index 9243f67..7b9117c 100644
--- a/scilab/modules/api_scilab/Makefile.in
+++ b/scilab/modules/api_scilab/Makefile.in
@@ -221,6 +221,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
221JAR = @JAR@ 221JAR = @JAR@
222JAVA = @JAVA@ 222JAVA = @JAVA@
223JAVAC = @JAVAC@ 223JAVAC = @JAVAC@
224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
226JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/arnoldi/Makefile.in b/scilab/modules/arnoldi/Makefile.in
index 216aef2..6a72992 100644
--- a/scilab/modules/arnoldi/Makefile.in
+++ b/scilab/modules/arnoldi/Makefile.in
@@ -243,6 +243,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
243JAR = @JAR@ 243JAR = @JAR@
244JAVA = @JAVA@ 244JAVA = @JAVA@
245JAVAC = @JAVAC@ 245JAVAC = @JAVAC@
246JAVADOC = @JAVADOC@
246JAVAH = @JAVAH@ 247JAVAH = @JAVAH@
247JAVASCI_ENABLE = @JAVASCI_ENABLE@ 248JAVASCI_ENABLE = @JAVASCI_ENABLE@
248JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 249JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/atoms/Makefile.in b/scilab/modules/atoms/Makefile.in
index fddb2ba..e5e444a 100644
--- a/scilab/modules/atoms/Makefile.in
+++ b/scilab/modules/atoms/Makefile.in
@@ -186,6 +186,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
186JAR = @JAR@ 186JAR = @JAR@
187JAVA = @JAVA@ 187JAVA = @JAVA@
188JAVAC = @JAVAC@ 188JAVAC = @JAVAC@
189JAVADOC = @JAVADOC@
189JAVAH = @JAVAH@ 190JAVAH = @JAVAH@
190JAVASCI_ENABLE = @JAVASCI_ENABLE@ 191JAVASCI_ENABLE = @JAVASCI_ENABLE@
191JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 192JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/boolean/Makefile.in b/scilab/modules/boolean/Makefile.in
index bf2d138..ff39a86 100644
--- a/scilab/modules/boolean/Makefile.in
+++ b/scilab/modules/boolean/Makefile.in
@@ -223,6 +223,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
223JAR = @JAR@ 223JAR = @JAR@
224JAVA = @JAVA@ 224JAVA = @JAVA@
225JAVAC = @JAVAC@ 225JAVAC = @JAVAC@
226JAVADOC = @JAVADOC@
226JAVAH = @JAVAH@ 227JAVAH = @JAVAH@
227JAVASCI_ENABLE = @JAVASCI_ENABLE@ 228JAVASCI_ENABLE = @JAVASCI_ENABLE@
228JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 229JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/cacsd/Makefile.in b/scilab/modules/cacsd/Makefile.in
index 591fea1..6c8eebc 100644
--- a/scilab/modules/cacsd/Makefile.in
+++ b/scilab/modules/cacsd/Makefile.in
@@ -317,6 +317,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
317JAR = @JAR@ 317JAR = @JAR@
318JAVA = @JAVA@ 318JAVA = @JAVA@
319JAVAC = @JAVAC@ 319JAVAC = @JAVAC@
320JAVADOC = @JAVADOC@
320JAVAH = @JAVAH@ 321JAVAH = @JAVAH@
321JAVASCI_ENABLE = @JAVASCI_ENABLE@ 322JAVASCI_ENABLE = @JAVASCI_ENABLE@
322JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 323JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/call_scilab/Makefile.in b/scilab/modules/call_scilab/Makefile.in
index a65150c..0f270fe 100644
--- a/scilab/modules/call_scilab/Makefile.in
+++ b/scilab/modules/call_scilab/Makefile.in
@@ -218,6 +218,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
218JAR = @JAR@ 218JAR = @JAR@
219JAVA = @JAVA@ 219JAVA = @JAVA@
220JAVAC = @JAVAC@ 220JAVAC = @JAVAC@
221JAVADOC = @JAVADOC@
221JAVAH = @JAVAH@ 222JAVAH = @JAVAH@
222JAVASCI_ENABLE = @JAVASCI_ENABLE@ 223JAVASCI_ENABLE = @JAVASCI_ENABLE@
223JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 224JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/commons/Makefile.in b/scilab/modules/commons/Makefile.in
index 7e7e800..68e360f 100644
--- a/scilab/modules/commons/Makefile.in
+++ b/scilab/modules/commons/Makefile.in
@@ -238,6 +238,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
238JAR = @JAR@ 238JAR = @JAR@
239JAVA = @JAVA@ 239JAVA = @JAVA@
240JAVAC = @JAVAC@ 240JAVAC = @JAVAC@
241JAVADOC = @JAVADOC@
241JAVAH = @JAVAH@ 242JAVAH = @JAVAH@
242JAVASCI_ENABLE = @JAVASCI_ENABLE@ 243JAVASCI_ENABLE = @JAVASCI_ENABLE@
243JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 244JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/compatibility_functions/Makefile.in b/scilab/modules/compatibility_functions/Makefile.in
index aadaf1c..8afea7b 100644
--- a/scilab/modules/compatibility_functions/Makefile.in
+++ b/scilab/modules/compatibility_functions/Makefile.in
@@ -183,6 +183,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
183JAR = @JAR@ 183JAR = @JAR@
184JAVA = @JAVA@ 184JAVA = @JAVA@
185JAVAC = @JAVAC@ 185JAVAC = @JAVAC@
186JAVADOC = @JAVADOC@
186JAVAH = @JAVAH@ 187JAVAH = @JAVAH@
187JAVASCI_ENABLE = @JAVASCI_ENABLE@ 188JAVASCI_ENABLE = @JAVASCI_ENABLE@
188JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 189JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/completion/Makefile.in b/scilab/modules/completion/Makefile.in
index 409cc69..049d112 100644
--- a/scilab/modules/completion/Makefile.in
+++ b/scilab/modules/completion/Makefile.in
@@ -245,6 +245,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
245JAR = @JAR@ 245JAR = @JAR@
246JAVA = @JAVA@ 246JAVA = @JAVA@
247JAVAC = @JAVAC@ 247JAVAC = @JAVAC@
248JAVADOC = @JAVADOC@
248JAVAH = @JAVAH@ 249JAVAH = @JAVAH@
249JAVASCI_ENABLE = @JAVASCI_ENABLE@ 250JAVASCI_ENABLE = @JAVASCI_ENABLE@
250JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 251JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/console/Makefile.in b/scilab/modules/console/Makefile.in
index f975b71..0228ceb 100644
--- a/scilab/modules/console/Makefile.in
+++ b/scilab/modules/console/Makefile.in
@@ -257,6 +257,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
257JAR = @JAR@ 257JAR = @JAR@
258JAVA = @JAVA@ 258JAVA = @JAVA@
259JAVAC = @JAVAC@ 259JAVAC = @JAVAC@
260JAVADOC = @JAVADOC@
260JAVAH = @JAVAH@ 261JAVAH = @JAVAH@
261JAVASCI_ENABLE = @JAVASCI_ENABLE@ 262JAVASCI_ENABLE = @JAVASCI_ENABLE@
262JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 263JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/core/Makefile.in b/scilab/modules/core/Makefile.in
index aa07581..8ea82db 100644
--- a/scilab/modules/core/Makefile.in
+++ b/scilab/modules/core/Makefile.in
@@ -460,6 +460,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
460JAR = @JAR@ 460JAR = @JAR@
461JAVA = @JAVA@ 461JAVA = @JAVA@
462JAVAC = @JAVAC@ 462JAVAC = @JAVAC@
463JAVADOC = @JAVADOC@
463JAVAH = @JAVAH@ 464JAVAH = @JAVAH@
464JAVASCI_ENABLE = @JAVASCI_ENABLE@ 465JAVASCI_ENABLE = @JAVASCI_ENABLE@
465JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 466JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/data_structures/Makefile.in b/scilab/modules/data_structures/Makefile.in
index f264241..84c8da3 100644
--- a/scilab/modules/data_structures/Makefile.in
+++ b/scilab/modules/data_structures/Makefile.in
@@ -253,6 +253,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
253JAR = @JAR@ 253JAR = @JAR@
254JAVA = @JAVA@ 254JAVA = @JAVA@
255JAVAC = @JAVAC@ 255JAVAC = @JAVAC@
256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
258JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 259JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/demo_tools/Makefile.in b/scilab/modules/demo_tools/Makefile.in
index 9af542d..b9b3ad3 100644
--- a/scilab/modules/demo_tools/Makefile.in
+++ b/scilab/modules/demo_tools/Makefile.in
@@ -182,6 +182,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
182JAR = @JAR@ 182JAR = @JAR@
183JAVA = @JAVA@ 183JAVA = @JAVA@
184JAVAC = @JAVAC@ 184JAVAC = @JAVAC@
185JAVADOC = @JAVADOC@
185JAVAH = @JAVAH@ 186JAVAH = @JAVAH@
186JAVASCI_ENABLE = @JAVASCI_ENABLE@ 187JAVASCI_ENABLE = @JAVASCI_ENABLE@
187JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 188JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/development_tools/Makefile.in b/scilab/modules/development_tools/Makefile.in
index 1968608..899c0e9 100644
--- a/scilab/modules/development_tools/Makefile.in
+++ b/scilab/modules/development_tools/Makefile.in
@@ -181,6 +181,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
181JAR = @JAR@ 181JAR = @JAR@
182JAVA = @JAVA@ 182JAVA = @JAVA@
183JAVAC = @JAVAC@ 183JAVAC = @JAVAC@
184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 187JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/development_tools/src/fake/Makefile.in b/scilab/modules/development_tools/src/fake/Makefile.in
index 790f4c7..ca41146 100644
--- a/scilab/modules/development_tools/src/fake/Makefile.in
+++ b/scilab/modules/development_tools/src/fake/Makefile.in
@@ -129,6 +129,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
129JAR = @JAR@ 129JAR = @JAR@
130JAVA = @JAVA@ 130JAVA = @JAVA@
131JAVAC = @JAVAC@ 131JAVAC = @JAVAC@
132JAVADOC = @JAVADOC@
132JAVAH = @JAVAH@ 133JAVAH = @JAVAH@
133JAVASCI_ENABLE = @JAVASCI_ENABLE@ 134JAVASCI_ENABLE = @JAVASCI_ENABLE@
134JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 135JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/differential_equations/Makefile.in b/scilab/modules/differential_equations/Makefile.in
index 7d77d49..e8c28ce 100644
--- a/scilab/modules/differential_equations/Makefile.in
+++ b/scilab/modules/differential_equations/Makefile.in
@@ -263,6 +263,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
263JAR = @JAR@ 263JAR = @JAR@
264JAVA = @JAVA@ 264JAVA = @JAVA@
265JAVAC = @JAVAC@ 265JAVAC = @JAVAC@
266JAVADOC = @JAVADOC@
266JAVAH = @JAVAH@ 267JAVAH = @JAVAH@
267JAVASCI_ENABLE = @JAVASCI_ENABLE@ 268JAVASCI_ENABLE = @JAVASCI_ENABLE@
268JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 269JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/double/Makefile.in b/scilab/modules/double/Makefile.in
index 541b48e..a6096e2 100644
--- a/scilab/modules/double/Makefile.in
+++ b/scilab/modules/double/Makefile.in
@@ -222,6 +222,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
222JAR = @JAR@ 222JAR = @JAR@
223JAVA = @JAVA@ 223JAVA = @JAVA@
224JAVAC = @JAVAC@ 224JAVAC = @JAVAC@
225JAVADOC = @JAVADOC@
225JAVAH = @JAVAH@ 226JAVAH = @JAVAH@
226JAVASCI_ENABLE = @JAVASCI_ENABLE@ 227JAVASCI_ENABLE = @JAVASCI_ENABLE@
227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 228JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/dynamic_link/Makefile.in b/scilab/modules/dynamic_link/Makefile.in
index 556eccf..e4429f1 100644
--- a/scilab/modules/dynamic_link/Makefile.in
+++ b/scilab/modules/dynamic_link/Makefile.in
@@ -240,6 +240,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
240JAR = @JAR@ 240JAR = @JAR@
241JAVA = @JAVA@ 241JAVA = @JAVA@
242JAVAC = @JAVAC@ 242JAVAC = @JAVAC@
243JAVADOC = @JAVADOC@
243JAVAH = @JAVAH@ 244JAVAH = @JAVAH@
244JAVASCI_ENABLE = @JAVASCI_ENABLE@ 245JAVASCI_ENABLE = @JAVASCI_ENABLE@
245JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 246JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/elementary_functions/Makefile.in b/scilab/modules/elementary_functions/Makefile.in
index d96fe3e..61bcff6 100644
--- a/scilab/modules/elementary_functions/Makefile.in
+++ b/scilab/modules/elementary_functions/Makefile.in
@@ -592,6 +592,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
592JAR = @JAR@ 592JAR = @JAR@
593JAVA = @JAVA@ 593JAVA = @JAVA@
594JAVAC = @JAVAC@ 594JAVAC = @JAVAC@
595JAVADOC = @JAVADOC@
595JAVAH = @JAVAH@ 596JAVAH = @JAVAH@
596JAVASCI_ENABLE = @JAVASCI_ENABLE@ 597JAVASCI_ENABLE = @JAVASCI_ENABLE@
597JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 598JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/fftw/Makefile.in b/scilab/modules/fftw/Makefile.in
index 234f1e3..b317d5a 100644
--- a/scilab/modules/fftw/Makefile.in
+++ b/scilab/modules/fftw/Makefile.in
@@ -241,6 +241,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
241JAR = @JAR@ 241JAR = @JAR@
242JAVA = @JAVA@ 242JAVA = @JAVA@
243JAVAC = @JAVAC@ 243JAVAC = @JAVAC@
244JAVADOC = @JAVADOC@
244JAVAH = @JAVAH@ 245JAVAH = @JAVAH@
245JAVASCI_ENABLE = @JAVASCI_ENABLE@ 246JAVASCI_ENABLE = @JAVASCI_ENABLE@
246JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 247JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/fileio/Makefile.in b/scilab/modules/fileio/Makefile.in
index 0555907..00b5081 100644
--- a/scilab/modules/fileio/Makefile.in
+++ b/scilab/modules/fileio/Makefile.in
@@ -276,6 +276,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
276JAR = @JAR@ 276JAR = @JAR@
277JAVA = @JAVA@ 277JAVA = @JAVA@
278JAVAC = @JAVAC@ 278JAVAC = @JAVAC@
279JAVADOC = @JAVADOC@
279JAVAH = @JAVAH@ 280JAVAH = @JAVAH@
280JAVASCI_ENABLE = @JAVASCI_ENABLE@ 281JAVASCI_ENABLE = @JAVASCI_ENABLE@
281JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 282JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/functions/Makefile.in b/scilab/modules/functions/Makefile.in
index a41b533..096c4eb 100644
--- a/scilab/modules/functions/Makefile.in
+++ b/scilab/modules/functions/Makefile.in
@@ -231,6 +231,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
231JAR = @JAR@ 231JAR = @JAR@
232JAVA = @JAVA@ 232JAVA = @JAVA@
233JAVAC = @JAVAC@ 233JAVAC = @JAVAC@
234JAVADOC = @JAVADOC@
234JAVAH = @JAVAH@ 235JAVAH = @JAVAH@
235JAVASCI_ENABLE = @JAVASCI_ENABLE@ 236JAVASCI_ENABLE = @JAVASCI_ENABLE@
236JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 237JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/genetic_algorithms/Makefile.in b/scilab/modules/genetic_algorithms/Makefile.in
index fc92ff3..62094aa 100644
--- a/scilab/modules/genetic_algorithms/Makefile.in
+++ b/scilab/modules/genetic_algorithms/Makefile.in
@@ -185,6 +185,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
185JAR = @JAR@ 185JAR = @JAR@
186JAVA = @JAVA@ 186JAVA = @JAVA@
187JAVAC = @JAVAC@ 187JAVAC = @JAVAC@
188JAVADOC = @JAVADOC@
188JAVAH = @JAVAH@ 189JAVAH = @JAVAH@
189JAVASCI_ENABLE = @JAVASCI_ENABLE@ 190JAVASCI_ENABLE = @JAVASCI_ENABLE@
190JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 191JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/graph/Makefile.in b/scilab/modules/graph/Makefile.in
index fa13635..b684ee4 100644
--- a/scilab/modules/graph/Makefile.in
+++ b/scilab/modules/graph/Makefile.in
@@ -221,6 +221,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
221JAR = @JAR@ 221JAR = @JAR@
222JAVA = @JAVA@ 222JAVA = @JAVA@
223JAVAC = @JAVAC@ 223JAVAC = @JAVAC@
224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
226JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/graphic_export/Makefile.in b/scilab/modules/graphic_export/Makefile.in
index 7ab0d9c..1aa25a7 100644
--- a/scilab/modules/graphic_export/Makefile.in
+++ b/scilab/modules/graphic_export/Makefile.in
@@ -258,6 +258,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
258JAR = @JAR@ 258JAR = @JAR@
259JAVA = @JAVA@ 259JAVA = @JAVA@
260JAVAC = @JAVAC@ 260JAVAC = @JAVAC@
261JAVADOC = @JAVADOC@
261JAVAH = @JAVAH@ 262JAVAH = @JAVAH@
262JAVASCI_ENABLE = @JAVASCI_ENABLE@ 263JAVASCI_ENABLE = @JAVASCI_ENABLE@
263JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 264JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/graphics/Makefile.in b/scilab/modules/graphics/Makefile.in
index 9ce3dc7..cb89f25 100644
--- a/scilab/modules/graphics/Makefile.in
+++ b/scilab/modules/graphics/Makefile.in
@@ -593,6 +593,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
593JAR = @JAR@ 593JAR = @JAR@
594JAVA = @JAVA@ 594JAVA = @JAVA@
595JAVAC = @JAVAC@ 595JAVAC = @JAVAC@
596JAVADOC = @JAVADOC@
596JAVAH = @JAVAH@ 597JAVAH = @JAVAH@
597JAVASCI_ENABLE = @JAVASCI_ENABLE@ 598JAVASCI_ENABLE = @JAVASCI_ENABLE@
598JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 599JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/gui/Makefile.in b/scilab/modules/gui/Makefile.in
index 9690309..0d745b9 100644
--- a/scilab/modules/gui/Makefile.in
+++ b/scilab/modules/gui/Makefile.in
@@ -348,6 +348,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
348JAR = @JAR@ 348JAR = @JAR@
349JAVA = @JAVA@ 349JAVA = @JAVA@
350JAVAC = @JAVAC@ 350JAVAC = @JAVAC@
351JAVADOC = @JAVADOC@
351JAVAH = @JAVAH@ 352JAVAH = @JAVAH@
352JAVASCI_ENABLE = @JAVASCI_ENABLE@ 353JAVASCI_ENABLE = @JAVASCI_ENABLE@
353JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 354JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/hdf5/Makefile.in b/scilab/modules/hdf5/Makefile.in
index 0ef703b..177e279 100644
--- a/scilab/modules/hdf5/Makefile.in
+++ b/scilab/modules/hdf5/Makefile.in
@@ -273,6 +273,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
273JAR = @JAR@ 273JAR = @JAR@
274JAVA = @JAVA@ 274JAVA = @JAVA@
275JAVAC = @JAVAC@ 275JAVAC = @JAVAC@
276JAVADOC = @JAVADOC@
276JAVAH = @JAVAH@ 277JAVAH = @JAVAH@
277JAVASCI_ENABLE = @JAVASCI_ENABLE@ 278JAVASCI_ENABLE = @JAVASCI_ENABLE@
278JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 279JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/helptools/Makefile.in b/scilab/modules/helptools/Makefile.in
index b69d9b8..be829d4 100644
--- a/scilab/modules/helptools/Makefile.in
+++ b/scilab/modules/helptools/Makefile.in
@@ -257,6 +257,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
257JAR = @JAR@ 257JAR = @JAR@
258JAVA = @JAVA@ 258JAVA = @JAVA@
259JAVAC = @JAVAC@ 259JAVAC = @JAVAC@
260JAVADOC = @JAVADOC@
260JAVAH = @JAVAH@ 261JAVAH = @JAVAH@
261JAVASCI_ENABLE = @JAVASCI_ENABLE@ 262JAVASCI_ENABLE = @JAVASCI_ENABLE@
262JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 263JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/history_browser/Makefile.in b/scilab/modules/history_browser/Makefile.in
index bdfbfa9..6a971dc 100644
--- a/scilab/modules/history_browser/Makefile.in
+++ b/scilab/modules/history_browser/Makefile.in
@@ -252,6 +252,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
252JAR = @JAR@ 252JAR = @JAR@
253JAVA = @JAVA@ 253JAVA = @JAVA@
254JAVAC = @JAVAC@ 254JAVAC = @JAVAC@
255JAVADOC = @JAVADOC@
255JAVAH = @JAVAH@ 256JAVAH = @JAVAH@
256JAVASCI_ENABLE = @JAVASCI_ENABLE@ 257JAVASCI_ENABLE = @JAVASCI_ENABLE@
257JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 258JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/history_manager/Makefile.in b/scilab/modules/history_manager/Makefile.in
index 794d59f..811f317 100644
--- a/scilab/modules/history_manager/Makefile.in
+++ b/scilab/modules/history_manager/Makefile.in
@@ -269,6 +269,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
269JAR = @JAR@ 269JAR = @JAR@
270JAVA = @JAVA@ 270JAVA = @JAVA@
271JAVAC = @JAVAC@ 271JAVAC = @JAVAC@
272JAVADOC = @JAVADOC@
272JAVAH = @JAVAH@ 273JAVAH = @JAVAH@
273JAVASCI_ENABLE = @JAVASCI_ENABLE@ 274JAVASCI_ENABLE = @JAVASCI_ENABLE@
274JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 275JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/integer/Makefile.in b/scilab/modules/integer/Makefile.in
index 6227b79..f68fa72 100644
--- a/scilab/modules/integer/Makefile.in
+++ b/scilab/modules/integer/Makefile.in
@@ -256,6 +256,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
256JAR = @JAR@ 256JAR = @JAR@
257JAVA = @JAVA@ 257JAVA = @JAVA@
258JAVAC = @JAVAC@ 258JAVAC = @JAVAC@
259JAVADOC = @JAVADOC@
259JAVAH = @JAVAH@ 260JAVAH = @JAVAH@
260JAVASCI_ENABLE = @JAVASCI_ENABLE@ 261JAVASCI_ENABLE = @JAVASCI_ENABLE@
261JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 262JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/interpolation/Makefile.in b/scilab/modules/interpolation/Makefile.in
index 35dd8c4..0f5be2d 100644
--- a/scilab/modules/interpolation/Makefile.in
+++ b/scilab/modules/interpolation/Makefile.in
@@ -238,6 +238,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
238JAR = @JAR@ 238JAR = @JAR@
239JAVA = @JAVA@ 239JAVA = @JAVA@
240JAVAC = @JAVAC@ 240JAVAC = @JAVAC@
241JAVADOC = @JAVADOC@
241JAVAH = @JAVAH@ 242JAVAH = @JAVAH@
242JAVASCI_ENABLE = @JAVASCI_ENABLE@ 243JAVASCI_ENABLE = @JAVASCI_ENABLE@
243JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 244JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/intersci/Makefile.in b/scilab/modules/intersci/Makefile.in
index 922c100..a12f6d1 100644
--- a/scilab/modules/intersci/Makefile.in
+++ b/scilab/modules/intersci/Makefile.in
@@ -223,6 +223,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
223JAR = @JAR@ 223JAR = @JAR@
224JAVA = @JAVA@ 224JAVA = @JAVA@
225JAVAC = @JAVAC@ 225JAVAC = @JAVAC@
226JAVADOC = @JAVADOC@
226JAVAH = @JAVAH@ 227JAVAH = @JAVAH@
227JAVASCI_ENABLE = @JAVASCI_ENABLE@ 228JAVASCI_ENABLE = @JAVASCI_ENABLE@
228JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 229JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/io/Makefile.in b/scilab/modules/io/Makefile.in
index 689c3c0..8da9dbc 100644
--- a/scilab/modules/io/Makefile.in
+++ b/scilab/modules/io/Makefile.in
@@ -235,6 +235,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
235JAR = @JAR@ 235JAR = @JAR@
236JAVA = @JAVA@ 236JAVA = @JAVA@
237JAVAC = @JAVAC@ 237JAVAC = @JAVAC@
238JAVADOC = @JAVADOC@
238JAVAH = @JAVAH@ 239JAVAH = @JAVAH@
239JAVASCI_ENABLE = @JAVASCI_ENABLE@ 240JAVASCI_ENABLE = @JAVASCI_ENABLE@
240JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 241JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/javasci/Makefile.in b/scilab/modules/javasci/Makefile.in
index 4a78474..bbb6124 100644
--- a/scilab/modules/javasci/Makefile.in
+++ b/scilab/modules/javasci/Makefile.in
@@ -251,6 +251,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
251JAR = @JAR@ 251JAR = @JAR@
252JAVA = @JAVA@ 252JAVA = @JAVA@
253JAVAC = @JAVAC@ 253JAVAC = @JAVAC@
254JAVADOC = @JAVADOC@
254JAVAH = @JAVAH@ 255JAVAH = @JAVAH@
255JAVASCI_ENABLE = @JAVASCI_ENABLE@ 256JAVASCI_ENABLE = @JAVASCI_ENABLE@
256JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 257JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/jvm/Makefile.in b/scilab/modules/jvm/Makefile.in
index 5504d27..f453c2d 100644
--- a/scilab/modules/jvm/Makefile.in
+++ b/scilab/modules/jvm/Makefile.in
@@ -250,6 +250,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
250JAR = @JAR@ 250JAR = @JAR@
251JAVA = @JAVA@ 251JAVA = @JAVA@
252JAVAC = @JAVAC@ 252JAVAC = @JAVAC@
253JAVADOC = @JAVADOC@
253JAVAH = @JAVAH@ 254JAVAH = @JAVAH@
254JAVASCI_ENABLE = @JAVASCI_ENABLE@ 255JAVASCI_ENABLE = @JAVASCI_ENABLE@
255JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 256JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/linear_algebra/Makefile.in b/scilab/modules/linear_algebra/Makefile.in
index fa991ab..32e0633 100644
--- a/scilab/modules/linear_algebra/Makefile.in
+++ b/scilab/modules/linear_algebra/Makefile.in
@@ -259,6 +259,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
259JAR = @JAR@ 259JAR = @JAR@
260JAVA = @JAVA@ 260JAVA = @JAVA@
261JAVAC = @JAVAC@ 261JAVAC = @JAVAC@
262JAVADOC = @JAVADOC@
262JAVAH = @JAVAH@ 263JAVAH = @JAVAH@
263JAVASCI_ENABLE = @JAVASCI_ENABLE@ 264JAVASCI_ENABLE = @JAVASCI_ENABLE@
264JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 265JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/localization/Makefile.in b/scilab/modules/localization/Makefile.in
index 56320ce..dc2217d 100644
--- a/scilab/modules/localization/Makefile.in
+++ b/scilab/modules/localization/Makefile.in
@@ -246,6 +246,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
246JAR = @JAR@ 246JAR = @JAR@
247JAVA = @JAVA@ 247JAVA = @JAVA@
248JAVAC = @JAVAC@ 248JAVAC = @JAVAC@
249JAVADOC = @JAVADOC@
249JAVAH = @JAVAH@ 250JAVAH = @JAVAH@
250JAVASCI_ENABLE = @JAVASCI_ENABLE@ 251JAVASCI_ENABLE = @JAVASCI_ENABLE@
251JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 252JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/m2sci/Makefile.in b/scilab/modules/m2sci/Makefile.in
index 79b5daf..6134c8f 100644
--- a/scilab/modules/m2sci/Makefile.in
+++ b/scilab/modules/m2sci/Makefile.in
@@ -180,6 +180,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
180JAR = @JAR@ 180JAR = @JAR@
181JAVA = @JAVA@ 181JAVA = @JAVA@
182JAVAC = @JAVAC@ 182JAVAC = @JAVAC@
183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
185JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/maple2scilab/Makefile.in b/scilab/modules/maple2scilab/Makefile.in
index 1dafbd6..95b42ce 100644
--- a/scilab/modules/maple2scilab/Makefile.in
+++ b/scilab/modules/maple2scilab/Makefile.in
@@ -180,6 +180,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
180JAR = @JAR@ 180JAR = @JAR@
181JAVA = @JAVA@ 181JAVA = @JAVA@
182JAVAC = @JAVAC@ 182JAVAC = @JAVAC@
183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
185JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/matio/Makefile.in b/scilab/modules/matio/Makefile.in
index 3bc9d6b..fa6cca9 100644
--- a/scilab/modules/matio/Makefile.in
+++ b/scilab/modules/matio/Makefile.in
@@ -247,6 +247,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
247JAR = @JAR@ 247JAR = @JAR@
248JAVA = @JAVA@ 248JAVA = @JAVA@
249JAVAC = @JAVAC@ 249JAVAC = @JAVAC@
250JAVADOC = @JAVADOC@
250JAVAH = @JAVAH@ 251JAVAH = @JAVAH@
251JAVASCI_ENABLE = @JAVASCI_ENABLE@ 252JAVASCI_ENABLE = @JAVASCI_ENABLE@
252JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 253JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/mexlib/Makefile.in b/scilab/modules/mexlib/Makefile.in
index ade4780..3ce5b14 100644
--- a/scilab/modules/mexlib/Makefile.in
+++ b/scilab/modules/mexlib/Makefile.in
@@ -224,6 +224,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
224JAR = @JAR@ 224JAR = @JAR@
225JAVA = @JAVA@ 225JAVA = @JAVA@
226JAVAC = @JAVAC@ 226JAVAC = @JAVAC@
227JAVADOC = @JAVADOC@
227JAVAH = @JAVAH@ 228JAVAH = @JAVAH@
228JAVASCI_ENABLE = @JAVASCI_ENABLE@ 229JAVASCI_ENABLE = @JAVASCI_ENABLE@
229JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 230JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/modules_manager/Makefile.in b/scilab/modules/modules_manager/Makefile.in
index 1c356fd..c2a6120 100644
--- a/scilab/modules/modules_manager/Makefile.in
+++ b/scilab/modules/modules_manager/Makefile.in
@@ -181,6 +181,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
181JAR = @JAR@ 181JAR = @JAR@
182JAVA = @JAVA@ 182JAVA = @JAVA@
183JAVAC = @JAVAC@ 183JAVAC = @JAVAC@
184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 187JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/optimization/Makefile.in b/scilab/modules/optimization/Makefile.in
index 0cb0b58..f9dc783 100644
--- a/scilab/modules/optimization/Makefile.in
+++ b/scilab/modules/optimization/Makefile.in
@@ -249,6 +249,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
249JAR = @JAR@ 249JAR = @JAR@
250JAVA = @JAVA@ 250JAVA = @JAVA@
251JAVAC = @JAVAC@ 251JAVAC = @JAVAC@
252JAVADOC = @JAVADOC@
252JAVAH = @JAVAH@ 253JAVAH = @JAVAH@
253JAVASCI_ENABLE = @JAVASCI_ENABLE@ 254JAVASCI_ENABLE = @JAVASCI_ENABLE@
254JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 255JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/output_stream/Makefile.in b/scilab/modules/output_stream/Makefile.in
index bc61cd0..350b8b6 100644
--- a/scilab/modules/output_stream/Makefile.in
+++ b/scilab/modules/output_stream/Makefile.in
@@ -266,6 +266,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
266JAR = @JAR@ 266JAR = @JAR@
267JAVA = @JAVA@ 267JAVA = @JAVA@
268JAVAC = @JAVAC@ 268JAVAC = @JAVAC@
269JAVADOC = @JAVADOC@
269JAVAH = @JAVAH@ 270JAVAH = @JAVAH@
270JAVASCI_ENABLE = @JAVASCI_ENABLE@ 271JAVASCI_ENABLE = @JAVASCI_ENABLE@
271JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 272JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/overloading/Makefile.in b/scilab/modules/overloading/Makefile.in
index a969d0c..a1e3bba 100644
--- a/scilab/modules/overloading/Makefile.in
+++ b/scilab/modules/overloading/Makefile.in
@@ -181,6 +181,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
181JAR = @JAR@ 181JAR = @JAR@
182JAVA = @JAVA@ 182JAVA = @JAVA@
183JAVAC = @JAVAC@ 183JAVAC = @JAVAC@
184JAVADOC = @JAVADOC@
184JAVAH = @JAVAH@ 185JAVAH = @JAVAH@
185JAVASCI_ENABLE = @JAVASCI_ENABLE@ 186JAVASCI_ENABLE = @JAVASCI_ENABLE@
186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 187JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/parallel/Makefile.in b/scilab/modules/parallel/Makefile.in
index 8999b52..d175a89 100644
--- a/scilab/modules/parallel/Makefile.in
+++ b/scilab/modules/parallel/Makefile.in
@@ -235,6 +235,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
235JAR = @JAR@ 235JAR = @JAR@
236JAVA = @JAVA@ 236JAVA = @JAVA@
237JAVAC = @JAVAC@ 237JAVAC = @JAVAC@
238JAVADOC = @JAVADOC@
238JAVAH = @JAVAH@ 239JAVAH = @JAVAH@
239JAVASCI_ENABLE = @JAVASCI_ENABLE@ 240JAVASCI_ENABLE = @JAVASCI_ENABLE@
240JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 241JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/parameters/Makefile.in b/scilab/modules/parameters/Makefile.in
index 284c2a5..d516edc 100644
--- a/scilab/modules/parameters/Makefile.in
+++ b/scilab/modules/parameters/Makefile.in
@@ -213,6 +213,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
213JAR = @JAR@ 213JAR = @JAR@
214JAVA = @JAVA@ 214JAVA = @JAVA@
215JAVAC = @JAVAC@ 215JAVAC = @JAVAC@
216JAVADOC = @JAVADOC@
216JAVAH = @JAVAH@ 217JAVAH = @JAVAH@
217JAVASCI_ENABLE = @JAVASCI_ENABLE@ 218JAVASCI_ENABLE = @JAVASCI_ENABLE@
218JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 219JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/polynomials/Makefile.in b/scilab/modules/polynomials/Makefile.in
index 483358c..8189f9d 100644
--- a/scilab/modules/polynomials/Makefile.in
+++ b/scilab/modules/polynomials/Makefile.in
@@ -253,6 +253,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
253JAR = @JAR@ 253JAR = @JAR@
254JAVA = @JAVA@ 254JAVA = @JAVA@
255JAVAC = @JAVAC@ 255JAVAC = @JAVAC@
256JAVADOC = @JAVADOC@
256JAVAH = @JAVAH@ 257JAVAH = @JAVAH@
257JAVASCI_ENABLE = @JAVASCI_ENABLE@ 258JAVASCI_ENABLE = @JAVASCI_ENABLE@
258JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 259JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/pvm/Makefile.in b/scilab/modules/pvm/Makefile.in
index 06ccbf7..9fd6918 100644
--- a/scilab/modules/pvm/Makefile.in
+++ b/scilab/modules/pvm/Makefile.in
@@ -296,6 +296,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
296JAR = @JAR@ 296JAR = @JAR@
297JAVA = @JAVA@ 297JAVA = @JAVA@
298JAVAC = @JAVAC@ 298JAVAC = @JAVAC@
299JAVADOC = @JAVADOC@
299JAVAH = @JAVAH@ 300JAVAH = @JAVAH@
300JAVASCI_ENABLE = @JAVASCI_ENABLE@ 301JAVASCI_ENABLE = @JAVASCI_ENABLE@
301JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 302JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/randlib/Makefile.in b/scilab/modules/randlib/Makefile.in
index 735626d..6b5fc8a 100644
--- a/scilab/modules/randlib/Makefile.in
+++ b/scilab/modules/randlib/Makefile.in
@@ -227,6 +227,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
227JAR = @JAR@ 227JAR = @JAR@
228JAVA = @JAVA@ 228JAVA = @JAVA@
229JAVAC = @JAVAC@ 229JAVAC = @JAVAC@
230JAVADOC = @JAVADOC@
230JAVAH = @JAVAH@ 231JAVAH = @JAVAH@
231JAVASCI_ENABLE = @JAVASCI_ENABLE@ 232JAVASCI_ENABLE = @JAVASCI_ENABLE@
232JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 233JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/renderer/Makefile.in b/scilab/modules/renderer/Makefile.in
index e2dd692..dac10bd 100644
--- a/scilab/modules/renderer/Makefile.in
+++ b/scilab/modules/renderer/Makefile.in
@@ -477,6 +477,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
477JAR = @JAR@ 477JAR = @JAR@
478JAVA = @JAVA@ 478JAVA = @JAVA@
479JAVAC = @JAVAC@ 479JAVAC = @JAVAC@
480JAVADOC = @JAVADOC@
480JAVAH = @JAVAH@ 481JAVAH = @JAVAH@
481JAVASCI_ENABLE = @JAVASCI_ENABLE@ 482JAVASCI_ENABLE = @JAVASCI_ENABLE@
482JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 483JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/scicos/Makefile.in b/scilab/modules/scicos/Makefile.in
index 959f730..36f60fc 100644
--- a/scilab/modules/scicos/Makefile.in
+++ b/scilab/modules/scicos/Makefile.in
@@ -464,6 +464,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
464JAR = @JAR@ 464JAR = @JAR@
465JAVA = @JAVA@ 465JAVA = @JAVA@
466JAVAC = @JAVAC@ 466JAVAC = @JAVAC@
467JAVADOC = @JAVADOC@
467JAVAH = @JAVAH@ 468JAVAH = @JAVAH@
468JAVASCI_ENABLE = @JAVASCI_ENABLE@ 469JAVASCI_ENABLE = @JAVASCI_ENABLE@
469JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 470JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/scicos_blocks/Makefile.in b/scilab/modules/scicos_blocks/Makefile.in
index 8321a5e..ff2a702 100644
--- a/scilab/modules/scicos_blocks/Makefile.in
+++ b/scilab/modules/scicos_blocks/Makefile.in
@@ -722,6 +722,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
722JAR = @JAR@ 722JAR = @JAR@
723JAVA = @JAVA@ 723JAVA = @JAVA@
724JAVAC = @JAVAC@ 724JAVAC = @JAVAC@
725JAVADOC = @JAVADOC@
725JAVAH = @JAVAH@ 726JAVAH = @JAVAH@
726JAVASCI_ENABLE = @JAVASCI_ENABLE@ 727JAVASCI_ENABLE = @JAVASCI_ENABLE@
727JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 728JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/scinotes/Makefile.in b/scilab/modules/scinotes/Makefile.in
index b274b74..5137175 100644
--- a/scilab/modules/scinotes/Makefile.in
+++ b/scilab/modules/scinotes/Makefile.in
@@ -246,6 +246,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
246JAR = @JAR@ 246JAR = @JAR@
247JAVA = @JAVA@ 247JAVA = @JAVA@
248JAVAC = @JAVAC@ 248JAVAC = @JAVAC@
249JAVADOC = @JAVADOC@
249JAVAH = @JAVAH@ 250JAVAH = @JAVAH@
250JAVASCI_ENABLE = @JAVASCI_ENABLE@ 251JAVASCI_ENABLE = @JAVASCI_ENABLE@
251JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 252JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/shell/Makefile.in b/scilab/modules/shell/Makefile.in
index 92b5918..df4c747 100644
--- a/scilab/modules/shell/Makefile.in
+++ b/scilab/modules/shell/Makefile.in
@@ -236,6 +236,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
236JAR = @JAR@ 236JAR = @JAR@
237JAVA = @JAVA@ 237JAVA = @JAVA@
238JAVAC = @JAVAC@ 238JAVAC = @JAVAC@
239JAVADOC = @JAVADOC@
239JAVAH = @JAVAH@ 240JAVAH = @JAVAH@
240JAVASCI_ENABLE = @JAVASCI_ENABLE@ 241JAVASCI_ENABLE = @JAVASCI_ENABLE@
241JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 242JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/signal_processing/Makefile.in b/scilab/modules/signal_processing/Makefile.in
index 0da05f4..55cd70a 100644
--- a/scilab/modules/signal_processing/Makefile.in
+++ b/scilab/modules/signal_processing/Makefile.in
@@ -245,6 +245,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
245JAR = @JAR@ 245JAR = @JAR@
246JAVA = @JAVA@ 246JAVA = @JAVA@
247JAVAC = @JAVAC@ 247JAVAC = @JAVAC@
248JAVADOC = @JAVADOC@
248JAVAH = @JAVAH@ 249JAVAH = @JAVAH@
249JAVASCI_ENABLE = @JAVASCI_ENABLE@ 250JAVASCI_ENABLE = @JAVASCI_ENABLE@
250JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 251JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/simulated_annealing/Makefile.in b/scilab/modules/simulated_annealing/Makefile.in
index 25d749b..3b72aa3 100644
--- a/scilab/modules/simulated_annealing/Makefile.in
+++ b/scilab/modules/simulated_annealing/Makefile.in
@@ -185,6 +185,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
185JAR = @JAR@ 185JAR = @JAR@
186JAVA = @JAVA@ 186JAVA = @JAVA@
187JAVAC = @JAVAC@ 187JAVAC = @JAVAC@
188JAVADOC = @JAVADOC@
188JAVAH = @JAVAH@ 189JAVAH = @JAVAH@
189JAVASCI_ENABLE = @JAVASCI_ENABLE@ 190JAVASCI_ENABLE = @JAVASCI_ENABLE@
190JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 191JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/sound/Makefile.in b/scilab/modules/sound/Makefile.in
index da28164..7ef5a7b 100644
--- a/scilab/modules/sound/Makefile.in
+++ b/scilab/modules/sound/Makefile.in
@@ -210,6 +210,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
210JAR = @JAR@ 210JAR = @JAR@
211JAVA = @JAVA@ 211JAVA = @JAVA@
212JAVAC = @JAVAC@ 212JAVAC = @JAVAC@
213JAVADOC = @JAVADOC@
213JAVAH = @JAVAH@ 214JAVAH = @JAVAH@
214JAVASCI_ENABLE = @JAVASCI_ENABLE@ 215JAVASCI_ENABLE = @JAVASCI_ENABLE@
215JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 216JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/sparse/Makefile.in b/scilab/modules/sparse/Makefile.in
index 8d3515a..fcdedb9 100644
--- a/scilab/modules/sparse/Makefile.in
+++ b/scilab/modules/sparse/Makefile.in
@@ -260,6 +260,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
260JAR = @JAR@ 260JAR = @JAR@
261JAVA = @JAVA@ 261JAVA = @JAVA@
262JAVAC = @JAVAC@ 262JAVAC = @JAVAC@
263JAVADOC = @JAVADOC@
263JAVAH = @JAVAH@ 264JAVAH = @JAVAH@
264JAVASCI_ENABLE = @JAVASCI_ENABLE@ 265JAVASCI_ENABLE = @JAVASCI_ENABLE@
265JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 266JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/special_functions/Makefile.in b/scilab/modules/special_functions/Makefile.in
index 8e3db74..fdd3445 100644
--- a/scilab/modules/special_functions/Makefile.in
+++ b/scilab/modules/special_functions/Makefile.in
@@ -239,6 +239,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
239JAR = @JAR@ 239JAR = @JAR@
240JAVA = @JAVA@ 240JAVA = @JAVA@
241JAVAC = @JAVAC@ 241JAVAC = @JAVAC@
242JAVADOC = @JAVADOC@
242JAVAH = @JAVAH@ 243JAVAH = @JAVAH@
243JAVASCI_ENABLE = @JAVASCI_ENABLE@ 244JAVASCI_ENABLE = @JAVASCI_ENABLE@
244JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 245JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/spreadsheet/Makefile.in b/scilab/modules/spreadsheet/Makefile.in
index 1a5c38e..4b10e33 100644
--- a/scilab/modules/spreadsheet/Makefile.in
+++ b/scilab/modules/spreadsheet/Makefile.in
@@ -221,6 +221,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
221JAR = @JAR@ 221JAR = @JAR@
222JAVA = @JAVA@ 222JAVA = @JAVA@
223JAVAC = @JAVAC@ 223JAVAC = @JAVAC@
224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
226JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/statistics/Makefile.in b/scilab/modules/statistics/Makefile.in
index 022c3c0..5a23fb5 100644
--- a/scilab/modules/statistics/Makefile.in
+++ b/scilab/modules/statistics/Makefile.in
@@ -241,6 +241,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
241JAR = @JAR@ 241JAR = @JAR@
242JAVA = @JAVA@ 242JAVA = @JAVA@
243JAVAC = @JAVAC@ 243JAVAC = @JAVAC@
244JAVADOC = @JAVADOC@
244JAVAH = @JAVAH@ 245JAVAH = @JAVAH@
245JAVASCI_ENABLE = @JAVASCI_ENABLE@ 246JAVASCI_ENABLE = @JAVASCI_ENABLE@
246JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 247JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/string/Makefile.in b/scilab/modules/string/Makefile.in
index 54354fa..00c5fc6 100644
--- a/scilab/modules/string/Makefile.in
+++ b/scilab/modules/string/Makefile.in
@@ -254,6 +254,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
254JAR = @JAR@ 254JAR = @JAR@
255JAVA = @JAVA@ 255JAVA = @JAVA@
256JAVAC = @JAVAC@ 256JAVAC = @JAVAC@
257JAVADOC = @JAVADOC@
257JAVAH = @JAVAH@ 258JAVAH = @JAVAH@
258JAVASCI_ENABLE = @JAVASCI_ENABLE@ 259JAVASCI_ENABLE = @JAVASCI_ENABLE@
259JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 260JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/symbolic/Makefile.in b/scilab/modules/symbolic/Makefile.in
index d43b1fd..1276892 100644
--- a/scilab/modules/symbolic/Makefile.in
+++ b/scilab/modules/symbolic/Makefile.in
@@ -225,6 +225,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
225JAR = @JAR@ 225JAR = @JAR@
226JAVA = @JAVA@ 226JAVA = @JAVA@
227JAVAC = @JAVAC@ 227JAVAC = @JAVAC@
228JAVADOC = @JAVADOC@
228JAVAH = @JAVAH@ 229JAVAH = @JAVAH@
229JAVASCI_ENABLE = @JAVASCI_ENABLE@ 230JAVASCI_ENABLE = @JAVASCI_ENABLE@
230JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 231JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/tclsci/Makefile.in b/scilab/modules/tclsci/Makefile.in
index c2330b7..9cc56d7 100644
--- a/scilab/modules/tclsci/Makefile.in
+++ b/scilab/modules/tclsci/Makefile.in
@@ -259,6 +259,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
259JAR = @JAR@ 259JAR = @JAR@
260JAVA = @JAVA@ 260JAVA = @JAVA@
261JAVAC = @JAVAC@ 261JAVAC = @JAVAC@
262JAVADOC = @JAVADOC@
262JAVAH = @JAVAH@ 263JAVAH = @JAVAH@
263JAVASCI_ENABLE = @JAVASCI_ENABLE@ 264JAVASCI_ENABLE = @JAVASCI_ENABLE@
264JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 265JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/texmacs/Makefile.in b/scilab/modules/texmacs/Makefile.in
index 4a7deb4..ead5c8c 100644
--- a/scilab/modules/texmacs/Makefile.in
+++ b/scilab/modules/texmacs/Makefile.in
@@ -180,6 +180,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
180JAR = @JAR@ 180JAR = @JAR@
181JAVA = @JAVA@ 181JAVA = @JAVA@
182JAVAC = @JAVAC@ 182JAVAC = @JAVAC@
183JAVADOC = @JAVADOC@
183JAVAH = @JAVAH@ 184JAVAH = @JAVAH@
184JAVASCI_ENABLE = @JAVASCI_ENABLE@ 185JAVASCI_ENABLE = @JAVASCI_ENABLE@
185JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 186JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/time/Makefile.in b/scilab/modules/time/Makefile.in
index c75b437..40a1610 100644
--- a/scilab/modules/time/Makefile.in
+++ b/scilab/modules/time/Makefile.in
@@ -217,6 +217,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
217JAR = @JAR@ 217JAR = @JAR@
218JAVA = @JAVA@ 218JAVA = @JAVA@
219JAVAC = @JAVAC@ 219JAVAC = @JAVAC@
220JAVADOC = @JAVADOC@
220JAVAH = @JAVAH@ 221JAVAH = @JAVAH@
221JAVASCI_ENABLE = @JAVASCI_ENABLE@ 222JAVASCI_ENABLE = @JAVASCI_ENABLE@
222JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 223JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/types/Makefile.in b/scilab/modules/types/Makefile.in
index 46e8fd3..8119889 100644
--- a/scilab/modules/types/Makefile.in
+++ b/scilab/modules/types/Makefile.in
@@ -221,6 +221,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
221JAR = @JAR@ 221JAR = @JAR@
222JAVA = @JAVA@ 222JAVA = @JAVA@
223JAVAC = @JAVAC@ 223JAVAC = @JAVAC@
224JAVADOC = @JAVADOC@
224JAVAH = @JAVAH@ 225JAVAH = @JAVAH@
225JAVASCI_ENABLE = @JAVASCI_ENABLE@ 226JAVASCI_ENABLE = @JAVASCI_ENABLE@
226JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 227JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/ui_data/Makefile.in b/scilab/modules/ui_data/Makefile.in
index 17b588a..e5103ed 100644
--- a/scilab/modules/ui_data/Makefile.in
+++ b/scilab/modules/ui_data/Makefile.in
@@ -246,6 +246,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
246JAR = @JAR@ 246JAR = @JAR@
247JAVA = @JAVA@ 247JAVA = @JAVA@
248JAVAC = @JAVAC@ 248JAVAC = @JAVAC@
249JAVADOC = @JAVADOC@
249JAVAH = @JAVAH@ 250JAVAH = @JAVAH@
250JAVASCI_ENABLE = @JAVASCI_ENABLE@ 251JAVASCI_ENABLE = @JAVASCI_ENABLE@
251JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 252JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/umfpack/Makefile.in b/scilab/modules/umfpack/Makefile.in
index f6d1561..58f3d84 100644
--- a/scilab/modules/umfpack/Makefile.in
+++ b/scilab/modules/umfpack/Makefile.in
@@ -248,6 +248,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
248JAR = @JAR@ 248JAR = @JAR@
249JAVA = @JAVA@ 249JAVA = @JAVA@
250JAVAC = @JAVAC@ 250JAVAC = @JAVAC@
251JAVADOC = @JAVADOC@
251JAVAH = @JAVAH@ 252JAVAH = @JAVAH@
252JAVASCI_ENABLE = @JAVASCI_ENABLE@ 253JAVASCI_ENABLE = @JAVASCI_ENABLE@
253JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 254JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/windows_tools/Makefile.in b/scilab/modules/windows_tools/Makefile.in
index 01c6b28..203d0b5 100644
--- a/scilab/modules/windows_tools/Makefile.in
+++ b/scilab/modules/windows_tools/Makefile.in
@@ -210,6 +210,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
210JAR = @JAR@ 210JAR = @JAR@
211JAVA = @JAVA@ 211JAVA = @JAVA@
212JAVAC = @JAVAC@ 212JAVAC = @JAVAC@
213JAVADOC = @JAVADOC@
213JAVAH = @JAVAH@ 214JAVAH = @JAVAH@
214JAVASCI_ENABLE = @JAVASCI_ENABLE@ 215JAVASCI_ENABLE = @JAVASCI_ENABLE@
215JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 216JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@
diff --git a/scilab/modules/xcos/Makefile.in b/scilab/modules/xcos/Makefile.in
index b1e645d..b5695cf 100644
--- a/scilab/modules/xcos/Makefile.in
+++ b/scilab/modules/xcos/Makefile.in
@@ -258,6 +258,7 @@ INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
258JAR = @JAR@ 258JAR = @JAR@
259JAVA = @JAVA@ 259JAVA = @JAVA@
260JAVAC = @JAVAC@ 260JAVAC = @JAVAC@
261JAVADOC = @JAVADOC@
261JAVAH = @JAVAH@ 262JAVAH = @JAVAH@
262JAVASCI_ENABLE = @JAVASCI_ENABLE@ 263JAVASCI_ENABLE = @JAVASCI_ENABLE@
263JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@ 264JAVA_DEBUG_OPTIONS = @JAVA_DEBUG_OPTIONS@