Commit 48957684 authored by Alexandre Julliard's avatar Alexandre Julliard

Link to the curses library only for the dlls that need it.

parent 966121cc
......@@ -363,13 +363,23 @@ else
fi
dnl **** Check which curses lib to use ***
CURSESLIBS=""
if test "$CURSES" = "yes"
then
AC_CHECK_HEADERS(ncurses.h,
AC_CHECK_LIB(ncurses,waddch),
[AC_CHECK_HEADERS(curses.h,[AC_CHECK_LIB(curses,waddch)])])
AC_CHECK_LIB(ncurses,waddch,
[AC_DEFINE(HAVE_LIBNCURSES, 1, [Define if you have the ncurses library (-lncurses)])
CURSESLIBS="-lncurses"],
[AC_CHECK_HEADERS(curses.h,
[AC_CHECK_LIB(curses,waddch,
[AC_DEFINE(HAVE_LIBCURSES, 1, [Define if you have the curses library (-lcurses)])
CURSESLIBS="-lcurses"])])]))
saved_libs="$LIBS"
LIBS="$CURSESLIBS $LIBS"
AC_CHECK_FUNCS(getbkgd resizeterm)
LIBS="$saved_libs"
fi
AC_SUBST(CURSESLIBS)
CUPSLIBS=""
dnl **** Check for CUPS ****
......
......@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = ttydrv
SOVERSION = 1.0
IMPORTS = user32 gdi32 kernel32 ntdll
EXTRALIBS = @CURSESLIBS@
LDDLLFLAGS = @LDDLLFLAGS@
SYMBOLFILE = $(MODULE).tmp.o
......
......@@ -5,6 +5,7 @@ VPATH = @srcdir@
MODULE = winedos
SOVERSION = 1.0
IMPORTS = user32 kernel32 ntdll
EXTRALIBS = @CURSESLIBS@
C_SRCS = \
dosaspi.c \
......
......@@ -409,9 +409,6 @@
/* Define if you have the <ucontext.h> header file. */
#undef HAVE_UCONTEXT_H
/* Define if you have the curses library (-lcurses). */
#undef HAVE_LIBCURSES
/* Define if you have the i386 library (-li386). */
#undef HAVE_LIBI386
......@@ -421,9 +418,6 @@
/* Define if you have the mmap library (-lmmap). */
#undef HAVE_LIBMMAP
/* Define if you have the ncurses library (-lncurses). */
#undef HAVE_LIBNCURSES
/* Define if you have the ossaudio library (-lossaudio). */
#undef HAVE_LIBOSSAUDIO
......@@ -469,6 +463,12 @@
/* Define if the OpenGL headers define extension typedefs */
#undef HAVE_GLEXT_PROTOTYPES
/* Define if you have the ncurses library (-lncurses) */
#undef HAVE_LIBNCURSES
/* Define if you have the curses library (-lcurses) */
#undef HAVE_LIBCURSES
/* Define if we have CUPS */
#undef HAVE_CUPS
......
......@@ -8,6 +8,7 @@
#include <fcntl.h>
#include <errno.h>
#include <stdlib.h>
#include <stdio.h>
#ifdef HAVE_SYS_FILE_H
# include <sys/file.h>
#endif
......@@ -32,7 +33,6 @@
#include "miscemu.h"
#include "task.h"
#include "debugtools.h"
#include "console.h"
DEFAULT_DEBUG_CHANNEL(int21);
#if defined(__svr4__) || defined(_SCO_DS)
......
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