diff --git a/configure b/configure index 5563ad8..eb502b3 100755 --- a/configure +++ b/configure @@ -748,8 +748,6 @@ am__EXEEXT_TRUE LTLIBOBJS TERMLIBS AM_CFLAGS -CONFIG_DEFAULT_COMPLETE_FALSE -CONFIG_DEFAULT_COMPLETE_TRUE LIBOBJS CPP OTOOL64 @@ -1516,11 +1514,12 @@ Optional Features: --disable-unique-history Disable uniqify of scrollback. Default: duplicate entries are ignored. Use this to save dupes. - --enable-default-complete Enable default completion handler. - --enable-arrow-keys Enable ANSI arrow keys. - --enable-sigstop Enable SIGSTOP key. - --enable-terminal-bell Enable terminal bell on completion. - --enable-termcap Use the termcap library for terminal size. + --disable-default-complete + Disable default (filename) completion handler. + --disable-arrow-keys Disable ANSI arrow keys. + --enable-sigstop Enable SIGSTOP key. + --enable-terminal-bell Enable terminal bell on completion. + --enable-termcap Use termcap library to query terminal size. Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -4562,13 +4561,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4565: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4564: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4568: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4567: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4571: output\"" >&5) + (eval echo "\"\$as_me:4570: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5774,7 +5773,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5777 "configure"' > conftest.$ac_ext + echo '#line 5776 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7304,11 +7303,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7307: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7306: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7311: \$? = $ac_status" >&5 + echo "$as_me:7310: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7643,11 +7642,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7646: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7645: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7650: \$? = $ac_status" >&5 + echo "$as_me:7649: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7748,11 +7747,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7751: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7750: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7755: \$? = $ac_status" >&5 + echo "$as_me:7754: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7803,11 +7802,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7806: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7805: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7810: \$? = $ac_status" >&5 + echo "$as_me:7809: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10187,7 +10186,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10190 "configure" +#line 10189 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10283,7 +10282,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10286 "configure" +#line 10285 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11142,24 +11141,20 @@ fi # Check whether --enable-default-complete was given. if test "${enable_default_complete+set}" = set; then : - enableval=$enable_default_complete; complete=true; -$as_echo "#define CONFIG_DEFAULT_COMPLETE /**/" >>confdefs.h - -fi - - if test x$complete = xtrue; then - CONFIG_DEFAULT_COMPLETE_TRUE= - CONFIG_DEFAULT_COMPLETE_FALSE='#' + enableval=$enable_default_complete; else - CONFIG_DEFAULT_COMPLETE_TRUE='#' - CONFIG_DEFAULT_COMPLETE_FALSE= + +$as_echo "#define CONFIG_DEFAULT_COMPLETE 1" >>confdefs.h + fi # Check whether --enable-arrow-keys was given. if test "${enable_arrow_keys+set}" = set; then : enableval=$enable_arrow_keys; -$as_echo "#define CONFIG_ANSI_ARROWS /**/" >>confdefs.h +else + +$as_echo "#define CONFIG_ANSI_ARROWS 1" >>confdefs.h fi @@ -11167,7 +11162,7 @@ fi # Check whether --enable-sigstop was given. if test "${enable_sigstop+set}" = set; then : enableval=$enable_sigstop; -$as_echo "#define CONFIG_SIGSTOP /**/" >>confdefs.h +$as_echo "#define CONFIG_SIGSTOP 1" >>confdefs.h fi @@ -11175,7 +11170,7 @@ fi # Check whether --enable-terminal-bell was given. if test "${enable_terminal_bell+set}" = set; then : enableval=$enable_terminal_bell; -$as_echo "#define CONFIG_ANNOYING_NOISE /**/" >>confdefs.h +$as_echo "#define CONFIG_ANNOYING_NOISE 1" >>confdefs.h fi @@ -11183,7 +11178,7 @@ fi # Check whether --enable-termcap was given. if test "${enable_termcap+set}" = set; then : enableval=$enable_termcap; -$as_echo "#define CONFIG_USE_TERMCAP /**/" >>confdefs.h +$as_echo "#define CONFIG_USE_TERMCAP 1" >>confdefs.h fi @@ -11520,10 +11515,6 @@ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then as_fn_error "conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${CONFIG_DEFAULT_COMPLETE_TRUE}" && test -z "${CONFIG_DEFAULT_COMPLETE_FALSE}"; then - as_fn_error "conditional \"CONFIG_DEFAULT_COMPLETE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi : ${CONFIG_STATUS=./config.status} ac_write_fail=0 diff --git a/configure.ac b/configure.ac index 6905385..60c1fdc 100644 --- a/configure.ac +++ b/configure.ac @@ -58,25 +58,24 @@ AC_ARG_ENABLE(unique-history, , AC_DEFINE(CONFIG_UNIQUE_HISTORY, 1, [Define to skip duplicate lines in the scrollback history.])) AC_ARG_ENABLE(default-complete, - [ --enable-default-complete Enable default completion handler.], - complete=true; AC_DEFINE(CONFIG_DEFAULT_COMPLETE,, [Define to enable the default completion handler.])) -AM_CONDITIONAL([CONFIG_DEFAULT_COMPLETE], [test x$complete = xtrue]) + [AS_HELP_STRING([--disable-default-complete], [Disable default (filename) completion handler.])], + , AC_DEFINE(CONFIG_DEFAULT_COMPLETE, 1, [Define to enable the default completion handler.])) AC_ARG_ENABLE(arrow-keys, - [ --enable-arrow-keys Enable ANSI arrow keys.], - AC_DEFINE([CONFIG_ANSI_ARROWS],, [Define to include ANSI arrow keys support.])) + [AS_HELP_STRING([--disable-arrow-keys], [Disable ANSI arrow keys.])], + , AC_DEFINE(CONFIG_ANSI_ARROWS, 1, [Define to include ANSI arrow keys support.])) AC_ARG_ENABLE(sigstop, - [ --enable-sigstop Enable SIGSTOP key.], - AC_DEFINE([CONFIG_SIGSTOP],, [Define to enable SIGSTOP (Ctrl-Z) key.])) + [AS_HELP_STRING([--enable-sigstop], [Enable SIGSTOP key.])], + AC_DEFINE([CONFIG_SIGSTOP], 1, [Define to enable SIGSTOP (Ctrl-Z) key.])) AC_ARG_ENABLE(terminal-bell, - [ --enable-terminal-bell Enable terminal bell on completion.], - AC_DEFINE([CONFIG_ANNOYING_NOISE],, [Define to enable terminal bell on completion.])) + [AS_HELP_STRING([--enable-terminal-bell], [Enable terminal bell on completion.])], + AC_DEFINE([CONFIG_ANNOYING_NOISE], 1, [Define to enable terminal bell on completion.])) AC_ARG_ENABLE(termcap, - [ --enable-termcap Use the termcap library for terminal size.], - AC_DEFINE([CONFIG_USE_TERMCAP],, [Define to use the termcap library for terminal size.])) + [AS_HELP_STRING([--enable-termcap], [Use termcap library to query terminal size.])], + AC_DEFINE([CONFIG_USE_TERMCAP], 1, [Define to use the termcap library for terminal size.])) # Restore gnu89 inline semantics on gcc 4.3 and newer saved_cflags="$CFLAGS"