[svn-r29525] Merge of r29509 from revise_chunks.

Misc. CMake and autotools enhancements.

Tested on: jam

5 files changed, 50 insertions, 14 deletions

diff --git a/autogen.sh b/autogen.sh
index 3c0ad7b..f3bd774 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/sh
 #
 # Copyright by The HDF Group.                                              
 # All rights reserved.                                                     
@@ -110,8 +110,10 @@ while getopts "$optspec" optchar; do
         verbose=true
         ;;
     *)
-        if [ "$OPTERR" != 1 ] || [ "${optspec:0:1}" = ":" ]; then
-            echo "Non-option argument: '-${OPTARG}'" >&2
+        if [ "$OPTERR" != 1 ] || case $optspec in :*) ;; *) false; esac; then
+            echo "ERROR: non-option argument: '-${OPTARG}'" >&2
+            echo "Quitting"
+            exit 1
         fi
         ;;
     esac
diff --git a/configure b/configure
index b29ec1e..9e2effd 100755
--- a/configure
+++ b/configure
@@ -9610,10 +9610,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.
 
 
-## Default is no JAVA
+## Default is no Java
 HDF_JAVA=no
 
  H5_CLASSPATH=""
@@ -27754,7 +27754,7 @@ if test "${enable_threadsafe+set}" = set; then :
 fi
 
 
-## The high-level, C++, and Fortran interfaces are not compatible
+## The high-level, C++, Fortran and Java interfaces are not compatible
 ## with the thread-safety option because the lock is not hoisted
 ## into the higher-level API calls.
 
@@ -27786,6 +27786,14 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
+## --enable-threadsafe is also incompatible with --enable-java unless
+## --enable-unsupported has been specified on the configure line.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    as_fn_error $? "--enable-java and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
+  fi
+fi
+
 
 case "X-$THREADSAFE" in
   X-|X-no)
@@ -29544,6 +29552,15 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
+## The --enable-parallel flag is not compatible with --enable-java.
+## If the user tried to specify both flags, throw an error, unless
+## they also provided the --enable-unsupported flag.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
+    as_fn_error $? "--enable-java and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error." "$LINENO" 5
+  fi
+fi
+
 ## --enable-parallel is also incompatible with --enable-threadsafe, unless
 ## --enable-unsupported has been specified on the configure line.
 if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
@@ -30812,7 +30829,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/configure.ac b/configure.ac
index 837e5ca..ee6e15b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -858,10 +858,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=""
@@ -1578,7 +1578,7 @@ AC_ARG_ENABLE([threadsafe],
                               [default=no]])],
               [THREADSAFE=$enableval])
 
-## The high-level, C++, and Fortran interfaces are not compatible
+## The high-level, C++, Fortran and Java interfaces are not compatible
 ## with the thread-safety option because the lock is not hoisted
 ## into the higher-level API calls.
 
@@ -1610,6 +1610,14 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
+## --enable-threadsafe is also incompatible with --enable-java unless
+## --enable-unsupported has been specified on the configure line.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_threadsafe}" = "Xyes"; then
+    AC_MSG_ERROR([--enable-java and --enable-threadsafe flags are incompatible. Use --enable-unsupported to override this error.])
+  fi
+fi
+
 
 case "X-$THREADSAFE" in
   X-|X-no)
@@ -2432,6 +2440,15 @@ if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
   fi
 fi
 
+## The --enable-parallel flag is not compatible with --enable-java.
+## If the user tried to specify both flags, throw an error, unless
+## they also provided the --enable-unsupported flag.
+if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
+  if test "X${HDF_JAVA}" = "Xyes" -a "X${enable_parallel}" = "Xyes"; then
+    AC_MSG_ERROR([--enable-java and --enable-parallel flags are incompatible. Use --enable-unsupported to override this error.])
+  fi
+fi
+
 ## --enable-parallel is also incompatible with --enable-threadsafe, unless
 ## --enable-unsupported has been specified on the configure line.
 if test "X${ALLOW_UNSUPPORTED}" != "Xyes"; then
@@ -3177,7 +3194,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/CMakeLists.txt b/src/CMakeLists.txt
index 03c2773..d93612b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -792,7 +792,6 @@ set (H5_GENERATED_HEADERS
 )
 
 option (HDF5_GENERATE_HEADERS "Rebuild Generated Files" OFF)
-mark_as_advanced (HDF5_GENERATE_HEADERS)
 if (HDF5_GENERATE_HEADERS)
   set_source_files_properties(${H5_GENERATED_HEADERS} PROPERTIES GENERATED TRUE)
   find_package (Perl)
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:
 ---------