[svn-r13971] Description:

Add --enable-deprecated-symbols configure option, to allow users to remove deprecated public API symbols at configure time. Add bin/make_vers script to bin/reconfigure actions. Run bin/reconfigure to regenerate autotool components. Tested on: Mac OS X/32 10.4.10 (amazon) FreeBSD/32 6.2 (duty) Linux/32 2.6 (kagiso)
2024-11-27 02:10:55 +08:00 · 2007-07-12 17:01:35 -05:00 · 2007-07-12 17:01:35 -05:00 · b4e029c70b
commit b4e029c70b
parent a73ea1b4f0
45 changed files with 161 additions and 49 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -137,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/bin/make_vers
+++ b/bin/make_vers
@ -86,9 +86,9 @@ sub print_checkoptions ($) {

    # Print the option checking
    print $fh "\n/* Issue error if contradicting macros have been defined. */\n";
-    print $fh "#if defined(H5_USE_16_API) && defined(H5_WITHOUT_DEPRECATED_APIS)\n";
+    print $fh "#if defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS)\n";
    print $fh "#error \"Can't choose old API versions when deprecated APIs are disabled\"\n";
-    print $fh "#endif /* defined(H5_USE_16_API) && defined(H5_WITHOUT_DEPRECATED_APIS) */\n";
+    print $fh "#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */\n";
 }

 ##############################################################################
--- a/bin/reconfigure
+++ b/bin/reconfigure
@ -118,11 +118,18 @@ echo
 echo "    Running trace script:"
 bin/trace src/H5*.c || exit 1

-# Run make_error
-# make_error automatically generates the H5E headers that create error message
+# Run make_err
+# make_err automatically generates the H5E headers that create error message
 # types for HDF5.
 echo
 echo "    Running error generation script:"
 bin/make_err src/H5err.txt || exit 1

+# Run make_vers
+# make_vers automatically generates the public headers that define the API version
+# macros for HDF5.
+echo
+echo "    Running API version generation script:"
+bin/make_vers src/H5vers.txt || exit 1
+
 exit 0
--- a/c++/Makefile.in
+++ b/c++/Makefile.in
@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/c++/examples/Makefile.in
+++ b/c++/examples/Makefile.in
@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/c++/src/Makefile.in
+++ b/c++/src/Makefile.in
@ -138,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/c++/test/Makefile.in
+++ b/c++/test/Makefile.in
@ -124,6 +124,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/86
+++ b/86
@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13925 2007-06-28 20:36:08Z mcgreevy .
+# From configure.in Id: configure.in 13928 2007-06-29 20:52:56Z mcgreevy .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta2post1.
 #
@ -943,6 +943,7 @@ HL
 HL_FOR
 BUILD_ALL_CONDITIONAL_TRUE
 BUILD_ALL_CONDITIONAL_FALSE
+DEPRECATED_SYMBOLS
 BUILD_CXX_CONDITIONAL_TRUE
 BUILD_CXX_CONDITIONAL_FALSE
 BUILD_PARALLEL_CONDITIONAL_TRUE
@ -1620,6 +1621,8 @@ Optional Features:
  --enable-hl             Enable the high level library [default=yes]
  --enable-build-all      Build helper programs that only developers should
                          need [default=no]
+  --enable-deprecated-symbols
+                          Enable deprecated public API symbols [default=yes]

 Optional Packages:
  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@ -7921,7 +7924,7 @@ ia64-*-hpux*)
  ;;
 *-*-irix6*)
  # Find out which ABI we are using.
-  echo '#line 7924 "configure"' > conftest.$ac_ext
+  echo '#line 7927 "configure"' > conftest.$ac_ext
  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
  (eval $ac_compile) 2>&5
  ac_status=$?
@ -10195,11 +10198,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:10198: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10201: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:10202: \$? = $ac_status" >&5
+   echo "$as_me:10205: \$? = $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.
@ -10463,11 +10466,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:10466: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10469: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:10470: \$? = $ac_status" >&5
+   echo "$as_me:10473: \$? = $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.
@ -10567,11 +10570,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:10570: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10573: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:10574: \$? = $ac_status" >&5
+   echo "$as_me:10577: \$? = $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
@ -12947,7 +12950,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 12950 "configure"
+#line 12953 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -13047,7 +13050,7 @@ else
  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
  lt_status=$lt_dlunknown
  cat > conftest.$ac_ext <<EOF
