diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 317 |
1 files changed, 304 insertions, 13 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for tmux 3.3a. +# Generated by GNU Autoconf 2.69 for tmux 3.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='tmux' PACKAGE_TARNAME='tmux' -PACKAGE_VERSION='3.3a' -PACKAGE_STRING='tmux 3.3a' +PACKAGE_VERSION='3.4' +PACKAGE_STRING='tmux 3.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -625,6 +625,8 @@ LTLIBOBJS AM_LDFLAGS AM_CFLAGS AM_CPPFLAGS +DEFAULT_LOCK_CMD +found_vlock IS_UNKNOWN_FALSE IS_UNKNOWN_TRUE IS_HAIKU_FALSE @@ -653,18 +655,23 @@ DEFAULT_TERM NEED_FORKPTY_FALSE NEED_FORKPTY_TRUE XOPEN_DEFINES +ENABLE_SIXEL_FALSE +ENABLE_SIXEL_TRUE HAVE_SYSTEMD_FALSE HAVE_SYSTEMD_TRUE SYSTEMD_LIBS SYSTEMD_CFLAGS HAVE_UTF8PROC_FALSE HAVE_UTF8PROC_TRUE +LIBUTF8PROC_LIBS +LIBUTF8PROC_CFLAGS LIBNCURSESW_LIBS LIBNCURSESW_CFLAGS LIBNCURSES_LIBS LIBNCURSES_CFLAGS LIBTINFO_LIBS LIBTINFO_CFLAGS +found_yacc LIBEVENT_LIBS LIBEVENT_CFLAGS LIBEVENT_CORE_LIBS @@ -790,6 +797,8 @@ with_TERM enable_utempter enable_utf8proc enable_systemd +enable_cgroups +enable_sixel ' ac_precious_vars='build_alias host_alias @@ -816,6 +825,8 @@ LIBNCURSES_CFLAGS LIBNCURSES_LIBS LIBNCURSESW_CFLAGS LIBNCURSESW_LIBS +LIBUTF8PROC_CFLAGS +LIBUTF8PROC_LIBS SYSTEMD_CFLAGS SYSTEMD_LIBS' @@ -1368,7 +1379,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tmux 3.3a to adapt to many kinds of systems. +\`configure' configures tmux 3.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1439,7 +1450,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tmux 3.3a:";; + short | recursive ) echo "Configuration of tmux 3.4:";; esac cat <<\_ACEOF @@ -1464,6 +1475,10 @@ Optional Features: --enable-systemd enable systemd integration + --disable-cgroups disable adding panes to new cgroups with systemd + + --enable-sixel enable sixel images + Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -1512,6 +1527,10 @@ Some influential environment variables: C compiler flags for LIBNCURSESW, overriding pkg-config LIBNCURSESW_LIBS linker flags for LIBNCURSESW, overriding pkg-config + LIBUTF8PROC_CFLAGS + C compiler flags for LIBUTF8PROC, overriding pkg-config + LIBUTF8PROC_LIBS + linker flags for LIBUTF8PROC, overriding pkg-config SYSTEMD_CFLAGS C compiler flags for SYSTEMD, overriding pkg-config SYSTEMD_LIBS @@ -1583,7 +1602,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tmux configure 3.3a +tmux configure 3.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1994,7 +2013,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tmux $as_me 3.3a, which was +It was created by tmux $as_me 3.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2860,7 +2879,7 @@ fi # Define the identity of the package. PACKAGE='tmux' - VERSION='3.3a' + VERSION='3.4' cat >>confdefs.h <<_ACEOF @@ -5202,7 +5221,7 @@ for ac_func in \ prctl \ proc_pidinfo \ getpeerucred \ - sysconf \ + sysconf do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` @@ -5373,6 +5392,19 @@ esac fi +ac_fn_c_check_func "$LINENO" "htonll" "ac_cv_func_htonll" +if test "x$ac_cv_func_htonll" = xyes; then : + $as_echo "#define HAVE_HTONLL 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" htonll.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS htonll.$ac_objext" + ;; +esac + +fi + ac_fn_c_check_func "$LINENO" "memmem" "ac_cv_func_memmem" if test "x$ac_cv_func_memmem" = xyes; then : $as_echo "#define HAVE_MEMMEM 1" >>confdefs.h @@ -5386,6 +5418,19 @@ esac fi +ac_fn_c_check_func "$LINENO" "ntohll" "ac_cv_func_ntohll" +if test "x$ac_cv_func_ntohll" = xyes; then : + $as_echo "#define HAVE_NTOHLL 1" >>confdefs.h + +else + case " $LIBOBJS " in + *" ntohll.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS ntohll.$ac_objext" + ;; +esac + +fi + ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv" if test "x$ac_cv_func_setenv" = xyes; then : $as_echo "#define HAVE_SETENV 1" >>confdefs.h @@ -5978,6 +6023,49 @@ if test "x$found_libevent" = xno; then as_fn_error $? "\"libevent not found\"" "$LINENO" 5 fi +# Look for yacc. +# Extract the first word of "$YACC", so it can be a program name with args. +set dummy $YACC; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_found_yacc+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$found_yacc"; then + ac_cv_prog_found_yacc="$found_yacc" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_found_yacc="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_found_yacc" && ac_cv_prog_found_yacc="no" +fi +fi +found_yacc=$ac_cv_prog_found_yacc +if test -n "$found_yacc"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_yacc" >&5 +$as_echo "$found_yacc" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "x$found_yacc" = xno; then + as_fn_error $? "\"yacc not found\"" "$LINENO" 5 +fi + # Look for ncurses or curses. Try pkg-config first then directly for the # library. @@ -6243,7 +6331,7 @@ return setupterm (); return 0; } _ACEOF -for ac_lib in '' tinfo ncurses ncursesw; do +for ac_lib in '' tinfo terminfo ncurses ncursesw; do if test -z "$ac_lib"; then ac_res="none required" else @@ -6356,6 +6444,21 @@ fi as_fn_error $? "\"curses not found\"" "$LINENO" 5 fi fi +for ac_func in \ + tiparm \ + tiparm_s \ + +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + # Look for utempter. # Check whether --enable-utempter was given. @@ -6448,6 +6551,102 @@ if test "${enable_utf8proc+set}" = set; then : fi if test "x$enable_utf8proc" = xyes; then + +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libutf8proc" >&5 +$as_echo_n "checking for libutf8proc... " >&6; } + +if test -n "$LIBUTF8PROC_CFLAGS"; then + pkg_cv_LIBUTF8PROC_CFLAGS="$LIBUTF8PROC_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libutf8proc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libutf8proc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBUTF8PROC_CFLAGS=`$PKG_CONFIG --cflags "libutf8proc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LIBUTF8PROC_LIBS"; then + pkg_cv_LIBUTF8PROC_LIBS="$LIBUTF8PROC_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libutf8proc\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libutf8proc") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LIBUTF8PROC_LIBS=`$PKG_CONFIG --libs "libutf8proc" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LIBUTF8PROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libutf8proc" 2>&1` + else + LIBUTF8PROC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libutf8proc" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBUTF8PROC_PKG_ERRORS" >&5 + + as_fn_error $? "Package requirements (libutf8proc) were not met: + +$LIBUTF8PROC_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables LIBUTF8PROC_CFLAGS +and LIBUTF8PROC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables LIBUTF8PROC_CFLAGS +and LIBUTF8PROC_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } +else + LIBUTF8PROC_CFLAGS=$pkg_cv_LIBUTF8PROC_CFLAGS + LIBUTF8PROC_LIBS=$pkg_cv_LIBUTF8PROC_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + + AM_CPPFLAGS="$LIBUTF8PROC_CFLAGS $AM_CPPFLAGS" + CPPFLAGS="$LIBUTF8PROC_CFLAGS $SAVED_CPPFLAGS" + LIBS="$LIBUTF8PROC_LIBS $LIBS" + + +fi ac_fn_c_check_header_mongrel "$LINENO" "utf8proc.h" "ac_cv_header_utf8proc_h" "$ac_includes_default" if test "x$ac_cv_header_utf8proc_h" = xyes; then : enable_utf8proc=yes @@ -6633,11 +6832,47 @@ else HAVE_SYSTEMD_FALSE= fi +# Check whether --enable-cgroups was given. +if test "${enable_cgroups+set}" = set; then : + enableval=$enable_cgroups; +fi + +if test "x$enable_cgroups" = x; then + # Default to the same as $enable_systemd. + enable_cgroups=$enable_systemd +fi +if test "x$enable_cgroups" = xyes; then + if test "x$found_systemd" = xyes; then + $as_echo "#define ENABLE_CGROUPS 1" >>confdefs.h + + else + as_fn_error $? "\"cgroups requires systemd to be enabled\"" "$LINENO" 5 + fi +fi + +# Enable sixel support. +# Check whether --enable-sixel was given. +if test "${enable_sixel+set}" = set; then : + enableval=$enable_sixel; +fi + +if test "x$enable_sixel" = xyes; then + $as_echo "#define ENABLE_SIXEL 1" >>confdefs.h + +fi + if test "x$enable_sixel" = xyes; then + ENABLE_SIXEL_TRUE= + ENABLE_SIXEL_FALSE='#' +else + ENABLE_SIXEL_TRUE='#' + ENABLE_SIXEL_FALSE= +fi + # Check for b64_ntop. If we have b64_ntop, we assume b64_pton as well. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop" >&5 $as_echo_n "checking for b64_ntop... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <sys/types.h> @@ -7891,6 +8126,58 @@ else fi +# Set the default lock command +DEFAULT_LOCK_CMD="lock -np" +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking lock-command" >&5 +$as_echo_n "checking lock-command... " >&6; } +if test "x$PLATFORM" = xlinux; then + # Extract the first word of "vlock", so it can be a program name with args. +set dummy vlock; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_found_vlock+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$found_vlock"; then + ac_cv_prog_found_vlock="$found_vlock" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_found_vlock="yes" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_found_vlock" && ac_cv_prog_found_vlock="no" +fi +fi +found_vlock=$ac_cv_prog_found_vlock +if test -n "$found_vlock"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $found_vlock" >&5 +$as_echo "$found_vlock" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + + if test "x$found_vlock" = xyes; then + DEFAULT_LOCK_CMD="vlock" + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_LOCK_CMD" >&5 +$as_echo "$DEFAULT_LOCK_CMD" >&6; } + + + # Save our CFLAGS/CPPFLAGS/LDFLAGS for the Makefile and restore the old user # variables. @@ -8096,6 +8383,10 @@ if test -z "${HAVE_SYSTEMD_TRUE}" && test -z "${HAVE_SYSTEMD_FALSE}"; then as_fn_error $? "conditional \"HAVE_SYSTEMD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_SIXEL_TRUE}" && test -z "${ENABLE_SIXEL_FALSE}"; then + as_fn_error $? "conditional \"ENABLE_SIXEL\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${NEED_FORKPTY_TRUE}" && test -z "${NEED_FORKPTY_FALSE}"; then as_fn_error $? "conditional \"NEED_FORKPTY\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -8541,7 +8832,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tmux $as_me 3.3a, which was +This file was extended by tmux $as_me 3.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8598,7 +8889,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -tmux config.status 3.3a +tmux config.status 3.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |