Damn me!!

Looks like I have found a buglet in cvs.  For configure.in
we branched at revision 1.12, accidentally removed a line in
revision 1.13 and merged from HEAD to the branch.  Quite rightly
the removed line difference is applied to the branch during the
merge and is now missing from there too.  Now we put the line
back in the trunk for a new HEAD revision, but when we merge from
HEAD back to the branch for a second time, the line is *still*
missing from the branch.  The reason seems to be that cvs merge is
using the common ancestor (1.12) to find differences, and the
offending line is now present in the HEAD revision and the common
ancestor, so no difference there, so no change applied during the
merge onto the branch: net result the missing line is never put back.

I put it back by hand with this commit.  Grrrr.

diff --git a/configure.in b/configure.in
index e5280c80b8e1cbc2a11c2986ee7d0a3f4234a615..f9bb667ba732bab683ecda954e2ee4ed7f2275a6 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -24,6 +24,7 @@ changequote([,])
     ;;
 esac    
 
+AC_SUBST(pkgdatadir)
 aclocaldir='${datadir}/aclocal'
 AC_SUBST(aclocaldir)