[Qemacs-devel] [PATCH] configure: Fix usage on --help

[François Revol]

-h and --help didn't seem to work...

François.

Index: configure
===================================================================
RCS file: /sources/qemacs/qemacs/configure,v
retrieving revision 1.20
diff -u -r1.20 configure
--- configure   17 Dec 2013 23:17:09 -0000      1.20
+++ configure   18 Dec 2013 11:14:17 -0000
@@ -179,6 +179,41 @@
     doc="no"
 fi

+usage () {
+    cat << EOF
+
+Usage: configure [options]
+Options: [defaults in brackets after descriptions]
+
+EOF
+
+echo "Standard options:"
+echo "  --help                   print this message"
+echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
+echo "  --enable-win32           enable win32 cross compile"
+echo "  --enable-cygwin          compile for cygwin systems"
+echo "  --disable-x11            disable Xwindow support"
+echo "  --disable-xv             disable Xvideo extension support"
+echo "  --disable-xrender        disable Xrender extension support"
+echo "  --enable-tiny            build a very small version"
+echo "  --disable-html           disable graphical html support"
+echo "  --disable-png            disable png support"
+echo "  --disable-plugins        disable plugins support"
+echo "  --disable-ffmpeg         disable ffmpeg support"
+echo "  --with-ffmpegdir=DIR     find ffmpeg sources and libraries in DIR"
+echo "                           for audio/video/image support"
+echo ""
+echo "Advanced options (experts only):"
+echo "  --source-path=PATH       path of source code [$source_path]"
+echo "  --cross-prefix=PREFIX    use PREFIX for compile tools
[$cross_prefix]"
+echo "  --cc=CC                  use C compiler CC [$cc]"
+echo "  --make=MAKE              use specified make [$make]"
+echo "  --with-ffmpeglibdir=DIR  set ffmpeg object files directory"
+echo ""
+echo "NOTE: The object files are built at the place where configure is
launched"
+exit 1
+}
+
 for opt do
     value="none"
     case "$opt" in
@@ -221,6 +256,9 @@
       --enable-*)
         value="yes"
         ;;
+      --help|-h)
+        usage
+        ;;
       *)
         echo "unknown option: $opt"
         exit 1
@@ -411,41 +449,6 @@
     has_typeof="yes"
 fi

-if test x"$1" = x"-h" -o x"$1" = x"--help" ; then
-    cat << EOF
-
-Usage: configure [options]
-Options: [defaults in brackets after descriptions]
-
-EOF
-
-echo "Standard options:"
-echo "  --help                   print this message"
-echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
-echo "  --enable-win32           enable win32 cross compile"
-echo "  --enable-cygwin          compile for cygwin systems"
-echo "  --disable-x11            disable Xwindow support"
-echo "  --disable-xv             disable Xvideo extension support"
-echo "  --disable-xrender        disable Xrender extension support"
-echo "  --enable-tiny            build a very small version"
-echo "  --disable-html           disable graphical html support"
-echo "  --disable-png            disable png support"
-echo "  --disable-plugins        disable plugins support"
-echo "  --disable-ffmpeg         disable ffmpeg support"
-echo "  --with-ffmpegdir=DIR     find ffmpeg sources and libraries in DIR"
-echo "                           for audio/video/image support"
-echo ""
-echo "Advanced options (experts only):"
-echo "  --source-path=PATH       path of source code [$source_path]"
-echo "  --cross-prefix=PREFIX    use PREFIX for compile tools
[$cross_prefix]"
-echo "  --cc=CC                  use C compiler CC [$cc]"
-echo "  --make=MAKE              use specified make [$make]"
-echo "  --with-ffmpeglibdir=DIR  set ffmpeg object files directory"
-echo ""
-echo "NOTE: The object files are built at the place where configure is
launched"
-exit 1
-fi
-
 echo "Install prefix      $prefix"
 echo "Source path         $source_path"
 echo "C compiler          $cc"