configure: rename GETTEXT variable

This variable contains pre-processor flags, so name it accordingly.

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

diff --git a/configure.ac b/configure.ac
index 078c2e79885fe66a7b54f7c1e365e084524ae79e..f67dae2452439e68db2769d836fa1ff7475bb60d 100644 (file)
--- 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 12f7b6a9ca399a783fc812a31a8e4753a6504820..2bdebb6e787f53b7d791b2a9079569ae12d85988 100644 (file)
--- 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 f105fbc0c8c26b4d839c9a3df925c5a242b9af94..109dfa50459ad66344fa54fde8420b1e5c9de856 100644 (file)
--- 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 566fbe35c4ce1f7cbacb2b939f4d45c6ec26f10d..d60f6f1a00b178dccc1ac316f8546d559d645bb7 100644 (file)
--- 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 00c9ca7769fc16957556302cc9891b709bf6a666..65bc825d22a55c568dfc537f2580739692fea911 100644 (file)
--- 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 1c654bf4fe5defa0d8c2052ccf4ee1150dc93489..c62dc15c012577c38d0b0eb8695c85cf2aba97f8 100644 (file)
--- 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 1526dddffaf5c49e3ecfbfab09072fb195dd796f..271b220f91d6fe8c0dcbc35abb88b995069a9528 100644 (file)
--- 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 482beda54abd8a1f6b6eec69ef31cf7fa124b918..421799d0b98b12b78d9b664a61dd39cad73cbc6a 100644 (file)
--- 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 $<