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