[svn-r29236] Check for shared libs only within enable-java block

1 files changed, 116 insertions, 116 deletions

diff --git a/configure.ac b/configure.ac
index d547ac5..e304481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,13 +214,13 @@ fi
 ## turning on debug or profiling flags for the compiler.  The search order
 ## is:
 ##
-##	CPU-VENDOR-OS
-##	VENDOR-OS
-##	CPU-OS
-##	CPU-VENDOR
-##	OS
-##	VENDOR
-##	CPU
+##    CPU-VENDOR-OS
+##    VENDOR-OS
+##    CPU-OS
+##    CPU-VENDOR
+##    OS
+##    VENDOR
+##    CPU
 ##
 ## If the `OS' ends with a version number then remove it. For instance,
 ## `freebsd3.1' would become `freebsd'
@@ -458,11 +458,11 @@ fi
 
 if test "X$HDF_FORTRAN" = "Xyes"; then
 
-## We will output an include file for Fortran, H5config_f.inc which 
-## contains various configure definitions used by the Fortran Library. 
-## Prepend H5_ to all macro names. This avoids name conflict between HDF5 macro 
+## We will output an include file for Fortran, H5config_f.inc which
+## contains various configure definitions used by the Fortran Library.
+## Prepend H5_ to all macro names. This avoids name conflict between HDF5 macro
 ## names and those generated by another software package that uses the HDF5 library.
