Diff for /embedaddon/readline/configure.ac between versions 1.1.1.1 and 1.1.1.2

version 1.1.1.1, 2014/07/30 08:16:45 version 1.1.1.2, 2021/03/17 01:01:01
Line 5  dnl report bugs to chet@po.cwru.edu Line 5  dnl report bugs to chet@po.cwru.edu
 dnl  dnl
 dnl Process this file with autoconf to produce a configure script.  dnl Process this file with autoconf to produce a configure script.
   
# Copyright (C) 1987-2014 Free Software Foundation, Inc.# Copyright (C) 1987-2020 Free Software Foundation, Inc.
   
 #   This program is free software: you can redistribute it and/or modify  #   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  #   it under the terms of the GNU General Public License as published by
Line 20  dnl Process this file with autoconf to produce a confi Line 20  dnl Process this file with autoconf to produce a confi
 #   You should have received a copy of the GNU General Public License  #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.  #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
   
AC_REVISION([for Readline 6.3, version 2.73])AC_REVISION([for Readline 8.1, version 2.90])
   
AC_INIT(readline, 6.3, bug-readline@gnu.org)AC_INIT(readline, 8.1, bug-readline@gnu.org)
   
 dnl make sure we are using a recent autoconf version  dnl make sure we are using a recent autoconf version
 AC_PREREQ(2.50)  AC_PREREQ(2.50)
Line 32  AC_CONFIG_AUX_DIR(./support) Line 32  AC_CONFIG_AUX_DIR(./support)
 AC_CONFIG_HEADERS(config.h)  AC_CONFIG_HEADERS(config.h)
   
 dnl update the value of RL_READLINE_VERSION in readline.h when this changes  dnl update the value of RL_READLINE_VERSION in readline.h when this changes
LIBVERSION=6.3LIBVERSION=8.1
   
 AC_CANONICAL_HOST  AC_CANONICAL_HOST
 AC_CANONICAL_BUILD  AC_CANONICAL_BUILD
   
 dnl configure defaults  dnl configure defaults
 opt_curses=no  opt_curses=no
 opt_purify=no  
   
 dnl arguments to configure  dnl arguments to configure
 AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)  AC_ARG_WITH(curses, AC_HELP_STRING([--with-curses], [use the curses library instead of the termcap library]), opt_curses=$withval)
 AC_ARG_WITH(purify, AC_HELP_STRING([--with-purify], [configure to postprocess with purify]), opt_purify=$withval)  
   
 if test "$opt_curses" = "yes"; then  if test "$opt_curses" = "yes"; then
         prefer_curses=yes          prefer_curses=yes
 fi  fi
   
 if test "$opt_purify" = yes; then  
         PURIFY="purify"  
 else  
         PURIFY=  
 fi  
   
 dnl option parsing for optional features  dnl option parsing for optional features
 opt_multibyte=yes  opt_multibyte=yes
 opt_static_libs=yes  opt_static_libs=yes
 opt_shared_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(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(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(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  if test $opt_multibyte = no; then
 AC_DEFINE(NO_MULTIBYTE_SUPPORT)  AC_DEFINE(NO_MULTIBYTE_SUPPORT)
 fi  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 load up the cross-building cache file -- add more cases and cache
 dnl files as necessary  dnl files as necessary
   
Line 103  echo "Beginning configuration for readline-$LIBVERSION Line 107  echo "Beginning configuration for readline-$LIBVERSION
 echo ""  echo ""
   
 # We want these before the checks, so the checks can modify their values.  # We want these before the checks, so the checks can modify their values.
test -z "$CFLAGS" && CFLAGS=-g auto_cflags=1test -z "$CFLAGS" && want_auto_cflags=1
   
 AC_PROG_MAKE_SET  AC_PROG_MAKE_SET
 AC_PROG_CC  AC_PROG_CC
 dnl AC_AIX  dnl AC_AIX
 AC_MINIX  AC_MINIX
   
# If we're using gcc and the user hasn't specified CFLAGS, add -O to CFLAGS.# If we're using gcc and the user hasn't specified CFLAGS, add -O2 to CFLAGS
test -n "$GCC" && test -n "$auto_cflags" && CFLAGS="$CFLAGS -O"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_GCC_TRADITIONAL
 AC_PROG_INSTALL  AC_PROG_INSTALL
Line 139  AC_HEADER_STDC Line 146  AC_HEADER_STDC
 AC_HEADER_STAT  AC_HEADER_STAT
 AC_HEADER_DIRENT  AC_HEADER_DIRENT
   
AC_CHECK_FUNCS(fcntl kill lstat)AC_CHECK_FUNCS(fcntl kill lstat readlink)
AC_CHECK_FUNCS(memmove putenv select setenv setlocale \AC_CHECK_FUNCS(fnmatch memmove pselect putenv select setenv setlocale \
                 strcasecmp strpbrk tcgetattr vsnprintf)                  strcasecmp strpbrk tcgetattr vsnprintf)
 AC_CHECK_FUNCS(isascii isxdigit)  AC_CHECK_FUNCS(isascii isxdigit)
 AC_CHECK_FUNCS(getpwent getpwnam getpwuid)  AC_CHECK_FUNCS(getpwent getpwnam getpwuid)
   
   AC_FUNC_CHOWN
 AC_FUNC_STRCOLL  AC_FUNC_STRCOLL
   
 AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h stdbool.h \  AC_CHECK_HEADERS(fcntl.h unistd.h stdlib.h varargs.h stdarg.h stdbool.h \
                 string.h strings.h \                  string.h strings.h \
                 limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)                  limits.h locale.h pwd.h memory.h termcap.h termios.h termio.h)
AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h)AC_CHECK_HEADERS(sys/ioctl.h sys/pte.h sys/stream.h sys/select.h sys/file.h)
   
 AC_CHECK_HEADERS(sys/ptem.h,,,  AC_CHECK_HEADERS(sys/ptem.h,,,
 [[  [[
Line 183  BASH_STRUCT_WINSIZE Line 191  BASH_STRUCT_WINSIZE
 BASH_STRUCT_DIRENT_D_INO  BASH_STRUCT_DIRENT_D_INO
 BASH_STRUCT_DIRENT_D_FILENO  BASH_STRUCT_DIRENT_D_FILENO
   
   AC_CHECK_HEADERS(libaudit.h)
 AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]])  AC_CHECK_DECLS([AUDIT_USER_TTY],,, [[#include <linux/audit.h>]])
   
 dnl yuck  dnl yuck
Line 197  if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a"; Line 206  if test "$TERMCAP_LIB" = "./lib/termcap/libtermcap.a";
                 TERMCAP_LIB=-ltermcap   #default                  TERMCAP_LIB=-ltermcap   #default
         fi          fi
 fi  fi
   # Windows ncurses installation
   if test "$TERMCAP_LIB" = "-lncurses"; then
           AC_CHECK_HEADERS(ncurses/termcap.h)
   fi
   
   case "$TERMCAP_LIB" in
   -ltinfo)  TERMCAP_PKG_CONFIG_LIB=tinfo ;;
   -lcurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
   -lncurses) TERMCAP_PKG_CONFIG_LIB=ncurses ;;
   -ltermcap) TERMCAP_PKG_CONFIG_LIB=termcap ;;
   *) TERMCAP_PKG_CONFIG_LIB=termcap ;;
   esac
   
 BASH_CHECK_MULTIBYTE  BASH_CHECK_MULTIBYTE
   
 case "$host_cpu" in  case "$host_cpu" in
Line 207  esac Line 228  esac
   
 case "$host_os" in  case "$host_os" in
 isc*)   LOCAL_CFLAGS=-Disc386 ;;  isc*)   LOCAL_CFLAGS=-Disc386 ;;
   hpux*)  LOCAL_CFLAGS="-DTGETENT_BROKEN -DTGETFLAG_BROKEN" ;;
 esac  esac
   
 # shared library configuration section  # shared library configuration section
