From 385c16e309ac217d38806685781c5e3813705329 Mon Sep 17 00:00:00 2001
From: "john.mccutchan" <john.mccutchan@08e121b0-ae19-0410-a57b-3be3395fd4fd>
Date: Thu, 3 Dec 2009 16:52:41 +0000
Subject: [PATCH] Remove calls to AC_PROG_CC and AC_PROG_CXX from CS_PROG_CC
 and CS_PROG_CXX because we call those functions earlier.

---
 acinclude.m4    | 2 --
 config.h.in     | 5 ++---
 configure.ac    | 2 +-
 src/Makefile.am | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 15c56c31f..6dd5738eb 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1416,7 +1416,6 @@ AC_DEFUN([CS_CHECK_TEMPLATE_TOOLKIT2],
 #-----------------------------------------------------------------------------
 AC_DEFUN([CS_PROG_CC],[
     CFLAGS="$CFLAGS" # Filter undesired flags
-    AC_PROG_CC
     AS_IF([test -n "$CC"],[
 	CS_EMIT_BUILD_PROPERTY([CMD.CC], [$CC])
 	CS_EMIT_BUILD_PROPERTY([COMPILER.CFLAGS], [$CPPFLAGS $CFLAGS], [+])
@@ -1429,7 +1428,6 @@ AC_DEFUN([CS_PROG_CC],[
 
 AC_DEFUN([CS_PROG_CXX],[
     CXXFLAGS="$CXXFLAGS" # Filter undesired flags
-    AC_PROG_CXX
     AS_IF([test -n "$CXX"],[
 	CS_EMIT_BUILD_PROPERTY([CMD.C++], [$CXX])
 
diff --git a/config.h.in b/config.h.in
index 2f10be9b4..3159f1e96 100644
--- a/config.h.in
+++ b/config.h.in
@@ -60,9 +60,8 @@
 /* Define to 1 if you have the <windows.h> header file. */
 #undef HAVE_WINDOWS_H
 
-/* Define to the sub-directory in which libtool stores uninstalled libraries.
-   */
-#undef LT_OBJDIR
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
 
 /* Name of package */
 #undef PACKAGE
diff --git a/configure.ac b/configure.ac
index acac19376..7a9e6cb84 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ CS_PACKAGEINFO(
     [http://www.bulletphysics.com])
 AC_CONFIG_SRCDIR([configure.ac])
 AM_INIT_AUTOMAKE
-AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
diff --git a/src/Makefile.am b/src/Makefile.am
index bd939eb6d..c8e20d42f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -318,7 +318,7 @@ libbulletdynamics_la_SOURCES = \
 		BulletDynamics/Vehicle/btRaycastVehicle.cpp \
 		BulletDynamics/Character/btKinematicCharacterController.cpp \
 		BulletDynamics/Character/btKinematicCharacterController.h \
-		BulletDynamics/Character/btCharacterControllerInterface.h \		
+		BulletDynamics/Character/btCharacterControllerInterface.h \
 		BulletDynamics/Dynamics/btActionInterface.h \
 		BulletDynamics/Dynamics/btContinuousDynamicsWorld.h \
 		BulletDynamics/Dynamics/btSimpleDynamicsWorld.h \