ooo-build r12164 - trunk

[jannieuw svn gnome org]

Author: jannieuw
Date: Tue Apr 15 09:14:13 2008
New Revision: 12164
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12164&view=rev

Log:
2008-04-15  Jan Nieuwenhuizen  <janneke gnu org>

	* autogen.sh (old_args): To more fixes: do not hoard
	quotes and quote arguments when invoking configure.


Modified:
   trunk/ChangeLog
   trunk/autogen.sh

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Tue Apr 15 09:14:13 2008
@@ -13,7 +13,7 @@
 
 old_args=""
 if test "z$@" = "z" && 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 | sed -e 's/.*configure //' -e 's/=\(\([^"-]\|-[-]\)*\)\( \|$\)/="\1" /g'`
     echo "re-using arguments from last configure: $old_args";
 fi
 
@@ -22,7 +22,7 @@
 # intltoolize --copy --force --automake
 autoconf || exit 1;
 if test "x$NOCONFIGURE" = "x"; then
-    ./configure "$@" $old_args
+    ./configure "$@" "$old_args"
 else
     echo "Skipping configure process."
 fi