From: Tobias Oetiker <tobi@oetiker.ch>
Date: Mon, 5 Jul 2010 15:37:08 +0000 (+0000)
Subject: remove gettext copy ... just don't use it when we don't have it ...
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3effda5fdd3eeeb29755f7a0765a44c95fcc5faf;p=thirdparty%2Frrdtool-1.x.git

remove gettext copy ... just don't use it when we don't have it ...


git-svn-id: svn://svn.oetiker.ch/rrdtool/branches/1.3/program@2105 a5681a0c-68f1-0310-ab6d-d61299d08faa
---

diff --git a/MakeMakefile b/MakeMakefile
index b6658d6c..0d8a860a 100755
--- a/MakeMakefile
+++ b/MakeMakefile
@@ -3,7 +3,7 @@
 # Run this script after the first cvs checkout to build
 # makefiles and friends
 
-PATH="/usr/pack/automake-1.11-to/amd64-linux-debian3.1/:/usr/pack/automake-1.11-to/amd64-linux-ubuntu8.04/bin:$PATH"
+PATH="/usr/pack/automake-1.11-to/amd64-linux-debian3.1/:/usr/pack/automake-1.11-to/amd64-linux-ubuntu8.04/bin:/usr/pack/gettext-0.18.1.1-to/amd64-linux-ubuntu8.04/bin:$PATH"
 export PATH
 vcheck (){
   perl <<PERL
diff --git a/Makefile.am b/Makefile.am
index bda0889c..f1081805 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 RSYNC = rsync --rsh=ssh
 
-SUBDIRS = po src examples doc bindings intl
+SUBDIRS = po src examples doc bindings
 
  # the following files are not mentioned in any other Makefile
 EXTRA_DIST = COPYRIGHT CHANGES WIN32-BUILD-TIPS.txt TODO CONTRIBUTORS THREADS \
diff --git a/configure.ac b/configure.ac
index 0bd41458..93e6f766 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,8 +247,8 @@ AC_CHECK_FUNCS(posix_fadvise)
 
 CONFIGURE_PART(Libintl Processing)
 
-AM_GNU_GETTEXT_VERSION(0.14.4)
-AM_GNU_GETTEXT()
+AM_GNU_GETTEXT_VERSION(0.18)
+AM_GNU_GETTEXT(external)
 
 CONFIGURE_PART(IEEE Math Checks)
  
@@ -693,7 +693,6 @@ AC_CONFIG_FILES([examples/perftest.pl])
 AC_CONFIG_FILES([examples/Makefile])
 AC_CONFIG_FILES([doc/Makefile])
 AC_CONFIG_FILES([po/Makefile.in])
-AC_CONFIG_FILES([intl/Makefile])  
 AC_CONFIG_FILES([src/Makefile])
 AC_CONFIG_FILES([src/librrd.sym.in])
 AC_CONFIG_FILES([src/librrd.pc])