HEYAHONG/kconfig-frontends
1
0
Fork 0
mirror of https://github.com/HEYAHONG/kconfig-frontends.git synced 2025-05-09 02:01:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

configure: rename ncurses_EXTRA_CFLAGS

Browse Source 
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>
This commit is contained in:
Yann E. MORIN" 2013-03-05 00:03:10 +01:00
parent f8e2db383a
commit 5a9190603d
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

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

10
frontends/nconf/Makefile.am
View File

@ -1,12 +1,12 @@
bin_PROGRAMS = nconf bin_PROGRAMS = nconf
nconf_SOURCES = nconf.c nconf.gui.c nconf.h nconf_SOURCES = nconf.c nconf.gui.c nconf.h
nconf_CPPFLAGS = $(AM_CPPFLAGS) \ nconf_CPPFLAGS = $(AM_CPPFLAGS) \
$(intl_CPPFLAGS) \ $(intl_CPPFLAGS) \
$(ncurses_extra_CPPFLAGS) \ $(ncurses_nconf_CPPFLAGS) \
-I$(top_srcdir)/libs/parser -I$(top_srcdir)/libs/parser
nconf_CFLAGS = $(AM_CFLAGS) \ nconf_CFLAGS = $(AM_CFLAGS) \
$(kf_CFLAGS) $(kf_CFLAGS)
nconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la \ nconf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la \
$(intl_LIBS) $(ncurses_extra_LIBS) $(ncurses_LIBS) \ $(intl_LIBS) $(ncurses_panel_menu_LIBS) $(ncurses_LIBS) \
$(nconf_EXTRA_LIBS) $(nconf_EXTRA_LIBS)