[MacOSX Lion] Compilation with gfortran-4.6

Change-Id: I7f49e0486ba3e096d797f82fbf3c844b8dbbd148

diff --git a/scilab/configure b/scilab/configure
index 93a6ab5..abde32a 100755 (executable)
--- a/scilab/configure
+++ b/scilab/configure
@@ -9343,7 +9343,7 @@ case "$CC" in
   *-*-darwin*)
     CFLAGS="$CFLAGS -no_compact_linkedit -mmacosx-version-min=10.5"
     CXXFLAGS="$CXXFLAGS -no_compact_linkedit -mmacosx-version-min=10.5"
-    FFLAGS="$FFLAGS -no_compact_linkedit -mmacosx-version-min=10.5"
+    FFLAGS="$FFLAGS -mmacosx-version-min=10.5"
     case "$F77" in
          gfortran-*|gfortran)
              # Extract from gfortran -v the version it has been built for
@@ -10277,6 +10277,11 @@ if test "$with_javasci" != no -o "$with_gui" != no -o "$enable_build_help" != no
 
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking MacOSX Version" >&5
 $as_echo_n "checking MacOSX Version... " >&6; }
+        if eval system_profiler SPSoftwareDataType | grep "System Version" | grep "10\.7" > /dev/null; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: MacOSX 10.7 - Lion." >&5
+$as_echo "MacOSX 10.7 - Lion." >&6; }
+        macosx_version="10.7"
+        else
         if eval system_profiler SPSoftwareDataType | grep "System Version" | grep "10\.6" > /dev/null; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: MacOSX 10.6 - Snow Leopard." >&5
 $as_echo "MacOSX 10.6 - Snow Leopard." >&6; }
@@ -10287,9 +10292,10 @@ $as_echo "MacOSX 10.6 - Snow Leopard." >&6; }
 $as_echo "MacOSX 10.5 - Leopard." >&6; }
         macosx_version="10.5"
         else
-        as_fn_error $? "MacOSX 10.5 or 10.6 is needed." "$LINENO" 5
+        as_fn_error $? "MacOSX 10.5,10.6 or 10.7 is needed." "$LINENO" 5
         fi
         fi
+       fi
 ;;
   esac
 
@@ -10510,7 +10516,7 @@ $as_echo "$ac_java_classpath" >&6; }
 $as_echo_n "checking to see if the java compiler works... " >&6; }
 
     cat << \EOF > conftest.java
-// #line 10513 "configure"
+// #line 10519 "configure"
 
 
 public class conftest {
@@ -10576,7 +10582,7 @@ $as_echo_n "checking type of jvm... " >&6; }
     if test "x$ac_java_jvm_name" = "x" ; then
 
     cat << \EOF > conftest.java
-// #line 10579 "configure"
+// #line 10585 "configure"
 import gnu.java.io.EncodingManager;
 
 public class conftest {
@@ -10639,7 +10645,7 @@ $as_echo_n "checking java API version... " >&6; }
     # The class java.nio.charset.Charset is new to 1.4
 
     cat << \EOF > conftest.java
