diff --git a/src/native/Makefile.am b/src/native/Makefile.am
index 6f93f28f..bd514d35 100644
--- a/src/native/Makefile.am
+++ b/src/native/Makefile.am
@@ -1,7 +1,6 @@
 #SUBDIRS = common linux
 
 lib_LTLIBRARIES = liblwjgl.la
-liblwjgl_la_SOURCES = dummy.c
-liblwjgl_la_LINK=$(CXXLINK)
-#liblwjgl_la_LINK=g++ -shared -o $@
+liblwjgl_la_SOURCES = dummy.cpp
 #liblwjgl_la_LIBADD = common/libcommon.la linux/liblinux.la
+#liblwjgl_la_DEPENDENCIES = common/libcommon.la linux/liblinux.la
diff --git a/src/native/autogen.sh b/src/native/autogen.sh
index fc3cc728..ab195836 100755
--- a/src/native/autogen.sh
+++ b/src/native/autogen.sh
@@ -1,9 +1,5 @@
-#export WANT_AUTOCONF_2_5=1
-#WANT_AUTOMAKE_1_5=1
-
-#autoheader linux
 aclocal
 autoheader
-libtoolize --force
-autoconf
+libtoolize --automake
 automake --foreign --include-deps --add-missing --copy
+autoconf
diff --git a/src/native/configure.in b/src/native/configure.in
index 86f0b756..026342a4 100644
--- a/src/native/configure.in
+++ b/src/native/configure.in
@@ -7,19 +7,18 @@ AM_INIT_AUTOMAKE(LWJGL, 0.7)
 AC_CONFIG_SRCDIR([dummy.cpp])
 AM_CONFIG_HEADER([config.h])
 
-AC_DISABLE_STATIC
+#AC_DISABLE_STATIC
 AC_LIBTOOL_DLOPEN
 
 # Checks for programs.
 AC_PROG_CC
-AC_PROG_CPP
 AC_PROG_CXX
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
-AC_PROG_LIBTOOL 
 
-#AC_REQUIRE_CPP
+CC=$CXX
+AC_PROG_LIBTOOL 
 
 case "$host_os" in
         darwin*)        _BUILD_FLAG="-D_AGL"