[svn-r14312] Added support of

   -fortran:   add --enable-fortran
   -cxx:       add --enable-cxx
   -pp:        add --enable-parallel

Tested: Kagiso (serial and parallel).

1 files changed, 16 insertions, 4 deletions

diff --git a/bin/buildhdf5 b/bin/buildhdf5
index cb56efd..f0dd938 100755
--- a/bin/buildhdf5
+++ b/bin/buildhdf5
@@ -28,7 +28,7 @@ can continue from a previous build.
 
 Command Syntax
 ==============
-buildhdf5 [-config] [-srcdir dir] config-arguments ...
+buildhdf5 [-config] [-szlib] [-help] [-n] [-srcdir dir] [-fortran] [-cxx] [-pp] config-arguments ...
    -config:	run configure only. [default to do build too]
    -szlib:      configure in the szlib option
    -help:	show this help page
@@ -36,6 +36,9 @@ buildhdf5 [-config] [-srcdir dir] config-arguments ...
    -srcdir:	use dir as the source directory
              	   [Note: this is different from --srcdir
              	    which will be passed to configure]
+   -fortran:	add --enable-fortran
+   -cxx:	add --enable-cxx
+   -pp:		add --enable-parallel
    all other arguments are passed to configure
 
 
@@ -245,6 +248,9 @@ while [ $# -gt 0 ]; do
 	    # do configure only
 	    CONFIG_ONLY=yes
 	    ;;
+	-szlib)
+	    LOCATE_SZLIB
+	    ;;
 	-help)
 	    USAGE
 	    exit 0
@@ -256,8 +262,14 @@ while [ $# -gt 0 ]; do
 	    shift
 	    SRCDIRLIST="$1"
 	    ;;
-	-szlib)
-	    LOCATE_SZLIB
+	-cxx)
+	    CONFIG_CXX="--enable-cxx"
+	    ;;
+	-fortran)
+	    CONFIG_FORTRAN="--enable-fortran"
+	    ;;
+	-pp)
+	    CONFIG_PARALLEL="--enable-parallel"
 	    ;;
 	*)	# Quit parsing
 	    break
@@ -285,7 +297,7 @@ if [ x-$SRCDIR = x-dummy ]; then
 fi
 
 # Setup Configure options
-CONFIG_OP="$WITH_SZLIB"
+CONFIG_OP="$WITH_SZLIB $CONFIG_FORTRAN $CONFIG_CXX $CONFIG_PARALLEL"
 
 # Configure
 # no configure if already done.