APPROVE COMMIT
NOTE: This patch has been committed
# HG changeset patch
# User Aidan Kehoe <kehoea(a)parhasard.net>
# Date 1489618450 0
# Wed Mar 15 22:54:10 2017 +0000
# Node ID 72c0d63b2ad689f80852f6195eda16128eb62081
# Parent b87475042f4709539c8000e20b87d8e50ab774f4
Silence warnings about _BSD_SOURCE, _SVID_SOURCE on glibc.
ChangeLog addition:
2017-03-15 Aidan Kehoe <kehoea(a)parhasard.net>
* configure.ac:
Don't #define _BSD_SOURCE or _SVID_SOURCE on glibc, even if xmkmf
asks us to. Silences a warning on Linux. Thank you Mats Lidell.
* configure: Regenerate.
diff -r b87475042f47 -r 72c0d63b2ad6 ChangeLog
--- a/ChangeLog Mon Mar 13 22:19:58 2017 +0000
+++ b/ChangeLog Wed Mar 15 22:54:10 2017 +0000
@@ -9,6 +9,13 @@
were checking for.
* configure: Rebuild.
+2017-03-15 Aidan Kehoe <kehoea(a)parhasard.net>
+
+ * configure.ac:
+ Don't #define _BSD_SOURCE or _SVID_SOURCE on glibc, even if xmkmf
+ asks us to. Silences a warning on Linux. Thank you Mats Lidell.
+ * configure: Regenerate.
+
2016-11-05 Michael Sperber <mike(a)xemacs.org>
* configure.ac: Disable ASLR on macOS Sierra..
diff -r b87475042f47 -r 72c0d63b2ad6 configure
--- a/configure Mon Mar 13 22:19:58 2017 +0000
+++ b/configure Wed Mar 15 22:54:10 2017 +0000
@@ -13530,7 +13530,10 @@
-D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
* ) val=1 ;;
esac
- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+ if grep "^#define $sym " confdefs.h >/dev/null || \
+ test "$have_glibc" = "yes" -a "$sym" =
"_BSD_SOURCE" || \
+ test "$have_glibc" = "yes" -a "$sym" =
"_SVID_SOURCE";
+ then :; else
if test "$val" = "1"
then cat >>confdefs.h <<_ACEOF
#define $sym 1
diff -r b87475042f47 -r 72c0d63b2ad6 configure.ac
--- a/configure.ac Mon Mar 13 22:19:58 2017 +0000
+++ b/configure.ac Wed Mar 15 22:54:10 2017 +0000
@@ -3141,7 +3141,12 @@
* ) val=1 ;;
esac
dnl Avoid re-AC_DEFINE-ing xmkmf symbols we've already defined above.
- if grep "^#define $sym " confdefs.h >/dev/null; then :; else
+dnl Also, glibc doesn't like two of the traditional POSIX macros that xmkmf
+dnl likes us to define; ignore them if appropriate.
+ if grep "^#define $sym " confdefs.h >/dev/null || \
+ test "$have_glibc" = "yes" -a "$sym" =
"_BSD_SOURCE" || \
+ test "$have_glibc" = "yes" -a "$sym" =
"_SVID_SOURCE";
+ then :; else
if test "$val" = "1"
then AC_DEFINE_UNQUOTED($sym)
else AC_DEFINE_UNQUOTED($sym,$val)
--
‘As I sat looking up at the Guinness ad, I could never figure out /
How your man stayed up on the surfboard after forty pints of stout’
(C. Moore)
Show replies by date