ooo-build r12318 - trunk

[jannieuw svn gnome org]

Author: jannieuw
Date: Thu Apr 24 09:15:24 2008
New Revision: 12318
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12318&view=rev

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

	* autogen.sh: Oops, fix -- regex to actually only quote individual
	arguments.  Remove quotes around $old_args: fixes having only
	one (distro) argument.


Modified:
   trunk/ChangeLog
   trunk/autogen.sh

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Apr 24 09:15:24 2008
@@ -13,7 +13,7 @@
 
 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 | 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