blob: 0a25a7fccee4b5ccfc47c80b5cd599d4c245ace9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
Subject: [PATCH] use pkg-config for ncurses detection.
Upstream-Status: Inappropriate [configuration]
This is a workaround to make dialog be able to build after ncurses-config
does not work, since the configure file is called directly in dialog bb
file, and autoconf can not work, make a workaround in configure file.
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
configure | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 8afe3d7..a54bcc1 100755
--- a/configure
+++ b/configure
@@ -11567,9 +11567,8 @@ fi
if test "$NCURSES_CONFIG" != none ; then
-CPPFLAGS="$CPPFLAGS `$NCURSES_CONFIG --cflags`"
-
-cf_add_libs="`$NCURSES_CONFIG --libs`"
+CPPFLAGS="$CPPFLAGS `pkg-config --short-errors --print-errors --cflags "ncurses" 2>/dev/null`"
+cf_add_libs="`pkg-config --short-errors --print-errors --libs "ncurses" 2>/dev/null` $LIBS"
# Filter out duplicates - this happens with badly-designed ".pc" files...
for cf_add_1lib in $LIBS
do
--
1.7.10.4
|
