git commit: updated refs/heads/master to 82a103b

[dj...@apache.org]

Updated Branches:
  refs/heads/master 54813a7c1 -> 82a103ba7


Revert to checking both files, but give .in priority.


Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/82a103ba
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/82a103ba
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/82a103ba

Branch: refs/heads/master
Commit: 82a103ba71e8ccc9efb24d97b763517978e63c22
Parents: 54813a7
Author: Dirkjan Ochtman <dj...@apache.org>
Authored: Wed Oct 2 15:20:13 2013 +0200
Committer: Dirkjan Ochtman <dj...@apache.org>
Committed: Wed Oct 2 16:47:58 2013 +0200

----------------------------------------------------------------------
 share/doc/src/conf.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/82a103ba/share/doc/src/conf.py
----------------------------------------------------------------------
diff --git a/share/doc/src/conf.py b/share/doc/src/conf.py
index 0b16402..0c649b8 100644
--- a/share/doc/src/conf.py
+++ b/share/doc/src/conf.py
@@ -22,9 +22,12 @@ extensions = ["sphinx.ext.todo", "sphinx.ext.extlinks", 'github',
 
 _info = {}
 _regex = re.compile('m4_define\(\[(.+)\],\s+\[(.+)\]\)')
+_acinclude_m4 = '../../../acinclude.m4'
 _acinclude_m4_in = '../../../acinclude.m4.in'
 if os.path.exists(_acinclude_m4_in):
     _source = _acinclude_m4_in
+elif os.path.exists(_acinclude_m4):
+    _source = _acinclude_m4
 else:
     _source = None
 if _source is not None:
@@ -142,4 +145,4 @@ html_context['git_branch'] = github_branch = 'master'
 
 github_docs_path = 'share/doc/src'
 
-del _info, _regex, _acinclude_m4_in, _source
+del _info, _regex, _acinclude_m4, _acinclude_m4_in, _source