diff -urN automake-1.11~/automake.in automake-1.11/automake.in
--- automake-1.11~/automake.in	2010-03-09 16:11:41.000000000 -0600
+++ automake-1.11/automake.in	2010-03-09 16:21:04.000000000 -0600
@@ -783,6 +783,25 @@
 		   'pure' => 1,
 		   'extensions' => ['.m']);
 
+# CUDA.
+register_language ('name' => 'cuda',
+		   'Name' => 'CUDA',
+		   'config_vars' => ['CUDA'],
+		   'linker' => 'CUDALINK',
+		   'link' => '$(CUDALD) $(AM_CUDAFLAGS) $(CUDAFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@',
+		   'autodep' => 'CUDA',
+		   'flags' => ['CUDAFLAGS', 'CPPFLAGS'],
+		   'compile' => '$(CUDA) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CUDAFLAGS) $(CUDAFLAGS)',
+		   'ccer' => 'CUDA',
+		   'compiler' => 'CUDACOMPILE',
+		   'compile_flag' => '-c',
+		   'output_flag' => '-o',
+		   'libtool_tag' => 'CUDA',
+		   'lder' => 'CUDALD',
+		   'ld' => '$(CUDA)',
+		   'pure' => 1,
+		   'extensions' => ['.cu']);
+
 # Unified Parallel C.
 register_language ('name' => 'upc',
 		   'Name' => 'Unified Parallel C',
@@ -5866,6 +5885,12 @@
     return &lang_sub_obj;
 }
 
+# Rewrite a single CUDA file.
+sub lang_cuda_rewrite
+{
+    return &lang_sub_obj;
+}
+
 # Rewrite a single Java file.
 sub lang_java_rewrite
 {
@@ -6334,7 +6359,8 @@
   am__fastdepCXX => 'AC_PROG_CXX',
   am__fastdepGCJ => 'AM_PROG_GCJ',
   am__fastdepOBJC => 'AC_PROG_OBJC',
-  am__fastdepUPC => 'AM_PROG_UPC'
+  am__fastdepUPC => 'AM_PROG_UPC',
+  am__fastdepCUDA => 'AM_PROG_CUDA'
   );
 
 # $COND
diff -urN automake-1.11~/lib/Automake/Variable.pm automake-1.11/lib/Automake/Variable.pm
--- automake-1.11~/lib/Automake/Variable.pm	2010-03-09 16:11:41.000000000 -0600
+++ automake-1.11/lib/Automake/Variable.pm	2010-03-08 13:47:19.000000000 -0600
@@ -188,6 +188,8 @@
    RANLIB => 'AC_PROG_RANLIB',
    UPC => 'AM_PROG_UPC',
    UPCFLAGS => 'AM_PROG_UPC',
+   CUDA => 'AM_PROG_CUDA',
+   CUDAFLAGS => 'AM_PROG_CUDA',
    YACC => 'AC_PROG_YACC',
    );
 
diff -urN automake-1.11~/lib/depcomp automake-1.11/lib/depcomp
--- automake-1.11~/lib/depcomp	2010-03-09 16:11:41.000000000 -0600
+++ automake-1.11/lib/depcomp	2010-03-09 16:05:43.000000000 -0600
@@ -1,7 +1,7 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2010-03-09.22; # UTC
 
 # Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
 # Software Foundation, Inc.
@@ -122,6 +122,41 @@
   mv "$tmpdepfile" "$depfile"
   ;;
 
+nvcc)
+## nvcc uses gcc as its backend.
+## execute  two commands, dependency and compile
+## pass preprocessor options Using -Xcompiler flags
+## if using libtool, strip off libtool command in dependency command
+  nvcc_Xcompiler="-Xcompiler \"-MT $object -MD -MP -MF $tmpdepfile\""
+  nvcc_dep=""
+  ignore=`expr "$libtool" = "yes"` # set to ignore to 1 if libtool
+  for arg; do
+      case $arg in
+	  --mode=*) ignore=0 ;; # ignore up to and including --mode
+	  -o) ignore=2 ;; # ignore -o and argument
+	  -c) nvcc_dep="$nvcc_dep $nvcc_Xcompiler -M" ;; # replace -c
+	  *) {
+               	  if test $ignore -eq 2; then
+		      ignore=0
+		  elif test $ignore -eq 0; then
+		      nvcc_dep="$nvcc_dep $arg"
+		  fi
+	      };;
+      esac
+  done
+  # dependency command, suppress output
+  eval "$nvcc_dep" > /dev/null
+  stat=$?
+  if test $stat -eq 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  mv "$tmpdepfile" "$depfile"
+  # compile command
+  "$@"
+  ;;
+
 gcc)
 ## There are various ways to get dependency output from gcc.  Here's
 ## why we pick this rather obscure method:
