From 087016d3d69ba8e54f80299074a8ff8723e1ebe7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Mon, 28 May 2012 19:17:13 +0200 Subject: [PATCH] configure: rename GETTEXT variable This variable contains pre-processor flags, so name it accordingly. Signed-off-by: "Yann E. MORIN" --- configure.ac | 4 ++-- frontends/conf/Makefile.am | 4 ++-- frontends/gconf/Makefile.am | 2 +- frontends/mconf/Makefile.am | 2 +- frontends/nconf/Makefile.am | 4 ++-- frontends/qconf/Makefile.am | 2 +- libs/lxdialog/Makefile.am | 2 +- libs/parser/Makefile.am | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 078c2e7..f67dae2 100644 --- a/configure.ac +++ b/configure.ac @@ -215,7 +215,7 @@ AC_CHECK_FUNCS([ gettimeofday mkdir regcomp setlocale uname ]) #---------------------------------------- # Check for gettext, for the kconfig frontends -AC_SUBST([GETTEXT]) +AC_SUBST([intl_CPPFLAGS]) AC_CHECK_HEADERS( [libintl.h], [ac_ct_gettext_hdr=$ac_header; break], @@ -225,7 +225,7 @@ AS_IF( [AC_CHECK_DECL( [gettext],, [AC_MSG_WARN([gettext is missing, frontends will not be localised]) - GETTEXT=-DKBUILD_NO_NLS], + intl_CPPFLAGS=-DKBUILD_NO_NLS], [#include <$ac_ct_gettext_hdr>])]) #---------------------------------------- diff --git a/frontends/conf/Makefile.am b/frontends/conf/Makefile.am index 12f7b6a..2bdebb6 100644 --- a/frontends/conf/Makefile.am +++ b/frontends/conf/Makefile.am @@ -1,8 +1,8 @@ bin_PROGRAMS = conf conf_SOURCES = conf.c -conf_CPPFLAGS = $(AM_CPPFLAGS) \ - $(GETTEXT) \ +conf_CPPFLAGS = $(AM_CPPFLAGS) \ + $(intl_CPPFLAGS) \ -I$(top_srcdir)/libs/parser conf_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS) conf_LDADD = $(top_builddir)/libs/parser/libkconfig-parser.la \ diff --git a/frontends/gconf/Makefile.am b/frontends/gconf/Makefile.am index f105fbc..109dfa5 100644 --- a/frontends/gconf/Makefile.am +++ b/frontends/gconf/Makefile.am @@ -2,7 +2,7 @@ bin_PROGRAMS = gconf gconf_SOURCES = gconf.c gconf.glade gconf_CPPFLAGS = $(AM_CPPFLAGS) \ - $(GETTEXT) \ + $(intl_CPPFLAGS) \ -I$(top_srcdir)/libs/parser \ -I$(top_builddir)/libs/images \ -DGUI_PATH='"$(pkgdatadir)/gconf.glade"' diff --git a/frontends/mconf/Makefile.am b/frontends/mconf/Makefile.am index 566fbe3..d60f6f1 100644 --- a/frontends/mconf/Makefile.am +++ b/frontends/mconf/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = mconf mconf_SOURCES = mconf.c mconf_CPPFLAGS = $(AM_CPPFLAGS) \ -DCURSES_LOC='"$(CURSES_LOC)"' \ - $(GETTEXT) \ + $(intl_CPPFLAGS) \ -I$(top_srcdir)/libs \ -I$(top_srcdir)/libs/parser mconf_CFLAGS = $(AM_CFLAGS) \ diff --git a/frontends/nconf/Makefile.am b/frontends/nconf/Makefile.am index 00c9ca7..65bc825 100644 --- a/frontends/nconf/Makefile.am +++ b/frontends/nconf/Makefile.am @@ -1,8 +1,8 @@ bin_PROGRAMS = nconf nconf_SOURCES = nconf.c nconf.gui.c nconf.h -nconf_CPPFLAGS = $(AM_CPPFLAGS) \ - $(GETTEXT) \ +nconf_CPPFLAGS = $(AM_CPPFLAGS) \ + $(intl_CPPFLAGS) \ -I$(top_srcdir)/libs/parser nconf_CFLAGS = $(AM_CFLAGS) \ $(kf_CFLAGS) diff --git a/frontends/qconf/Makefile.am b/frontends/qconf/Makefile.am index 1c654bf..c62dc15 100644 --- a/frontends/qconf/Makefile.am +++ b/frontends/qconf/Makefile.am @@ -3,7 +3,7 @@ bin_PROGRAMS = qconf qconf_SOURCES = qconf.cc qconf.h BUILT_SOURCES = qconf.moc qconf_CPPFLAGS = $(AM_CPPFLAGS) \ - $(GETTEXT) \ + $(intl_CPPFLAGS) \ -I$(top_srcdir)/libs/parser \ -I$(top_builddir)/libs/images qconf_CXXFLAGS = $(AM_CXXFLAGS) \ diff --git a/libs/lxdialog/Makefile.am b/libs/lxdialog/Makefile.am index 1526ddd..271b220 100644 --- a/libs/lxdialog/Makefile.am +++ b/libs/lxdialog/Makefile.am @@ -11,5 +11,5 @@ libkconfig_lxdialog_a_SOURCES = \ libkconfig_lxdialog_a_CPPFLAGS = $(AM_CPPFLAGS) \ -DCURSES_LOC='"${CURSES_LOC}"' \ - $(GETTEXT) + $(intl_CPPFLAGS) liblxdialog_a_CFLAGS = $(AM_CFLAGS) $(kf_CFLAGS) diff --git a/libs/parser/Makefile.am b/libs/parser/Makefile.am index 482beda..421799d 100644 --- a/libs/parser/Makefile.am +++ b/libs/parser/Makefile.am @@ -19,7 +19,7 @@ CLEANFILES = hconf.c lconf.c yconf.c EXTRA_DIST = yconf.y.patch # Can't use libkconfig_parser_a_CPPFLAGS, as it breaks dependencies -yconf.o: CPPFLAGS+=$(GETTEXT) +yconf.o: CPPFLAGS+=$(intl_CPPFLAGS) .gperf.c: $(GPERF) -t --output-file $@ -a -C -E -g -k 1,3,$$ -p -t $< -- 2.39.5