diff --git a/polly/autoconf/aclocal.m4 b/polly/autoconf/aclocal.m4
index 0db70c1a6188..3f702b03f8ee 100644
--- a/polly/autoconf/aclocal.m4
+++ b/polly/autoconf/aclocal.m4
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 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.
diff --git a/polly/autoconf/configure.ac b/polly/autoconf/configure.ac
index 63df3588e7a6..21991572b326 100644
--- a/polly/autoconf/configure.ac
+++ b/polly/autoconf/configure.ac
@@ -127,8 +127,8 @@ AC_ARG_ENABLE(polly_gpu_codegen,
                              enableval=default)
 case "$enableval" in
   yes) AC_DEFINE([GPU_CODEGEN],[1], [Define if gpu codegen is enabled]) ;;
-  no)  AC_DEFINE([GPU_CODEGEN],[0], [Define if gpu codegen is enabled]) ;;
-  default) AC_DEFINE([GPU_CODEGEN],[0],  [Define if gpu codegen is enabled]) ;;
+  no) ;;
+  default) ;;
   *) AC_MSG_ERROR([Invalid setting for --enable-polly-gpu-codegen. Use "yes" or "no"]) ;;
 esac
 
diff --git a/polly/configure b/polly/configure
index 6e21cc7a7f35..36751e82823b 100755
--- a/polly/configure
+++ b/polly/configure
@@ -3021,12 +3021,8 @@ case "$enableval" in
   yes)
 $as_echo "#define GPU_CODEGEN 1" >>confdefs.h
  ;;
-  no)
-$as_echo "#define GPU_CODEGEN 0" >>confdefs.h
- ;;
-  default)
-$as_echo "#define GPU_CODEGEN 0" >>confdefs.h
- ;;
+  no) ;;
+  default) ;;
   *) as_fn_error $? "Invalid setting for --enable-polly-gpu-codegen. Use \"yes\" or \"no\"" "$LINENO" 5 ;;
 esac