From: Adam Heath <doogie@debian.org>
Date: Wed, 20 Dec 2000 08:21:27 +0000 (+0000)
Subject: Move -D_GNU_SOURCE from configure.in to Makefile, and from CFLAGS to DEFS.
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=357b0685345cd6227443a28190b99c8c70887076;p=dpkg

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 de64512f..7235bee5 100644
--- 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 bb5f9c9d..39e37591 100644
--- 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 cf25d2d0..495ae8f7 100644
--- 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"