summaryrefslogtreecommitdiff
blob: 2219ddd8719d449c770c8f2517c5034a52b75528 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
https://marc.info/?l=freeipmi-devel&m=166752785904895&w=2

From e89f234b9032ce5b2a9477c91a25ce982e14cc63 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Fri, 4 Nov 2022 02:05:53 +0000
Subject: [PATCH 3/3] configure.ac: Use AC_USE_SYSTEM_EXTENSIONS instead of
 appending -D_GNU_SOURCE

This achieves the same effect as it'll use -D_GNU_SOURCE when possible
but it ensures we never forget it in an individual Makefile.am.

AC_USE_SYSTEM_EXTENSIONS was introduced in autoconf 2.60, so we bump
the requirement from 2.57->2.60. Given the comment mentions "modern
autoconf and automake", we could really justify bumping this to 2.69
which itself is not exactly brand new, if we want.

Signed-off-by: Sam James <sam@gentoo.org>
--- a/bmc-device/Makefile.am
+++ b/bmc-device/Makefile.am
@@ -7,7 +7,6 @@ bmc_device_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 bmc_device_LDADD = \
--- a/bmc-info/Makefile.am
+++ b/bmc-info/Makefile.am
@@ -7,7 +7,6 @@ bmc_info_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 bmc_info_LDADD = \
--- a/bmc-watchdog/Makefile.am
+++ b/bmc-watchdog/Makefile.am
@@ -7,7 +7,6 @@ bmc_watchdog_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT \
 	-DBMC_WATCHDOG_LOCALSTATEDIR='"$(localstatedir)"'
 
--- a/common/debugutil/Makefile.am
+++ b/common/debugutil/Makefile.am
@@ -5,7 +5,6 @@ libdebugutil_la_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libdebugutil_la_SOURCES = \
--- a/common/miscutil/Makefile.am
+++ b/common/miscutil/Makefile.am
@@ -2,7 +2,6 @@ noinst_LTLIBRARIES = \
 	libmiscutil.la
 
 libmiscutil_la_CPPFLAGS = \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libmiscutil_la_SOURCES = \
--- a/common/parsecommon/Makefile.am
+++ b/common/parsecommon/Makefile.am
@@ -5,7 +5,6 @@ libparsecommon_la_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libparsecommon_la_SOURCES = \
--- a/common/pingtool/Makefile.am
+++ b/common/pingtool/Makefile.am
@@ -6,7 +6,6 @@ libpingtool_la_CPPFLAGS = \
 	-I$(top_srcdir)/common/toolcommon \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libpingtool_la_SOURCES = \
--- a/common/portability/Makefile.am
+++ b/common/portability/Makefile.am
@@ -16,7 +16,6 @@ noinst_LTLIBRARIES = \
 	libportability.la
 
 libportability_la_CPPFLAGS = \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libportability_la_SOURCES = \
--- a/common/toolcommon/Makefile.am
+++ b/common/toolcommon/Makefile.am
@@ -11,7 +11,6 @@ libtoolcommon_la_CPPFLAGS = \
 	-I$(top_builddir)/libipmidetect \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libtoolcommon_la_SOURCES = \
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ AC_SUBST(FREEIPMI_PACKAGE_VERSION_MINOR)
 AC_SUBST(FREEIPMI_PACKAGE_VERSION_PATCH)
 
 dnl We require a modern autoconf and automake
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
 
 AC_CONFIG_AUX_DIR([config])
 
