* Makefile.am (INCLUDES): Don't -D_GNU_SOURCE here.

	* configure.in: Call AC_GNU_SOURCE here, after AC_PROG_CC.
	* configure, config.in, Makefile.in: Regenerate.
	* sysdep.h (stpcpy): Revert last change.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 204ad1b302fc126985f7b6d6e8f8c91c2c1d0a67..87ec00da0af02292d24bca24b0f498fcc2bb11b8 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2005-05-05  Hans-Peter Nilsson  <hp@axis.com>
+
+       * Makefile.am (INCLUDES): Don't -D_GNU_SOURCE here.
+       * configure.in: Call AC_GNU_SOURCE here, after AC_PROG_CC.
+       * configure, config.in, Makefile.in: Regenerate.
+       * sysdep.h (stpcpy): Revert last change.
+
 2005-05-05  Hans-Peter Nilsson  <hp@axis.com>
 
        * sysdep.h (stpcpy): Wrap declaration in parentheses.

diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index 88278a873722a1fe4f6006597531eb71f5fef231..c476a21473b93a0393a3ccddb69bf8af4006e1f7 100644 (file)
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -598,7 +598,7 @@ BFD_LIBS = @bfd_libs@
 BFD_MACHINES = @bfd_machines@
 TDEFAULTS = @tdefaults@
 
-INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
+INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
 
 # C source files that correspond to .o's.
 SOURCE_CFILES = \

diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index e1c73a7332e9f90dd16db97ae9ff2d7e945d8282..0043b297f4d87bbb51ce5aae6bbdb4b11be2995d 100644 (file)
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -839,7 +839,7 @@ BFD_BACKENDS = @bfd_backends@
 BFD_LIBS = @bfd_libs@
 BFD_MACHINES = @bfd_machines@
 TDEFAULTS = @tdefaults@
-INCLUDES = -D_GNU_SOURCE @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
+INCLUDES = @HDEFINES@ @COREFLAG@ @TDEFINES@ $(CSEARCH) $(CSWITCHES) -I$(srcdir)/../intl -I../intl
 
 # C source files that correspond to .o's.
 SOURCE_CFILES = \

diff --git a/bfd/config.in b/bfd/config.in
index b716983b91c4dc9de09fdde37e2b44a3bdb04fae..6bdbb6aa2a1b7e48e7a4f28d2b3609e161a7c255 100644 (file)
--- a/bfd/config.in
+++ b/bfd/config.in
@@ -337,6 +337,11 @@
 /* Version number of package */
 #undef VERSION
 
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const
 

diff --git a/bfd/configure b/bfd/configure
index 06e04ca8376caeded4061637a89a26109c53820b..a852b8692769ea8b19cb2b8d3ae1e67c4caa8519 100755 (executable)
--- a/bfd/configure
+++ b/bfd/configure
@@ -5138,6 +5138,12 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+cat >>confdefs.h <<\_ACEOF
+#define _GNU_SOURCE 1
+_ACEOF
+
+
+
 ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw"
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.

diff --git a/bfd/configure.in b/bfd/configure.in
index 0443d37d7dd9a78a2199c7207982bf8a6bb3c98a..b27e8200e9e5159d5a39c17a819a7f2beb40573e 100644 (file)
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -70,6 +70,7 @@ bfd_default_target_size=32
 # host stuff:
 
 AC_PROG_CC
+AC_GNU_SOURCE
 
 ALL_LINGUAS="fr tr ja es sv da zh_CN ro rw"
 CY_GNU_GETTEXT

diff --git a/bfd/sysdep.h b/bfd/sysdep.h
index d9469ef0b937418c57153236aa261e4723d825ae..a9ea6b41c9433e42e71833b7e0af50396040637b 100644 (file)
--- a/bfd/sysdep.h
+++ b/bfd/sysdep.h
@@ -126,9 +126,7 @@ extern PTR realloc ();
 #endif
 
 #if !HAVE_DECL_STPCPY
-/* With glibc, not exposed without -D__USE_GNU, but some old versions
-   (2.2.5-34 on RH 7.3) still expose the macro.  */
-extern char *(stpcpy) (char *__dest, const char *__src);
+extern char *stpcpy (char *__dest, const char *__src);
 #endif
 
 #if !HAVE_DECL_STRSTR