mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-31 17:10:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r29499] Minor prettification of Java configure code and library

Browse Source 
settings file.

Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
           autotools serial w/Java
This commit is contained in:
Dana Robinson 2016-03-22 02:22:52 -05:00
parent 7f641b520d
commit 6668fe8c83
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@ -855,10 +855,10 @@ esac
## Check if they would like the Java native interface (JNI) compiled
##
## This needs to be exposed for the library info file even if JAVA is disabled.
## This needs to be exposed for the library info file even if Java is disabled.
AC_SUBST([HDF_JAVA])
## Default is no JAVA
## Default is no Java
HDF_JAVA=no
AC_SUBST([H5_CLASSPATH]) H5_CLASSPATH=""
@ -3174,7 +3174,7 @@ fi
java_version_info=`$JAVA -version 2>&1 |\
grep 'version' | sed -e 's/version "//' | sed -e 's/"//'`
if test -n "$java_version_info"; then
JAVA_VERSION="$JAVA_VERSION ( $java_version_info)"
JAVA_VERSION="$JAVA_VERSION ($java_version_info)"
fi
## ----------------------------------------------------------------------

5
src/libhdf5.settings.in
View File

@ -60,8 +60,9 @@ Languages:
@BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @enable_shared@
@BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @enable_static@
JAVA: @HDF_JAVA@
@BUILD_JAVA_CONDITIONAL_TRUE@ JAVA Compiler: @JAVA_VERSION@
Java: @HDF_JAVA@
@BUILD_JAVA_CONDITIONAL_TRUE@ Java Compiler: @JAVA_VERSION@
Features:
---------