Sebastian Lackner : configure: Fix detection of ncurses library on Archlinux.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 8d4e1fa7d77636a88651c9d48a48d39fab931c49
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=8d4e1fa7d77636a88651c9d48a...

Author: Sebastian Lackner 
Date:   Thu Sep  4 09:26:33 2014 +0200

configure: Fix detection of ncurses library on Archlinux.

---

configure    | 8 ++++----
 configure.ac | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 17c1e30..ca28645 100755
--- a/configure
+++ b/configure
@@ -11325,10 +11325,10 @@ _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 "libncurses\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*/(libncurses.[0-9A-Za-z.]*dylib).*$/\1/"';2,$d'` ;;
-    *) ac_cv_lib_soname_ncurses=`$READELF -d conftest$ac_exeext | grep "NEEDED.*libncurses\.$LIBEXT" | sed -e "s/^.*\[\(libncurses\.$LIBEXT[^	 ]*\)\].*$/\1/"';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 "libncurses\.$LIBEXT" | sed -e "s/^.*(libncurses.$LIBEXT[^	 ]*).*$/\1/"';2,$d'`
+  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
 fi
@@ -16950,7 +16950,7 @@ wine_fn_config_dll dpnet enable_dpnet clean,implib
 wine_fn_config_test dlls/dpnet/tests dpnet_test
 wine_fn_config_dll dpnhpast enable_dpnhpast
 wine_fn_config_dll dpnlobby enable_dpnlobby
-wine_fn_config_dll dpvoice enable_dpvoice
+wine_fn_config_dll dpvoice enable_dpvoice clean
 wine_fn_config_dll dpwsockx enable_dpwsockx
 wine_fn_config_dll drmclien enable_drmclien
 wine_fn_config_dll dsound enable_dsound clean,implib
diff --git a/configure.ac b/configure.ac
index db8b76f..2bc0008 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1370,7 +1370,7 @@ 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"])
+    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"])
@@ -2859,7 +2859,7 @@ WINE_CONFIG_DLL(dpnet,,[clean,implib])
 WINE_CONFIG_TEST(dlls/dpnet/tests)
 WINE_CONFIG_DLL(dpnhpast)
 WINE_CONFIG_DLL(dpnlobby)
-WINE_CONFIG_DLL(dpvoice)
+WINE_CONFIG_DLL(dpvoice,,[clean])
 WINE_CONFIG_DLL(dpwsockx)
 WINE_CONFIG_DLL(drmclien)
 WINE_CONFIG_DLL(dsound,,[clean,implib])