Updated libncursesw patch to be FreeBSD/MacOS compatible.

This commit is contained in:
Sebastian Lackner 2014-09-04 22:23:45 +02:00
parent 3cd7f91608
commit b1a5dfb1f7
3 changed files with 6 additions and 6 deletions

View File

@ -269,7 +269,7 @@ configure-Absolute_RPATH.ok:
# Patchset configure-Detect_Ncurses
# |
# | Included patches:
# | * Fix detection of ncurses library on Archlinux. [rev 2, by Sebastian Lackner]
# | * Fix detection of ncurses library on Archlinux. [rev 3, by Sebastian Lackner]
# |
# | Modified files:
# | * configure.ac
@ -278,7 +278,7 @@ configure-Absolute_RPATH.ok:
configure-Detect_Ncurses.ok:
$(call APPLY_FILE,configure-Detect_Ncurses/0001-configure-Fix-detection-of-ncurses-library-on-Archli.patch)
@( \
echo '+ { "configure-Detect_Ncurses", "Sebastian Lackner", "Fix detection of ncurses library on Archlinux. [rev 2]" },'; \
echo '+ { "configure-Detect_Ncurses", "Sebastian Lackner", "Fix detection of ncurses library on Archlinux. [rev 3]" },'; \
) > configure-Detect_Ncurses.ok
# Patchset dsound-Fast_Mixer

View File

@ -1,4 +1,4 @@
From 9e35c8cf89c38c122b877924cb153f4c1748a7d3 Mon Sep 17 00:00:00 2001
From 20b1ab08fbddbaeaba82761006b68c1ab8dfb70b Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Thu, 4 Sep 2014 09:26:33 +0200
Subject: configure: Fix detection of ncurses library on Archlinux.
@ -8,7 +8,7 @@ Subject: configure: Fix detection of ncurses library on Archlinux.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index db8b76f..f3fd12d 100644
index db8b76f..17475b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1370,7 +1370,7 @@ dnl **** Check which curses lib to use ***
@ -16,7 +16,7 @@ index db8b76f..f3fd12d 100644
if test "$ac_cv_header_ncurses_h" = "yes"
then
- WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"])
+ WINE_CHECK_SONAME(ncurses,waddch,[CURSES_LIBS="-lncurses"],,,libncursesw\\?)
+ 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"])

View File

@ -1,3 +1,3 @@
Author: Sebastian Lackner
Subject: Fix detection of ncurses library on Archlinux.
Revision: 2
Revision: 3