diff options
Diffstat (limited to 'src/auto/configure')
-rwxr-xr-x | src/auto/configure | 32 |
1 files changed, 22 insertions, 10 deletions
diff --git a/src/auto/configure b/src/auto/configure index 72d2d076dc..09abdf1bcb 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -5256,6 +5256,12 @@ esac +if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + has_eval=no +else + has_eval=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking --with-compiledby argument" >&5 $as_echo_n "checking --with-compiledby argument... " >&6; } @@ -5333,7 +5339,7 @@ fi $as_echo "$enable_luainterp" >&6; } if test "$enable_luainterp" = "yes" -o "$enable_luainterp" = "dynamic"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then as_fn_error $? "cannot use Lua with tiny or small features" "$LINENO" 5 fi @@ -6103,7 +6109,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_perlinterp" >&5 $as_echo "$enable_perlinterp" >&6; } if test "$enable_perlinterp" = "yes" -o "$enable_perlinterp" = "dynamic"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then as_fn_error $? "cannot use Perl with tiny or small features" "$LINENO" 5 fi @@ -6308,7 +6314,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_pythoninterp" >&5 $as_echo "$enable_pythoninterp" >&6; } if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 fi @@ -6659,7 +6665,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_python3interp" >&5 $as_echo "$enable_python3interp" >&6; } if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then as_fn_error $? "cannot use Python with tiny or small features" "$LINENO" 5 fi @@ -7587,7 +7593,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_rubyinterp" >&5 $as_echo "$enable_rubyinterp" >&6; } if test "$enable_rubyinterp" = "yes" -o "$enable_rubyinterp" = "dynamic"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then as_fn_error $? "cannot use Ruby with tiny or small features" "$LINENO" 5 fi @@ -7765,7 +7771,7 @@ else fi if test "$enable_netbeans" = "yes"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use NetBeans with tiny or small features" >&5 $as_echo "cannot use NetBeans with tiny or small features" >&6; } enable_netbeans="no" @@ -7788,7 +7794,7 @@ else fi if test "$enable_channel" = "yes"; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use channels with tiny or small features" >&5 $as_echo "cannot use channels with tiny or small features" >&6; } enable_channel="no" @@ -8092,7 +8098,7 @@ else fi if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then - if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then + if test "$has_eval" = "no"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use terminal emulator with tiny or small features" >&5 $as_echo "cannot use terminal emulator with tiny or small features" >&6; } enable_terminal="no" @@ -13051,8 +13057,14 @@ $as_echo "Defaulting to no" >&6; } enable_canberra="no" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 + if test "$enable_canberra" = "yes" -a "$has_eval" = "no"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot use sound with tiny or small features" >&5 +$as_echo "cannot use sound with tiny or small features" >&6; } + enable_canberra="no" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_canberra" >&5 $as_echo "$enable_canberra" >&6; } + fi fi if test "$enable_canberra" = "yes"; then if test "x$PKG_CONFIG" != "xno"; then @@ -13067,7 +13079,7 @@ if test "$enable_canberra" = "yes"; then $as_echo_n "checking for libcanberra... " >&6; } ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" - if `echo "$CFLAGS" | grep -v "$canberra_cflags" >/dev/null`; then + if `echo "$CFLAGS" | grep -v "$canberra_cflags" 2>/dev/null`; then CFLAGS="$CFLAGS $canberra_cflags" fi LIBS="$LIBS $canberra_lib" |