From: Jacob Champion <jchampion@apache.org>
Date: Thu, 26 Jan 2017 20:19:16 +0000 (+0000)
Subject: buildconf: add --help for the new behavior
X-Git-Tag: 2.5.0-alpha~724^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=517c8587b2dcae2813f786f46cd745bfffcdeb74;p=thirdparty%2Fapache%2Fhttpd.git

buildconf: add --help for the new behavior

buildconf's behavior is a little complicated (and was made more so with
apr-config mode), so add some self-documentation.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/trunk-buildconf-noapr@1780470 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/buildconf b/buildconf
index 01c1c60d302..bf115a532a0 100755
--- a/buildconf
+++ b/buildconf
@@ -39,25 +39,71 @@ apu_src_dir=""
 
 while test $# -gt 0 
 do
-  # Normalize
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case "$1" in
-  --with-apr=*)
-  apr_src_dir=$optarg
-  ;;
-  esac
-
-  case "$1" in
-  --with-apr-util=*)
-  apu_src_dir=$optarg
-  ;;
-  esac
-
-  shift
+    # Normalize
+    case "$1" in
+    -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+    *) optarg= ;;
+    esac
+
+    case "$1" in
+    --with-apr=*)
+        apr_src_dir=$optarg
+        ;;
+
+    --with-apr-util=*)
+        apu_src_dir=$optarg
+        ;;
+
+    -h|--help)
+        cat <<EOF
+buildconf: generates the files needed to configure httpd.
+
+Usage: $0 [OPTION]...
+
+Configuration:
+  -h, --help               display this help and exit
+
+  --with-apr=SRCDIR        define a space-separated list of directories to
+                           search for the APR source code. If, instead of a
+                           directory, an apr-config executable name is passed,
+                           APR-Config Mode is enabled (see below). Defaults to
+                           "srclib/apr ../apr"
+  --with-apr-util=SRCDIR   define a space-separated list of directories to
+                           search for the APR-util source code. Defaults to the
+                           same location as the --with-apr SRCDIR, but with
+                           "apr" replaced with "apr-util" or "aprutil". Ignored
+                           in APR-Config Mode.
+
+APR-Config Mode:
+
+  When passing an apr-config executable to --with-apr, buildconf will attempt to
+  copy build scripts from various installed locations on your system instead of
+  an APR source tree. This allows you to configure httpd from source without
+  also requiring you to download the APR and/or APR-util sources.
+
+  For example:
+
+      ./buildconf --with-apr=apr-1-config
+
+  For this functionality to work reliably, you must have automake >= 1.12 and be
+  using a distribution that includes both find_apr.m4 and find_apu.m4 in the
+  --installbuilddir pointed to by apr-config.
+
+Environment variables used by buildconf:
+  AUTOCONF           autoconf executable name [autoconf]
+  AUTOMAKE           automake executable name [automake]
+  AUTOHEADER         autoheader executable name [autoheader]
+EOF
+        exit
+        ;;
+
+    *)
+        echo "unknown option $1 (try --help for usage)"
+        exit 1
+        ;;
+    esac
+
+    shift
 done
 
 #