configure: rename ncurses_EXTRA_CFLAGS

ncurses_EXTRA_CFLAGS are actually used by nconf, so needs to be renamed
to a more meaningful name.

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

diff --git a/configure.ac b/configure.ac
index bf357865d8ce9660bf6c1edfa277a7ffcb1c4ddc..f177892386a7304cab3ab90efc6eac066c2f803b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -291,12 +291,12 @@ AS_IF(
 # Check for libpanel and libmenu, for the nconf frontend
 AS_IF(
     [test "$need_panel_menu" = "yes" -o "$need_panel_menu" = "auto"],
-    [AC_SUBST([ncurses_extra_LIBS])
-     AC_SUBST([ncurses_extra_CPPFLAGS])
+    [AC_SUBST([ncurses_nconf_CPPFLAGS])
+     AC_SUBST([ncurses_panel_menu_LIBS])
      AS_CASE(
         [$CURSES_LOC],
-        [ncursesw/*],[ncurses_extra_CPPFLAGS="-I/usr/include/ncursesw"],
-        [ncurses/*],[ncurses_extra_CPPFLAGS="-I/usr/include/ncurses"])
+        [ncursesw/*],[ncurses_nconf_CPPFLAGS="-I/usr/include/ncursesw"],
+        [ncurses/*],[ncurses_nconf_CPPFLAGS="-I/usr/include/ncurses"])
      LIBS_old="$LIBS"
      LIBS=
      AC_SEARCH_LIBS(
@@ -321,7 +321,7 @@ AS_IF(
             [test "$need_panel_menu" = "yes"],
             [AC_MSG_ERROR([could not find libmenu library (frontend: nconf)])],
             [has_panel_menu=no])])
-     ncurses_extra_LIBS="$LIBS"
+     ncurses_panel_menu_LIBS="$LIBS"
      LIBS=$LIBS_old])
 
 AS_IF(

diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am
index 32096ab37de16e578362523ad1bee75da1604330..90a61545f5dc317088b2d7e57dd6f2fa01bab9dd 100644 (file)
--- a/frontends/nconf/Makefile.am
+++ b/frontends/nconf/Makefile.am
@@ -1,12 +1,12 @@
 bin_PROGRAMS = nconf
 
 nconf_SOURCES = nconf.c nconf.gui.c nconf.h
-nconf_CPPFLAGS = $(AM_CPPFLAGS)     \
-                 $(intl_CPPFLAGS)   \
-                 $(ncurses_extra_CPPFLAGS) \
+nconf_CPPFLAGS = $(AM_CPPFLAGS)             \
+                 $(intl_CPPFLAGS)           \
+                 $(ncurses_nconf_CPPFLAGS)  \
                  -I$(top_srcdir)/libs/parser
 nconf_CFLAGS = $(AM_CFLAGS) \
                $(kf_CFLAGS)
-nconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la      \
-              $(intl_LIBS) $(ncurses_extra_LIBS) $(ncurses_LIBS)    \
+nconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la          \
+              $(intl_LIBS) $(ncurses_panel_menu_LIBS) $(ncurses_LIBS)   \
               $(nconf_EXTRA_LIBS)