Don't build rpmgettext/rpmputtext if USE_NLS=no.

CVS patchset: 3353
CVS date: 1999/09/30 16:03:43

diff --git a/configure.in b/configure.in
index c07422d..220b7a1 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -385,6 +385,14 @@ else
 fi
 AC_SUBST(BUILD_RPMCONVERT)
 
+dnl whether or not we should try to build rpmgettext/rpmputtext.
+if test X"USE_NLS" = Xyes; then
+    BUILD_RPMNLSTOOLS="rpmgettext rpmputtext"
+else
+    BUILD_RPMNLSTOOLS=
+fi
+AC_SUBST(BUILD_RPMNLSTOOLS)
+
 AC_CHECK_HEADERS(glob.h)
 
 dnl statfs portability fiddles.

diff --git a/python/Makefile.in b/python/Makefile.in
index 534c9a5..47097ad 100644 (file)
--- a/python/Makefile.in
+++ b/python/Makefile.in
@@ -70,6 +70,7 @@ AR = @AR@
 AS = @AS@
 AWK = @AWK@
 BUILD_RPMCONVERT = @BUILD_RPMCONVERT@
+BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@
 BZIP2BIN = @BZIP2BIN@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 9fca2b0..c065772 100644 (file)
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -70,6 +70,7 @@ AR = @AR@
 AS = @AS@
 AWK = @AWK@
 BUILD_RPMCONVERT = @BUILD_RPMCONVERT@
+BUILD_RPMNLSTOOLS = @BUILD_RPMNLSTOOLS@
 BZIP2BIN = @BZIP2BIN@
 CATALOGS = @CATALOGS@
 CATOBJEXT = @CATOBJEXT@

diff --git a/tools/Makefile.am b/tools/Makefile.am
index c93a64e..9b66add 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -17,13 +17,15 @@ mylibs=     $(top_builddir)/build/.libs/librpmbuild.a \
        $(top_builddir)/popt/.libs/libpopt.a \
        @LIBMISC@
 
+EXTRA_PROGRAMS = rpmgettext rpmputtext
+
 LDADD = $(top_builddir)/lib/.libs/librpm.a @LIBMISC@
 
 noinst_PROGRAMS = \
        dump dumpdb javadeps rpmarchive rpmheader rpmlead rpmsignature
 
 pkgbindir = @RPMCONFIGDIR@
-pkgbin_PROGRAMS = rpmgettext rpmputtext
+pkgbin_PROGRAMS = @BUILD_RPMNLSTOOLS@
 
 rpmgettext_SOURCES =   rpmgettext.c
 rpmgettext_LDADD =     $(mylibs)