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 <s...@gentoo.org>
---
bmc-device/Makefile.am | 1 -
bmc-info/Makefile.am | 1 -
bmc-watchdog/Makefile.am | 1 -
common/debugutil/Makefile.am | 1 -
common/miscutil/Makefile.am | 1 -
common/parsecommon/Makefile.am | 1 -
common/pingtool/Makefile.am | 1 -
common/portability/Makefile.am | 1 -
common/toolcommon/Makefile.am | 1 -
configure.ac | 4 +++-
ipmi-chassis/Makefile.am | 1 -
ipmi-config/Makefile.am | 1 -
ipmi-dcmi/Makefile.am | 1 -
ipmi-fru/Makefile.am | 1 -
ipmi-locate/Makefile.am | 1 -
ipmi-oem/Makefile.am | 1 -
ipmi-pet/Makefile.am | 1 -
ipmi-raw/Makefile.am | 1 -
ipmi-sel/Makefile.am | 1 -
ipmi-sensors/Makefile.am | 1 -
ipmiconsole/Makefile.am | 1 -
ipmidetect/Makefile.am | 1 -
ipmidetectd/Makefile.am | 1 -
ipmiping/Makefile.am | 3 +--
ipmipower/Makefile.am | 1 -
ipmiseld/Makefile.am | 1 -
libfreeipmi/Makefile.am | 1 -
libipmiconsole/Makefile.am | 1 -
libipmimonitoring/Makefile.am | 1 -
rmcpping/Makefile.am | 3 +--
30 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/bmc-device/Makefile.am b/bmc-device/Makefile.am
index 6b1f05771..d229ab4f5 100644
--- 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 = \
diff --git a/bmc-info/Makefile.am b/bmc-info/Makefile.am
index fb043c343..8c263c113 100644
--- 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 = \
diff --git a/bmc-watchdog/Makefile.am b/bmc-watchdog/Makefile.am
index be392dd96..99d6655c2 100644
--- 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)"'
diff --git a/common/debugutil/Makefile.am b/common/debugutil/Makefile.am
index 16ba9cba7..48595accf 100644
--- 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 = \
diff --git a/common/miscutil/Makefile.am b/common/miscutil/Makefile.am
index 7bd0c7687..5da082e72 100644
--- 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 = \
diff --git a/common/parsecommon/Makefile.am b/common/parsecommon/Makefile.am
index 3b2f42992..d4665993d 100644
--- 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 = \
diff --git a/common/pingtool/Makefile.am b/common/pingtool/Makefile.am
index c37e1a825..66080a6c7 100644
--- 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 = \
diff --git a/common/portability/Makefile.am b/common/portability/Makefile.am
index 020c39e26..d00428e9a 100644
--- 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 = \
diff --git a/common/toolcommon/Makefile.am b/common/toolcommon/Makefile.am
index a76fa43b8..c9af1636a 100644
--- 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 = \
diff --git a/configure.ac b/configure.ac
index c2276c7d9..b1a0723d5 100644
--- 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],
diff --git a/ipmi-chassis/Makefile.am b/ipmi-chassis/Makefile.am
index 19e9ffdb2..a81ee93c7 100644
--- 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 = \
diff --git a/ipmi-config/Makefile.am b/ipmi-config/Makefile.am
index fb47649ae..de097e684 100644
--- 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 = \
diff --git a/ipmi-dcmi/Makefile.am b/ipmi-dcmi/Makefile.am
index 65e13c0f7..926dfd319 100644
--- 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 = \
diff --git a/ipmi-fru/Makefile.am b/ipmi-fru/Makefile.am
index c92ba0e8c..d0a0a3902 100644
--- 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 = \
diff --git a/ipmi-locate/Makefile.am b/ipmi-locate/Makefile.am
index 977eb218f..ce713f85e 100644
--- 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 = \
diff --git a/ipmi-oem/Makefile.am b/ipmi-oem/Makefile.am
index d55a7e332..0b9209c98 100644
--- 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 = \
diff --git a/ipmi-pet/Makefile.am b/ipmi-pet/Makefile.am
index c34048158..c08d0949d 100644
--- 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 = \
diff --git a/ipmi-raw/Makefile.am b/ipmi-raw/Makefile.am
index 299a4e987..ad9d44a49 100644
--- 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 = \
diff --git a/ipmi-sel/Makefile.am b/ipmi-sel/Makefile.am
index a9d7e8715..abd76674f 100644
--- 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 = \
diff --git a/ipmi-sensors/Makefile.am b/ipmi-sensors/Makefile.am
index 4396ccc1c..904abe7f3 100644
--- 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 = \
diff --git a/ipmiconsole/Makefile.am b/ipmiconsole/Makefile.am
index 91fdf0a17..258d3ab40 100644
--- 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
diff --git a/ipmidetect/Makefile.am b/ipmidetect/Makefile.am
index aaf8ac960..83636f405 100644
--- 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 = \
diff --git a/ipmidetectd/Makefile.am b/ipmidetectd/Makefile.am
index 4d9745b24..b7ffcfade 100644
--- 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)"'
diff --git a/ipmiping/Makefile.am b/ipmiping/Makefile.am
index 75960c45b..71d7255f0 100644
--- 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 \
diff --git a/ipmipower/Makefile.am b/ipmipower/Makefile.am
index d95a04ebb..344e750ad 100644
--- 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 = \
diff --git a/ipmiseld/Makefile.am b/ipmiseld/Makefile.am
index b4bd2e644..1603e1028 100644
--- 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)"'
diff --git a/libfreeipmi/Makefile.am b/libfreeipmi/Makefile.am
index e350fa4b7..330590676 100644
--- 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 = \
diff --git a/libipmiconsole/Makefile.am b/libipmiconsole/Makefile.am
index 890fa4b0c..4d8874445 100644
--- 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 = \
diff --git a/libipmimonitoring/Makefile.am b/libipmimonitoring/Makefile.am
index 8faf3af39..c5435dad3 100644
--- 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 = \
diff --git a/rmcpping/Makefile.am b/rmcpping/Makefile.am
index 6880496f1..adb075c4f 100644
--- 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 \
--
2.38.1
