[gentoo-commits] gentoo-x86 commit in app-text/pinfo/files: pinfo-0.6.10-tinfo.patch

[Jeroen Roovers (jer)]

jer         13/02/27 20:20:39

  Added:                pinfo-0.6.10-tinfo.patch
  Log:
  Fix building against sys-libs/ncurses[-tinfo] (bug #459528).
  
  (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key A792A613)

Revision  Changes    Path
1.1                  app-text/pinfo/files/pinfo-0.6.10-tinfo.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/pinfo/files/pinfo-0.6.10-tinfo.patch?rev=1.1&content-type=text/plain

Index: pinfo-0.6.10-tinfo.patch
===================================================================
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,24 @@
 					
 
 # curses
+PKG_CHECK_MODULES(ncursesw,ncursesw,[
+	curses_includes="$ncursesw_CFLAGS"
+	curses_libs="$ncursesw_LIBS"
+	curses_h=ncurses.h
+	stop_searching=true
+	found_curses_h=true
+	USE_CURSES=true],[
+	PKG_CHECK_MODULES(ncurses,ncurses,[
+		curses_includes="$ncurses_CFLAGS"
+		curses_libs="$ncurses_LIBS"
+		curses_h=ncurses.h
+		stop_searching=true
+		found_curses_h=true
+		USE_CURSES=true],
+		[])])
+
 AC_CHECK_CURSES
+
 if ! test "x$USE_CURSES" = "xtrue"; then
 	AC_MSG_ERROR([Curses not found. You need curses to compile pinfo])
 fi
--- a/macros/curses.m4
+++ b/macros/curses.m4
@@ -175,8 +175,8 @@
 AC_DEFUN([AC_SEARCH_CURSES_H], [
 	AC_MSG_CHECKING([location of curses.h file])
 
-	stop_searching=false
-	found_curses_h=false
+#	stop_searching=false
+#	found_curses_h=false
 
 	dnl  if a particular location was specified
 	if test "x$curses_location" != "xfalse"