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

[11/50] git commit: Update prog checks

Update prog checks


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

Branch: refs/heads/docs_tmp
Commit: ffaa5fd88d2ed9faa8b56535edf829e84213a585
Parents: d98d19f
Author: Noah Slater <ns...@apache.org>
Authored: Sun Oct 14 14:03:02 2012 +0100
Committer: Robert Newson <rn...@apache.org>
Committed: Sun Nov 18 00:15:32 2012 +0000

----------------------------------------------------------------------
 DEVELOPERS   |   44 ++++++++++++++++++++++++++++++++++----------
 configure.ac |    8 ++++----
 2 files changed, 38 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb/blob/ffaa5fd8/DEVELOPERS
----------------------------------------------------------------------
diff --git a/DEVELOPERS b/DEVELOPERS
index a77bf8e..2579504 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -30,7 +30,12 @@ Debian-based (inc. Ubuntu) Systems
 
 You can install the dependencies by running:
 
-    apt-get install libtool automake autoconf autoconf-archive pkg-config help2man
+    sudo apt-get install libtool
+    sudo apt-get install automake
+    sudo apt-get install autoconf
+    sudo apt-get install autoconf-archive
+    sudo apt-get install pkg-config
+    sudo apt-get install help2man
 
 Be sure to update the version numbers to match your system's available packages.
 
@@ -39,7 +44,12 @@ Mac OS X
 
 You can install the dependencies by running:
 
-    brew install libtool automake autoconf autoconf-archive pkg-config help2man
+    brew install libtool
+    brew install automake
+    brew install autoconf 
+    brew install autoconf-archive
+    brew install pkg-config
+    brew install help2man
 
 # @@ check these packages are correct
 
@@ -56,6 +66,28 @@ Bootstrap the pristine source by running:
 
 You must repeat this step every time you update your source checkout.
 
+Configuring
+-----------
+
+Configure the source by running:
+
+    ./configure --enable-strictness
+
+This will cause `configure' to fail when optional dependancies are missing.
+Certain parts of the build are shipped along with the release, and so the tools
+needed to rebuild them are not required. When you are building from source,
+these tools are required or you will have missing files.
+
+# @@ check what happens if you try to install from source without them
+
+# @@ check `syntax' with Github, etc
+
+If you're working on the build system itself, you can run:
+
+    ./configure --disable-tests
+
+This skips the tests allowing quicker `make' cycles.
+
 Testing
 -------
 
@@ -79,10 +111,6 @@ The release procedure is documented in the project wiki:
 Unix-like Systems
 ~~~~~~~~~~~~~~~~~
 
-Configure the source by running:
-
-    ./configure
-
 Prepare the release artefacts by running:
 
     make distcheck
@@ -96,10 +124,6 @@ The release artefacts can be found in the root source directory.
 Microsoft Windows
 ~~~~~~~~~~~~~~~~~
 
-Configure the source by running:
-
-    ./configure
-
 Prepare the release artefacts by running:
 
     make dist

http://git-wip-us.apache.org/repos/asf/couchdb/blob/ffaa5fd8/configure.ac
----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index c27bc59..9b6c027 100644
--- a/configure.ac
+++ b/configure.ac
@@ -535,7 +535,7 @@ if test "$use_launchd" = "yes"; then
     fi
 fi
 
-AC_PATH_PROG([HELP2MAN], [help2man])
+AM_MISSING_PROG([HELP2MAN], [help2man])
 
 if test x${HELP2MAN} = x; then
     if test x${strictness_enabled} = xyes; then
@@ -545,7 +545,7 @@ if test x${HELP2MAN} = x; then
     fi
 fi
 
-AC_PATH_PROG([SPHINX_BUILD], [sphinx-build])
+AM_MISSING_PROG([SPHINX_BUILD], [sphinx-build])
 
 if test x${SPHINX_BUILD} = x; then
     if test x${strictness_enabled} = xyes; then
@@ -561,7 +561,7 @@ else
     AX_PYTHON_MODULE([pygments])
 fi
 
-AC_PATH_PROG([PDFLATEX], [pdflatex])
+AM_MISSING_PROG([PDFLATEX], [pdflatex])
 
 if test x${PDFLATEX} = x; then
     if test x${strictness_enabled} = xyes; then
@@ -573,7 +573,7 @@ Is LaTeX installed?])
     fi
 fi
 
-AC_PATH_PROG([MAKEINFO], [makeinfo])
+AM_MISSING_PROG([MAKEINFO], [makeinfo])
 
 if test x${MAKEINFO} = x; then
     if test x${strictness_enabled} = xyes; then