diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | configure | 23 | ||||
| -rw-r--r-- | configure.ac | 23 | ||||
| -rw-r--r-- | extension/ChangeLog | 5 | ||||
| -rwxr-xr-x | extension/configure | 18 | ||||
| -rw-r--r-- | extension/configure.ac | 14 |
6 files changed, 57 insertions, 34 deletions
@@ -1,3 +1,11 @@ +2017-12-19 Arnold D. Robbins <arnold@skeeve.com> + + * configure.ac: Remove x's from `test "x$something" = "xyes" + kinds of things. With correct quoting, the x isn't needed. + (DYNAMIC): Remove use of -Wl,-export-dynamic on Linux + and FreeBSD. It was needed for old-style extensions, which are + no longer supported. + 2017-12-10 Arnold D. Robbins <arnold@skeeve.com> * awkgram.y: For '!' optimization on a string constant, don't @@ -2596,7 +2596,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # With Autoconf 2.5x, this needs to come very early on, but *after* # the INIT macro. Sigh. -if test "x$INSTALL" = "x" +if test "$INSTALL" = "" then INSTALL="$srcdir/install-sh -c" export INSTALL @@ -8356,7 +8356,7 @@ done fi - if test "x$build_alias" != "x$host_alias"; then + if test "$build_alias" != "$host_alias"; then TEST_CROSS_COMPILE_TRUE= TEST_CROSS_COMPILE_FALSE='#' else @@ -8870,7 +8870,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext done done - if test "x$rsync_cv_socklen_t_equiv" = x + if test "$rsync_cv_socklen_t_equiv" = "" then rsync_cv_socklen_t_equiv=int fi @@ -10004,7 +10004,7 @@ if test "${enable_extensions+set}" = set; then : enableval=$enable_extensions; fi -if test "x$enable_extensions" != "xno" +if test "$enable_extensions" != "no" then extensions_supported=no @@ -10084,15 +10084,6 @@ fi $as_echo "#define DYNAMIC 1" >>confdefs.h - # Add -export-dynamic for old extensions. Only works for GCC - if test "$GCC" = yes - then - case $host_os in - linux*|freebsd*) - LDFLAGS="$LDFLAGS -Wl,-export-dynamic" - ;; - esac - fi fi fi @@ -10101,13 +10092,13 @@ fi ;; esac - if test "x$enable_extensions$extensions_supported" = "xyesno" + if test "$enable_extensions$extensions_supported" = "yesno" then as_fn_error $? "extension support requested, but unavailable" "$LINENO" 5 fi enable_extensions=$extensions_supported fi - if test "x$enable_extensions" = "xyes"; then + if test "$enable_extensions" = "yes"; then ENABLE_EXTENSIONS_TRUE= ENABLE_EXTENSIONS_FALSE='#' else @@ -11018,7 +11009,7 @@ esac ac_config_files="$ac_config_files Makefile support/Makefile awklib/Makefile doc/Makefile extras/Makefile po/Makefile.in test/Makefile" -if test "x$enable_extensions" = "xyes" +if test "$enable_extensions" = "yes" then diff --git a/configure.ac b/configure.ac index abd977c7..8b3434f2 100644 --- a/configure.ac +++ b/configure.ac @@ -33,7 +33,7 @@ AC_INIT([GNU Awk],[4.2.0],[bug-gawk@gnu.org],[gawk]) # With Autoconf 2.5x, this needs to come very early on, but *after* # the INIT macro. Sigh. -if test "x$INSTALL" = "x" +if test "$INSTALL" = "" then INSTALL="$srcdir/install-sh -c" export INSTALL @@ -175,7 +175,7 @@ else fi dnl Check cross compiling -AM_CONDITIONAL([TEST_CROSS_COMPILE], [test "x$build_alias" != "x$host_alias"]) +AM_CONDITIONAL([TEST_CROSS_COMPILE], [test "$build_alias" != "$host_alias"]) dnl checks for typedefs AC_TYPE_PID_T @@ -248,7 +248,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], done done - if test "x$rsync_cv_socklen_t_equiv" = x + if test "$rsync_cv_socklen_t_equiv" = "" then dnl Some systems get this. Default to int. -- ADR dnl AC_MSG_ERROR([Cannot find a type to use in place of socklen_t]) @@ -307,7 +307,7 @@ dnl check for dynamic linking dnl This is known to be very primitive AC_ARG_ENABLE([extensions], [AS_HELP_STRING([--disable-extensions], [disable dynamic extensions (default is detect)])]) -if test "x$enable_extensions" != "xno" +if test "$enable_extensions" != "no" then extensions_supported=no @@ -328,27 +328,18 @@ then then extensions_supported=yes AC_DEFINE([DYNAMIC], 1, [dynamic loading is possible]) - # Add -export-dynamic for old extensions. Only works for GCC - if test "$GCC" = yes - then - case $host_os in - linux*|freebsd*) - LDFLAGS="$LDFLAGS -Wl,-export-dynamic" - ;; - esac - fi fi ]) ;; esac - if test "x$enable_extensions$extensions_supported" = "xyesno" + if test "$enable_extensions$extensions_supported" = "yesno" then AC_MSG_ERROR([extension support requested, but unavailable]) fi enable_extensions=$extensions_supported fi -AM_CONDITIONAL([ENABLE_EXTENSIONS], [test "x$enable_extensions" = "xyes"]) +AM_CONDITIONAL([ENABLE_EXTENSIONS], [test "$enable_extensions" = "yes"]) dnl check for how to use getpgrp dnl have to hardwire it for VMS POSIX. Sigh. @@ -447,7 +438,7 @@ AC_CONFIG_FILES(Makefile extras/Makefile po/Makefile.in test/Makefile) -if test "x$enable_extensions" = "xyes" +if test "$enable_extensions" = "yes" then AC_CONFIG_SUBDIRS(extension) fi 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 |