[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)

3 files changed, 23 insertions, 19 deletions

diff --git a/src/H5config.h.in b/src/H5config.h.in
index a4ce02f..06e1972 100644
--- 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
 
diff --git a/src/H5version.h b/src/H5version.h
index a74857b..6b27ce3 100644
--- 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.
diff --git a/src/Makefile.in b/src/Makefile.in
index c6284b6..5f8d79a 100644
--- 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 \
-        H5Cpublic.h H5Dpublic.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