diff options
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 33 |
1 files changed, 26 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index b73e37b..147bae5 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl report bugs to chet@po.cwru.edu dnl dnl Process this file with autoconf to produce a configure script. -# Copyright (C) 1987-2018 Free Software Foundation, Inc. +# Copyright (C) 1987-2020 Free Software Foundation, Inc. # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -20,9 +20,9 @@ dnl Process this file with autoconf to produce a configure script. # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -AC_REVISION([for Readline 8.0, version 2.85]) +AC_REVISION([for Readline 8.1, version 2.90]) -AC_INIT(readline, 8.0, bug-readline@gnu.org) +AC_INIT(readline, 8.1, bug-readline@gnu.org) dnl make sure we are using a recent autoconf version AC_PREREQ(2.50) @@ -32,7 +32,7 @@ AC_CONFIG_AUX_DIR(./support) AC_CONFIG_HEADERS(config.h) dnl update the value of RL_READLINE_VERSION in readline.h when this changes -LIBVERSION=8.0 +LIBVERSION=8.1 AC_CANONICAL_HOST AC_CANONICAL_BUILD @@ -52,16 +52,26 @@ opt_multibyte=yes opt_static_libs=yes opt_shared_libs=yes opt_install_examples=yes +opt_bracketed_paste_default=yes AC_ARG_ENABLE(multibyte, AC_HELP_STRING([--enable-multibyte], [enable multibyte characters if OS supports them]), opt_multibyte=$enableval) AC_ARG_ENABLE(shared, AC_HELP_STRING([--enable-shared], [build shared libraries [[default=YES]]]), opt_shared_libs=$enableval) AC_ARG_ENABLE(static, AC_HELP_STRING([--enable-static], [build static libraries [[default=YES]]]), opt_static_libs=$enableval) AC_ARG_ENABLE(install-examples, AC_HELP_STRING([--disable-install-examples], [don't install examples [[default=install]]]), opt_install_examples=$enableval) +AC_ARG_ENABLE(bracketed-paste-default, AC_HELP_STRING([--disable-bracketed-paste-default], [disable bracketed paste by default [[default=enable]]]), opt_bracketed_paste_default=$enableval) + if test $opt_multibyte = no; then AC_DEFINE(NO_MULTIBYTE_SUPPORT) fi +if test $opt_bracketed_paste_default = yes; then + BRACKETED_PASTE='-DBRACKETED_PASTE_DEFAULT=1' +else + BRACKETED_PASTE='-DBRACKETED_PASTE_DEFAULT=0' +fi +AC_SUBST(BRACKETED_PASTE) + dnl load up the cross-building cache file -- add more cases and cache dnl files as necessary @@ -97,15 +107,18 @@ echo "Beginning configuration for readline-$LIBVERSION for ${host_cpu}-${host_ve echo "" # We want these before the checks, so the checks can modify their values. -test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1 +test -z "$CFLAGS" && want_auto_cflags=1 AC_PROG_MAKE_SET AC_PROG_CC dnl AC_AIX AC_MINIX -# If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS. -test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O" +# If we're using gcc and the user hasn't specified CFLAGS, add -O2 to CFLAGS +if test -n "$want_auto_cflags" ; then + AUTO_CFLAGS="-g ${GCC+-O2}" + STYLE_CFLAGS="${GCC+-Wno-parentheses} ${GCC+-Wno-format-security}" +fi AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL @@ -215,6 +228,7 @@ esac case "$host_os" in isc*) LOCAL_CFLAGS=-Disc386 ;; +hpux*) LOCAL_CFLAGS="-DTGETENT_BROKEN -DTGETFLAG_BROKEN" ;; esac # shared library configuration section @@ -293,6 +307,11 @@ esac AC_SUBST(BUILD_DIR) +if test -n "$want_auto_cflags"; then + CFLAGS="$AUTO_CFLAGS" +fi +CFLAGS="$CFLAGS $STYLE_CFLAGS" + AC_SUBST(CFLAGS) AC_SUBST(LOCAL_CFLAGS) AC_SUBST(LOCAL_LDFLAGS) |