PR 14072

	* bfd-in.h: Check for PACKAGE or PACKAGE_VERSION before
	complaining about config.h not having been included.
	* bfd-in2.h: Regenerate.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index e33fd5fc0fafb6a3448199d59f6ece629084c8c3..5edc067667e13e1b30a8be2ac1a0247a15ea82d2 100644 (file)
--- 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 ae8149a2e45505196ea115de791cdde7fb453c41..a61e7215654a50f0f142b5d247b0f4edd53d1b71 100644 (file)
--- 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 275f9779bb841f89b6b2df85ccddad1beee1ea24..7535483623c28f17c772a93e03404512582b7b93 100644 (file)
--- 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