diff options
Diffstat (limited to 'extension')
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rwxr-xr-x | extension/configure | 18 | ||||
| -rw-r--r-- | extension/configure.ac | 14 |
3 files changed, 35 insertions, 2 deletions
diff --git a/extension/ChangeLog b/extension/ChangeLog index c04e9c26..e79e55c6 100644 --- a/extension/ChangeLog +++ b/extension/ChangeLog @@ -1,3 +1,8 @@ +2017-12-19 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac: Add --disable-mpfr to be in sync with main + configure.ac and revise checking for MPFR appropriately. + 2017-10-28 Arnold D. Robbins <arnold@skeeve.com> * rwarray.c (do_writea): Fix description in comment. diff --git a/extension/configure b/extension/configure index 985e3079..e5fd4752 100755 --- a/extension/configure +++ b/extension/configure @@ -755,6 +755,7 @@ ac_user_opts=' enable_option_checking enable_dependency_tracking enable_silent_rules +enable_mpfr enable_largefile enable_static enable_shared @@ -1400,6 +1401,7 @@ Optional Features: speeds up one-time build --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") + --disable-mpfr do not check for MPFR --disable-largefile omit support for large files --enable-static[=PKGS] build static libraries [default=no] --enable-shared[=PKGS] build shared libraries [default=yes] @@ -4527,6 +4529,17 @@ END fi +SKIP_MPFR=no +# Check whether --enable-mpfr was given. +if test "${enable_mpfr+set}" = set; then : + enableval=$enable_mpfr; if test "$enableval" = no + then + SKIP_MPFR=yes + fi + +fi + + ac_fn_c_check_member "$LINENO" "struct stat" "st_blksize" "ac_cv_member_struct_stat_st_blksize" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_blksize" = xyes; then : @@ -12866,7 +12879,8 @@ case `uname -m` in *'Power Macintosh'*) : ;; *) - + case $SKIP_MPFR in + no) # Check whether --with-mpfr was given. if test "${with_mpfr+set}" = set; then : @@ -12940,6 +12954,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 bf43b689..69461d24 100644 --- a/extension/configure.ac +++ b/extension/configure.ac @@ -36,6 +36,15 @@ export INSTALL AM_INIT_AUTOMAKE([1.15 -Wall -Werror]) +SKIP_MPFR=no +AC_ARG_ENABLE([mpfr], + [AS_HELP_STRING([--disable-mpfr],[do not check for MPFR])], + if test "$enableval" = no + then + SKIP_MPFR=yes + fi +) + dnl checks for structure members AC_CHECK_MEMBERS([struct stat.st_blksize]) @@ -74,7 +83,10 @@ case `uname -m` in *'Power Macintosh'*) : ;; *) - GNUPG_CHECK_MPFR + case $SKIP_MPFR in + no) GNUPG_CHECK_MPFR + ;; + esac ;; esac |