Explorar el Código

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?

Adam Heath hace 25 años
padre
commit
357b068534
Se han modificado 3 ficheros con 8 adiciones y 2 borrados
  1. 7 0
      ChangeLog
  2. 1 1
      Makefile.conf.in
  3. 0 1
      configure.in

+ 7 - 0
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

+ 1 - 1
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

+ 0 - 1
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"