diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 133 |
1 files changed, 107 insertions, 26 deletions
diff --git a/configure.in b/configure.in index 791282d..182d773 100644 --- a/configure.in +++ b/configure.in @@ -1,11 +1,11 @@ dnl -dnl Configure script for bash-3.0 +dnl Configure script for bash-3.1 dnl dnl report bugs to chet@po.cwru.edu dnl dnl Process this file with autoconf to produce a configure script. -# Copyright (C) 1987-2004 Free Software Foundation, Inc. +# Copyright (C) 1987-2005 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 @@ -22,9 +22,9 @@ dnl Process this file with autoconf to produce a configure script. # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. -AC_REVISION([for Bash 3.0, version 3.166, from autoconf version] AC_ACVERSION)dnl +AC_REVISION([for Bash 3.1, version 3.183])dnl -define(bashvers, 3.0) +define(bashvers, 3.1) define(relstatus, release) AC_INIT(bash, bashvers-relstatus, bug-bash@gnu.org) @@ -73,7 +73,7 @@ sparc-netbsd*) opt_bash_malloc=no ;; # needs 8-byte alignment mips-irix6*) opt_bash_malloc=no ;; # needs 8-byte alignment m68k-sysv) opt_bash_malloc=no ;; # fixes file descriptor leak in closedir sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF -*-freebsd*-gnu) opt_bash_malloc=no ;; # there's some undetermined problem here +#*-freebsd*-gnu) opt_bash_malloc=no ;; # there's some undetermined problem here #*-freebsd*) opt_bash_malloc=no ;; # they claim it's better; I disagree *-openbsd*) opt_bash_malloc=no ;; # they claim it needs eight-bit alignment *-aix*) opt_bash_malloc=no ;; # AIX machines @@ -82,7 +82,7 @@ sparc-linux*) opt_bash_malloc=no ;; # sparc running linux; requires ELF *-rhapsody*) opt_bash_malloc=no ;; # Apple Rhapsody (MacOS X) *-darwin*) opt_bash_malloc=no ;; # Apple Darwin (MacOS X) *-dgux*) opt_bash_malloc=no ;; # DG/UX machines -*-qnx*) opt_bash_malloc=no ;; # QNX 4.2 +*-qnx*) opt_bash_malloc=no ;; # QNX 4.2, QNX 6.x *-machten4) opt_bash_malloc=no ;; # MachTen 4.x *-bsdi2.1|*-bsdi3.?) opt_bash_malloc=no ; : ${CC:=shlicc2} ;; # for loadable builtins *-beos*) opt_bash_malloc=no ;; # they say it's suitable @@ -173,6 +173,7 @@ opt_brace_expansion=yes opt_disabled_builtins=no opt_command_timing=yes opt_xpg_echo=no +opt_strict_posix=no opt_cond_command=yes opt_cond_regexp=yes opt_arith_for_command=yes @@ -181,6 +182,7 @@ opt_progcomp=yes opt_separate_help=no opt_multibyte=yes opt_debugger=yes +opt_single_longdoc_strings=yes dnl options that affect how bash is compiled and linked opt_static_link=no @@ -227,6 +229,8 @@ AC_ARG_ENABLE(readline, AC_HELP_STRING([--enable-readline], [turn on command lin AC_ARG_ENABLE(restricted, AC_HELP_STRING([--enable-restricted], [enable a restricted shell]), opt_restricted=$enableval) AC_ARG_ENABLE(select, AC_HELP_STRING([--enable-select], [include select command]), opt_select=$enableval) AC_ARG_ENABLE(separate-helpfiles, AC_HELP_STRING([--enable-separate-helpfiles], [use external files for help builtin documentation]), opt_separate_help=$enableval) +AC_ARG_ENABLE(single-help-strings, AC_HELP_STRING([--enable-single-help-strings], [store help documentation as a single string to ease translation]), opt_single_longdoc_strings=$enableval) +AC_ARG_ENABLE(strict-posix-default, AC_HELP_STRING([--enable-strict-posix-default], [configure bash to be posix-conformant by default]), opt_strict_posix=$enableval) AC_ARG_ENABLE(usg-echo-default, AC_HELP_STRING([--enable-usg-echo-default], [a synonym for --enable-xpg-echo-default]), opt_xpg_echo=$enableval) AC_ARG_ENABLE(xpg-echo-default, AC_HELP_STRING([--enable-xpg-echo-default], [make the echo builtin expand escape sequences by default]), opt_xpg_echo=$enableval) @@ -280,6 +284,9 @@ fi if test $opt_xpg_echo = yes ; then AC_DEFINE(DEFAULT_ECHO_TO_XPG) fi +if test $opt_strict_posix = yes; then +AC_DEFINE(STRICT_POSIX) +fi if test $opt_extended_glob = yes ; then AC_DEFINE(EXTENDED_GLOB) fi @@ -325,6 +332,10 @@ if test "$opt_separate_help" != no; then HELPDIRDEFINE='-H ${HELPDIR}' HELPINSTALL='install-help' fi +HELPSTRINGS= +if test "$opt_single_longdoc_strings" != "yes"; then + HELPSTRINGS='-S' +fi dnl now substitute in the values generated by arguments AC_SUBST(TESTSCRIPT) @@ -342,6 +353,7 @@ AC_SUBST(htmldir) AC_SUBST(HELPDIR) AC_SUBST(HELPDIRDEFINE) AC_SUBST(HELPINSTALL) +AC_SUBST(HELPSTRINGS) echo "" echo "Beginning configuration for bash-$BASHVERS-$RELSTATUS for ${host_cpu}-${host_vendor}-${host_os}" @@ -356,13 +368,10 @@ dnl test for Unix variants AC_ISC_POSIX AC_MINIX -dnl test for non-Unix variants -AC_CYGWIN -AC_MINGW32 - AC_SYS_LARGEFILE -dnl BEGIN changes for cross-building for cygwin and BeOS +dnl BEGIN changes for cross-building (currently cygwin, minGW, and +dnl (obsolete) BeOS) SIGNAMES_H=lsignames.h @@ -379,6 +388,9 @@ if test "x$cross_compiling" = "xyes"; then cross_cache=${srcdir}/cross-build/cygwin32.cache SIGNAMES_H='$(srcdir)/cross-build/win32sig.h' ;; + *-mingw*) + cross_cache=${srcdir}/cross-build/cygwin32.cache + ;; i[[3456]]86-*-beos*) cross_cache=${srcdir}/cross-build/x86-beos.cache SIGNAMES_H='${srcdir}/cross-build/beos-sig.h' @@ -391,6 +403,8 @@ if test "x$cross_compiling" = "xyes"; then . ${cross_cache} fi unset cross_cache + CROSS_COMPILE='-DCROSS_COMPILING' + AC_SUBST(CROSS_COMPILE) fi AC_SUBST(SIGNAMES_H) @@ -475,9 +489,9 @@ then esac fi +TILDE_LIB=-ltilde if test $opt_readline = yes; then AC_DEFINE(READLINE) - READLINE_LIB=-lreadline if test "$opt_with_installed_readline" != "no" ; then case "$opt_with_installed_readline" in yes) RL_INCLUDE= ;; @@ -488,9 +502,23 @@ if test $opt_readline = yes; then ;; esac READLINE_DEP= + READLINE_LIB=-lreadline + # section for OS versions that don't allow unresolved symbols + # to be compiled into dynamic libraries. + case "$host_os" in + cygwin*) TILDE_LIB= ;; + esac else RL_LIBDIR='$(dot)/$(LIBSUBDIR)/readline' READLINE_DEP='$(READLINE_LIBRARY)' + # section for OS versions that ship an older/broken version of + # readline as a standard dynamic library and don't allow a + # static version specified as -llibname to override the + # dynamic version + case "${host_os}" in + darwin8*) READLINE_LIB='${READLINE_LIBRARY}' ;; + *) READLINE_LIB=-lreadline ;; + esac fi else RL_LIBDIR='$(dot)/$(LIBSUBDIR)/readline' @@ -503,10 +531,10 @@ if test $opt_history = yes || test $opt_bang_history = yes; then if test $opt_bang_history = yes; then AC_DEFINE(BANG_HISTORY) fi - HISTORY_LIB=-lhistory if test "$opt_with_installed_readline" != "no"; then HIST_LIBDIR=$RL_LIBDIR HISTORY_DEP= + HISTORY_LIB=-lhistory case "$opt_with_installed_readline" in yes) RL_INCLUDE= ;; *) case "$RL_INCLUDEDIR" in @@ -518,6 +546,14 @@ if test $opt_history = yes || test $opt_bang_history = yes; then else HIST_LIBDIR='$(dot)/$(LIBSUBDIR)/readline' HISTORY_DEP='$(HISTORY_LIBRARY)' + # section for OS versions that ship an older version of + # readline as a standard dynamic library and don't allow a + # static version specified as -llibname to override the + # dynamic version + case "${host_os}" in + darwin8*) HISTORY_LIB='${HISTORY_LIBRARY}' ;; + *) HISTORY_LIB=-lhistory ;; + esac fi else HIST_LIBDIR='$(dot)/$(LIBSUBDIR)/readline' @@ -531,6 +567,7 @@ AC_SUBST(RL_INCLUDE) AC_SUBST(HISTORY_LIB) AC_SUBST(HISTORY_DEP) AC_SUBST(HIST_LIBDIR) +AC_SUBST(TILDE_LIB) dnl END READLINE and HISTORY LIBRARY SECTION @@ -550,6 +587,28 @@ opennt*|interix*) MAKE_SHELL="$INTERIX_ROOT/bin/sh" ;; esac AC_SUBST(MAKE_SHELL) +dnl this is similar to the expanded AC_PROG_RANLIB +if test x$SIZE = x; then + if test x$ac_tool_prefix = x; then + SIZE=size + else + SIZE=${ac_tool_prefix}size + save_IFS=$IFS ; IFS=: + size_found=0 + for dir in $PATH; do + if test -x $dir/$SIZE ; then + size_found=1 + break + fi + done + if test $size_found -eq 0; then + SIZE=: + fi + IFS=$save_IFS + fi +fi +AC_SUBST(SIZE) + dnl Turn on any extensions available in the GNU C library. AC_DEFINE(_GNU_SOURCE, 1) @@ -573,12 +632,20 @@ BASH_HEADER_INTTYPES AC_CHECK_HEADERS(unistd.h stdlib.h stdarg.h varargs.h limits.h string.h \ memory.h locale.h termcap.h termio.h termios.h dlfcn.h \ - stddef.h stdint.h netdb.h grp.h strings.h regex.h) -AC_CHECK_HEADERS(sys/ptem.h sys/pte.h sys/stream.h sys/select.h sys/file.h \ + stddef.h stdint.h netdb.h pwd.h grp.h strings.h regex.h) +AC_CHECK_HEADERS(sys/pte.h sys/stream.h sys/select.h sys/file.h \ sys/resource.h sys/param.h sys/socket.h sys/stat.h \ sys/time.h sys/times.h sys/types.h sys/wait.h) AC_CHECK_HEADERS(netinet/in.h arpa/inet.h) +dnl sys/ptem.h requires definitions from sys/stream.h on systems where it +dnl exists +AC_CHECK_HEADER(sys/ptem.h, , ,[[ +#if HAVE_SYS_STREAM_H +# include <sys/stream.h> +#endif +]]) + dnl special checks for libc functions AC_FUNC_ALLOCA AC_FUNC_GETPGRP @@ -625,20 +692,23 @@ dnl checks for missing libc functions AC_CHECK_FUNC(mkfifo,AC_DEFINE(HAVE_MKFIFO),AC_DEFINE(MKFIFO_MISSING)) dnl checks for system calls -AC_CHECK_FUNCS(dup2 select getdtablesize getgroups gethostname \ - setdtablesize getpagesize killpg lstat getpeername sbrk \ - getrlimit getrusage gettimeofday waitpid tcgetpgrp \ - readlink) +AC_CHECK_FUNCS(dup2 fcntl getdtablesize getgroups gethostname getpagesize \ + getpeername getrlimit getrusage gettimeofday kill killpg \ + lstat readlink sbrk select setdtablesize tcgetpgrp uname \ + ulimit waitpid) AC_REPLACE_FUNCS(rename) dnl checks for c library functions -AC_CHECK_FUNCS(bcopy bzero confstr sysconf pathconf setenv putenv unsetenv \ - setlinebuf setvbuf setlocale strchr tcgetattr uname \ - ulimit tzset siginterrupt memmove ttyname times \ +AC_CHECK_FUNCS(bcopy bzero confstr fnmatch \ getaddrinfo gethostbyname getservbyname getservent inet_aton \ - vsnprintf snprintf vasprintf asprintf fnmatch regcomp regexec) + memmove pathconf putenv raise regcomp regexec \ + setenv setlinebuf setlocale setvbuf siginterrupt strchr \ + sysconf tcgetattr times ttyname tzset unsetenv) + +AC_CHECK_FUNCS(vsnprintf snprintf vasprintf asprintf) AC_CHECK_FUNCS(isascii isblank isgraph isprint isspace isxdigit) -AC_REPLACE_FUNCS(getcwd strcasecmp strerror strftime strpbrk memset strstr) +AC_CHECK_FUNCS(getpwent getpwnam getpwuid) +AC_REPLACE_FUNCS(getcwd memset strcasecmp strerror strftime strnlen strpbrk strstr) AC_REPLACE_FUNCS(strtod strtol strtoul strtoll strtoull strtoimax strtoumax) AC_CHECK_DECLS([confstr]) @@ -852,6 +922,8 @@ AC_HEADER_TIOCGWINSZ BASH_HAVE_TIOCSTAT BASH_HAVE_FIONREAD +BASH_CHECK_WCONTINUED + dnl miscellaneous BASH_CHECK_SPEED_T BASH_CHECK_GETPW_FUNCS @@ -917,11 +989,15 @@ sco3.2*) LOCAL_CFLAGS=-DMUST_UNBLOCK_CHLD ;; sunos4*) LOCAL_CFLAGS=-DSunOS4 ;; solaris2.5*) LOCAL_CFLAGS=-DSunOS5 ;; lynxos*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; -linux*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading +linux*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading + case "`uname -r`" in + 2.[[456789]]*|3*) AC_DEFINE(PGRP_PIPE) ;; + esac ;; +*qnx6*) LOCAL_CFLAGS="-Dqnx -Dqnx6" LOCAL_LIBS="-lncurses" ;; *qnx*) LOCAL_CFLAGS="-Dqnx -F -3s" LOCAL_LDFLAGS="-3s" LOCAL_LIBS="-lunix -lncurses" ;; powerux*) LOCAL_LIBS="-lgen" ;; cygwin*) LOCAL_CFLAGS=-DRECYCLES_PIDS ;; -opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO" ;; +opennt*|interix*) LOCAL_CFLAGS="-DNO_MAIN_ENV_ARG -DBROKEN_DIRENT_D_INO -D_POSIX_SOURCE" ;; esac dnl Stanza for OS/compiler pair-specific flags @@ -938,6 +1014,7 @@ freebsd[[3-9]]*) LOCAL_LDFLAGS=-rdynamic # allow dynamic loading fi ;; freebsdelf*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading +dragonfly*) LOCAL_LDFLAGS=-rdynamic ;; # allow dynamic loading esac case "$host_cpu" in @@ -987,6 +1064,10 @@ case "$srcdir" in esac BUILD_DIR=`pwd` +case "$BUILD_DIR" in +*\ *) BUILD_DIR=`echo "$BUILD_DIR" | sed 's: :\\\\ :g'` ;; +*) ;; +esac AC_SUBST(PROFILE_FLAGS) |