svn commit: r1761334 - /subversion/trunk/configure.ac

[br...@apache.org]

Author: brane
Date: Sun Sep 18 15:35:25 2016
New Revision: 1761334

URL: http://svn.apache.org/viewvc?rev=1761334&view=rev
Log:
Fix SVN-4653: SVN_LOCALE_DIR incorrectly interpolated when prefix is not set explicitly.

* configure.ac: When calculating SVN_LOCALE_DIR, adjust the test for
   the default value to account for the new ${dataroot} variable
   that was introduced by autoconf 2.60.

Found by: Michael Osipov

Modified:
    subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1761334&r1=1761333&r2=1761334&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Sun Sep 18 15:35:25 2016
@@ -208,7 +208,10 @@ localedir='${datadir}/locale'
 AC_SUBST(localedir)
 
 dnl For SVN_LOCALE_DIR, we have to expand it to something.  See SVN_BINDIR.
-if test "${datadir}" = '${prefix}/share' && test "${prefix}" = "NONE"; then
+if test "${prefix}" = "NONE" \
+  && ( test "${datadir}" = '${prefix}/share' \
+       || ( test "${datadir}" = '${datarootdir}' \
+            && test "${datarootdir}" = '${prefix}/share' ) ); then
   exp_localedir='${ac_default_prefix}/share/locale'
 else
   exp_localedir=$localedir