-#line 13050 "configure"
+#line 13053 "configure"
 #include "confdefs.h"

 #if HAVE_DLFCN_H
@ -15399,11 +15402,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:15402: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15405: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:15406: \$? = $ac_status" >&5
+   echo "$as_me:15409: \$? = $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.
@ -15503,11 +15506,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:15506: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15509: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:15510: \$? = $ac_status" >&5
+   echo "$as_me:15513: \$? = $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
@ -17073,11 +17076,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:17076: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17079: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:17080: \$? = $ac_status" >&5
+   echo "$as_me:17083: \$? = $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.
@ -17177,11 +17180,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:17180: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17183: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:17184: \$? = $ac_status" >&5
+   echo "$as_me:17187: \$? = $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
@ -19375,11 +19378,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:19378: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19381: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:19382: \$? = $ac_status" >&5
+   echo "$as_me:19385: \$? = $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.
@ -19643,11 +19646,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:19646: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19649: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>conftest.err)
   ac_status=$?
   cat conftest.err >&5
-   echo "$as_me:19650: \$? = $ac_status" >&5
+   echo "$as_me:19653: \$? = $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.
@ -19747,11 +19750,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:19750: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19753: $lt_compile\"" >&5)
   (eval "$lt_compile" 2>out/conftest.err)
   ac_status=$?
   cat out/conftest.err >&5
-   echo "$as_me:19754: \$? = $ac_status" >&5
+   echo "$as_me:19757: \$? = $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
@ -52507,6 +52510,35 @@ fi