diff -urN automake-1.11~/m4/cuda.m4 automake-1.11/m4/cuda.m4
--- automake-1.11~/m4/cuda.m4	1969-12-31 18:00:00.000000000 -0600
+++ automake-1.11/m4/cuda.m4	2010-03-08 23:32:12.000000000 -0600
@@ -0,0 +1,34 @@
+# Find a compiler for CUDA.	            -*- Autoconf -*-
+
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+AC_DEFUN([AM_PROG_CUDA],
+[dnl We need OBJEXT and EXEEXT, but Autoconf doesn't offer any public
+dnl macro to compute them.  Use AC_PROG_CC instead.
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_ARG_VAR([CUDA], [CUDA compiler command])dnl
+AC_ARG_VAR([CUDAFLAGS], [CUDA compiler flags])dnl
+AC_ARG_VAR([CUDA_ROOT], [CUDA root])dnl
+AC_PATH_PROGS([CUDA], [nvcc], [nvcc],
+		      [CUDA_ROOT]dnl
+                      [/usr/local/cuda/cuda/bin /usr/local/cuda/bin]dnl
+		      [/opt/cuda/cuda/bin /opt/cuda/bin])
+AS_IF([test -z "$CUDA"], [AC_MSG_WARN([No CUDA compiler found.])], [
+  AS_IF([test -z "$CUDA_ROOT"], [
+    AC_MSG_CHECKING([where CUDA is installed])
+    AC_LANG(C)
+    AC_LANG_CONFTEST([AC_LANG_SOURCE([[@%:@include "cuda.h"]])])
+    cuda_h=`$CUDA -M conftest.c | sed -n -e ['s/[ \]//g;/cuda.h/p']`
+    rm -f conftest.c
+    cuda_include=`AS_DIRNAME("$cuda_h")`
+    CUDA_ROOT=`AS_DIRNAME("$cuda_include")`
+    AC_MSG_RESULT([$CUDA_ROOT])
+    AC_SUBST([CUDA_ROOT])
+  ])
+])
+_AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CUDA])])dnl
+])
diff -urN automake-1.11~/m4/depend.m4 automake-1.11/m4/depend.m4
--- automake-1.11~/m4/depend.m4	2010-03-09 16:11:41.000000000 -0600
+++ automake-1.11/m4/depend.m4	2010-03-08 13:45:53.000000000 -0600
@@ -35,6 +35,7 @@
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
        [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
+       [$1], CUDA, [depcc="$CUDA" am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
diff -urN automake-1.11~/m4/Makefile.am automake-1.11/m4/Makefile.am
--- automake-1.11~/m4/Makefile.am	2010-03-09 16:11:41.000000000 -0600
+++ automake-1.11/m4/Makefile.am	2010-03-07 20:28:23.000000000 -0600
@@ -27,6 +27,7 @@
 ccstdc.m4 \
 cond.m4 \
 cond-if.m4 \
+cuda.m4 \
 depend.m4 \
 depout.m4 \
 dmalloc.m4 \
diff -urN automake-1.11~/m4/Makefile.in automake-1.11/m4/Makefile.in
--- automake-1.11~/m4/Makefile.in	2010-03-09 16:11:41.000000000 -0600
+++ automake-1.11/m4/Makefile.in	2010-03-07 20:39:20.000000000 -0600
@@ -109,6 +109,7 @@
 PACKAGE_NAME = @PACKAGE_NAME@
 PACKAGE_STRING = @PACKAGE_STRING@
 PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PERL = @PERL@
@@ -173,6 +174,7 @@
 ccstdc.m4 \
 cond.m4 \
 cond-if.m4 \
+cuda.m4 \
 depend.m4 \
 depout.m4 \
 dmalloc.m4 \