Autoconf fixups in extension directory.

5 files changed, 49 insertions, 3 deletions

diff --git a/extension/ChangeLog b/extension/ChangeLog
index afec6146..ef666386 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,11 @@
+2015-12-16         Arnold D. Robbins     <arnold@skeeve.com>
+
+	Make change of 2015-10-26 actually work.
+
+	* ext_custom.h: New file. Move _DEFAULT_SOURCE dance to here.
+	* configure.ac: Add call to AH_BOTTOM.
+	* configure: Regenerate.
+
 2015-11-15         Ville Skytta          <ville.skytta@iki.fi>
 
 	* fnmatch.3am, fork.3am, inplace.3am, ordchr.3am, readdir.3am,
diff --git a/extension/configh.in b/extension/configh.in
index a52f609d..82cbb8f5 100644
--- a/extension/configh.in
+++ b/extension/configh.in
@@ -147,9 +147,6 @@
 #ifndef _GNU_SOURCE
 # undef _GNU_SOURCE
 #endif
-#if defined _GNU_SOURCE && !defined _DEFAULT_SOURCE
-# define _DEFAULT_SOURCE
-#endif
 /* Enable threading extensions on Solaris.  */
 #ifndef _POSIX_PTHREAD_SEMANTICS
 # undef _POSIX_PTHREAD_SEMANTICS
@@ -193,3 +190,5 @@
 #ifndef __cplusplus
 #undef inline
 #endif
+
+#include "ext_custom.h"
diff --git a/extension/configure b/extension/configure
index 0e6dd611..e42ceb60 100755
--- a/extension/configure
+++ b/extension/configure
@@ -13035,6 +13035,7 @@ esac
 ac_config_headers="$ac_config_headers config.h:configh.in"
 
 
+
 ac_config_files="$ac_config_files Makefile"
 
 cat >confcache <<\_ACEOF
diff --git a/extension/configure.ac b/extension/configure.ac
index 45e4fb6e..a0f78d76 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -79,6 +79,7 @@ dnl checks for compiler characteristics
 AC_C_INLINE
 
 AC_CONFIG_HEADERS([config.h:configh.in])
+AH_BOTTOM([#include "ext_custom.h"])
 
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
diff --git a/extension/ext_custom.h b/extension/ext_custom.h
new file mode 100644
index 00000000..13702f24
--- /dev/null
+++ b/extension/ext_custom.h
@@ -0,0 +1,37 @@
+/*
+ * ext_custom.h
+ *
+ * This file is for use on systems where Autoconf isn't quite able to
+ * get things right. It is appended to the bottom of config.h by configure,
+ * in order to override definitions from Autoconf that are erroneous. See
+ * the manual for more information.
+ *
+ * If you make additions to this file for your system, please send me
+ * the information, to arnold@skeeve.com.
+ */
+
+/* 
+ * Copyright (C) 2015 the Free Software Foundation, Inc.
+ * 
+ * This file is part of GAWK, the GNU implementation of the
+ * AWK Programming Language.
+ * 
+ * GAWK is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * GAWK is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ */
+
+/* From Michal Jaegermann for bleeding edge GLIBC. */
+#if defined _GNU_SOURCE && !defined _DEFAULT_SOURCE
+# define _DEFAULT_SOURCE
+#endif