+{ echo "$as_me:$LINENO: checking if deprecated public symbols are available" >&5
+echo $ECHO_N "checking if deprecated public symbols are available... $ECHO_C" >&6; };
+# Check whether --enable-deprecated-symbols was given.
+if test "${enable_deprecated_symbols+set}" = set; then
+  enableval=$enable_deprecated_symbols; DEPREC_SYMBOLS=$enableval
+else
+  DEPREC_SYMBOLS=yes
+fi
+
+
+case "X-$DEPREC_SYMBOLS" in
+  X-yes)
+    { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+    DEPRECATED_SYMBOLS=yes
+    ;;
+  X-no|*)
+    { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+    DEPRECATED_SYMBOLS=no
+
+cat >>confdefs.h <<\_ACEOF
+#define NO_DEPRECATED_SYMBOLS 1
+_ACEOF
+
+    ;;
+esac
+
+
 if test "X$HDF_CXX" = "Xyes"; then
  BUILD_CXX_CONDITIONAL_TRUE=
  BUILD_CXX_CONDITIONAL_FALSE='#'
@ -53558,6 +53590,7 @@ HL!$HL$ac_delim
 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
 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
@ -53572,7 +53605,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` = 87; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 88; then
    break
  elif $ac_last_try; then
    { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@ -54311,6 +54344,9 @@ IF_YES_NO "$enable_static"
 PRINT_N "  Statically Linked Executables"
 IF_YES_NO "$STATIC_EXEC"

+PRINT_N " With Deprecated Public Symbols"
+IF_YES_NO "$DEPRECATED_SYMBOLS"
+
 PRINT_N "                        Tracing"
 IF_YES_NO "$TRACE_API"

--- a/configure.in
+++ b/configure.in
@ -95,7 +95,7 @@ dnl
 DEFAULT_LIBS=""

 dnl Support F9X variable to define Fortran compiler if FC variable is
-dnl not used.  This should be depreciated in the future.
+dnl not used.  This should be deprecated in the future.
 if test "x" = "x$FC"; then
  FC=${F9X}
 fi
@ -3678,6 +3678,30 @@ else
 fi
 AM_CONDITIONAL([BUILD_ALL_CONDITIONAL], [test "X$BUILD_ALL" = "Xyes"])

+dnl ----------------------------------------------------------------------
+dnl Enable deprecated public API symbols
+dnl
+AC_SUBST([DEPRECATED_SYMBOLS])
+AC_MSG_CHECKING([if deprecated public symbols are available]);
+AC_ARG_ENABLE([deprecated-symbols],
+              [AC_HELP_STRING([--enable-deprecated-symbols],
+                     [Enable deprecated public API symbols [default=yes]])],
+             [DEPREC_SYMBOLS=$enableval],
+             [DEPREC_SYMBOLS=yes])
+
+case "X-$DEPREC_SYMBOLS" in
+  X-yes)
+    AC_MSG_RESULT([yes])
+    DEPRECATED_SYMBOLS=yes
+    ;;
+  X-no|*)
+    AC_MSG_RESULT([no])
+    DEPRECATED_SYMBOLS=no
+    AC_DEFINE([NO_DEPRECATED_SYMBOLS], [1],
+              [Define if deprecated public API symbols are disabled])
+    ;;
+esac
+
 dnl ----------------------------------------------------------------------
 dnl Create automake conditionals to tell automake makefiles which directories
 dnl need to be compiled
@ -3926,6 +3950,9 @@ IF_YES_NO "$enable_static"
 PRINT_N "  Statically Linked Executables"
 IF_YES_NO "$STATIC_EXEC"

+PRINT_N " With Deprecated Public Symbols"
+IF_YES_NO "$DEPRECATED_SYMBOLS"
+
 PRINT_N "                        Tracing"
 IF_YES_NO "$TRACE_API"

--- a/examples/Makefile.in
+++ b/examples/Makefile.in
@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/fortran/Makefile.in
+++ b/fortran/Makefile.in
@ -112,6 +112,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/fortran/examples/Makefile.in
+++ b/fortran/examples/Makefile.in
@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/fortran/src/Makefile.in
+++ b/fortran/src/Makefile.in
@ -165,6 +165,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/fortran/test/Makefile.in
+++ b/fortran/test/Makefile.in
@ -158,6 +158,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/fortran/testpar/Makefile.in
+++ b/fortran/testpar/Makefile.in
@ -115,6 +115,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/Makefile.in
+++ b/hl/Makefile.in
@ -112,6 +112,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@ -108,6 +108,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@ -127,6 +127,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@ -118,6 +118,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/examples/Makefile.in
+++ b/hl/examples/Makefile.in
@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/fortran/Makefile.in
+++ b/hl/fortran/Makefile.in
@ -112,6 +112,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/fortran/examples/Makefile.in
+++ b/hl/fortran/examples/Makefile.in
@ -102,6 +102,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/fortran/src/Makefile.in
+++ b/hl/fortran/src/Makefile.in
@ -132,6 +132,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/fortran/test/Makefile.in
+++ b/hl/fortran/test/Makefile.in
@ -122,6 +122,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/src/Makefile.in
+++ b/hl/src/Makefile.in
@ -128,6 +128,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/test/Makefile.in
+++ b/hl/test/Makefile.in
@ -138,6 +138,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/tools/Makefile.in
+++ b/hl/tools/Makefile.in
@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@ -130,6 +130,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/perform/Makefile.in
+++ b/perform/Makefile.in
@ -153,6 +153,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@ -441,6 +441,9 @@
 /* Define if your system can handle special collective IO properly. */
 #undef MPI_SPECIAL_COLLECTIVE_IO_WORKS

+/* Define if deprecated public API symbols are disabled */
+#undef NO_DEPRECATED_SYMBOLS
+
 /* Define if shared writing must be disabled (CodeWarrior only) */
 #undef NO_SHARED_WRITING

--- a/src/H5version.h
+++ b/src/H5version.h
@ -21,9 +21,9 @@
 #define _H5version_H

 /* Issue error if contradicting macros have been defined. */
-#if defined(H5_USE_16_API) && defined(H5_WITHOUT_DEPRECATED_APIS)
+#if defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS)
 #error "Can't choose old API versions when deprecated APIs are disabled"
-#endif /* defined(H5_USE_16_API) && defined(H5_WITHOUT_DEPRECATED_APIS) */
+#endif /* defined(H5_USE_16_API) && defined(H5_NO_DEPRECATED_SYMBOLS) */

 /* If a particular "global" version of the library's interfaces is chosen,
 *      set the versions for the API routines affected.
--- a/src/Makefile.in
+++ b/src/Makefile.in
@ -183,6 +183,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
@ -442,14 +443,15 @@ libhdf5_la_SOURCES = H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \


 # Public headers
-include_HEADERS = H5public.h H5version.h H5Apublic.h H5ACpublic.h \
+include_HEADERS = hdf5.h H5api_adpt.h H5pubconf.h H5public.h H5version.h \
+        H5Apublic.h H5ACpublic.h \
        H5Cpublic.h H5Dpublic.h \
        H5Epubgen.h H5Epublic.h H5Fpublic.h H5FDpublic.h H5FDcore.h H5FDdirect.h \
 	H5FDfamily.h H5FDlog.h H5FDmpi.h H5FDmpio.h H5FDmpiposix.h              \
        H5FDmulti.h H5FDsec2.h  H5FDstdio.h H5FDstream.h \
        H5Gpublic.h  H5Ipublic.h H5Lpublic.h \
        H5MMpublic.h H5Opublic.h H5Ppublic.h H5Rpublic.h H5Spublic.h \
-        H5Tpublic.h H5Zpublic.h H5pubconf.h hdf5.h H5api_adpt.h
+        H5Tpublic.h H5Zpublic.h


 # install libhdf5.settings in lib directory
@ -1062,21 +1064,8 @@ help:
 # http://hdfgroup.org/HDF5/doc/Copyright.html.  If you do not have
 # access to either file, you may request a copy from help@hdfgroup.org.

-# API version macro generation
-#
-$(top_srcdir)/src/H5version.h: $(top_srcdir)/src/H5vers.txt
-	perl $(top_srcdir)/bin/make_vers $?
-
-# Error header generation
-#
-# Actually, H5Einit.h, H5Eterm.h, H5Edefin.h and H5Epubgen.h all
-# depend on H5err.txt, but the perl script generates them all, so just
-# list one here.
-$(top_srcdir)/src/H5Edefin.h: $(top_srcdir)/src/H5err.txt
-	perl $(top_srcdir)/bin/make_err $?
-
 # Number format detection
-# The LD_LIBRARY_PATH setting is a klutch.
+# The LD_LIBRARY_PATH setting is a kludge.
 # Things should have been all set during H5detect making.
 # Remove the generated .c file if errors occur unless HDF5_Make_Ignore
 # is set to ignore the error.
@ -1087,6 +1076,18 @@ H5Tinit.c: H5detect$(EXEEXT)
 	    (test $$HDF5_Make_Ignore && echo "*** Error ignored") ||          \
 	    ($(RM) $@ ; exit 1)

+# Error header generation
+#
+# Actually, H5Einit.h, H5Eterm.h, H5Edefin.h and H5Epubgen.h all
+# depend on H5err.txt, but the perl script generates them all, so just
+# list one here.
+$(top_srcdir)/src/H5Edefin.h: $(top_srcdir)/src/H5err.txt
+	perl $(top_srcdir)/bin/make_err $?
+
+# API version macro generation
+$(top_srcdir)/src/H5version.h: $(top_srcdir)/src/H5vers.txt
+	perl $(top_srcdir)/bin/make_vers $?
+
 # Add TRACE macros to library source files.  This is done via the trace script
 # in the hdf5/bin directory.  If the file contains HDF5 API macros, a "clean"
 # version of the source file is saved with a tilde (~) after its name and
--- a/test/Makefile.in
+++ b/test/Makefile.in
@ -392,6 +392,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/testpar/Makefile.in
+++ b/testpar/Makefile.in
@ -145,6 +145,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@ -109,6 +109,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5copy/Makefile.in
+++ b/tools/h5copy/Makefile.in
@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5diff/Makefile.in
+++ b/tools/h5diff/Makefile.in
@ -133,6 +133,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5dump/Makefile.in
+++ b/tools/h5dump/Makefile.in
@ -131,6 +131,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5import/Makefile.in
+++ b/tools/h5import/Makefile.in
@ -126,6 +126,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5jam/Makefile.in
+++ b/tools/h5jam/Makefile.in
@ -137,6 +137,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@ -120,6 +120,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/h5repack/Makefile.in
+++ b/tools/h5repack/Makefile.in
@ -140,6 +140,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/lib/Makefile.in
+++ b/tools/lib/Makefile.in
@ -125,6 +125,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@
--- a/tools/misc/Makefile.in
+++ b/tools/misc/Makefile.in
@ -149,6 +149,7 @@ CYGPATH_W = @CYGPATH_W@
 DEBUG_PKG = @DEBUG_PKG@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
 DYNAMIC_DIRS = @DYNAMIC_DIRS@
 ECHO = @ECHO@
 ECHO_C = @ECHO_C@