Add check of ncurses*-config

The recent ncurses package provides ncurses*-config program to give the
proper cflags and libs.  Let's use them if available.

Right now, the ncurses version (5) is hard-coded.  It should be better
to be variable as well, but it'd be messy.  Hope the ncurses version won't
change rapidly.

diff --git a/alsamixer/Makefile.am b/alsamixer/Makefile.am
index 801f3e6..6426193 100644 (file)
--- a/alsamixer/Makefile.am
+++ b/alsamixer/Makefile.am
@@ -1,9 +1,10 @@
-LDADD = $(CURSESLIB)
+AM_CFLAGS = @CURSES_CFLAGS@ -DCURSESINC="@CURSESINC@"
+LDADD = @CURSESLIB@
 
 bin_PROGRAMS = alsamixer
 man_MANS = alsamixer.1
 EXTRA_DIST = alsamixer.1
-alsamixer_INCLUDES = -I$(top_srcdir)/include -DCURSESINC="$(CURSESINC)"
+alsamixer_INCLUDES = -I$(top_srcdir)/include
 
 #LDFLAGS = -static
 #CFLAGS += -g -Wall

diff --git a/configure.in b/configure.in
index 5c1adb6..331fcbd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,9 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AM_PATH_ALSA(1.0.16)
 
+CURSESINC=""
+CURSESLIB=""
+CURSES_CFLAGS=""
 AC_ARG_ENABLE(alsamixer,
      [  --disable-alsamixer     Disable alsamixer compilation],
      [case "${enableval}" in
@@ -46,12 +49,28 @@ if test x$alsamixer = xtrue; then
     curseslib="$withval",
     curseslib="auto")
   if test "$curseslib" = "ncursesw"; then
-    AC_CHECK_LIB(ncursesw, initscr, 
+    AC_CHECK_PROG([ncursesw5_config], [ncursesw5-config], [yes])
+    if test "$ncursesw5_config" = "yes"; then
+      CURSESINC="<ncurses.h>"
+      CURSESLIB=`ncursesw5-config --libs`
+      CURSES_CFLAGS=`ncursesw5-config --cflags`
+      curseslib="ncursesw"
+    else
+      AC_CHECK_LIB(ncursesw, initscr, 
                  [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncursesw'; curseslib="ncursesw"])
+    fi
   fi
   if test "$curseslib" = "ncurses" -o "$curseslib" = "auto"; then
-    AC_CHECK_LIB(ncurses, initscr, 
+    AC_CHECK_PROG([ncurses5_config], [ncurses5-config], [yes])
+    if test "$ncurses5_config" = "yes"; then
+      CURSESINC="<ncurses.h>"
+      CURSESLIB=`ncurses5-config --libs`
+      CURSES_CFLAGS=`ncurses5-config --cflags`
+      curseslib="ncurses"
+    else
+      AC_CHECK_LIB(ncurses, initscr, 
                  [ CURSESINC='<ncurses.h>'; CURSESLIB='-lncurses'; curseslib="ncurses"])
+    fi
   fi
   if test "$curseslib" = "curses" -o "$curseslib" = "auto"; then
     AC_CHECK_LIB(curses, initscr, 
@@ -64,6 +83,7 @@ fi
 
 AC_SUBST(CURSESINC)
 AC_SUBST(CURSESLIB)
+AC_SUBST(CURSES_CFLAGS)
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix