diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-03-22 07:22:52 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-03-22 07:22:52 (GMT) |
| commit | 6668fe8c839ca1b01e63e410cee15e2d4180ef88 (patch) | |
| tree | 7990496a23366dfa448db8eda9b0380f29105bdb | |
| parent | 7f641b520d13fa0dfd14baa067d165af0bd8d463 (diff) | |
| download | hdf5-6668fe8c839ca1b01e63e410cee15e2d4180ef88.zip hdf5-6668fe8c839ca1b01e63e410cee15e2d4180ef88.tar.gz hdf5-6668fe8c839ca1b01e63e410cee15e2d4180ef88.tar.bz2 | |
[svn-r29499] Minor prettification of Java configure code and library
settings file.
Tested on: 64-bit Ubuntu 15.10 w/ gcc 5.2.1
autotools serial w/Java
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | src/libhdf5.settings.in | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index e80eef6..59157b2 100644 --- a/configure.ac +++ b/configure.ac @@ -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 ## ---------------------------------------------------------------------- diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index b54257f..8017594 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -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: --------- |