You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2012/11/18 17:49:45 UTC
[13/50] git commit: Improved build so that no need to reconfigure
after installing optional dependancy
Improved build so that no need to reconfigure after installing optional dependancy
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/0972aff4
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/0972aff4
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/0972aff4
Branch: refs/heads/docs_tmp
Commit: 0972aff462463726b53e586a1c596d86205e9045
Parents: 1d0e360
Author: Noah Slater <ns...@apache.org>
Authored: Sun Oct 14 15:14:09 2012 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Nov 18 00:15:32 2012 +0000
----------------------------------------------------------------------
DEVELOPERS | 9 +++++----
bin/Makefile.am | 4 ++--
configure.ac | 8 ++++----
share/doc/build/Makefile.am | 16 ++++++++--------
src/couchdb/priv/Makefile.am | 4 ++--
5 files changed, 21 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0972aff4/DEVELOPERS
----------------------------------------------------------------------
diff --git a/DEVELOPERS b/DEVELOPERS
index d5a9375..dadf646 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -15,11 +15,9 @@ You will need the following installed:
* GNU Autoconf (>=2.68) (http://www.gnu.org/software/autoconf/)
* GNU Autoconf Archive (http://www.gnu.org/software/autoconf-archive/)
* pkg-config (http://www.freedesktop.org/wiki/Software/pkg-config)
+ * Sphinx (http://sphinx.pocoo.org/)
* GNU help2man (http://www.gnu.org/software/help2man/)
-# @@ pkg-config
-
-# @@ autoconf-archive
# @@ deps for docs
@@ -35,6 +33,7 @@ You can install the dependencies by running:
sudo apt-get install autoconf
sudo apt-get install autoconf-archive
sudo apt-get install pkg-config
+ sudo apt-get install python-sphinx
sudo apt-get install help2man
Be sure to update the version numbers to match your system's available packages.
@@ -49,6 +48,7 @@ You can install the dependencies by running:
brew install autoconf
brew install autoconf-archive
brew install pkg-config
+ @@ sphinx
brew install help2man
# @@ check these packages are correct
@@ -80,7 +80,8 @@ these tools are required or you will have missing files.
You will need these files anyway, because the build will error out.
-# @@ check what happens if you try to install from source without them
+# @@ if you dont have them it tells you to check the README file, so we need to
+# @@ put a note in there pointing to this file or something
# @@ check `syntax' with Github, etc
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0972aff4/bin/Makefile.am
----------------------------------------------------------------------
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 4d66157..93c44d4 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -115,9 +115,9 @@ HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
# XXX: the man pages.
couchdb.1: couchdb.tpl.in
- if test -n "$(HAS_HELP2MAN)"; then \
+ if test -n "`which help2man`"; then \
$(MAKE) -f Makefile couchdb; \
- $(HELP2MAN) $(HELP2MAN_OPTION) \
+ help2man $(HELP2MAN_OPTION) \
--name="Apache CouchDB database server" ./couchdb --output $@; \
else \
$(top_srcdir)/build-aux/missing help2man; \
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0972aff4/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index df6d577..2ad05d8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,9 +535,9 @@ if test "$use_launchd" = "yes"; then
fi
fi
-AC_PATH_PROG([HELP2MAN], [help2man])
+AC_CHECK_PROG([HAS_HELP2MAN], [help2man], [yes])
-if test x${HELP2MAN} = x; then
+if test x${HAS_HELP2MAN} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `help2man' executable.])
else
@@ -545,9 +545,9 @@ if test x${HELP2MAN} = x; then
fi
fi
-AC_PATH_PROG([SPHINX_BUILD], [sphinx-build])
+AC_CHECK_PROG([HAS_SPHINX_BUILD], [sphinx-build], [yes])
-if test x${SPHINX_BUILD} = x; then
+if test x${HAS_SPHINX_BUILD} = x; then
if test x${strictness_enabled} = xyes; then
AC_MSG_ERROR([Could not find the `sphinx-build' executable.])
else
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0972aff4/share/doc/build/Makefile.am
----------------------------------------------------------------------
diff --git a/share/doc/build/Makefile.am b/share/doc/build/Makefile.am
index 61b5c6c..30a5234 100644
--- a/share/doc/build/Makefile.am
+++ b/share/doc/build/Makefile.am
@@ -189,11 +189,11 @@ $(texinfo_files): texinfo.stamp
texinfo.stamp: $(image_files) $(src_files)
@rm -f texinfo.tmp
@touch texinfo.tmp
- if test -n "$(HAS_MAKEINFO)"; then \
+ if test -n "`which makeinfo`"; then \
$(top_srcdir)/build-aux/missing makeinfo; \
fi
- if test -x "$(SPHINX_BUILD)"; then \
- $(SPHINX_BUILD) -b texinfo $(SPHINXOPTS) $(builddir)/texinfo; \
+ if test -n "`which sphinx-build`"; then \
+ sphinx-build -b texinfo $(SPHINXOPTS) $(builddir)/texinfo; \
else \
$(top_srcdir)/build-aux/missing sphinx-build; \
fi
@@ -208,11 +208,11 @@ $(pdf_files): pdf.stamp
pdf.stamp: $(image_files) $(src_files)
@rm -f pdf.tmp
@touch pdf.tmp
- if test -n "$(HAS_PDFLATEX)"; then \
+ if test -n "`which pdflatex`"; then \
$(top_srcdir)/build-aux/missing pdflatex; \
fi
- if test -x "$(SPHINX_BUILD)"; then \
- $(SPHINX_BUILD) -b latex $(SPHINXOPTS) $(builddir)/latex; \
+ if test -n "`which sphinx-build`"; then \
+ sphinx-build -b latex $(SPHINXOPTS) $(builddir)/latex; \
$(MAKE) -C latex all-pdf; \
gzip -9 < latex/CouchDB.pdf > latex/CouchDB.pdf.gz; \
else \
@@ -229,8 +229,8 @@ $(html_files): html.stamp
html.stamp: $(image_files) $(src_files)
@rm -f html.tmp
@touch html.tmp
- if test -x "$(SPHINX_BUILD)"; then \
- $(SPHINX_BUILD) -b html $(SPHINXOPTS) $(builddir)/html; \
+ if test -n "`which sphinx-build`"; then \
+ sphinx-build -b html $(SPHINXOPTS) $(builddir)/html; \
else
$(top_srcdir)/build-aux/missing sphinx-build; \
fi
http://git-wip-us.apache.org/repos/asf/couchdb/blob/0972aff4/src/couchdb/priv/Makefile.am
----------------------------------------------------------------------
diff --git a/src/couchdb/priv/Makefile.am b/src/couchdb/priv/Makefile.am
index 6db3557..12ce7c7 100644
--- a/src/couchdb/priv/Makefile.am
+++ b/src/couchdb/priv/Makefile.am
@@ -67,8 +67,8 @@ couchpriv_PROGRAMS = couchspawnkillable
HELP2MAN_OPTION=--no-info --help-option="-h" --version-option="-V"
couchjs.1: couchjs
- if test -n "$(HAS_HELP2MAN)"; then \
- $(HELP2MAN) $(HELP2MAN_OPTION) \
+ if test -n "`which help2man`"; then \
+ help2man $(HELP2MAN_OPTION) \
--name="$(package_name) JavaScript interpreter" ./couchjs --output $@; \
else \
$(top_srcdir)/build-aux/missing help2man; \