Use pkg-config to detect ncurses instead of AC_SEARCH_LIBS.

We still have a --with-ncurses option to prepend the search path of the
ncurses headers. The CFLAGS from pkg-config are always appended, as they
not only contain -I but also -D flags.

Signed-off-by: Clemens Gruber <clemens.gru...@pqgruber.com>
---
 Makefile.in              |  1 +
 configure.ac             | 27 ++++++++++++++++++++-------
 scripts/kconfig/Makefile |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index f454cbd1a..40c676c2b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,6 +36,7 @@ kconfig:
        $(MAKE) -C "$(abs_srcdir)/scripts/kconfig" \
                CONF_LIBS="@CONF_LIBS@" \
                MCONF_LIBS="@MCONF_LIBS@" \
+               NCONF_LIBS="@NCONF_LIBS@" \
                CURSES_LOC="@CURSES_LOC@" \
                conf mconf $(NCONF)
        @echo "done."
diff --git a/configure.ac b/configure.ac
index 5348db8a2..338fb6089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,11 @@ dnl
 AC_PROG_CC
 AC_PROG_CXX
 
+dnl
+dnl Check for pkg-config
+dnl
+PKG_PROG_PKG_CONFIG
+
 dnl
 dnl Check header files, mostly for lxdialog & kconfig
 dnl
@@ -41,28 +46,36 @@ AC_SEARCH_LIBS(regcomp, [regex gnuregex],,
 CONF_LIBS=${LIBS}
 AC_SUBST(CONF_LIBS)
 
-AC_SEARCH_LIBS(mvaddch, [curses ncurses pdcurses], [CURSES_LIB=$ac_lib],
-       [AC_MSG_ERROR([curses development library not found, please install 
libncurses-dev])])
-MCONF_LIBS=${LIBS}
+PKG_CHECK_MODULES([NCURSES], [ncurses],, [
+       AC_MSG_ERROR([Cannot find ncurses library.])])
+MCONF_LIBS="${LIBS} ${NCURSES_LIBS}"
 AC_SUBST(MCONF_LIBS)
 
+PKG_CHECK_MODULES([NCURSES_PANEL], [panel],,
+       AC_MSG_ERROR([Cannot find ncurses panel library.])])
+PKG_CHECK_MODULES([NCURSES_MENU], [menu],,
+       AC_MSG_ERROR([Cannot find ncurses menu library.])])
+NCONF_LIBS="${LIBS} ${NCURSES_LIBS} ${NCURSES_PANEL_LIBS} ${NCURSES_MENU_LIBS}"
+AC_SUBST(NCONF_LIBS)
+
 AC_CHECK_HEADERS(
-       [curses.h ncurses.h ncurses/curses.h ncurses/ncurses.h pdcurses.h 
pdcurses/curses.h pdcurses/pdcurses.h],
+       [curses.h ncurses.h ncurses/curses.h ncurses/ncurses.h],
        [CURSES_LOC="<$ac_header>";found_curses_headers=yes; break;])
 AS_IF([test "x$CURSES_LOC" = "x"],
-       [AC_MSG_ERROR([curses headers not found])])
+       [AC_MSG_ERROR([ncurses headers not found])])
 AC_SUBST(CURSES_LOC)
 
+CPPFLAGS="${NCURSES_CFLAGS}"
 AC_ARG_WITH(ncurses, AS_HELP_STRING([--with-ncurses],[Include path to the 
ncurses headers]),
        [
                if test "x$withval" != "xyes"; then
-                       CPPFLAGS="-I$withval"
-                       AC_SUBST(CPPFLAGS)
+                       CPPFLAGS="-I$withval ${CPPFLAGS}"
                fi
                with_ncurses=yes
        ],[
                with_ncurses=auto
 ])
+AC_SUBST(CPPFLAGS)
 
 AC_CHECK_HEADER(
        [menu.h],
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 78a631680..7b2631702 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -25,7 +25,7 @@ endif
 
 conf-libs  := $(CONF_LIBS)
 mconf-libs := $(MCONF_LIBS)
-nconf-libs := -lncurses -lmenu -lpanel
+nconf-libs := $(NCONF_LIBS)
 
 lkc-deps := lkc.h lkc_defs.h expr.h
 
-- 
2.15.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

Reply via email to