Optionally define $datarootdir on our own for autoconf <2.60 compatibility.

While I'm at it, fix two warnings in other files about
ignoring datarootdir with autoconf >2.60. Closes #2905.

diff --git a/configure.ac b/configure.ac
index a3c20323742868866b19a8b1943b193a572bec5d..34961b8a45bda632da31ce058a9cb776c9e04737 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -521,6 +521,11 @@ fi
 
 AC_SUBST(DOTLOCK_TARGET)
 
+dnl autoconf <2.60 compatibility
+if test -z "$datarootdir"; then
+  datarootdir='${prefix}/share'
+fi
+AC_SUBST([datarootdir])
 
 AC_MSG_CHECKING(where to put the documentation)
 AC_ARG_WITH(docdir, AC_HELP_STRING([--with-docdir=PATH], [Specify where to put the documentation]),

diff --git a/intl/Makefile.in b/intl/Makefile.in
index 59ad491f2c24224be2367df4efd021f11a397410..6ad1204aa236c9820d931cf656c6f29ac3110a8c 100644 (file)
--- a/intl/Makefile.in
+++ b/intl/Makefile.in
@@ -32,6 +32,7 @@ transform = @program_transform_name@
 libdir = @libdir@
 includedir = @includedir@
 datadir = @datadir@
+datarootdir = @datarootdir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/intl
 aliaspath = $(localedir)

diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index cf6379f3e3deb78b43107e9ca7af0feaecee942d..85a905b2e63c5259dd936e99a0b4d36e2c457961 100644 (file)
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -23,6 +23,7 @@ VPATH = @srcdir@
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 datadir = @datadir@
+datarootdir = @datarootdir@
 localedir = $(datadir)/locale
 gettextsrcdir = $(datadir)/gettext/po