jer         15/06/13 06:23:39

  Added:                ncmpc-0.24-tinfo.patch
  Log:
  Fix building against sys-libs/ncurses[tinfo] (bug #551864).
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.1                  media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ncmpc/files/ncmpc-0.24-tinfo.patch?rev=1.1&content-type=text/plain

Index: ncmpc-0.24-tinfo.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -17,11 +17,8 @@
 dnl Check for programs
 AC_PROG_CC_C99
 AC_PROG_INSTALL
-AX_WITH_CURSES
+PKG_PROG_PKG_CONFIG
 
-AS_IF([ test "x$ax_cv_curses" = xno ],
-       [AC_MSG_ERROR([No curses support detected.])
-       ])
 
 dnl =======================================================
 dnl initialize variables
@@ -83,6 +80,19 @@
 esac
 AM_CONDITIONAL([HAVE_WINDOWS], [test $HAVE_WINDOWS -eq 1])
 
+dnl ncurses
+
+PKG_CHECK_MODULES([ncurses], [ncurses],[
+       LIBS="$LIBS $ncurses_LIBS"
+       ax_cv_curses_color=yes
+       ax_cv_curses_mouse=yes
+       ax_cv_curses_enhanced=yes
+       AC_DEFINE([HAVE_NCURSES_H], [1], [Define to 1 if the Ncurses library is 
present])
+       AC_SUBST([CURSES_LIB],[$ncurses_LIBS])
+       ],
+       [AC_MSG_ERROR([No curses support detected.])])
+
+
 dnl multi-byte character support
 
 AC_ARG_ENABLE([multibyte],
@@ -207,12 +217,6 @@
 
 dnl Optional - curses getmouse support
 
-dnl AC_CHECK_LIB depends on being able to prepend a '-l', remove the '-l' from 
CURSES_LIB first
-AC_CHECK_LIB([$(expr substr $CURSES_LIB 3 99)],
-               [getmouse],
-               [ax_cv_curses_mouse=yes],
-               [ax_cv_curses_mouse=no])
-
 AC_ARG_ENABLE([mouse], 
        AS_HELP_STRING([--enable-mouse],
                [Enable curses getmouse support @<:@default=yes@:>@]),




Reply via email to