Merge branch 'master' into feature/fix-comments

8 files changed, 60 insertions, 14 deletions

diff --git a/ChangeLog b/ChangeLog
index fb0a6cd7..7c2624ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure.ac: Restore checking for PPC Macintosh before
+	checking for MPFR. See README_d/README.macosx for info.
+
 2018-02-21         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* configure.ac: Remove checking for PPC Macintosh before
diff --git a/README_d/ChangeLog b/README_d/ChangeLog
index 0e18772f..e5fb5c4a 100644
--- a/README_d/ChangeLog
+++ b/README_d/ChangeLog
@@ -1,3 +1,7 @@
+2018-02-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* README.macosx: Updated.
+
 2018-02-21         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* README.macosx: Updated.
diff --git a/README_d/README.macosx b/README_d/README.macosx
index 008964e2..b46f0128 100644
--- a/README_d/README.macosx
+++ b/README_d/README.macosx
@@ -1,10 +1,18 @@
-Wed Feb 21 06:59:28 IST 2018
+Fri Feb 23 10:38:05 IST 2018
 ============================
 
-On PowerPC Macintosh, if you build GCC 4.2.4 and use that version of GCC,
-you can compile gawk with MPFR and the C99 settings. So I have restored
-the MPFR check for that system.  Right now the two readfile tests fail
-on that system; I may not let that block the release of 4.2.1.
+On PowerPC Macintosh, things are just weird.
+
+* Using the stock compiler, you can't build gawk (c99 mode) against MPFR;
+there is an issue with duplicate inline functions from GMP.  By default,
+I have disabled this compilation.
+
+* If you build GCC 4.2.4 and use that version of GCC, you can compile gawk
+with MPFR and the C99 settings.  But then the two readfile tests fail.
+The call to read(2) simply returns zero. I have no idea why.
+
+Since nobody but me has one of these left, I'm not going to mess
+with it anymore right now.
 
 Thu Jan 25 20:07:56 IST 2018
 ============================
diff --git a/configure b/configure
index bf246d64..2008a3ff 100755
--- a/configure
+++ b/configure
@@ -10530,8 +10530,12 @@ fi
   fi
 
 
-case $SKIP_MPFR in
-no)
+case `uname -m` in
+*'Power Macintosh'*)
+	: ;;
+*)
+	case $SKIP_MPFR in
+	no)
 
 # Check whether --with-mpfr was given.
 if test "${with_mpfr+set}" = set; then :
@@ -10605,6 +10609,8 @@ $as_echo "#define HAVE_MPFR 1" >>confdefs.h
      unset _found_mpfr
   fi
 
+		;;
+	esac
 	;;
 esac
 
diff --git a/configure.ac b/configure.ac
index a1c68c7e..fd7b73ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl
 dnl configure.ac --- autoconf input file for gawk
 dnl
-dnl Copyright (C) 1995-2018 the Free Software Foundation, Inc.
+dnl Copyright (C) 1995-2017 the Free Software Foundation, Inc.
 dnl
 dnl This file is part of GAWK, the GNU implementation of the
 dnl AWK Programming Language.
@@ -386,8 +386,14 @@ dnl check for readline support
 GAWK_CHECK_READLINE
 
 dnl check for mpfr support
-case $SKIP_MPFR in
-no)	GNUPG_CHECK_MPFR
+case `uname -m` in
+*'Power Macintosh'*)
+	: ;;
+*)
+	case $SKIP_MPFR in
+	no)	GNUPG_CHECK_MPFR
+		;;
+	esac
 	;;
 esac
 
diff --git a/extension/ChangeLog b/extension/ChangeLog
index a6a894ca..a670d81c 100644
--- a/extension/ChangeLog
+++ b/extension/ChangeLog
@@ -1,3 +1,8 @@
+2018-02-23         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* configure.ac: Restore checking for PPC Macintosh before
+	checking for MPFR. See README_d/README.macosx for info.
+
 2018-02-21         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* configure.ac: Remove checking for PPC Macintosh before
diff --git a/extension/configure b/extension/configure
index 4ea8d3f8..3bdccfc0 100755
--- a/extension/configure
+++ b/extension/configure
@@ -15074,8 +15074,12 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 fi
 
 
-case $SKIP_MPFR in
-no)
+case `uname -m` in
+*'Power Macintosh'*)
+	: ;;
+*)
+	case $SKIP_MPFR in
+	no)
 
 # Check whether --with-mpfr was given.
 if test "${with_mpfr+set}" = set; then :
@@ -15149,6 +15153,8 @@ $as_echo "#define HAVE_MPFR 1" >>confdefs.h
      unset _found_mpfr
   fi
 
+		;;
+	esac
 	;;
 esac
 
diff --git a/extension/configure.ac b/extension/configure.ac
index b8738b67..8d44e2b2 100644
--- a/extension/configure.ac
+++ b/extension/configure.ac
@@ -101,8 +101,14 @@ dnl AC_HEADER_MAJOR
 AC_HEADER_TIME
 
 dnl check for mpfr support
-case $SKIP_MPFR in
-no)	GNUPG_CHECK_MPFR
+case `uname -m` in
+*'Power Macintosh'*)
+	: ;;
+*)
+	case $SKIP_MPFR in
+	no)	GNUPG_CHECK_MPFR
+		;;
+	esac
 	;;
 esac