From f578e60dccf374f0dd794b462f7aed628da26a6c Mon Sep 17 00:00:00 2001 From: Chris McKenzie Date: Thu, 19 Jun 2008 00:59:02 +0000 Subject: [PATCH] (+bugfix) --help relied on writing a file to disk when there was no reason. (+bugfix) --help used POCO_BASE before it was defined. At the time of the help screen, it is known as $base. --- dist/configure | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dist/configure b/dist/configure index 1456796e9..da80cc3b2 100755 --- a/dist/configure +++ b/dist/configure @@ -12,8 +12,9 @@ # Specify --help to display supported options. # -helpfile=/tmp/config.help -cat <$helpfile +showhelp() +{ +cat << ENDHELP usage: configure {options} Configure the POCO C++ Libraries. @@ -23,14 +24,14 @@ Options: --config= Use the given build configuration. - See $POCO_BASE/build/config for possible configs. + See $base/build/config for possible configs. --prefix= Use the given install directory for make install. Default is /usr/local. --stdcxx-base= - If (and only if) the $POCO_BASE/build/config selected with --config + If (and only if) the $base/build/config selected with --config uses the Apache stdcxx library, then apache_stdcxx_install_prefix specifies the base directory where stdcxx is installed. @@ -51,6 +52,7 @@ Options: (such as uclibc-based systems). ENDHELP +} # save cwd build=`pwd` @@ -96,16 +98,13 @@ while [ "$1" != "" ] ; do fi if [ "$1" = "--help" ] ; then - cat $helpfile - rm -f $helpfile + showhelp exit 0 fi shift done -rm -f $helpfile - # autodetect build environment # ...special cases for CYGWIN or MinGW if [ "$config" = "" ] ; then