diff --git a/configure.ac b/configure.ac
index b4f453d1..5e6261ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,17 @@
-AC_INIT([projectM], [3.1.1-rc3], [mischa@mvstg.biz], [projectM], [https://github.com/projectM-visualizer/projectm/])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
+AC_PREREQ([2.60])
+AC_INIT([projectM],[3.1.1-rc3],[https://github.com/projectM-visualizer/projectm/issues/],[projectM],[https://github.com/projectM-visualizer/projectm/])
+
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_AUX_DIR(.)
+
+#AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects tar-pax])
+AM_INIT_AUTOMAKE([foreign subdir-objects dist-bzip2])
 
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-LT_INIT
+#LT_INIT
+#AC_DISABLE_STATIC
+AC_PROG_LIBTOOL
+AC_SYS_LARGEFILE
 
 # Check if we should disable rpath.
 #
@@ -110,7 +119,6 @@ AC_ARG_ENABLE([threading],
 AS_HELP_STRING([--enable-threading], [multhreading]),
 [], [enable_threading=yes])
 AS_IF([test "x$enable_threading" = "xyes" && ! test "$EMSCRIPTEN"], [
-  m4_include([m4/autoconf-archive/ax_pthread.m4])
   AX_PTHREAD([
     AC_DEFINE([USE_THREADS], [1], [Define USE_THREADS])
     LIBS="$LIBS $PTHREAD_LIBS $PTHREAD_CFLAGS"
@@ -216,10 +224,10 @@ AM_CONDITIONAL([ENABLE_PULSEAUDIO], [test "x$enable_pulseaudio" = "xyes"])
 AM_CONDITIONAL([ENABLE_EMSCRIPTEN], [test "x$enable_emscripten" = "xyes"])
 
 
-my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits "
+#my_CFLAGS="-Wall -Wchar-subscripts -Wformat-security -Wpointer-arith -Wshadow -Wsign-compare -Wtype-limits "
 #my_CFLAGS+="-fsanitize=address -fno-omit-frame-pointer "
-my_CFLAGS+='-DDATADIR_PATH=\""$(pkgdatadir)"\" '
-my_CFLAGS+='-I$(top_srcdir)/vendor '
+my_CFLAGS='-DDATADIR_PATH=\""$(pkgdatadir)"\" '
+#my_CFLAGS+='-I$(top_srcdir)/vendor '
 AC_SUBST([my_CFLAGS])
 
 
diff --git a/src/projectM-test/Makefile.am b/src/projectM-test/Makefile.am
index 5c702143..cf2e22f4 100644
--- a/src/projectM-test/Makefile.am
+++ b/src/projectM-test/Makefile.am
@@ -11,7 +11,6 @@ ${SDL_CFLAGS}
 bin_PROGRAMS = projectM-unittest
 
 projectM_unittest_SOURCES = projectM-unittest.cpp getConfigFilename.cpp ConfigFile.h getConfigFilename.h
-projectM_unittest_LDADD =
-projectM_unittest_LDADD += ${SDL_LIBS}	../libprojectM/libprojectM.la
+projectM_unittest_LDADD = ${SDL_LIBS} ../libprojectM/libprojectM.la
 projectM_unittest_LDFLAGS = -static
 projectM_unittest_PROGRAM = projectM-unittest