aboutsummaryrefslogtreecommitdiff
path: root/bfd
diff options
context:
space:
mode:
Diffstat (limited to 'bfd')
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/bfd-in.h3
-rw-r--r--bfd/bfd-in2.h3
3 files changed, 11 insertions, 2 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e33fd5f..5edc067 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-18 Nick Clifton <nickc@redhat.com>
+
+ PR 14072
+ * bfd-in.h: Check for PACKAGE or PACKAGE_VERSION before
+ complaining about config.h not having been included.
+ * bfd-in2.h: Regenerate.
+
2012-05-18 Andreas Schwab <schwab@linux-m68k.org>
* aclocal.m4: Regenerate.
diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h
index ae8149a..a61e721 100644
--- a/bfd/bfd-in.h
+++ b/bfd/bfd-in.h
@@ -25,7 +25,8 @@
#ifndef __BFD_H_SEEN__
#define __BFD_H_SEEN__
-#ifndef PACKAGE
+/* PR 14072: Ensure that config.h is included first. */
+#if !defined PACKAGE && !defined PACKAGE_VERSION
#error config.h must be included before this header
#endif
diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h
index 275f977..7535483 100644
--- a/bfd/bfd-in2.h
+++ b/bfd/bfd-in2.h
@@ -32,7 +32,8 @@
#ifndef __BFD_H_SEEN__
#define __BFD_H_SEEN__
-#ifndef PACKAGE
+/* PR 14072: Ensure that config.h is included first. */
+#if !defined PACKAGE && !defined PACKAGE_VERSION
#error config.h must be included before this header
#endif