summaryrefslogtreecommitdiffstats
path: root/hl/c++
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2010-04-15 21:17:22 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2010-04-15 21:17:22 (GMT)
commit0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a (patch)
treece9a5c86892be6162b739a147fa9e0dd453dcb85 /hl/c++
parent5dfdf41dfc2ca4f22529effacc0913681fae7e34 (diff)
downloadhdf5-0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a.zip
hdf5-0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a.tar.gz
hdf5-0cf2a97cfbb6261cea3645d9109a7313e8bb9f5a.tar.bz2
[svn-r18579] Purpose:
Autotool Upgrade / Libtool Bug Fix Description: Updated autotools referenced in bin/reconfigure as follows: Autoconf 2.64 --> Autoconf 2.65 Automake 1.11 --> Automake 1.11.1 Libtool 2.2.6a --> Libtool 2.2.6b-mcg The referenced libtool version is a custom version of 2.2.6b. It has been tweaked to fix a bug in libtool that occurs when using PGI 10.0 compilers. A check incorrectly categorizes the C++ compiler as version 1.0 instead of 10.0, and the link line is subsequently set up incorrectly and fails to compile. A patch has been made available and will be included in the next release of libtool, but in the meantime I've applied the patch to a custom installation as indicated above. This bin/reconfigure now references the custom installation, and the resulting configure script will correctly categorize the PGI 10.0 C++ compiler. Ran bin/reconfigure to regenerate configure and makefiles. Tested: jam and amani with PGI 10.0 compilers. h5committest
Diffstat (limited to 'hl/c++')
-rw-r--r--hl/c++/Makefile.in6
-rw-r--r--hl/c++/examples/Makefile.in2
-rw-r--r--hl/c++/src/Makefile.in2
-rw-r--r--hl/c++/test/Makefile.in2
4 files changed, 6 insertions, 6 deletions
diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in
index d83f520..0a5d32d 100644
--- a/hl/c++/Makefile.in
+++ b/hl/c++/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -429,7 +429,7 @@ clean-libtool:
# (which will cause the Makefiles to be regenerated when you run `make');
# (2) otherwise, pass the desired values on the `make' command line.
$(RECURSIVE_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
@@ -454,7 +454,7 @@ $(RECURSIVE_TARGETS):
fi; test -z "$$fail"
$(RECURSIVE_CLEAN_TARGETS):
- @failcom='exit 1'; \
+ @fail= failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
*=* | --[!k]*);; \
diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in
index 9fad167..51c04ad 100644
--- a/hl/c++/examples/Makefile.in
+++ b/hl/c++/examples/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in
index 82cf549..f58a07b 100644
--- a/hl/c++/src/Makefile.in
+++ b/hl/c++/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in
index 7266306..644966b 100644
--- a/hl/c++/test/Makefile.in
+++ b/hl/c++/test/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,