ooo-build r13729 - trunk

[jannieuw svn gnome org]

Author: jannieuw
Date: Fri Aug 29 14:37:13 2008
New Revision: 13729
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13729&view=rev

Log:
2008-08-29  Jan Nieuwenhuizen  <janneke gnu org>

	* autogen.sh: Also requote new arguments.  Fixes use of spaces
	in new arguments.


Modified:
   trunk/ChangeLog
   trunk/autogen.sh

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Fri Aug 29 14:37:13 2008
@@ -11,26 +11,16 @@
     exit 1;
 fi
 
-for arg in "$@"; do
-    case "$arg" in
-	*' '*)
+requote_args ()
+{
+    sed -e 's/.*configure //' -e 's/=\(\([^"'"'"'-]\|-[^-]\| \)*\)\( \|$\)/="\1" /g'
+}
 
-	    echo '
-
-This autogen.sh script does not handle command-line arguments
-containing spaces correctly. So if you need to pass such arguments on
-to the configure script that autogen.sh produces, you should run
-autogen.sh first without arguments, then run ./configure with the
-arguments you want.'
-
-	    exit 1
-	    ;;
-    esac
-done
+new_args=`echo $@ | requote_args`
 
 old_args=""
 if test $# -eq 0 && test -f config.log; then
-    old_args=`grep '\$ ./configure' config.log | sed -e 's/.*configure //' -e 's/=\(\([^"'"'"'-]\|-[^-]\| \)*\)\( \|$\)/="\1" /g'`
+    old_args=`grep '\$ ./configure' config.log | requote_args`
     echo "re-using arguments from last configure: $old_args";
 fi
 
@@ -39,7 +29,7 @@
 # intltoolize --copy --force --automake
 autoconf || exit 1;
 if test "x$NOCONFIGURE" = "x"; then
-    eval `echo ./configure "$@" $old_args`
+    eval `echo ./configure $new_args $old_args`
 else
     echo "Skipping configure process."
 fi