[haiku-commits] haiku: hrev47574 - /

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Sat, 26 Jul 2014 11:41:10 +0200 (CEST)

hrev47574 adds 1 changeset to branch 'master'
old head: 63701e7dd54ec05141df916ddfcf1d233af1c45b
new head: 8b420c2f0af777d6dc281b11312e226ea6f5a94a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=8b420c2+%5E63701e7

----------------------------------------------------------------------------

8b420c2: Fix configure --help to not rely on gcc.
  
  * Make sure that the invocation of 'configure --help', 'configure -h' or
    just 'configure' will show the usage text and exit.

                                    [ Oliver Tappe <zooey@xxxxxxxxxxxxxxx> ]

----------------------------------------------------------------------------

Revision:    hrev47574
Commit:      8b420c2f0af777d6dc281b11312e226ea6f5a94a
URL:         http://cgit.haiku-os.org/haiku/commit/?id=8b420c2
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Sat Jul 26 09:39:30 2014 UTC

----------------------------------------------------------------------------

1 file changed, 6 insertions(+), 1 deletion(-)
configure | 7 ++++++-

----------------------------------------------------------------------------

diff --git a/configure b/configure
index 94f2c0b..2d370e0 100755
--- a/configure
+++ b/configure
@@ -482,6 +482,12 @@ is_in_list()
        return 1
 }
 
+# check for no params, --help or -h and show usage immediately
+if [ -z "$1" ] || [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
+       usage; exit 0;
+fi
+
+
 # get cwd and the source directory
 currentDir=`pwd`
 cd `dirname "$0"`
@@ -670,7 +676,6 @@ while [ $# -gt 0 ] ; do
                        shift 2
                        ;;
                --enable-multiuser)     HAIKU_ENABLE_MULTIUSER=1; shift 1;;
-               --help | -h)    usage; exit 0;;
                --host-only)    HAIKU_HOST_BUILD_ONLY=1; shift 1;;
                --include-gpl-addons)   HAIKU_INCLUDE_GPL_ADDONS=1; shift 1;;
                --include-patented-code)        HAIKU_INCLUDE_PATENTED_CODE=1; 
shift 1;;


Other related posts:

  • » [haiku-commits] haiku: hrev47574 - / - zooey