diff options
| author | peter <peter@FreeBSD.org> | 2016-12-03 20:30:05 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2016-12-03 20:30:05 +0000 |
| commit | 2f03622249e1b2235178d72a69557347a1997797 (patch) | |
| tree | 5c78414f2f8a2506969724b458a583fa3340f1b4 /contrib/subversion/configure.ac | |
| parent | a203d9c63d502ce7493285c37f596756db8494c6 (diff) | |
| download | FreeBSD-src-2f03622249e1b2235178d72a69557347a1997797.zip FreeBSD-src-2f03622249e1b2235178d72a69557347a1997797.tar.gz | |
MFC r309356: svn 1.9.4 -> 1.9.5
Diffstat (limited to 'contrib/subversion/configure.ac')
| -rw-r--r-- | contrib/subversion/configure.ac | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/subversion/configure.ac b/contrib/subversion/configure.ac index 4ed66d4..1fe0414 100644 --- a/contrib/subversion/configure.ac +++ b/contrib/subversion/configure.ac @@ -199,7 +199,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 @@ -1504,6 +1507,7 @@ fi # Need to strip '-no-cpp-precomp' from CPPFLAGS for SWIG as well. SWIG_CPPFLAGS="$CPPFLAGS" SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-no-cpp-precomp ]) +SVN_STRIP_FLAG(SWIG_CPPFLAGS, [-Wdate-time ]) AC_SUBST([SWIG_CPPFLAGS]) dnl Since this is used only on Unix-y systems, define the path separator as '/' |
