r15457 - gnucash/trunk/macros - Fix relocation support detection that was broken with autoconf-2.60.

Christian Stimming cstim at cvs.gnucash.org
Sun Jan 28 16:44:22 EST 2007


Author: cstim
Date: 2007-01-28 16:44:21 -0500 (Sun, 28 Jan 2007)
New Revision: 15457
Trac: http://svn.gnucash.org/trac/changeset/15457

Modified:
   gnucash/trunk/macros/binreloc.m4
Log:
Fix relocation support detection that was broken with autoconf-2.60.

Modified: gnucash/trunk/macros/binreloc.m4
===================================================================
--- gnucash/trunk/macros/binreloc.m4	2007-01-28 21:41:05 UTC (rev 15456)
+++ gnucash/trunk/macros/binreloc.m4	2007-01-28 21:44:21 UTC (rev 15457)
@@ -20,8 +20,10 @@
 		AC_CHECK_FILE([/proc/self/maps])
 		AC_CACHE_CHECK([whether everything is installed to the same prefix],
 			       [br_cv_valid_prefixes], [
+				# datarootdir variables was introduced with autoconf-2.60
 				if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
-					"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+					\( "$datadir" = '${prefix}/share' -o \( "$datadir" = '${datarootdir}' -a "$datarootdir" = '${prefix}/share' \) \) -a \
+					"$libdir" = '${exec_prefix}/lib' -a \
 					"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
 				then
 					br_cv_valid_prefixes=yes



More information about the gnucash-changes mailing list