From a0c4dc4798cb866d630416e9aae61b24a418ef35 Mon Sep 17 00:00:00 2001 From: oetiker Date: Mon, 5 Jul 2010 15:29:56 +0000 Subject: [PATCH] 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/branches/1.4@2104 a5681a0c-68f1-0310-ab6d-d61299d08faa --- program/CHANGES | 2 ++ program/MakeMakefile | 2 +- program/Makefile.am | 2 +- program/configure.ac | 5 ++--- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/program/CHANGES b/program/CHANGES index 5bd98dc8..feb855d3 100644 --- a/program/CHANGES +++ b/program/CHANGES @@ -4,6 +4,8 @@ Bugfixes: * compile: multiple fixes isnan and isinf defines to make rrdtool compile with gcc on solaris (with --disable-nls) -- Tobi + * handle gettext/libintl like any other feature, do not try to supply + our own ... rrdtool can work fine without it -- tobi * rrd_client: fix potential segfaults -- Florian Forster * rrd_client: resolve synmlinks properly -- Kevin Brintnall * compile: fix libtool and libtoolize names for OSX compiles -- Antoine Musso 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 9c5fa8a5..4b008a2b 100644 --- a/program/configure.ac +++ b/program/configure.ac @@ -273,8 +273,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) @@ -901,7 +901,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]) -- 2.30.2