Add usage function and -h/--help

diff --git a/NEWS b/NEWS
index 7d7b07fb53acd65f596683a10280602b642195f5..413185916bb265440384fd86fc6ecaf71500bc8f 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ New in version 1.20
 * Fix handling of initstepslew if no servers are listed (John Hasler)
 * Fix install rule in Makefile if chronyd is in use (Juliusz Chroboczek)
 * Replace sprintf by snprintf to remove risk of buffer overrun (John Hasler)
+* Add --help to configure script
 
 New in version 1.19
 ===================

diff --git a/configure b/configure
index 27f91386cd26d05a351ea7b42712a28a12fb8bcc..f591912cd40684752ffef40f75c8d50613c505dc 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $Header: /cvs/src/chrony/configure,v 1.29 2003/09/22 21:22:30 richard Exp $
+# $Header: /cvs/src/chrony/configure,v 1.30 2003/09/22 21:53:57 richard Exp $
 #
 # =======================================================================
 #
@@ -106,6 +106,52 @@ EOF
   echo $result
 }
 #}}}
+#{{{ usage
+usage () {
+  cat <<EOF;
+\`configure' configures tdl to adapt to many kinds of systems.
+
+Usage: ./configure [OPTION]...
+
+Defaults for the options are specified in brackets.
+
+Configuration:
+  -h, --help              display this help and exit
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+                          [/usr/local]
+
+By default, \`make install' will install all the files in
+\`/usr/local/bin', \`/usr/local/lib' etc.  You can specify
+an installation prefix other than \`/usr/local' using \`--prefix',
+for instance \`--prefix=$HOME'.
+
+For better control, use the options below.
+  --disable-readline     Don't try to use GNU readline
+  --readline-dir=DIR     Specify parent of readline include and lib directories
+  --readline-inc-dir=DIR Specify where readline include directory is
+  --readline-lib-dir=DIR Specify where readline lib directory is
+  --with-ncurses-library=DIR Specify where ncurses lib directory is
+
+Fine tuning of the installation directories:
+  --infodir=DIR          info documentation [PREFIX/info]
+  --mandir=DIR           man documentation [PREFIX/man]
+
+Some influential environment variables:
+  CC          C compiler command
+  CFLAGS      C compiler flags
+  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
+              nonstandard directory <lib dir>
+
+Use these variables to override the choices made by \`configure' or to help
+it to find libraries and programs with nonstandard names/locations.
+
+Report bugs to <rc@rc0.org.uk>.
+EOF
+
+}
+#}}}
 
 # ======================================================================
 
@@ -160,6 +206,10 @@ do
     --mandir=* )
       SETMANDIR=`echo $option | sed -e 's/^.*=//;'`
     ;;
+    --help | -h )
+      usage
+      exit 0
+    ;;
     * )
     echo "Unrecognized option : " $option
     esac
@@ -311,3 +361,6 @@ sed -e "s%@EXTRA_OBJECTS@%${EXTRA_OBJECTS}%;\
        s%@INFODIR@%${INFODIR}%;"\
        < Makefile.in > Makefile
 
+# =======================================================================
+# vim:et:sw=2:ht=2:sts=2:fdm=marker:cms=#%s
+