Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-editors/nano/files: nano-2.3.1-ncurses-pkg-config.patch
Date: Sun, 01 Jan 2012 07:34:51
Message-Id: 20120101073431.A4DF32004C@flycatcher.gentoo.org
1 vapier 12/01/01 07:34:31
2
3 Added: nano-2.3.1-ncurses-pkg-config.patch
4 Log:
5 Search for ncurses via pkg-config files.
6
7 (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/nano/files/nano-2.3.1-ncurses-pkg-config.patch?rev=1.1&content-type=text/plain
14
15 Index: nano-2.3.1-ncurses-pkg-config.patch
16 ===================================================================
17 From c662db58448fefe86184117e6bab5799e43eccf1 Mon Sep 17 00:00:00 2001
18 From: Mike Frysinger <vapier@g.o>
19 Date: Sun, 1 Jan 2012 02:26:16 -0500
20 Subject: [PATCH] search ncurses via pkg-config first
21
22 Newer ncurses installs include pkg-config files which tell us the right
23 -I/-L paths we need, so default to that before trying the legacy ways.
24
25 Signed-off-by: Mike Frysinger <vapier@g.o>
26 ---
27 configure.ac | 18 ++++++++++++++++++
28 1 files changed, 18 insertions(+), 0 deletions(-)
29
30 diff --git a/configure.ac b/configure.ac
31 index 1f61ae4..05308be 100644
32 --- a/configure.ac
33 +++ b/configure.ac
34 @@ -35,6 +35,7 @@ AC_PROG_CC
35 AC_PROG_LN_S
36 AC_ISC_POSIX
37 AC_SYS_LARGEFILE
38 +PKG_PROG_PKG_CONFIG
39
40 dnl Internationalization macros.
41
42 @@ -439,6 +440,23 @@ AC_CHECK_FUNCS(getopt_long)
43 dnl Checks for libraries.
44
45 if eval "test x$CURSES_LIB_NAME = x"; then
46 + if test x$enable_utf8 != xno; then
47 + PKG_CHECK_MODULES([NCURSESW], [ncursesw], [
48 + CURSES_LIB=$NCURSESW_LIBS
49 + CPPFLAGS="$NCURSESW_CFLAGS $CPPFLAGS"
50 + CURSES_LIB_NAME=ncursesw
51 + CURSES_LIB_WIDE=yes
52 + ], [:])
53 + else
54 + PKG_CHECK_MODULES([NCURSES], [ncurses], [
55 + CURSES_LIB=$NCURSES_LIBS
56 + CPPFLAGS="$NCURSES_CFLAGS $CPPFLAGS"
57 + CURSES_LIB_NAME=ncurses
58 + ], [:])
59 + fi
60 +fi
61 +
62 +if eval "test x$CURSES_LIB_NAME = x"; then
63 AC_CHECK_HEADERS(ncurses.h)
64
65 if test x$enable_utf8 != xno; then
66 --
67 1.7.6.1