-  AC_CONFIG_HEADERS([fortran/src/H5config_f.inc], 
+  AC_CONFIG_HEADERS([fortran/src/H5config_f.inc],
     [cat fortran/src/H5config_f.inc | sed '1d;s%^/\* \(.*\) \*/%\1%;s/#define /#define H5_/;s/#undef /#undef H5_/' >fortran/src/H5config_f.inc.tmp; mv -f fortran/src/H5config_f.inc.tmp fortran/src/H5config_f.inc])
 
   AC_SUBST([FC])
@@ -501,7 +501,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   ## Checking if the compiler supports the required Fortran 2003 features and
   ## stopping if it does not.
   PAC_PROG_FC_HAVE_F2003_REQUIREMENTS
- 
+
   if test "X$HAVE_F2003_REQUIREMENTS" = "Xno"; then
     AC_MSG_ERROR([Fortran compiler lacks required Fortran 2003 features; unsupported Fortran 2003 compiler, remove --enable-fortran])
   fi
@@ -517,7 +517,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
   ## See if the fortran compiler supports the intrinsic function "C_SIZEOF"
   PAC_PROG_FC_C_SIZEOF
-	
+
   ## See if the fortran compiler supports the intrinsic function "STORAGE_SIZE"
   PAC_PROG_FC_STORAGE_SIZE
 
@@ -526,12 +526,12 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
     FC_SIZEOF_A="STORAGE_SIZE(a, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
     FC_SIZEOF_B="STORAGE_SIZE(b, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
     FC_SIZEOF_C="STORAGE_SIZE(c, c_size_t)/STORAGE_SIZE(c_char_'a',c_size_t)"
-  else 
+  else
     if test "X$HAVE_SIZEOF_FORTRAN" = "Xyes";then
       FC_SIZEOF_A="SIZEOF(a)"
       FC_SIZEOF_B="SIZEOF(b)"
       FC_SIZEOF_C="SIZEOF(c)"
-    else	
+    else
       ## If neither intrinsic functions SIZEOF or STORAGE_SIZE is available then stop configure with an error
       AC_MSG_ERROR([Fortran compiler requires either intrinsic functions SIZEOF or STORAGE_SIZE])
     fi
@@ -541,7 +541,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   PAC_PROG_FC_ISO_FORTRAN_ENV
   ## Check KIND and size of native integer
   PAC_FC_NATIVE_INTEGER
- 
+
   ## Find all available KINDs
   PAC_FC_AVAIL_KINDS
   ## Find all sizeofs for available KINDs
@@ -552,7 +552,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   AC_SUBST([PAC_FC_MAX_REAL_PRECISION])
   AC_SUBST([PAC_FC_ALL_INTEGER_KINDS])
   AC_SUBST([PAC_FC_ALL_REAL_KINDS_SIZEOF])
-  AC_SUBST([PAC_FC_ALL_INTEGER_KINDS_SIZEOF])  
+  AC_SUBST([PAC_FC_ALL_INTEGER_KINDS_SIZEOF])
   AC_SUBST([PAC_FORTRAN_NATIVE_INTEGER_KIND])
   AC_SUBST([PAC_FORTRAN_NATIVE_INTEGER_SIZEOF])
   AC_SUBST([PAC_FORTRAN_NATIVE_REAL_KIND])
@@ -564,8 +564,8 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   AC_SUBST([FORTRAN_C_LONG_DOUBLE_IS_UNIQUE])
   AC_SUBST([FORTRAN_SIZEOF_LONG_DOUBLE])
   AC_SUBST([H5CONFIG_F_NUM_RKIND])
-  AC_SUBST([H5CONFIG_F_RKIND])	
-  AC_SUBST([H5CONFIG_F_RKIND_SIZEOF])	
+  AC_SUBST([H5CONFIG_F_RKIND])
+  AC_SUBST([H5CONFIG_F_RKIND_SIZEOF])
   AC_SUBST([H5CONFIG_F_NUM_IKIND])
   AC_SUBST([H5CONFIG_F_IKIND])
   AC_SUBST([Fortran_COMPILER_ID])
@@ -574,7 +574,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
   ## Setting definition if there is a 16 byte fortran integer
   if `echo $PAC_FC_ALL_INTEGER_KINDS_SIZEOF | grep '16' >/dev/null`; then
-    HAVE_Fortran_INTEGER_SIZEOF_16="1" 	
+    HAVE_Fortran_INTEGER_SIZEOF_16="1"
     AC_DEFINE([HAVE_Fortran_INTEGER_SIZEOF_16], [1], [Determine if INTEGER*16 is available])
   else
     HAVE_Fortran_INTEGER_SIZEOF_16="0"
@@ -588,7 +588,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   if  test "X$HAVE_C_SIZEOF_FORTRAN" = "Xyes"; then
     AC_DEFINE([FORTRAN_HAVE_C_SIZEOF], [1], [Define if we have Fortran intrinsic C_SIZEOF])
   fi
-	
+
   if  test "X$HAVE_SIZEOF_FORTRAN" = "Xyes"; then
     AC_DEFINE([FORTRAN_HAVE_SIZEOF], [1], [Define if we have Fortran intrinsic SIZEOF])
   fi
@@ -596,9 +596,9 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
   ## See if C_LONG_DOUBLE is available
   PAC_PROG_FC_HAVE_C_LONG_DOUBLE
 
-  FORTRAN_HAVE_C_LONG_DOUBLE="0" 
+  FORTRAN_HAVE_C_LONG_DOUBLE="0"
   if test "X$HAVE_C_LONG_DOUBLE_FORTRAN" = "Xyes"; then
-    FORTRAN_HAVE_C_LONG_DOUBLE="1" 
+    FORTRAN_HAVE_C_LONG_DOUBLE="1"
     AC_DEFINE([FORTRAN_HAVE_C_LONG_DOUBLE], [1], [Define if we have Fortran C_LONG_DOUBLE])
   fi
 
@@ -613,7 +613,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
       FORTRAN_C_LONG_DOUBLE_IS_UNIQUE="0"
     fi
   fi
-  
+
   FORTRAN_SIZEOF_LONG_DOUBLE=${ac_cv_sizeof_long_double}
   AC_DEFINE_UNQUOTED([FORTRAN_SIZEOF_LONG_DOUBLE], ["${ac_cv_sizeof_long_double}"], [Determine the size of C long double])
 
@@ -624,7 +624,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
 
   dnl remove the invalid kind from the list
   if test "$ac_cv_sizeof___float128" != 0;then
-    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" && 
+    if test "$ac_cv_sizeof___float128" != "$max_real_fortran_sizeof" &&
        test "${ac_cv_sizeof_long_double}" != "$max_real_fortran_sizeof" &&
        dnl account for the fact that the C compiler can have 16-byte __float128 and the Fortran compiler only has 8-byte doubles,
        dnl so we don't want to remove the 8-byte Fortran doubles. This is sometimes the case if different C and Fortran vendors
@@ -639,7 +639,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then
     fi
   fi
   AC_MSG_CHECKING([for Fortran interoperable KINDS with C])
-  AC_MSG_RESULT([$PAC_FC_ALL_REAL_KINDS])	
+  AC_MSG_RESULT([$PAC_FC_ALL_REAL_KINDS])
 
   dnl count the number of real kinds
   H5CONFIG_F_NUM_RKIND="INTEGER, PARAMETER :: num_rkinds = `echo \"[$]PAC_FC_ALL_REAL_KINDS\" |  tr -d -c ',\n' | awk '{ print length + 1; }'`"
@@ -669,7 +669,7 @@ HDF_CXX=no
 ## AC_PROG_CXX defines some macros that Automake 1.9.x uses and will
 ## miss even if c++ is not enabled.
 AC_PROG_CXX
-AC_PROG_CXXCPP	## this is checked for when AC_HEADER_STDC is done
+AC_PROG_CXXCPP    ## this is checked for when AC_HEADER_STDC is done
 
 AC_MSG_CHECKING([if c++ interface enabled])
 
@@ -802,36 +802,36 @@ fi
 ## The following variables are used to distinguish between building a
 ## serial and parallel library.
 ##
-##    HAVE_PARALLEL	-- defined in H5config.h if we are building
-##			   a parallel library even if configure wasn't
-##			   able to find some header file or library that
-##			   might be required. This is defined if the
-##			   user explicitly states
-##			   that a parallel library is being built by supplying
-##			   the `--enable-parallel' configure switch.
-##
-##    PARALLEL		-- This variable is set to a non-null value if
-##			   we're building a parallel version of the library.
-##
-##    RUNSERIAL	        -- This is a command which will be prepended to
-##			   the executable name to run the executable using
-##			   a single process. For serial versions of the
-##			   library this will normally be empty. For parallel
-##			   versions it might be something like `mpiexec -n 1'.
-##			   The value of this variable is substituted in *.in
-##			   files.
-##
-##    RUNPARALLEL	-- This is a command which will be prepended to
-##			   the executable name to run the executable on
-##			   multiple processors. For the serial library the
-##			   value will normally be the empty string. For
-##			   parallel library it should be something like
-##			   "mpiexec -n \$\${NPROCS:=6}" where NPROCS will
-##			   eventually contain the number of processors on which
-##			   to run the executable (the double dollarsigns are to
-##			   protect the expansion until make executes the
-##			   command).  The value of this variable is
-##			   substituted in *.in files.
+##    HAVE_PARALLEL    -- defined in H5config.h if we are building
+##               a parallel library even if configure wasn't
+##               able to find some header file or library that
+##               might be required. This is defined if the
+##               user explicitly states
+##               that a parallel library is being built by supplying
+##               the `--enable-parallel' configure switch.
+##
+##    PARALLEL        -- This variable is set to a non-null value if
+##               we're building a parallel version of the library.
+##
+##    RUNSERIAL            -- This is a command which will be prepended to
+##               the executable name to run the executable using
+##               a single process. For serial versions of the
+##               library this will normally be empty. For parallel
+##               versions it might be something like `mpiexec -n 1'.
+##               The value of this variable is substituted in *.in
+##               files.
+##
+##    RUNPARALLEL    -- This is a command which will be prepended to
+##               the executable name to run the executable on
+##               multiple processors. For the serial library the
+##               value will normally be the empty string. For
+##               parallel library it should be something like
+##               "mpiexec -n \$\${NPROCS:=6}" where NPROCS will
+##               eventually contain the number of processors on which
+##               to run the executable (the double dollarsigns are to
+##               protect the expansion until make executes the
+##               command).  The value of this variable is
+##               substituted in *.in files.
 ##
 AC_SUBST([PARALLEL])
 AC_SUBST([RUNSERIAL])
@@ -864,36 +864,36 @@ AC_ARG_ENABLE([java],
               [HDF_JAVA=$enableval],
               [HDF_JAVA=no])
 
-if test "X$HDF_JAVA" = "Xyes" && test "X${enable_shared}" != "Xno"; then
-  echo "yes"
-  if test "X$CLASSPATH" = "X"; then
-    H5_CLASSPATH=".:$srcdir/java/lib"
-  else
-    H5_CLASSPATH=".:$CLASSPATH:$srcdir/java/lib"
-  fi
-## Checks for programs.
-  AX_JAVA_OPTIONS
-  H5_JAVACFLAGS=$JAVACFLAGS
-  H5_JAVAFLAGS=$JAVAFLAGS
-  AX_PROG_JAVAC
-  AX_PROG_JAVA
-  AX_PROG_JAR
-  AX_PROG_JAVADOC
-  ## Find the include directories needed for building JNI code
-  AX_JNI_INCLUDE_DIR()
-  for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
-  do
-    JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR"
-  done
-  ## Find junit for testing the JNI code
-  AX_CHECK_CLASSPATH()
-  CLASSPATH_ENV=$H5_CLASSPATH
-  AX_CHECK_JUNIT()
-  AX_CHECK_JAVA_HOME
+if test "X$HDF_JAVA" = "Xyes"
+  if test "X${enable_shared}" != "Xno"; then
+    echo "yes"
+    if test "X$CLASSPATH" = "X"; then
+      H5_CLASSPATH=".:$srcdir/java/lib"
+    else
+      H5_CLASSPATH=".:$CLASSPATH:$srcdir/java/lib"
+    fi
+    ## Checks for programs.
+    AX_JAVA_OPTIONS
+    H5_JAVACFLAGS=$JAVACFLAGS
+    H5_JAVAFLAGS=$JAVAFLAGS
+    AX_PROG_JAVAC
+    AX_PROG_JAVA
+    AX_PROG_JAR
+    AX_PROG_JAVADOC
+    ## Find the include directories needed for building JNI code
+    AX_JNI_INCLUDE_DIR()
+    for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+    do
+      JNIFLAGS="$JNIFLAGS -I$JNI_INCLUDE_DIR"
+    done
+    ## Find junit for testing the JNI code
+    AX_CHECK_CLASSPATH()
+    CLASSPATH_ENV=$H5_CLASSPATH
+    AX_CHECK_JUNIT()
+    AX_CHECK_JAVA_HOME
 
-  AC_MSG_RESULT([yes])
-else
-  if test "X${enable_shared}" = "Xno"; then
+    AC_MSG_RESULT([yes])
+  else
     AC_MSG_ERROR([Java requires shared libraries to be built])
   fi
   HDF_JAVA="no"
@@ -1888,7 +1888,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
                         double d;
                     } u;
                 } di_struct_t;
