Merge remote-tracking branch 'origin/5.4'
[scilab.git] / scilab / configure
index ce972b0..72fbc3f 100755 (executable)
@@ -3066,8 +3066,8 @@ SCI_SRCDIR="$srcdir"
 SCI_SRCDIR_FULL="`cd $SCI_SRCDIR && pwd`"
 
 SCILAB_VERSION_MAJOR=5
-SCILAB_VERSION_MINOR=4
-SCILAB_VERSION_MAINTENANCE=1
+SCILAB_VERSION_MINOR=5
+SCILAB_VERSION_MAINTENANCE=0
 
 
 
@@ -13622,7 +13622,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar jogl2 used
                    # Provide known paths where distribs/OS can store JNI libs
                    LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
                    LDFLAGS="$LDFLAGS -L/usr/lib/java -L/usr/lib64/java"                 # jpackage.org
-                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl2 -L/usr/lib64/jogl2"               # RedHat
+                   LDFLAGS="$LDFLAGS -L/usr/lib/jogl -L/usr/lib64/jogl"                 # RedHat
                    LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
                    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for glTexParameterf in -ljogl_desktop" >&5
 $as_echo_n "checking for glTexParameterf in -ljogl_desktop... " >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jogl_desktop_glTexParameterf" >&5
 $as_echo "$ac_cv_lib_jogl_desktop_glTexParameterf" >&6; }
 if test "x$ac_cv_lib_jogl_desktop_glTexParameterf" = xyes; then :
-  JOGL2_LIBS="-ljogl_desktop"
+  JOGL2_LIBS="-ljogl"
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl_desktop -lGL" >&5
-$as_echo "$as_me: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl_desktop -lGL" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl2 -lGL" >&5
+$as_echo "$as_me: WARNING: Could not link against -ljogl_desktop. Will try against -ljogl2 -lGL" >&2;}
 fi
 
                    if test -z "$JOGL2_LIBS"; then # The previous test failed add more options to the LDFLAGS
@@ -13845,7 +13845,7 @@ $as_echo "$as_me: WARNING: Could not find or use the Java package/jar gluegen2-r
                    # Provide known paths where distribs/OS can store JNI libs
                    LDFLAGS="$LDFLAGS -L/usr/lib/jni -L/usr/lib64/jni"                   # Debian
                    LDFLAGS="$LDFLAGS -L/usr/lib/java -L/usr/lib64/java"                 # jpackage.org
-                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen2 -L/usr/lib64/gluegen2"         # RedHat
+                   LDFLAGS="$LDFLAGS -L/usr/lib/gluegen -L/usr/lib64/gluegen"           # RedHat
                    LDFLAGS="$LDFLAGS -L$SCI_SRCDIR/thirdparty -L$SCI_SRCDIR/bin"        # Scilab thirdparties
                    symbol="Java_jogamp_common_jvm_JVMUtil_initialize"
                    as_ac_Lib=`$as_echo "ac_cv_lib_gluegen2-rt_$symbol" | $as_tr_sh`
@@ -13887,7 +13887,7 @@ eval ac_res=\$$as_ac_Lib
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-  GLUEGEN2_RT_LIBS="-lgluegen2-rt"
+  GLUEGEN_RT_LIBS="-lgluegen-rt"
 else
   as_fn_error $? "libgluegen2-rt: Library missing (Cannot find symbol $symbol). Check if libgluegen-rt - C/Java (JNI) interface for GLUEGEN2 - is installed and if the version is correct. Note that you might have to update etc/librarypath.xml to provide the actual path the the JNI libraries." "$LINENO" 5
 fi