From f8b4b09e42318eed8b7cd1fe6746fa4bc542771f Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 24 Jul 2007 06:48:02 +0000 Subject: Removed recursive autohell, except for SLv2. Always build against local copies, hopefully fixing broken compilation against outdated system versions. git-svn-id: http://svn.drobilla.net/lad/patchage@610 a436a847-0d15-0410-975c-d299462d15a1 --- autogen.sh | 8 --- configure.ac | 136 -------------------------------------------------- src/JackDriver.h | 2 +- src/Makefile.am | 4 +- src/Patchage.cpp | 2 +- src/PatchageCanvas.h | 2 +- src/PatchageEvent.cpp | 2 +- src/PatchageEvent.h | 2 +- 8 files changed, 7 insertions(+), 151 deletions(-) delete mode 100755 autogen.sh delete mode 100644 configure.ac diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index 9da0b41..0000000 --- a/autogen.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -echo 'Generating necessary files...' -libtoolize --copy --force -aclocal -autoheader -automake --gnu --add-missing -autoconf diff --git a/configure.ac b/configure.ac deleted file mode 100644 index 8b367cd..0000000 --- a/configure.ac +++ /dev/null @@ -1,136 +0,0 @@ -# configure.in for patchage - -AC_INIT(patchage, 0.2.4pre, dave@drobilla.net) -AC_CONFIG_SRCDIR([src/main.cpp]) -AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE - -AC_LANG([C++]) - -AC_PROG_CXX -AC_PROG_LIBTOOL -AC_TYPE_SIZE_T -AC_CHECK_FUNCS([strerror]) - -# Check for pthreads -AC_CHECK_LIB(pthread, pthread_create, [], - AC_MSG_ERROR([*** Patchage requires POSIX threads support])) -AC_CHECK_HEADER([pthread.h]) - -PKG_CHECK_MODULES(RAUL, raul >= 0.0.0) - -# Check for FlowCanvas -PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas >= 0.1.0) - -# Check for Jack -PKG_CHECK_MODULES(JACK, jack >= 0.107.0) - -# Jack MIDI -build_jack_midi="yes" -AC_ARG_ENABLE(jack_midi, - [AS_HELP_STRING(--enable-jack-midi, [Enable Jack MIDI support (yes)])], - [ if test x$enable_jack_midi = xno ; then build_jack_midi=no ; fi ]) -if test "$build_jack_midi" = "yes"; then - AC_DEFINE(HAVE_JACK_MIDI, 1, [whether or not we have Jack MIDI]) -fi - -# Check for ALSA -build_alsa="yes" -AC_ARG_ENABLE(alsa, -[AS_HELP_STRING(--enable-alsa, [Enable Alsa MIDI driver (yes)])], - [ if test x$enable_alsa = xno ; then build_alsa=no ; fi ]) - -if test "$build_alsa" = "yes"; then - AC_CHECK_LIB(asound, snd_seq_open, ALSA_FOUND="yes", ALSA_FOUND="no", -lm -ldl -lpthread) - - if test "$ALSA_FOUND" = "yes"; then - AC_DEFINE(HAVE_ALSA, 1, [whether or not we have alsa]) - ALSA_CFLAGS="" - ALSA_LIBS="-lasound -lm -ldl -lpthread" - AC_SUBST(ALSA_CFLAGS) - AC_SUBST(ALSA_LIBS) - else - build_alsa="no" - fi -else - ALSA_FOUND="no" -fi -AM_CONDITIONAL(WITH_ALSA, test "$ALSA_FOUND" = "yes") - -# LASH config option -build_lash="yes" -AC_ARG_ENABLE(lash, - [AS_HELP_STRING(--enable-lash, [Enable LASH session management support (yes)])], - [ if test x$enable_lash = xno ; then build_lash=no ; fi ]) - -have_lash="no" -if test "$build_lash" = "yes"; then - PKG_CHECK_MODULES(LASH, lash-1.0 >= 0.5.2, have_lash="yes", have_lash="no") -fi -if test "$have_lash" = "yes"; then - AC_DEFINE(HAVE_LASH, 1, [Has lash.h]) -else - AC_MSG_WARN([LASH not found, session support will not be built.]) -fi -AM_CONDITIONAL(WITH_LASH, [test "$have_lash" = "yes"]) - - -# Check for debugging flag -debug="no" -AC_ARG_ENABLE(debug, - [AS_HELP_STRING(--enable-debug, [Enable debugging (no)])], - [debug="$enableval"]) -if test "$debug" = "yes"; then - # Useless POS gnomecanvasmm doesn't build w/ -pedantic - CFLAGS="-O0 -g -DDEBUG" - CXXFLAGS="$CFLAGS" -else - CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CFLAGS -DNDEBUG" -fi - -# Check for strict flag -strict="no" -AC_ARG_ENABLE(strict, - [AS_HELP_STRING(--enable-strict, [Enable strict compiler warnings or errors (no)])], - [strict="$enableval"]) -if test "$strict" = "yes"; then - # Useless POS gnomecanvasmm doesn't build w/ -pedantic - CFLAGS="$CFLAGS -ansi -Wall -Wextra -Wno-unused-parameter -Wconversion -Winit-self" - CXXFLAGS="$CXXFLAGS -ansi -Wall -Wextra -Wno-unused-parameter -Wconversion -Winit-self -Woverloaded-virtual -Wsign-promo" -fi - -# Boost shared_ptr debugging -pointer_debug="no" -AC_ARG_ENABLE(pointer_debug, - [AS_HELP_STRING(--enable-pointer-debug, [Enable smart pointer debugging (no)])], - [pointer_debug="$enableval"]) -if test "$pointer_debug" = "yes"; then - CFLAGS+=" -DBOOST_SP_ENABLE_DEBUG_HOOKS" - CXXFLAGS+=" -DBOOST_SP_ENABLE_DEBUG_HOOKS" -fi - -# Bolt on a few specific flags to CXXFLAGS that should always be used -CXXFLAGS="$CXXFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line" -CFLAGS="$CFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line" - -PKG_CHECK_MODULES(GTHREAD, gthread-2.0) -PKG_CHECK_MODULES(GTKMM, gtkmm-2.4) -PKG_CHECK_MODULES(GNOMECANVASMM, libgnomecanvasmm-2.6) -PKG_CHECK_MODULES(LIBGLADEMM, libglademm-2.4) - -AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([src/Makefile]) -AC_CONFIG_FILES([patchage.desktop]) - -AC_OUTPUT - -AC_MSG_RESULT([]) -AC_MSG_RESULT([**********************************************************************]) -AC_MSG_RESULT([Patchage build configuration:]) -AC_MSG_RESULT([]) -AC_MSG_RESULT([Alsa support: $build_alsa]) -AC_MSG_RESULT([Lash support: $have_lash]) -AC_MSG_RESULT([**********************************************************************]) -AC_MSG_RESULT([]) - diff --git a/src/JackDriver.h b/src/JackDriver.h index d036276..1c03972 100644 --- a/src/JackDriver.h +++ b/src/JackDriver.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include "raul/AtomicPtr.h" #include "Driver.h" class Patchage; class PatchageEvent; diff --git a/src/Makefile.am b/src/Makefile.am index b0915f1..485aec6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ -AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @GTHREAD_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@ -patchage_LDADD = @GTHREAD_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_LIBS@ +AM_CXXFLAGS = -I.. -I$(top_srcdir)/raul -I$(top_srcdir)/flowcanvas -DPKGDATADIR=\"$(pkgdatadir)\" @GTHREAD_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ +patchage_LDADD = @RAUL_LIBS@ @FLOWCANVAS_LIBS@ @GTHREAD_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ EXTRA_DIST = patchage.gladep diff --git a/src/Patchage.cpp b/src/Patchage.cpp index 8e2dd3a..b6e7f84 100644 --- a/src/Patchage.cpp +++ b/src/Patchage.cpp @@ -19,7 +19,7 @@ #include #include "Patchage.h" #include "PatchageEvent.h" -#include "../config.h" +#include "../../config/config.h" #include #include #include diff --git a/src/PatchageCanvas.h b/src/PatchageCanvas.h index 96e8912..4ac5c62 100644 --- a/src/PatchageCanvas.h +++ b/src/PatchageCanvas.h @@ -18,7 +18,7 @@ #ifndef PATCHAGECANVAS_H #define PATCHAGECANVAS_H -#include "../config.h" +#include "../../config/config.h" #include #ifdef HAVE_ALSA #include diff --git a/src/PatchageEvent.cpp b/src/PatchageEvent.cpp index 9450770..493050a 100644 --- a/src/PatchageEvent.cpp +++ b/src/PatchageEvent.cpp @@ -15,7 +15,7 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "../config.h" +#include "../../config/config.h" #include "raul/SharedPtr.h" #include "Patchage.h" #include "PatchageCanvas.h" diff --git a/src/PatchageEvent.h b/src/PatchageEvent.h index 79fb711..24dd7ba 100644 --- a/src/PatchageEvent.h +++ b/src/PatchageEvent.h @@ -20,7 +20,7 @@ #include #include -#include "../config.h" +#include "../../config/config.h" #ifdef HAVE_ALSA #include #endif -- cgit v1.2.1