From 0bee45d9e7432d8e5e4a38124827bf9c3b22f017 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 18 May 2012 10:29:12 +0000 Subject: [PATCH] PR 14072 * bfd-in.h: Check for PACKAGE or PACKAGE_VERSION before complaining about config.h not having been included. * bfd-in2.h: Regenerate. --- bfd/ChangeLog | 7 +++++++ bfd/bfd-in.h | 3 ++- bfd/bfd-in2.h | 3 ++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e33fd5fc0fa..5edc067667e 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,10 @@ +2012-05-18 Nick Clifton + + 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 * aclocal.m4: Regenerate. diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index ae8149a2e45..a61e7215654 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 275f9779bb8..7535483623c 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 -- 2.30.2