-// #line 10642 "configure"
+// #line 10648 "configure"
 import java.nio.charset.Charset;
 
 public class conftest {
@@ -10683,7 +10689,7 @@ EOF
     # The class java.lang.StringBuilder is new to 1.5
 
     cat << \EOF > conftest.java
-// #line 10686 "configure"
+// #line 10692 "configure"
 import java.lang.StringBuilder;
 
 public class conftest {
@@ -10727,7 +10733,7 @@ EOF
     # The class java.util.ArrayDeque is new to 1.6
 
     cat << \EOF > conftest.java
-// #line 10730 "configure"
+// #line 10736 "configure"
 import java.util.ArrayDeque;
 
 public class conftest {
@@ -10771,7 +10777,7 @@ EOF
     # The class java.nio.file.Path is new to 1.7
 
     cat << \EOF > conftest.java
-// #line 10774 "configure"
+// #line 10780 "configure"
 import java.nio.file.Path;
 
 public class conftest {
@@ -12140,7 +12146,7 @@ $as_echo_n "checking jgraphx... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12143 "configure"
+// #line 12149 "configure"
 import com.mxgraph.model.mxCell;
 
 public class conftest {
@@ -12234,7 +12240,7 @@ $as_echo_n "checking minimal version (1.8.0.0) of jgraphx... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12237 "configure"
+// #line 12243 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -12285,7 +12291,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12288 "configure"
+// #line 12294 "configure"
 import com.mxgraph.view.mxGraph;
 
 public class conftest {
@@ -12362,7 +12368,7 @@ $as_echo_n "checking jhdf5... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12365 "configure"
+// #line 12371 "configure"
 import ncsa.hdf.hdf5lib.HDF5Constants;
 
 public class conftest {
@@ -12515,7 +12521,7 @@ $as_echo_n "checking minimal version (1.8.4) of hdf5... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12518 "configure"
+// #line 12524 "configure"
 import ncsa.hdf.hdf5lib.H5;
 
 public class conftest {
@@ -12570,7 +12576,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12573 "configure"
+// #line 12579 "configure"
 import ncsa.hdf.hdf5lib.H5;
 
 public class conftest {
@@ -12654,7 +12660,7 @@ $as_echo_n "checking flexdock... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12657 "configure"
+// #line 12663 "configure"
 import org.flexdock.docking.DockingManager;
 
 public class conftest {
@@ -12748,7 +12754,7 @@ $as_echo_n "checking minimal version (0.5.3) of flexdock... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 12751 "configure"
+// #line 12757 "configure"
 import org.flexdock.util.Utilities;
 
 public class conftest {
@@ -12799,7 +12805,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 12802 "configure"
+// #line 12808 "configure"
 import org.flexdock.util.Utilities;
 
 public class conftest {
@@ -12872,7 +12878,7 @@ $as_echo_n "checking looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12875 "configure"
+// #line 12881 "configure"
 import com.jgoodies.looks.common.MenuItemRenderer;
 
 public class conftest {
@@ -12979,7 +12985,7 @@ $as_echo_n "checking jgoodies-looks... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 12982 "configure"
+// #line 12988 "configure"
 import com.jgoodies.looks.common.MenuItemRenderer;
 
 public class conftest {
@@ -13087,7 +13093,7 @@ $as_echo_n "checking skinlf... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13090 "configure"
+// #line 13096 "configure"
 import com.l2fprod.util.AccessUtils;
 
 public class conftest {
@@ -13194,7 +13200,7 @@ $as_echo_n "checking jogl... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13197 "configure"
+// #line 13203 "configure"
 import javax.media.opengl.glu.GLUnurbs;
 
 public class conftest {
@@ -13408,7 +13414,7 @@ $as_echo_n "checking gluegen-rt... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13411 "configure"
+// #line 13417 "configure"
 import com.sun.gluegen.runtime.CPU;
 
 public class conftest {
@@ -13571,7 +13577,7 @@ $as_echo_n "checking jhall... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13574 "configure"
+// #line 13580 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -13678,7 +13684,7 @@ $as_echo_n "checking javahelp2... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13681 "configure"
+// #line 13687 "configure"
 import javax.help.JHelp;
 
 public class conftest {
@@ -13786,7 +13792,7 @@ $as_echo_n "checking jrosetta-API... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13789 "configure"
+// #line 13795 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -13891,7 +13897,7 @@ $as_echo_n "checking jrosetta-api... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 13894 "configure"
+// #line 13900 "configure"
 import com.artenum.rosetta.interfaces.core.ConsoleConfiguration;
 
 public class conftest {
@@ -13999,7 +14005,7 @@ $as_echo_n "checking jrosetta-engine... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14002 "configure"
+// #line 14008 "configure"
 import com.artenum.rosetta.core.action.AbstractConsoleAction;
 
 public class conftest {
@@ -14092,7 +14098,7 @@ $as_echo_n "checking minimal version (1.0.4) of jrosetta-engine... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14095 "configure"
+// #line 14101 "configure"
 import com.artenum.rosetta.util.ConfigurationBuilder;
 
 public class conftest {
@@ -14143,7 +14149,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 14146 "configure"
+// #line 14152 "configure"
 import com.artenum.rosetta.util.ConfigurationBuilder;
 
 public class conftest {
@@ -14218,7 +14224,7 @@ $as_echo_n "checking jeuclid-core... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14221 "configure"
+// #line 14227 "configure"
 import net.sourceforge.jeuclid.LayoutContext;
 
 public class conftest {
@@ -14327,7 +14333,7 @@ $as_echo_n "checking fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14330 "configure"
+// #line 14336 "configure"
 import org.apache.fop.pdf.PDFInfo;
 
 public class conftest {
@@ -14434,7 +14440,7 @@ $as_echo_n "checking batik-all... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14437 "configure"
+// #line 14443 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -14541,7 +14547,7 @@ $as_echo_n "checking batik... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14544 "configure"
+// #line 14550 "configure"
 import org.apache.batik.parser.Parser;
 
 public class conftest {
@@ -14635,7 +14641,7 @@ $as_echo_n "checking minimal version (1.7) of batik... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 14638 "configure"
+// #line 14644 "configure"
 import org.apache.batik.Version;
 
 public class conftest {
@@ -14686,7 +14692,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 14689 "configure"
+// #line 14695 "configure"
 import org.apache.batik.Version;
 
 public class conftest {
@@ -14759,7 +14765,7 @@ $as_echo_n "checking commons-io... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14762 "configure"
+// #line 14768 "configure"
 import org.apache.commons.io.output.CountingOutputStream;
 
 public class conftest {
@@ -14866,7 +14872,7 @@ $as_echo_n "checking xmlgraphics-commons... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14869 "configure"
+// #line 14875 "configure"
 import org.apache.xmlgraphics.util.Service;
 
 public class conftest {
@@ -14973,7 +14979,7 @@ $as_echo_n "checking avalon-framework... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 14976 "configure"
+// #line 14982 "configure"
 import org.apache.avalon.framework.configuration.ConfigurationException;
 
 public class conftest {
@@ -15080,7 +15086,7 @@ $as_echo_n "checking xml-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15083 "configure"
+// #line 15089 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -15187,7 +15193,7 @@ $as_echo_n "checking xml-commons-apis-ext... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15190 "configure"
+// #line 15196 "configure"
 import org.w3c.dom.svg.SVGDocument;
 
 public class conftest {
@@ -15298,7 +15304,7 @@ $as_echo_n "checking commons-logging... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15301 "configure"
+// #line 15307 "configure"
 import org.apache.commons.logging.LogFactory;
 
 public class conftest {
@@ -15405,7 +15411,7 @@ $as_echo_n "checking jlatexmath... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15408 "configure"
+// #line 15414 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -15499,7 +15505,7 @@ $as_echo_n "checking minimal version (0.9.4) of jlatexmath... " >&6; }
    if test "x" == "x"; then
 
     cat << \EOF > conftest.java
-// #line 15502 "configure"
+// #line 15508 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -15550,7 +15556,7 @@ EOF
    else
 
     cat << \EOF > conftest.java
-// #line 15553 "configure"
+// #line 15559 "configure"
 import org.scilab.forge.jlatexmath.TeXFormula;
 
 public class conftest {
@@ -15629,7 +15635,7 @@ $as_echo_n "checking checkstyle... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15632 "configure"
+// #line 15638 "configure"
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 
 public class conftest {
@@ -15736,7 +15742,7 @@ $as_echo_n "checking commons-beanutils... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15739 "configure"
+// #line 15745 "configure"
 import org.apache.commons.beanutils.Converter;
 
 public class conftest {
@@ -15843,7 +15849,7 @@ $as_echo_n "checking antlr... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15846 "configure"
+// #line 15852 "configure"
 import antlr.TokenStreamException;
 
 public class conftest {
@@ -15950,7 +15956,7 @@ $as_echo_n "checking testng... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 15953 "configure"
+// #line 15959 "configure"
 import org.testng.TestNG;
 
 public class conftest {
@@ -16057,7 +16063,7 @@ $as_echo_n "checking qdox... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16060 "configure"
+// #line 16066 "configure"
 import com.thoughtworks.qdox.tools.QDoxTester;
 
 public class conftest {
@@ -16164,7 +16170,7 @@ $as_echo_n "checking bsh... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16167 "configure"
+// #line 16173 "configure"
 import bsh.Console;
 
 public class conftest {
@@ -16271,7 +16277,7 @@ $as_echo_n "checking junit... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 16274 "configure"
+// #line 16280 "configure"
 import junit.framework.Assert;
 
 public class conftest {
@@ -23830,7 +23836,7 @@ CPPFLAGS="$CPPFLAGS -I$CHK_TCL_INCLUDE_PATH"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later" >&5
 $as_echo_n "checking if tcl is version $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later... " >&6; }
 cat > conftest.$ac_ext <<EOF
-#line 23833 "configure"
+#line 23839 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TCL_INCLUDE_PATH/$CHK_TCL_INC_NAME"
@@ -24140,7 +24146,7 @@ CPPFLAGS="$CPPFLAGS $TCL_INC_PATH -I$CHK_TK_INCLUDE_PATH $X_CFLAGS"
 $as_echo_n "checking if tk is version $CHK_TK_MAJOR.$CHK_TK_MINOR or later... " >&6; }
 
 cat > conftest.$ac_ext <<EOF
-#line 24143 "configure"
+#line 24149 "configure"
 #include "confdefs.h"
 
 #include "$CHK_TK_INCLUDE_PATH/$CHK_TK_INC_NAME"
@@ -24721,7 +24727,7 @@ $as_echo_n "checking saxon... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 24724 "configure"
+// #line 24730 "configure"
 import com.icl.saxon.Loader;
 
 public class conftest {
@@ -24828,7 +24834,7 @@ $as_echo_n "checking jlatexmath-fop... " >&6; }
           export ac_java_classpath="$jar_resolved:$ac_java_classpath"
 
     cat << \EOF > conftest.java
-// #line 24831 "configure"
+// #line 24837 "configure"
 import org.scilab.forge.jlatexmath.fop.JLaTeXMathObj;
 
 public class conftest {
@@ -31135,7 +31141,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 31138 "configure"
+#line 31144 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31241,7 +31247,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 31244 "configure"
+#line 31250 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/scilab/configure.ac b/scilab/configure.ac
index e571c11..5d29663 100644 (file)
--- a/scilab/configure.ac
+++ b/scilab/configure.ac
@@ -603,7 +603,7 @@ case "$CC" in
   *-*-darwin*)
     CFLAGS="$CFLAGS -no_compact_linkedit -mmacosx-version-min=10.5"
     CXXFLAGS="$CXXFLAGS -no_compact_linkedit -mmacosx-version-min=10.5"
-    FFLAGS="$FFLAGS -no_compact_linkedit -mmacosx-version-min=10.5"
+    FFLAGS="$FFLAGS -mmacosx-version-min=10.5"
     case "$F77" in
          gfortran-*|gfortran)
              # Extract from gfortran -v the version it has been built for

diff --git a/scilab/m4/macosx.m4 b/scilab/m4/macosx.m4
index ca6c746..958f08f 100644 (file)
--- a/scilab/m4/macosx.m4
+++ b/scilab/m4/macosx.m4
@@ -3,6 +3,10 @@
 #
 AC_DEFUN([AC_GET_MACOSX_VERSION],[
         AC_MSG_CHECKING([MacOSX Version])
+        if eval system_profiler SPSoftwareDataType | grep "System Version" | grep "10\.7" > /dev/null; then
+        AC_MSG_RESULT([MacOSX 10.7 - Lion.])
+        macosx_version="10.7"
+        else
         if eval system_profiler SPSoftwareDataType | grep "System Version" | grep "10\.6" > /dev/null; then
         AC_MSG_RESULT([MacOSX 10.6 - Snow Leopard.])
         macosx_version="10.6"
@@ -11,7 +15,8 @@ AC_DEFUN([AC_GET_MACOSX_VERSION],[
         AC_MSG_RESULT([MacOSX 10.5 - Leopard.])
         macosx_version="10.5"
         else
-        AC_MSG_ERROR([MacOSX 10.5 or 10.6 is needed.])
+        AC_MSG_ERROR([MacOSX 10.5,10.6 or 10.7 is needed.])
         fi
         fi
-])
\ No newline at end of file
+       fi
+])