-                di_struct_t x = {0, { .d = 0.0}}; ]])], 
+                di_struct_t x = {0, { .d = 0.0}}; ]])],
                [AC_DEFINE([HAVE_C99_DESIGNATED_INITIALIZER], [1],
                          [Define if the compiler understands C99 designated initialization of structs and unions])
                  AC_MSG_RESULT([yes])],
@@ -2088,7 +2088,7 @@ AC_ARG_ENABLE([optimization],
                                at several levels: High, with aggressive optimizations
                                turned on; debug, with optimizations that are
                                unlikely to interfere with debugging or profiling;
-                               and none, with no optimizations at all. 
+                               and none, with no optimizations at all.
                                See the compiler-specific config/*-flags file for more
                                details.
                                Alternatively, optimization options can
@@ -2446,11 +2446,11 @@ case "X-$enable_parallel" in
     ## Try link a simple MPI program.
     AC_MSG_CHECKING([whether a simple MPI-IO C program can be linked])
     AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <mpi.h>]],
-                   [[ MPI_Init(0, (void *)0); 
-		      MPI_File_open(0, (void *)0, 0, 0, (void *)0);]])], 
-		   [AC_MSG_RESULT([yes])],
-	  	   [AC_MSG_RESULT([no])
-		    AC_MSG_ERROR([unable to link a simple MPI-IO C program])])
+                   [[ MPI_Init(0, (void *)0);
+            MPI_File_open(0, (void *)0, 0, 0, (void *)0);]])],
+        [AC_MSG_RESULT([yes])],
+            [AC_MSG_RESULT([no])
+            AC_MSG_ERROR([unable to link a simple MPI-IO C program])])
 
     if test "X$HDF_FORTRAN" = "Xyes"; then
       PAC_PROG_FC_MPI_CHECK
@@ -2721,13 +2721,13 @@ fi
 ## ----------------------------------------------------------------------
 ## Decide whether the data accuracy has higher priority during data
 ## conversions.  If not, some hard conversions will still be prefered even
-## though the data may be wrong (for example, some compilers don't 
+## though the data may be wrong (for example, some compilers don't
 ## support denormalized floating values) to maximize speed.
-## 
+##
 AC_MSG_CHECKING([whether data accuracy is guaranteed during data conversions])
 AC_ARG_ENABLE([dconv-accuracy],
               [AS_HELP_STRING([--enable-dconv-accuracy],
-                              [if data accuracy is guaranteed during 
+                              [if data accuracy is guaranteed during
                               data conversions [default=yes]])],
               [DATA_ACCURACY=$enableval], [DATA_ACCURACY=yes])
 
@@ -2943,19 +2943,19 @@ else
             unsigned long long  ull;
             unsigned char       s[16];
             int                 ret = 0;
-            
+
             if(sizeof(long double) == 16) {
-                /*make sure the long double type is the same as the failing type 
+                /*make sure the long double type is the same as the failing type
                  *which has 16 bytes in size and 11 bits of exponent.  If it is,
-                 *the bit sequence should be like below.  It's not 
-                 *a decent way to check but this info isn't available. */   
+                 *the bit sequence should be like below.  It's not
+                 *a decent way to check but this info isn't available. */
                 memcpy(s, &ld, 16);
                 if(s[0]==0x43 && s[1]==0x51 && s[2]==0xcc && s[3]==0xf3 &&
                     s[4]==0x85 && s[5]==0xeb && s[6]==0xc8 && s[7]==0xa0 &&
                     s[8]==0xbf && s[9]==0xcc && s[10]==0x2a && s[11]==0x3c) {
 
                     /*slightly adjust the bit sequence (s[8]=0xdf).  The converted
-                     *values will go wild on Mac OS 10.4 and IRIX64 6.5.*/ 
+                     *values will go wild on Mac OS 10.4 and IRIX64 6.5.*/
                     s[0]=0x43; s[1]=0x51; s[2]=0xcc; s[3]=0xf3;
                     s[4]=0x85; s[5]=0xeb; s[6]=0xc8; s[7]=0xa0;
                     s[8]=0xdf; s[9]=0xcc; s[10]=0x2a; s[11]=0x3c;
@@ -2964,11 +2964,11 @@ else
                     memcpy(&ld, s, 16);
                     ll = (long long)ld;
                     ull = (unsigned long long)ld;
-                    
+
                     if(ll != 20041683600089728 || ull != 20041683600089728)
                         ret = 1;
-                }    
-            }    
+                }
+            }
     done:
             exit(ret);
         }
