[llvm-commits] [llvm] r57269 - in /llvm/branches/release_24: autoconf/configure.ac configure

[Tanya Lattner]

Author: tbrethou
Date: Tue Oct  7 17:34:35 2008
New Revision: 57269

URL: http://llvm.org/viewvc/llvm-project?rev=57269&view=rev
Log:
Merge from mainline.

Modified:
    llvm/branches/release_24/autoconf/configure.ac
    llvm/branches/release_24/configure

Modified: llvm/branches/release_24/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/autoconf/configure.ac?rev=57269&r1=57268&r2=57269&view=diff

==============================================================================
--- llvm/branches/release_24/autoconf/configure.ac (original)
+++ llvm/branches/release_24/autoconf/configure.ac Tue Oct  7 17:34:35 2008
@@ -872,7 +872,7 @@
   llvmgccmajvers=[`echo $llvmgccversion | sed 's/^\([0-9]\).*/\1/'`]
   AC_SUBST(LLVMGCC_VERSION,$llvmgccversion)
   AC_SUBST(LLVMGCC_MAJVERS,$llvmgccmajvers)
-  llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'`]
+  llvmgcclangs=[`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`]  
   AC_SUBST(LLVMGCC_LANGS,$llvmgcclangs)
   AC_MSG_RESULT([ok])
 fi

Modified: llvm/branches/release_24/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_24/configure?rev=57269&r1=57268&r2=57269&view=diff

==============================================================================
--- llvm/branches/release_24/configure (original)
+++ llvm/branches/release_24/configure Tue Oct  7 17:34:35 2008
@@ -34246,7 +34246,7 @@
 
   LLVMGCC_MAJVERS=$llvmgccmajvers
 
-  llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ -]*\).*/\1/'`
+  llvmgcclangs=`"$LLVMGCC" -v --help 2>&1 | grep '^Configured with:' | sed 's/^.*--enable-languages=\([^ ]*\).*/\1/'`
   LLVMGCC_LANGS=$llvmgcclangs
 
   { echo "$as_me:$LINENO: result: ok" >&5