|
@@ -295,7 +295,8 @@ unset target_list_exclude
|
|
|
|
|
|
brlapi=""
|
|
|
curl=""
|
|
|
-curses=""
|
|
|
+iconv="auto"
|
|
|
+curses="auto"
|
|
|
docs=""
|
|
|
fdt="auto"
|
|
|
netmap="no"
|
|
@@ -1173,13 +1174,13 @@ for opt do
|
|
|
;;
|
|
|
--disable-safe-stack) safe_stack="no"
|
|
|
;;
|
|
|
- --disable-curses) curses="no"
|
|
|
+ --disable-curses) curses="disabled"
|
|
|
;;
|
|
|
- --enable-curses) curses="yes"
|
|
|
+ --enable-curses) curses="enabled"
|
|
|
;;
|
|
|
- --disable-iconv) iconv="no"
|
|
|
+ --disable-iconv) iconv="disabled"
|
|
|
;;
|
|
|
- --enable-iconv) iconv="yes"
|
|
|
+ --enable-iconv) iconv="enabled"
|
|
|
;;
|
|
|
--disable-curl) curl="no"
|
|
|
;;
|
|
@@ -2386,37 +2387,6 @@ if test "$vhost_net" = ""; then
|
|
|
test "$vhost_kernel" = "yes" && vhost_net=yes
|
|
|
fi
|
|
|
|
|
|
-##########################################
|
|
|
-# MinGW / Mingw-w64 localtime_r/gmtime_r check
|
|
|
-
|
|
|
-if test "$mingw32" = "yes"; then
|
|
|
- # Some versions of MinGW / Mingw-w64 lack localtime_r
|
|
|
- # and gmtime_r entirely.
|
|
|
- #
|
|
|
- # Some versions of Mingw-w64 define a macro for
|
|
|
- # localtime_r/gmtime_r.
|
|
|
- #
|
|
|
- # Some versions of Mingw-w64 will define functions
|
|
|
- # for localtime_r/gmtime_r, but only if you have
|
|
|
- # _POSIX_THREAD_SAFE_FUNCTIONS defined. For fun
|
|
|
- # though, unistd.h and pthread.h both define
|
|
|
- # that for you.
|
|
|
- #
|
|
|
- # So this #undef localtime_r and #include <unistd.h>
|
|
|
- # are not in fact redundant.
|
|
|
-cat > $TMPC << EOF
|
|
|
-#include <unistd.h>
|
|
|
-#include <time.h>
|
|
|
-#undef localtime_r
|
|
|
-int main(void) { localtime_r(NULL, NULL); return 0; }
|
|
|
-EOF
|
|
|
- if compile_prog "" "" ; then
|
|
|
- localtime_r="yes"
|
|
|
- else
|
|
|
- localtime_r="no"
|
|
|
- fi
|
|
|
-fi
|
|
|
-
|
|
|
##########################################
|
|
|
# pkg-config probe
|
|
|
|
|
@@ -3471,105 +3441,6 @@ EOF
|
|
|
fi
|
|
|
fi
|
|
|
|
|
|
-##########################################
|
|
|
-# iconv probe
|
|
|
-if test "$iconv" != "no" ; then
|
|
|
- cat > $TMPC << EOF
|
|
|
-#include <iconv.h>
|
|
|
-int main(void) {
|
|
|
- iconv_t conv = iconv_open("WCHAR_T", "UCS-2");
|
|
|
- return conv != (iconv_t) -1;
|
|
|
-}
|
|
|
-EOF
|
|
|
- iconv_prefix_list="/usr/local:/usr"
|
|
|
- iconv_lib_list=":-liconv"
|
|
|
- IFS=:
|
|
|
- for iconv_prefix in $iconv_prefix_list; do
|
|
|
- IFS=:
|
|
|
- iconv_cflags="-I$iconv_prefix/include"
|
|
|
- iconv_ldflags="-L$iconv_prefix/lib"
|
|
|
- for iconv_link in $iconv_lib_list; do
|
|
|
- unset IFS
|
|
|
- iconv_lib="$iconv_ldflags $iconv_link"
|
|
|
- echo "looking at iconv in '$iconv_cflags' '$iconv_lib'" >> config.log
|
|
|
- if compile_prog "$iconv_cflags" "$iconv_lib" ; then
|
|
|
- iconv_found=yes
|
|
|
- break
|
|
|
- fi
|
|
|
- done
|
|
|
- if test "$iconv_found" = yes ; then
|
|
|
- break
|
|
|
- fi
|
|
|
- done
|
|
|
- if test "$iconv_found" = "yes" ; then
|
|
|
- iconv=yes
|
|
|
- else
|
|
|
- if test "$iconv" = "yes" ; then
|
|
|
- feature_not_found "iconv" "Install iconv devel"
|
|
|
- fi
|
|
|
- iconv=no
|
|
|
- fi
|
|
|
-fi
|
|
|
-
|
|
|
-##########################################
|
|
|
-# curses probe
|
|
|
-if test "$iconv" = "no" ; then
|
|
|
- # curses will need iconv
|
|
|
- curses=no
|
|
|
-fi
|
|
|
-if test "$curses" != "no" ; then
|
|
|
- if test "$mingw32" = "yes" ; then
|
|
|
- curses_inc_list="$($pkg_config --cflags ncurses 2>/dev/null):"
|
|
|
- curses_lib_list="$($pkg_config --libs ncurses 2>/dev/null):-lpdcurses"
|
|
|
- else
|
|
|
- curses_inc_list="$($pkg_config --cflags ncursesw 2>/dev/null):-I/usr/include/ncursesw:"
|
|
|
- curses_lib_list="$($pkg_config --libs ncursesw 2>/dev/null):-lncursesw:-lcursesw"
|
|
|
- fi
|
|
|
- curses_found=no
|
|
|
- cat > $TMPC << EOF
|
|
|
-#include <locale.h>
|
|
|
-#include <curses.h>
|
|
|
-#include <wchar.h>
|
|
|
-#include <langinfo.h>
|
|
|
-int main(void) {
|
|
|
- const char *codeset;
|
|
|
- wchar_t wch = L'w';
|
|
|
- setlocale(LC_ALL, "");
|
|
|
- resize_term(0, 0);
|
|
|
- addwstr(L"wide chars\n");
|
|
|
- addnwstr(&wch, 1);
|
|
|
- add_wch(WACS_DEGREE);
|
|
|
- codeset = nl_langinfo(CODESET);
|
|
|
- return codeset != 0;
|
|
|
-}
|
|
|
-EOF
|
|
|
- IFS=:
|
|
|
- for curses_inc in $curses_inc_list; do
|
|
|
- # Make sure we get the wide character prototypes
|
|
|
- curses_inc="-DNCURSES_WIDECHAR $curses_inc"
|
|
|
- IFS=:
|
|
|
- for curses_lib in $curses_lib_list; do
|
|
|
- unset IFS
|
|
|
- if compile_prog "$curses_inc" "$curses_lib" ; then
|
|
|
- curses_found=yes
|
|
|
- break
|
|
|
- fi
|
|
|
- done
|
|
|
- if test "$curses_found" = yes ; then
|
|
|
- break
|
|
|
- fi
|
|
|
- done
|
|
|
- unset IFS
|
|
|
- if test "$curses_found" = "yes" ; then
|
|
|
- curses=yes
|
|
|
- else
|
|
|
- if test "$curses" = "yes" ; then
|
|
|
- feature_not_found "curses" "Install ncurses devel"
|
|
|
- fi
|
|
|
- curses=no
|
|
|
- fi
|
|
|
-fi
|
|
|
-
|
|
|
##########################################
|
|
|
# curl probe
|
|
|
if test "$curl" != "no" ; then
|
|
@@ -6234,16 +6105,6 @@ if test "$have_x11" = "yes" && test "$need_x11" = "yes"; then
|
|
|
echo "X11_CFLAGS=$x11_cflags" >> $config_host_mak
|
|
|
echo "X11_LIBS=$x11_libs" >> $config_host_mak
|
|
|
fi
|
|
|
-if test "$iconv" = "yes" ; then
|
|
|
- echo "CONFIG_ICONV=y" >> $config_host_mak
|
|
|
- echo "ICONV_CFLAGS=$iconv_cflags" >> $config_host_mak
|
|
|
- echo "ICONV_LIBS=$iconv_lib" >> $config_host_mak
|
|
|
-fi
|
|
|
-if test "$curses" = "yes" ; then
|
|
|
- echo "CONFIG_CURSES=y" >> $config_host_mak
|
|
|
- echo "CURSES_CFLAGS=$curses_inc" >> $config_host_mak
|
|
|
- echo "CURSES_LIBS=$curses_lib" >> $config_host_mak
|
|
|
-fi
|
|
|
if test "$pipe2" = "yes" ; then
|
|
|
echo "CONFIG_PIPE2=y" >> $config_host_mak
|
|
|
fi
|
|
@@ -6613,9 +6474,6 @@ if [ "$bsd" = "yes" ] ; then
|
|
|
echo "CONFIG_BSD=y" >> $config_host_mak
|
|
|
fi
|
|
|
|
|
|
-if test "$localtime_r" = "yes" ; then
|
|
|
- echo "CONFIG_LOCALTIME_R=y" >> $config_host_mak
|
|
|
-fi
|
|
|
if test "$qom_cast_debug" = "yes" ; then
|
|
|
echo "CONFIG_QOM_CAST_DEBUG=y" >> $config_host_mak
|
|
|
fi
|
|
@@ -7218,6 +7076,7 @@ NINJA=${ninja:-$PWD/ninjatool} $meson setup \
|
|
|
-Dvnc=$vnc -Dvnc_sasl=$vnc_sasl -Dvnc_jpeg=$vnc_jpeg -Dvnc_png=$vnc_png \
|
|
|
-Dgettext=$gettext -Dxkbcommon=$xkbcommon -Du2f=$u2f \
|
|
|
-Dcapstone=$capstone -Dslirp=$slirp -Dfdt=$fdt \
|
|
|
+ -Diconv=$iconv -Dcurses=$curses \
|
|
|
$cross_arg \
|
|
|
"$PWD" "$source_path"
|
|
|
|