Line 268  AC_SUBST(SHARED_TARGET) Line 290  AC_SUBST(SHARED_TARGET)
 AC_SUBST(STATIC_INSTALL_TARGET)  AC_SUBST(STATIC_INSTALL_TARGET)
 AC_SUBST(SHARED_INSTALL_TARGET)  AC_SUBST(SHARED_INSTALL_TARGET)
   
   if test "$opt_install_examples" = "yes"; then
           EXAMPLES_INSTALL_TARGET=install-examples
   fi
   AC_SUBST(EXAMPLES_INSTALL_TARGET)
   
 case "$build_os" in  case "$build_os" in
 msdosdjgpp*)    BUILD_DIR=`pwd.exe` ;;  # to prevent //d/path/file  msdosdjgpp*)    BUILD_DIR=`pwd.exe` ;;  # to prevent //d/path/file
 *)              BUILD_DIR=`pwd` ;;  *)              BUILD_DIR=`pwd` ;;
Line 278  case "$BUILD_DIR" in Line 305  case "$BUILD_DIR" in
 *)      ;;  *)      ;;
 esac  esac
   
 AC_SUBST(PURIFY)  
 AC_SUBST(BUILD_DIR)  AC_SUBST(BUILD_DIR)
   
   if test -n "$want_auto_cflags"; then
           CFLAGS="$AUTO_CFLAGS"
   fi
   CFLAGS="$CFLAGS $STYLE_CFLAGS"
   
 AC_SUBST(CFLAGS)  AC_SUBST(CFLAGS)
 AC_SUBST(LOCAL_CFLAGS)  AC_SUBST(LOCAL_CFLAGS)
 AC_SUBST(LOCAL_LDFLAGS)  AC_SUBST(LOCAL_LDFLAGS)
Line 295  AC_SUBST(host_os) Line 326  AC_SUBST(host_os)
 AC_SUBST(LIBVERSION)  AC_SUBST(LIBVERSION)
   
 AC_SUBST(TERMCAP_LIB)  AC_SUBST(TERMCAP_LIB)
   AC_SUBST(TERMCAP_PKG_CONFIG_LIB)
   
AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile],AC_OUTPUT([Makefile doc/Makefile examples/Makefile shlib/Makefile readline.pc],
 [  [
 # Makefile uses this timestamp file to record whether config.h is up to date.  # Makefile uses this timestamp file to record whether config.h is up to date.
 echo > stamp-h  echo > stamp-h

Removed from v.1.1.1.1  
changed lines
  Added in v.1.1.1.2


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>