Move -D_GNU_SOURCE from configure.in to Makefile, and from CFLAGS to DEFS.

This macro was getting lost if someone was setting CFLAGS on the cmdline.
Perhaps this should be moved into config.h.in?

diff --git a/ChangeLog b/ChangeLog
index de64512f621ad32b4468386efa2a715c7f09b45f..7235bee515643c78cffd868ec985e7f5bd31c0d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Dec 20 02:17:56 CST 2000 Adam Heath <doogie@debian.org>
+
+  * configure.in, Makefile.conf.in: Move -D_GNU_SOURCE from configure.in
+    to Makefile, and from CFLAGS to DEFS.  This macro was getting lost
+    if someone was setting CFLAGS on the cmdline.  Perhaps this should
+    be moved into config.h.in?
+
 Wed Dec 20 01:39:30 CST 2000 Adam Heath <doogie@debian.org>
 
   * main/processarc.c: Don't copy trailing zeros from dpkg-deb

diff --git a/Makefile.conf.in b/Makefile.conf.in
index bb5f9c9dba97e69e684db0d18d2db7292fdbebed..39e375911c56351c2e95b77137e76ca9adcba285 100644 (file)
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -54,7 +54,7 @@ LD                    = @LD@
 LDFLAGS                        = @LDFLAGS@
 LIBS                   = @LIBS@
 
-DEFS                   = @DEFS@
+DEFS                   = @DEFS@ -D_GNU_SOURCE
 INCLUDE_CFLAGS         = -I$(top_srcdir)/include -I$(top_srcdir) -I$(srcdir) -I../include -I.. -I.
 
 NLS_CFLAGS             = -DLOCALEDIR=\"$(localedir)\" -I$(top_srcdir)/intl -I../intl

diff --git a/configure.in b/configure.in
index cf25d2d0e604c28b917ec209aa8b3c8934a7ad62..495ae8f7c96e4aef208999ba89567293cae90952 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,6 @@ dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.13])
 
 AC_INIT(include/dpkg.h.in)
-CFLAGS="-D_GNU_SOURCE $CFLAGS"
 AC_CONFIG_HEADER(config.h)
 
 DSELECTDIR="dselect"