summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2007-06-29 20:52:56 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2007-06-29 20:52:56 (GMT)
commit1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28 (patch)
tree701e6acc390362121f10decfe692ed520f73f357 /src
parent1091bb70297776d18a236e3efc55ac415a21c0f8 (diff)
downloadhdf5-1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28.zip
hdf5-1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28.tar.gz
hdf5-1d7e8f9deedf6b2ce1cb6b7eea92236ed2f8dc28.tar.bz2
[svn-r13928] Purpose: 1) Moving H5_CXX_HAVE_OFFSETOF macro to src/H5pubconf.h file.
2) Removing configuration of c++/src/H5cxx_pubconf.h file. Reasoning: the additional pubconf file caused compilation complications, this is cleaner. Tested: kagiso, smirom
Diffstat (limited to 'src')
-rw-r--r--src/H5config.h.in6
-rw-r--r--src/Makefile.in10
2 files changed, 8 insertions, 8 deletions
diff --git a/src/H5config.h.in b/src/H5config.h.in
index 66e3310..a4ce02f 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -11,6 +11,9 @@
values. */
#undef CONVERT_DENORMAL_FLOAT
+/* Define if C++ compiler recognizes offsetof */
+#undef CXX_HAVE_OFFSETOF
+
/* Define the default virtual file driver to compile */
#undef DEFAULT_VFD
@@ -228,9 +231,6 @@
/* Define to 1 if you have the <netinet/tcp.h> header file. */
#undef HAVE_NETINET_TCP_H
-/* Define if C++ compiler recognizes offsetof */
-#undef HAVE_OFFSETOF
-
/* Define if we have parallel support */
#undef HAVE_PARALLEL
diff --git a/src/Makefile.in b/src/Makefile.in
index 4851429..bf9074f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -65,7 +65,7 @@ am__aclocal_m4_deps = $(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/bin/mkinstalldirs
-CONFIG_HEADER = H5config.h $(top_builddir)/c++/src/H5cxx_config.h
+CONFIG_HEADER = H5config.h
CONFIG_CLEAN_FILES = libhdf5.settings
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
@@ -114,9 +114,9 @@ am_libhdf5_la_OBJECTS = H5.lo H5checksum.lo H5dbg.lo H5system.lo \
H5Tcommit.lo H5Tcompound.lo H5Tconv.lo H5Tcset.lo H5Tdeprec.lo \
H5Tenum.lo H5Tfields.lo H5Tfixed.lo H5Tfloat.lo H5Tinit.lo \
H5Tnative.lo H5Toffset.lo H5Toh.lo H5Topaque.lo H5Torder.lo \
- H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvlen.lo H5TS.lo H5V.lo H5WB.lo \
- H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo H5Zshuffle.lo \
- H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
+ H5Tpad.lo H5Tprecis.lo H5Tstrpad.lo H5Tvlen.lo H5TS.lo H5V.lo \
+ H5WB.lo H5Z.lo H5Zdeflate.lo H5Zfletcher32.lo H5Znbit.lo \
+ H5Zshuffle.lo H5Zszip.lo H5Zscaleoffset.lo H5Ztrans.lo
libhdf5_la_OBJECTS = $(am_libhdf5_la_OBJECTS)
libhdf5_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -128,7 +128,7 @@ H5detect_LDADD = $(LDADD)
H5detect_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(H5detect_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/c++/src@am__isrc@
+DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/bin/depcomp
am__depfiles_maybe = depfiles
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \