Jacek Caban : configure: Remove curses checks.
Alexandre Julliard
julliard at winehq.org
Tue Sep 22 15:46:42 CDT 2020
Module: wine
Branch: master
Commit: 26c715f85b490eda36fa06473a24218bda40a56e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c715f85b490eda36fa06473a24218bda40a56e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Sep 22 16:46:33 2020 +0200
configure: Remove curses checks.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
configure | 150 ----------------------------------------------------
configure.ac | 20 -------
include/config.h.in | 15 ------
3 files changed, 185 deletions(-)
diff --git a/configure b/configure
index e8d97610f2..a623a72256 100755
--- a/configure
+++ b/configure
@@ -845,7 +845,6 @@ with_capi
with_cms
with_coreaudio
with_cups
-with_curses
with_dbus
with_faudio
with_float_abi
@@ -2576,7 +2575,6 @@ Optional Packages:
--without-cms do not use CMS (color management support)
--without-coreaudio do not use the CoreAudio sound support
--without-cups do not use CUPS
- --without-curses do not use (n)curses
--without-dbus do not use DBus (dynamic device support)
--without-faudio do not use FAudio (XAudio2 support)
--with-float-abi=abi specify the ABI (soft|softfp|hard) for ARM platforms
@@ -3928,12 +3926,6 @@ if test "${with_cups+set}" = set; then :
fi
-# Check whether --with-curses was given.
-if test "${with_curses+set}" = set; then :
- withval=$with_curses; if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi
-fi
-
-
# Check whether --with-dbus was given.
if test "${with_dbus+set}" = set; then :
withval=$with_dbus;
@@ -7407,7 +7399,6 @@ for ac_header in \
arpa/nameser.h \
asm/types.h \
asm/user.h \
- curses.h \
dirent.h \
dlfcn.h \
elf.h \
@@ -7444,7 +7435,6 @@ for ac_header in \
machine/cpu.h \
machine/sysarch.h \
mntent.h \
- ncurses.h \
netdb.h \
netinet/in.h \
netinet/in_systm.h \
@@ -13669,146 +13659,6 @@ esac
fi
-CURSES_LIBS=""
-if test "$ac_cv_header_ncurses_h" = "yes"
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lncurses" >&5
-$as_echo_n "checking for -lncurses... " >&6; }
-if ${ac_cv_lib_soname_ncurses+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_soname_save_LIBS=$LIBS
-LIBS="-lncurses $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char waddch ();
-int
-main ()
-{
-return waddch ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- case "$LIBEXT" in
- dll) ac_cv_lib_soname_ncurses=`$ac_cv_path_LDD conftest.exe | grep "ncurses" | sed -e "s/dll.*/dll/"';2,$d'` ;;
- dylib) ac_cv_lib_soname_ncurses=`$OTOOL -L conftest$ac_exeext | grep "libncursesw\\{0,1\\}\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libncursesw\\{0,1\\}\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
- *) ac_cv_lib_soname_ncurses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libncursesw\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\\[\\(libncursesw\\{0,1\\}\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'`
- if ${ac_cv_lib_soname_ncurses:+false} :; then :
- ac_cv_lib_soname_ncurses=`$LDD conftest$ac_exeext | grep "libncursesw\\{0,1\\}\\.$LIBEXT" | sed -e "s/^.*\(libncursesw\\{0,1\\}\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'`
-fi ;;
- esac
-else
- ac_cv_lib_soname_ncurses=
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_soname_save_LIBS
-fi
-if ${ac_cv_lib_soname_ncurses:+false} :; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_ncurses" >&5
-$as_echo "$ac_cv_lib_soname_ncurses" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SONAME_LIBNCURSES "$ac_cv_lib_soname_ncurses"
-_ACEOF
-
- CURSES_LIBS="-lncurses"
-fi
-elif test "$ac_cv_header_curses_h" = "yes"
-then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lcurses" >&5
-$as_echo_n "checking for -lcurses... " >&6; }
-if ${ac_cv_lib_soname_curses+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- ac_check_soname_save_LIBS=$LIBS
-LIBS="-lcurses $LIBS"
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char waddch ();
-int
-main ()
-{
-return waddch ();
- ;
- return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
- case "$LIBEXT" in
- dll) ac_cv_lib_soname_curses=`$ac_cv_path_LDD conftest.exe | grep "curses" | sed -e "s/dll.*/dll/"';2,$d'` ;;
- dylib) ac_cv_lib_soname_curses=`$OTOOL -L conftest$ac_exeext | grep "libcurses\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libcurses\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;;
- *) ac_cv_lib_soname_curses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libcurses\\.$LIBEXT" | sed -e "s/^.*\\[\\(libcurses\\.$LIBEXT[^ ]*\\)\\].*$/\1/"';2,$d'`
- if ${ac_cv_lib_soname_curses:+false} :; then :
- ac_cv_lib_soname_curses=`$LDD conftest$ac_exeext | grep "libcurses\\.$LIBEXT" | sed -e "s/^.*\(libcurses\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'`
-fi ;;
- esac
-else
- ac_cv_lib_soname_curses=
-fi
-rm -f core conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_soname_save_LIBS
-fi
-if ${ac_cv_lib_soname_curses:+false} :; then :
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5
-$as_echo "not found" >&6; }
-
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_curses" >&5
-$as_echo "$ac_cv_lib_soname_curses" >&6; }
-
-cat >>confdefs.h <<_ACEOF
-#define SONAME_LIBCURSES "$ac_cv_lib_soname_curses"
-_ACEOF
-
- CURSES_LIBS="-lcurses"
-fi
-fi
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $CURSES_LIBS"
-for ac_func in mousemask
-do :
- ac_fn_c_check_func "$LINENO" "mousemask" "ac_cv_func_mousemask"
-if test "x$ac_cv_func_mousemask" = xyes; then :
- cat >>confdefs.h <<_ACEOF
-#define HAVE_MOUSEMASK 1
-_ACEOF
-
-fi
-done
-
-LIBS="$ac_save_LIBS"
-if test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"; then :
- case "x$with_curses" in
- x) as_fn_append wine_notices "|lib(n)curses ${notice_platform}development files not found, curses won't be supported." ;;
- xno) ;;
- *) as_fn_error $? "lib(n)curses ${notice_platform}development files not found, curses won't be supported.
-This is an error since --with-curses was requested." "$LINENO" 5 ;;
-esac
-
-fi
-
if test "x$with_sane" != "xno"
then
if ${SANE_CFLAGS:+false} :; then :
diff --git a/configure.ac b/configure.ac
index 20ae7577fa..cb9fc47f45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -40,8 +40,6 @@ AC_ARG_WITH(cms, AS_HELP_STRING([--without-cms],[do not use CMS (color man
AC_ARG_WITH(coreaudio, AS_HELP_STRING([--without-coreaudio],[do not use the CoreAudio sound support]),
[if test "x$withval" = "xno"; then ac_cv_header_CoreAudio_CoreAudio_h=no; fi])
AC_ARG_WITH(cups, AS_HELP_STRING([--without-cups],[do not use CUPS]))
-AC_ARG_WITH(curses, AS_HELP_STRING([--without-curses],[do not use (n)curses]),
- [if test "x$withval" = "xno"; then ac_cv_header_ncurses_h=no; ac_cv_header_curses_h=no; fi])
AC_ARG_WITH(dbus, AS_HELP_STRING([--without-dbus],[do not use DBus (dynamic device support)]))
AC_ARG_WITH(faudio, AS_HELP_STRING([--without-faudio],[do not use FAudio (XAudio2 support)]))
AC_ARG_WITH(float-abi, AS_HELP_STRING([--with-float-abi=abi],[specify the ABI (soft|softfp|hard) for ARM platforms]))
@@ -436,7 +434,6 @@ AC_CHECK_HEADERS(\
arpa/nameser.h \
asm/types.h \
asm/user.h \
- curses.h \
dirent.h \
dlfcn.h \
elf.h \
@@ -473,7 +470,6 @@ AC_CHECK_HEADERS(\
machine/cpu.h \
machine/sysarch.h \
mntent.h \
- ncurses.h \
netdb.h \
netinet/in.h \
netinet/in_systm.h \
@@ -1450,22 +1446,6 @@ fi
WINE_WARNING_WITH(gnutls,[test "x$ac_cv_lib_soname_gnutls" = "x"],
[libgnutls ${notice_platform}development files not found, no schannel support.])
-dnl **** Check which curses lib to use ***
-CURSES_LIBS=""
-if test "$ac_cv_header_ncurses_h" = "yes"
-then
- WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,[[libncursesw\\{0,1\\}]])
-elif test "$ac_cv_header_curses_h" = "yes"
-then
- WINE_CHECK_SONAME(curses,waddch,[CURSES_LIBS="-lcurses"])
-fi
-ac_save_LIBS="$LIBS"
-LIBS="$LIBS $CURSES_LIBS"
-AC_CHECK_FUNCS(mousemask)
-LIBS="$ac_save_LIBS"
-WINE_NOTICE_WITH(curses,[test "x$ac_cv_lib_soname_curses$ac_cv_lib_soname_ncurses" = "x"],
- [lib(n)curses ${notice_platform}development files not found, curses won't be supported.])
-
dnl **** Check for SANE ****
if test "x$with_sane" != "xno"
then
diff --git a/include/config.h.in b/include/config.h.in
index 4309920ffa..f7702c5aaf 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -94,9 +94,6 @@
/* Define to 1 if you have the <cups/ppd.h> header file. */
#undef HAVE_CUPS_PPD_H
-/* Define to 1 if you have the <curses.h> header file. */
-#undef HAVE_CURSES_H
-
/* Define to 1 if you have the <dirent.h> header file. */
#undef HAVE_DIRENT_H
@@ -570,18 +567,12 @@
/* Define to 1 if you have the <mntent.h> header file. */
#undef HAVE_MNTENT_H
-/* Define to 1 if you have the `mousemask' function. */
-#undef HAVE_MOUSEMASK
-
/* Define to 1 if you have the <mpg123.h> header file. */
#undef HAVE_MPG123_H
/* Define if MTLDevice protocol has registryID property. */
#undef HAVE_MTLDEVICE_REGISTRYID
-/* Define to 1 if you have the <ncurses.h> header file. */
-#undef HAVE_NCURSES_H
-
/* Define to 1 if you have the `nearbyint' function. */
#undef HAVE_NEARBYINT
@@ -1331,9 +1322,6 @@
/* Define to the soname of the libcups library. */
#undef SONAME_LIBCUPS
-/* Define to the soname of the libcurses library. */
-#undef SONAME_LIBCURSES
-
/* Define to the soname of the libdbus-1 library. */
#undef SONAME_LIBDBUS_1
@@ -1379,9 +1367,6 @@
/* Define to the soname of the libMoltenVK library. */
#undef SONAME_LIBMOLTENVK
-/* Define to the soname of the libncurses library. */
-#undef SONAME_LIBNCURSES
-
/* Define to the soname of the libnetapi library. */
#undef SONAME_LIBNETAPI
More information about the wine-cvs
mailing list