File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -7473,20 +7473,34 @@ $as_echo_n "checking --enable-terminal argument... " >&6; }
74737473# Check whether --enable-terminal was given.
74747474if test " ${enable_terminal+set} " = set ; then :
74757475 enableval=$enable_terminal ; enable_terminal=" yes"
7476+ else
7477+ enable_terminal=" auto"
74767478fi
74777479
7478- if test " $enable_terminal " = " yes" ; then
7480+ if test " $enable_terminal " = " yes" || test " $enable_terminal " = " auto " -a " x $features " = " xhuge " ; then
74797481 if test " x$features " = " xtiny" -o " x$features " = " xsmall" ; then
74807482 { $as_echo " $as_me :${as_lineno-$LINENO } : result: cannot use terminal emulator with tiny or small features" >&5
74817483$as_echo " cannot use terminal emulator with tiny or small features" >&6 ; }
74827484 enable_terminal=" no"
74837485 else
7484- { $as_echo " $as_me :${as_lineno-$LINENO } : result: yes" >&5
7486+ if test " $enable_terminal " = " auto" ; then
7487+ enable_terminal=" yes"
7488+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: defaulting to yes" >&5
7489+ $as_echo " defaulting to yes" >&6 ; }
7490+ else
7491+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: yes" >&5
74857492$as_echo " yes" >&6 ; }
7493+ fi
74867494 fi
74877495else
7488- { $as_echo " $as_me :${as_lineno-$LINENO } : result: no" >&5
7496+ if test " $enable_terminal " = " auto" ; then
7497+ enable_terminal=" no"
7498+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: defaulting to no" >&5
7499+ $as_echo " defaulting to no" >&6 ; }
7500+ else
7501+ { $as_echo " $as_me :${as_lineno-$LINENO } : result: no" >&5
74897502$as_echo " no" >&6 ; }
7503+ fi
74907504fi
74917505if test " $enable_terminal " = " yes" ; then
74927506 $as_echo " #define FEAT_TERMINAL 1" >> confdefs.h
Original file line number Diff line number Diff line change @@ -2031,16 +2031,26 @@ fi
20312031AC_MSG_CHECKING ( -- enable-terminal argument )
20322032AC_ARG_ENABLE ( terminal ,
20332033 [ --enable-terminal Enable terminal emulation support.] ,
2034- [ enable_terminal="yes"] , )
2035- if test "$enable_terminal" = "yes"; then
2034+ [ enable_terminal="yes"] , [ enable_terminal="auto" ] )
2035+ if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
20362036 if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
20372037 AC_MSG_RESULT ( [ cannot use terminal emulator with tiny or small features] )
20382038 enable_terminal="no"
20392039 else
2040- AC_MSG_RESULT ( yes )
2040+ if test "$enable_terminal" = "auto"; then
2041+ enable_terminal="yes"
2042+ AC_MSG_RESULT ( defaulting to yes )
2043+ else
2044+ AC_MSG_RESULT ( yes )
2045+ fi
20412046 fi
20422047else
2043- AC_MSG_RESULT ( no )
2048+ if test "$enable_terminal" = "auto"; then
2049+ enable_terminal="no"
2050+ AC_MSG_RESULT ( defaulting to no )
2051+ else
2052+ AC_MSG_RESULT ( no )
2053+ fi
20442054fi
20452055if test "$enable_terminal" = "yes"; then
20462056 AC_DEFINE ( FEAT_TERMINAL )
Original file line number Diff line number Diff line change @@ -769,6 +769,8 @@ static char *(features[]) =
769769
770770static int included_patches [] =
771771{ /* Add new patch number below this line */
772+ /**/
773+ 1050 ,
772774/**/
773775 1049 ,
774776/**/
You can’t perform that action at this time.
0 commit comments