aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Obergrusberger <tradiaz@yahoo.de>2006-08-05 16:53:19 +0000
committerAndreas Obergrusberger <tradiaz@yahoo.de>2006-08-05 16:53:19 +0000
commit11ab1a3a5264c2234bfe2915203c909a812356ca (patch)
tree52529820aa360b877665876069a5465821fde074
parent2d0bc2a3f794ec9d974396e1b06a4b47849b551c (diff)
downloadmpd-11ab1a3a5264c2234bfe2915203c909a812356ca.tar.gz
mpd-11ab1a3a5264c2234bfe2915203c909a812356ca.tar.xz
mpd-11ab1a3a5264c2234bfe2915203c909a812356ca.zip
fixed building on systems with libncursesw but without <ncursesw/ncurses.h> like Arch Linux
git-svn-id: https://svn.musicpd.org/ncmpc/branches/tradiaz@4563 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--ChangeLog1
-rw-r--r--configure.ac15
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c574c7e9b..81a796757 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
* updated translation template
* german lyrics- and search-screen translation added
* avuton has fixed a lot of warnings
+ * fixed a problem with compiling on Arch Linux
2006-09-4 Anderas Obergrusberger <tradiaz@yahoo.de>
* tradiaz is temporary maintainer of a special branch of ncmpc now
diff --git a/configure.ac b/configure.ac
index e3e68eec1..1baa12f17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -82,6 +82,12 @@ if test "x$ncurses" = "xauto"; then
[ncurses=ncurses])
fi
+AC_CHECK_HEADER([ncursesw/ncurses.h],
+ [have_ncursesw_h=yes],
+ ,)
+
+
+
AC_CHECK_LIB([$ncurses],
[initscr],
@@ -89,12 +95,15 @@ AC_CHECK_LIB([$ncurses],
[AC_MSG_ERROR($ncurses library is required)])
-if test "x$ncurses" = "xncursesw" ; then
- AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [wide-char wget_ch()])
- AC_DEFINE(USE_NCURSESW, 1, [use wide-char ncurses library])
+if test "x$ncurses" != "xncursesw" ; then
+ if test "x$have_ncursesw_h" = "xyes" ; then
+ AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, [wide-char wget_ch()])
+ AC_DEFINE(USE_NCURSESW, 1, [use wide-char ncurses library])
+ fi
fi
+
dnl Check for glib-2.4
PKG_CHECK_MODULES([GLIB],
[glib-2.0 >= 2.4],