X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=configure.gnu;h=f98eb7660f32e2c83668b6276e2dd378458876a2;hb=83272a45226e83bd136d713158e9b44ace2dbc8d;hp=868e45411185251f7ef8c26efc67408ff4b2b04c;hpb=774d564bb7dd1ed64ca0d7e534aa67e93f991f02;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/configure.gnu b/configure.gnu
index 868e454..f98eb76 100755
--- a/configure.gnu
+++ b/configure.gnu
@@ -27,7 +27,7 @@ case "$0" in
     if cmp $0 `echo $0 | sed -e s/configure/Configure/` >/dev/null; then
 	echo "Your configure and Configure scripts seem to be identical."
 	echo "This can happen on filesystems that aren't fully case sensitive."
-	echo "You'll have to explicitely extract Configure and run that."
+	echo "You'll have to explicitly extract Configure and run that."
 	exit 1
     fi
     ;;
@@ -40,12 +40,13 @@ while test $# -gt 0; do
 	case $1 in
     --help)
 		cat <<EOM
-Usage: configure [options]
+Usage: configure.gnu [options]
 This is GNU configure-like front end for a metaconfig-generated Configure.
 It emulates the following GNU configure options (must be fully spelled out):
 	--help
 	--no-create
 	--prefix=PREFIX
+ 	--cache-file  (ignored)
 	--quiet
 	--silent
 	--verbose
@@ -64,6 +65,9 @@ EOM
 		opts="$opts $arg"
 		shift
 		;;
+ 	--cache-file=*)
+ 		shift		# Just ignore it.
+ 		;;
 	--quiet|--silent)
 		exec >/dev/null 2>&1
 		shift
@@ -82,7 +86,7 @@ EOM
 		exit 1
 		;;
 	*)
-		opts="$opts $1"
+		opts="$opts '$1'"
 		shift
 		;;
 	esac
@@ -107,6 +111,14 @@ case "$ccflags" in
 '') ;;
 *) opts="$opts -Dccflags='$ccflags'";;
 esac
+case "$LDFLAGS" in
+'') ;;
+*) ldflags="$ldflags $LDFLAGS";;
+esac
+case "$ldflags" in
+'') ;;
+*) opts="$opts -Dldflags='$ldflags'";;
+esac
 
 # Don't use -s if they want verbose mode
 case "$verbose" in
@@ -114,7 +126,7 @@ case "$verbose" in
 *) copt="$copt -d";;
 esac
 
-set X sh Configure $copt $create $opts
+eval "set X sh Configure $copt $create $opts"
 shift
 echo "$@"
 exec "$@"