Remove special support for AIX; should work normally.

7 files changed, 16 insertions, 36 deletions

diff --git a/ChangeLog b/ChangeLog
index 63fc9300..e4bae0b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure.ac (GAWK_AC_AIX_TWEAK): Remove call.
+	* configure: Regenerated.
+	* io.c (GAWK_AIX): Check _AIX instead.
+	* custom.h (_AIX): Add define of _XOPEN_SOURCE_EXTENDED.
+
 2016-01-25         John E. Malmberg      <wb8tyw@qsl.net>
 
 	* io.c (redirect): Need to call close_one more than once after
diff --git a/configure b/configure
index 78864a11..849569cf 100755
--- a/configure
+++ b/configure
@@ -6212,25 +6212,6 @@ rm -rf conftest*
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for AIX compilation hacks" >&5
-$as_echo_n "checking for AIX compilation hacks... " >&6; }
-if ${gawk_cv_aix_hack+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-if test -d /lpp
-then
-	CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED=1 -DGAWK_AIX=1"
-	gawk_cv_aix_hack=yes
-else
-	gawk_cv_aix_hack=no
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${gawk_cv_aix_hack}" >&5
-$as_echo "${gawk_cv_aix_hack}" >&6; }
-
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if we are using EBCDIC" >&5
 $as_echo_n "checking if we are using EBCDIC... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
diff --git a/configure.ac b/configure.ac
index 2b52fcb7..8d6895ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,6 @@ dnl checks for systems
 AC_ZOS_USS
 AC_SEARCH_LIBS([strerror],[cposix])
 AC_SYS_LARGEFILE
-GAWK_AC_AIX_TWEAK
 
 AC_MSG_CHECKING([if we are using EBCDIC])
 AC_EGREP_CPP([gnu_gawk_in_ebcdic],
diff --git a/custom.h b/custom.h
index 956c52ab..64d4ec56 100644
--- a/custom.h
+++ b/custom.h
@@ -59,6 +59,10 @@
 #define _TZSET 1
 #endif
 
+#if defined(_AIX)
+#define _XOPEN_SOURCE_EXTENDED 1
+#endif
+
 /* Junk for dfa.[ch] */
 /* The __pure__ attribute was added in gcc 2.96.  */
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
diff --git a/io.c b/io.c
index 6d898dd6..d618181d 100644
--- a/io.c
+++ b/io.c
@@ -190,7 +190,7 @@
 #define setsid()	/* nothing */
 #endif /* HAVE_SETSID */
 
-#if defined(GAWK_AIX)
+#if defined(_AIX)
 #undef TANDEM	/* AIX defines this in one of its header files */
 #endif
 
diff --git a/m4/ChangeLog b/m4/ChangeLog
index 76f05960..2c0063ee 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-27         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* arch.m4 (GAWK_AC_AIX_TWEAK): Remove definition.
+
 2016-01-03         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* arch.m4 (GAWK_AC_LINUX_ALPHA): Remove definition.
diff --git a/m4/arch.m4 b/m4/arch.m4
index f156f9f3..6897a1a3 100644
--- a/m4/arch.m4
+++ b/m4/arch.m4
@@ -21,21 +21,6 @@ dnl along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 dnl
 
-dnl Check for AIX and add _XOPEN_SOURCE_EXTENDED
-AC_DEFUN([GAWK_AC_AIX_TWEAK], [
-AC_MSG_CHECKING([for AIX compilation hacks])
-AC_CACHE_VAL(gawk_cv_aix_hack, [
-if test -d /lpp
-then
-	CFLAGS="$CFLAGS -D_XOPEN_SOURCE_EXTENDED=1 -DGAWK_AIX=1"
-	gawk_cv_aix_hack=yes
-else
-	gawk_cv_aix_hack=no
-fi
-])dnl
-AC_MSG_RESULT([${gawk_cv_aix_hack}])
-])dnl
-
 dnl Check for z/OS Unix Systems Services
 AC_DEFUN([AC_ZOS_USS], [
 AC_MSG_CHECKING([for z/OS USS compilation])