@@ -3006,17 +3006,17 @@ else
             unsigned long long  ull;
             unsigned char       s[16];
             int                 flag=0, ret=0;
-        
+
             /*Determine if long double has 16 byte in size, 11 bit exponent, and
-             *the bias is 0x3ff */ 
-            if(sizeof(long double) == 16) { 
+             *the bias is 0x3ff */
+            if(sizeof(long double) == 16) {
                 ld = 1.0L;
                 memcpy(s, &ld, 16);
                 if(s[0]==0x3f && s[1]==0xf0 && s[2]==0x00 && s[3]==0x00 &&
-                    s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00) 
-                    flag = 1; 
+                    s[4]==0x00 && s[5]==0x00 && s[6]==0x00 && s[7]==0x00)
+                    flag = 1;
             }
-             
+
             if(flag==1 && sizeof(long long)==8) {
                 ll = 0x01ffffffffffffffLL;
                 ld = (long double)ll;
@@ -3026,7 +3026,7 @@ else
                     s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
                     s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
                     ret = 1;
-            }        
+            }
             if(flag==1 && sizeof(unsigned long long)==8) {
                 ull = 0x01ffffffffffffffULL;
                 ld = (long double)ull;
@@ -3035,11 +3035,11 @@ else
                     s[4]!=0xff || s[5]!=0xff || s[6]!=0xff || s[7]!=0xff ||
                     s[8]!=0xf0 || s[9]!=0x00 || s[10]!=0x00 || s[11]!=0x00)
                     ret = 1;
-            }        
+            }
     done:
             exit(ret);
         }
-        ]])],[hdf5_cv_llong_to_ldouble_correct=yes], [hdf5_cv_llong_to_ldouble_correct=no],[])]) 
+        ]])],[hdf5_cv_llong_to_ldouble_correct=yes], [hdf5_cv_llong_to_ldouble_correct=no],[])])
 fi
 
 if test ${hdf5_cv_llong_to_ldouble_correct} = "yes"; then
@@ -3316,9 +3316,9 @@ esac
 AC_MSG_CHECKING([whether to have library information embedded in the executables])
 AC_ARG_ENABLE([embedded-libinfo],
     [AS_HELP_STRING([--enable-embedded-libinfo],
-	[Enable embedded library information [default=yes]])],
-	[enable_embedded_libinfo=$enableval],
-	[enable_embedded_libinfo=yes])
+    [Enable embedded library information [default=yes]])],
+    [enable_embedded_libinfo=$enableval],
+    [enable_embedded_libinfo=yes])
 
    if test "${enable_embedded_libinfo}" = "yes"; then
       AC_MSG_RESULT([yes])