@@ -304,6 +304,8 @@ AM_CONDITIONAL(WITH_GNU_LD, test "$with_gnu_ld" = "yes")
 AC_PROG_MAKE_SET
 AC_PROG_LN_S
 
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl Enable error tracing. Lower level calls will spit error messages
 dnl on to the console
 AC_ARG_ENABLE([trace],
--- a/ipmi-chassis/Makefile.am
+++ b/ipmi-chassis/Makefile.am
@@ -7,7 +7,6 @@ ipmi_chassis_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_chassis_LDADD = \
--- a/ipmi-config/Makefile.am
+++ b/ipmi-config/Makefile.am
@@ -13,7 +13,6 @@ ipmi_config_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_config_LDADD = \
--- a/ipmi-dcmi/Makefile.am
+++ b/ipmi-dcmi/Makefile.am
@@ -7,7 +7,6 @@ ipmi_dcmi_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_dcmi_LDADD = \
--- a/ipmi-fru/Makefile.am
+++ b/ipmi-fru/Makefile.am
@@ -7,7 +7,6 @@ ipmi_fru_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_fru_LDADD = \
--- a/ipmi-locate/Makefile.am
+++ b/ipmi-locate/Makefile.am
@@ -7,7 +7,6 @@ ipmi_locate_CPPFLAGS = \
 	-I$(top_srcdir)/common/miscutil \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_locate_LDADD = \
--- a/ipmi-oem/Makefile.am
+++ b/ipmi-oem/Makefile.am
@@ -7,7 +7,6 @@ ipmi_oem_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_oem_LDADD = \
--- a/ipmi-pet/Makefile.am
+++ b/ipmi-pet/Makefile.am
@@ -7,7 +7,6 @@ ipmi_pet_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_pet_LDADD = \
--- a/ipmi-raw/Makefile.am
+++ b/ipmi-raw/Makefile.am
@@ -7,7 +7,6 @@ ipmi_raw_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_raw_LDADD = \
--- a/ipmi-sel/Makefile.am
+++ b/ipmi-sel/Makefile.am
@@ -8,7 +8,6 @@ ipmi_sel_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_sel_LDADD = \
--- a/ipmi-sensors/Makefile.am
+++ b/ipmi-sensors/Makefile.am
@@ -9,7 +9,6 @@ ipmi_sensors_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmi_sensors_LDADD = \
--- a/ipmiconsole/Makefile.am
+++ b/ipmiconsole/Makefile.am
@@ -8,7 +8,6 @@ ipmiconsole_CPPFLAGS = \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
 	-I$(top_builddir)/libipmiconsole/ \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 
--- a/ipmidetect/Makefile.am
+++ b/ipmidetect/Makefile.am
@@ -10,7 +10,6 @@ ipmidetect_CPPFLAGS = \
 	-I$(top_srcdir)/common/miscutil \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libipmidetect/ \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmidetect_LDADD = \
--- a/ipmidetectd/Makefile.am
+++ b/ipmidetectd/Makefile.am
@@ -12,7 +12,6 @@ ipmidetectd_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT \
 	-DIPMIDETECTD_LOCALSTATEDIR='"$(localstatedir)"'
 
--- a/ipmiping/Makefile.am
+++ b/ipmiping/Makefile.am
@@ -5,8 +5,7 @@ ipmiping_CPPFLAGS = \
 	-I$(top_srcdir)/common/debugutil \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
-	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE
+	-I$(top_srcdir)/libfreeipmi/include
 
 ipmiping_LDADD = \
 	$(top_builddir)/common/pingtool/libpingtool.la \
--- a/ipmipower/Makefile.am
+++ b/ipmipower/Makefile.am
@@ -11,7 +11,6 @@ ipmipower_CPPFLAGS = \
 	-I$(top_srcdir)/libfreeipmi/include \
 	-DWITH_LSD_FATAL_ERROR_FUNC=1 \
 	-DWITH_LSD_NOMEM_ERROR_FUNC=1 \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 ipmipower_LDADD = \
--- a/ipmiseld/Makefile.am
+++ b/ipmiseld/Makefile.am
@@ -13,7 +13,6 @@ ipmiseld_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT \
 	-DIPMISELD_LOCALSTATEDIR='"$(localstatedir)"'
 
--- a/libfreeipmi/Makefile.am
+++ b/libfreeipmi/Makefile.am
@@ -25,7 +25,6 @@ libfreeipmi_la_CPPFLAGS = \
 	-I$(top_srcdir)/libfreeipmi \
 	-DIPMI_IPCKEY=\"$(localstatedir)/lib/$(PACKAGE_NAME)/ipckey\" \
 	-DIPMI_DEBUG_IPCKEY=\"$(top_builddir)/libfreeipmi/driver/ipmi-semaphores.h\" \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libfreeipmi_la_LDFLAGS = \
--- a/libipmiconsole/Makefile.am
+++ b/libipmiconsole/Makefile.am
@@ -21,7 +21,6 @@ libipmiconsole_la_CPPFLAGS = \
         -I$(top_builddir)/libfreeipmi/include \
         -I$(top_srcdir)/libfreeipmi/include \
 	-DWITH_PTHREADS=1 \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libipmiconsole_la_LDFLAGS = \
--- a/libipmimonitoring/Makefile.am
+++ b/libipmimonitoring/Makefile.am
@@ -30,7 +30,6 @@ libipmimonitoring_la_CPPFLAGS = \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
 	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE \
 	-D_REENTRANT
 
 libipmimonitoring_la_LDFLAGS = \
--- a/rmcpping/Makefile.am
+++ b/rmcpping/Makefile.am
@@ -5,8 +5,7 @@ rmcpping_CPPFLAGS = \
 	-I$(top_srcdir)/common/debugutil \
 	-I$(top_srcdir)/common/portability \
 	-I$(top_builddir)/libfreeipmi/include \
-	-I$(top_srcdir)/libfreeipmi/include \
-	-D_GNU_SOURCE
+	-I$(top_srcdir)/libfreeipmi/include
 
 rmcpping_LDADD = \
 	$(top_builddir)/common/pingtool/libpingtool.la \