Commit 8f1d42eb authored by Alexandre Julliard's avatar Alexandre Julliard

configure: Remove some no longer used libcurses checks.

parent 2a63a03e
......@@ -704,7 +704,6 @@ XML2INCL
XSLTLIBS
XSLTINCL
HALINCL
CURSESLIBS
sane_devel
SANELIBS
SANEINCL
......@@ -1362,7 +1361,6 @@ Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--without-opengl do not use OpenGL
--without-curses do not use curses
--with-wine-tools=<dir> use Wine tools from directory <dir>
--with-x use the X Window System
......@@ -1863,12 +1861,6 @@ if test "${with_opengl+set}" = set; then
fi
# Check whether --with-curses was given.
if test "${with_curses+set}" = set; then
withval=$with_curses;
fi
# Check whether --with-wine-tools was given.
if test "${with_wine_tools+set}" = set; then
withval=$with_wine_tools;
......@@ -10915,10 +10907,8 @@ fi
fi
CURSESLIBS=""
if test "x$with_curses" != "xno"
if test "$ac_cv_header_ncurses_h" = "yes"
then
if test "$ac_cv_header_ncurses_h" = "yes"
then
{ echo "$as_me:$LINENO: checking for waddch in -lncurses" >&5
echo $ECHO_N "checking for waddch in -lncurses... $ECHO_C" >&6; }
if test "${ac_cv_lib_ncurses_waddch+set}" = set; then
......@@ -10997,16 +10987,11 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_ncurses_waddch" >&5
echo "${ECHO_T}$ac_cv_lib_ncurses_waddch" >&6; }
if test $ac_cv_lib_ncurses_waddch = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBNCURSES 1
_ACEOF
CURSESLIBS="-lncurses"
fi
elif test "$ac_cv_header_curses_h" = "yes"
then
elif test "$ac_cv_header_curses_h" = "yes"
then
{ echo "$as_me:$LINENO: checking for waddch in -lcurses" >&5
echo $ECHO_N "checking for waddch in -lcurses... $ECHO_C" >&6; }
if test "${ac_cv_lib_curses_waddch+set}" = set; then
......@@ -11085,17 +11070,12 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_curses_waddch" >&5
echo "${ECHO_T}$ac_cv_lib_curses_waddch" >&6; }
if test $ac_cv_lib_curses_waddch = yes; then
cat >>confdefs.h <<\_ACEOF
#define HAVE_LIBCURSES 1
_ACEOF
CURSESLIBS="-lcurses"
fi
fi
ac_save_LIBS="$LIBS"
LIBS="$LIBS $CURSESLIBS"
fi
ac_save_LIBS="$LIBS"
LIBS="$LIBS $CURSESLIBS"
for ac_func in mousemask
do
......@@ -11206,9 +11186,7 @@ _ACEOF
fi
done
LIBS="$ac_save_LIBS"
fi
LIBS="$ac_save_LIBS"
# Extract the first word of "sane-config", so it can be a program name with args.
set dummy sane-config; ac_word=$2
......@@ -24821,7 +24799,6 @@ XML2INCL!$XML2INCL$ac_delim
XSLTLIBS!$XSLTLIBS$ac_delim
XSLTINCL!$XSLTINCL$ac_delim
HALINCL!$HALINCL$ac_delim
CURSESLIBS!$CURSESLIBS$ac_delim
sane_devel!$sane_devel$ac_delim
SANELIBS!$SANELIBS$ac_delim
SANEINCL!$SANEINCL$ac_delim
......@@ -24878,7 +24855,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 77; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 76; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
......
......@@ -16,7 +16,6 @@ AC_ARG_ENABLE(win16, AC_HELP_STRING([--disable-win16],[do not include Win16 supp
AC_ARG_ENABLE(win64, AC_HELP_STRING([--enable-win64], [build a Win64 emulator on AMD64 (won't run Win32 binaries)]))
AC_ARG_WITH(opengl, AC_HELP_STRING([--without-opengl],[do not use OpenGL]))
AC_ARG_WITH(curses, AC_HELP_STRING([--without-curses],[do not use curses]))
AC_ARG_WITH(wine-tools,AC_HELP_STRING([--with-wine-tools=<dir>],[use Wine tools from directory <dir>]))
AC_CANONICAL_HOST
......@@ -520,25 +519,17 @@ fi
dnl **** Check which curses lib to use ***
CURSESLIBS=""
if test "x$with_curses" != "xno"
if test "$ac_cv_header_ncurses_h" = "yes"
then
if test "$ac_cv_header_ncurses_h" = "yes"
then
AC_CHECK_LIB(ncurses,waddch,
[AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have the ncurses library (-lncurses)])
CURSESLIBS="-lncurses"])
elif test "$ac_cv_header_curses_h" = "yes"
then
AC_CHECK_LIB(curses,waddch,
[AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have the curses library (-lcurses)])
CURSESLIBS="-lcurses"])
fi
ac_save_LIBS="$LIBS"
LIBS="$LIBS $CURSESLIBS"
AC_CHECK_FUNCS(mousemask)
LIBS="$ac_save_LIBS"
AC_CHECK_LIB(ncurses,waddch,[CURSESLIBS="-lncurses"])
elif test "$ac_cv_header_curses_h" = "yes"
then
AC_CHECK_LIB(curses,waddch,[CURSESLIBS="-lcurses"])
fi
AC_SUBST(CURSESLIBS)
ac_save_LIBS="$LIBS"
LIBS="$LIBS $CURSESLIBS"
AC_CHECK_FUNCS(mousemask)
LIBS="$ac_save_LIBS"
dnl **** Check for SANE ****
AC_CHECK_PROG(sane_devel,sane-config,sane-config,no)
......
......@@ -306,18 +306,12 @@
/* Define to 1 if you have the <libaudioio.h> header file. */
#undef HAVE_LIBAUDIOIO_H
/* Define if you have the curses library (-lcurses) */
#undef HAVE_LIBCURSES
/* Define if you have the hal library */
#undef HAVE_LIBHAL
/* Define to 1 if you have the `i386' library (-li386). */
#undef HAVE_LIBI386
/* Define if you have the ncurses library (-lncurses) */
#undef HAVE_LIBNCURSES
/* Define to 1 if you have the `nsl' library (-lnsl). */
#undef HAVE_LIBNSL
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment