diff --git a/Makefile.am b/Makefile.am
index 1d338ab19..dda1048fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1 @@
-ACLOCAL_AMFLAGS = -I mk/autoconf
 SUBDIRS=src Extras Demos/OpenGL Demos/BasicDemo Demos/VehicleDemo Demos/CcdPhysicsDemo Demos/ColladaDemo Demos/MultiThreadedDemo
diff --git a/autogen.sh b/autogen.sh
index b3ded4862..017a14d4d 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -22,6 +22,14 @@ else
 	exit $rc
 fi
 
+if test $rc -eq 0; then
+	echo "libtool worked."
+else
+	echo "libtool failed. trying glibtool."
+	glibtoolize --force --automake --copy
+	rc=$?
+fi
+
 if test $rc -eq 0; then
 	echo "running automake"
 	automake --add-missing --copy
diff --git a/config.h.in b/config.h.in
index cee30e48f..6c30c429a 100644
--- a/config.h.in
+++ b/config.h.in
@@ -1,5 +1,14 @@
 /* config.h.in.  Generated from configure.ac by autoheader.  */
 
+/* Architecture is PowerPC */
+#undef ARCH_PPC
+
+/* Architecture is x86 */
+#undef ARCH_X86
+
+/* Architecture is x86-64 */
+#undef ARCH_X86_64
+
 /* Define when compiling for MacOS/X */
 #undef CS_PLATFORM_MACOSX
 
@@ -69,12 +78,25 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
+/* Platform is Apple */
+#undef PLATFORM_APPLE
+
+/* Platform is Linux */
+#undef PLATFORM_LINUX
+
+/* Platform is Win32 */
+#undef PLATFORM_WIN32
+
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 
 /* Version number of package */
 #undef VERSION
 
+/* Define to 1 if your processor stores words with the most significant byte
+   first (like Motorola and SPARC, unlike Intel and VAX). */
+#undef WORDS_BIGENDIAN
+
 /* Define to 1 if the X Window System is missing or not being used. */
 #undef X_DISPLAY_MISSING
 
diff --git a/configure.ac b/configure.ac
index a3515a657..78dece28a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,7 +35,7 @@ case "$host" in
                 ;;
         *-*-darwin*)
                 AC_DEFINE(PLATFORM_APPLE, 1, [Platform is Apple])
-                opengl_LIBS="-framework AGL -framework OpenGL"
+                opengl_LIBS="-framework AGL -framework OpenGL -framework GLUT"
                 PLATFORM_STRING="Apple"
                 ;;
         *)