From: oetiker Date: Mon, 5 Jul 2010 15:29:56 +0000 (+0000) Subject: do not try to whisk i18n support into existance ... use it when its there X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2203007fa012c3c8612160818566cfeeaefd906d;p=rrdtool-all.git do not try to whisk i18n support into existance ... use it when its there don't when it is not, rrdtool works fine either way. git-svn-id: svn://svn.oetiker.ch/rrdtool/trunk@2104 a5681a0c-68f1-0310-ab6d-d61299d08faa --- diff --git a/program/MakeMakefile b/program/MakeMakefile index 74192458..4ef2a62e 100755 --- a/program/MakeMakefile +++ b/program/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 (){ diff --git a/program/Makefile.am b/program/Makefile.am index 114a1be5..1961ef23 100644 --- a/program/Makefile.am +++ b/program/Makefile.am @@ -5,7 +5,7 @@ RSYNC = rsync --rsh=ssh # build the following subdirectories -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/program/configure.ac b/program/configure.ac index d0fec6a2..04052ad4 100644 --- a/program/configure.ac +++ b/program/configure.ac @@ -274,8 +274,8 @@ AC_CHECK_FUNCS(posix_fadvise) CONFIGURE_PART(Libintl Processing) -AM_GNU_GETTEXT_VERSION(0.17) -AM_GNU_GETTEXT() +AM_GNU_GETTEXT_VERSION(0.18) +AM_GNU_GETTEXT(external) CONFIGURE_PART(IEEE Math Checks) @@ -902,7 +902,6 @@ AC_CONFIG_FILES([examples/Makefile]) AC_CONFIG_FILES([examples/rrdcached/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])