[svn-r13972] Description:

	Add --with-default-api-version configure flag.

Tested on:
	Mac OS X/32 10.4.10 (amazon)
	FreeBSD/32 6.2 (duty)
	Linux/32 2.6 (kagiso)

1 files changed, 71 insertions, 25 deletions

diff --git a/configure b/configure
index cdd58e6..f9be8e2 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13928 2007-06-29 20:52:56Z mcgreevy .
+# From configure.in Id: configure.in 13971 2007-07-12 22:01:35Z koziol .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta2post1.
 #
@@ -944,6 +944,7 @@ HL_FOR
 BUILD_ALL_CONDITIONAL_TRUE
 BUILD_ALL_CONDITIONAL_FALSE
 DEPRECATED_SYMBOLS
+DEFAULT_API_VERSION
 BUILD_CXX_CONDITIONAL_TRUE
 BUILD_CXX_CONDITIONAL_FALSE
 BUILD_PARALLEL_CONDITIONAL_TRUE
@@ -1649,6 +1650,9 @@ Optional Packages:
   --with-mpe=DIR          Use MPE instrumentation [default=no]
   --with-default-vfd=driver
                           Specify default file driver [default=sec2]
+  --with-default-api-version=(v16|v18)
+                          Specify default release version of public symbols
+                          [default=v18]
 
 Some influential environment variables:
   CC          C compiler command
@@ -7924,7 +7928,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7927 "configure"' > conftest.$ac_ext
+  echo '#line 7931 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10198,11 +10202,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10201: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10205: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10205: \$? = $ac_status" >&5
+   echo "$as_me:10209: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10466,11 +10470,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10469: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10473: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10473: \$? = $ac_status" >&5
+   echo "$as_me:10477: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -10570,11 +10574,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:10573: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10577: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10577: \$? = $ac_status" >&5
+   echo "$as_me:10581: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12950,7 +12954,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12953 "configure"
+#line 12957 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13050,7 +13054,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13053 "configure"
+#line 13057 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15402,11 +15406,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15405: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15409: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15409: \$? = $ac_status" >&5
+   echo "$as_me:15413: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15506,11 +15510,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15509: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15513: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15513: \$? = $ac_status" >&5
+   echo "$as_me:15517: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17076,11 +17080,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17079: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17083: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17083: \$? = $ac_status" >&5
+   echo "$as_me:17087: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17180,11 +17184,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17183: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17187: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17187: \$? = $ac_status" >&5
+   echo "$as_me:17191: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -19378,11 +19382,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19381: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19385: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19385: \$? = $ac_status" >&5
+   echo "$as_me:19389: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19646,11 +19650,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19649: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19653: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19653: \$? = $ac_status" >&5
+   echo "$as_me:19657: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -19750,11 +19754,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:19753: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19757: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19757: \$? = $ac_status" >&5
+   echo "$as_me:19761: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -52539,6 +52543,44 @@ _ACEOF
 esac
 
 
+
+{ echo "$as_me:$LINENO: checking which version of public symbols to use by default" >&5
+echo $ECHO_N "checking which version of public symbols to use by default... $ECHO_C" >&6; }
+
+# Check whether --with-default-api-version was given.
+if test "${with_default_api_version+set}" = set; then
+  withval=$with_default_api_version;
+else
+  withval=v18
+fi
+
+
+if test "X$withval" = "Xv16"; then
+    { echo "$as_me:$LINENO: result: v16" >&5
+echo "${ECHO_T}v16" >&6; }
+    DEFAULT_API_VERSION=v16
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_16_API 1
+_ACEOF
+
+elif test "X$withval" = "Xv18"; then
+    { echo "$as_me:$LINENO: result: v18" >&5
+echo "${ECHO_T}v18" >&6; }
+    DEFAULT_API_VERSION=v18
+else
+    { { echo "$as_me:$LINENO: error: invalid version of public symbols given" >&5
+echo "$as_me: error: invalid version of public symbols given" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+if test "X${DEFAULT_API_VERSION}" != "Xv18" -a "X${DEPRECATED_SYMBOLS}" = "Xno" ; then
+  { { echo "$as_me:$LINENO: error: Removing old public API symbols not allowed when using them as default public API symbols" >&5
+echo "$as_me: error: Removing old public API symbols not allowed when using them as default public API symbols" >&2;}
+   { (exit 1); exit 1; }; }
+fi
+
+
  if test "X$HDF_CXX" = "Xyes"; then
   BUILD_CXX_CONDITIONAL_TRUE=
   BUILD_CXX_CONDITIONAL_FALSE='#'
@@ -53591,6 +53633,7 @@ HL_FOR!$HL_FOR$ac_delim
 BUILD_ALL_CONDITIONAL_TRUE!$BUILD_ALL_CONDITIONAL_TRUE$ac_delim
 BUILD_ALL_CONDITIONAL_FALSE!$BUILD_ALL_CONDITIONAL_FALSE$ac_delim
 DEPRECATED_SYMBOLS!$DEPRECATED_SYMBOLS$ac_delim
+DEFAULT_API_VERSION!$DEFAULT_API_VERSION$ac_delim
 BUILD_CXX_CONDITIONAL_TRUE!$BUILD_CXX_CONDITIONAL_TRUE$ac_delim
 BUILD_CXX_CONDITIONAL_FALSE!$BUILD_CXX_CONDITIONAL_FALSE$ac_delim
 BUILD_PARALLEL_CONDITIONAL_TRUE!$BUILD_PARALLEL_CONDITIONAL_TRUE$ac_delim
@@ -53605,7 +53648,7 @@ LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 89; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -54344,6 +54387,9 @@ IF_YES_NO "$enable_static"
 PRINT_N "  Statically Linked Executables"
 IF_YES_NO "$STATIC_EXEC"
 
+PRINT_N "Default Version of Public Symbols"
+PRINT $DEFAULT_API_VERSION
+
 PRINT_N " With Deprecated Public Symbols"
 IF_YES_NO "$DEPRECATED_SYMBOLS"