diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-02-23 10:42:55 +0200 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-02-23 10:42:55 +0200 |
| commit | a0753d1e2b362e9e6b4ea35ff6135505758521f6 (patch) | |
| tree | cf8ba0f405d231fa9ce0c4b80f3f7c10cadd2ee0 /extension | |
| parent | 4a4c35ecc8cedd1189220d0d1044cd2b35c108a2 (diff) | |
| parent | 9b1151d32d047649e2a6a1f601aa8163ebe3e8e9 (diff) | |
| download | egawk-a0753d1e2b362e9e6b4ea35ff6135505758521f6.tar.gz egawk-a0753d1e2b362e9e6b4ea35ff6135505758521f6.tar.bz2 egawk-a0753d1e2b362e9e6b4ea35ff6135505758521f6.zip | |
Merge branch 'master' into feature/fix-comments
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rwxr-xr-x | extension/configure | 10 | ||||
| -rw-r--r-- | extension/configure.ac | 10 |
3 files changed, 21 insertions, 4 deletions
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 |