More build system fixes, everything now builds against the local copy if toplevel scripts are used.
git-svn-id: http://svn.drobilla.net/lad/patchage@158 a436a847-0d15-0410-975c-d299462d15a1
This commit is contained in:
parent
9cda9f66a4
commit
af94beec1b
32
configure.ac
32
configure.ac
|
@ -5,10 +5,9 @@ AC_CONFIG_SRCDIR([src/main.cpp])
|
||||||
AC_CONFIG_HEADER([config.h])
|
AC_CONFIG_HEADER([config.h])
|
||||||
AM_INIT_AUTOMAKE
|
AM_INIT_AUTOMAKE
|
||||||
|
|
||||||
# Checks for compilers
|
AC_LANG([C++])
|
||||||
AC_PROG_CXX
|
|
||||||
|
|
||||||
# Check other stuff..
|
AC_PROG_CXX
|
||||||
AC_TYPE_SIZE_T
|
AC_TYPE_SIZE_T
|
||||||
AC_CHECK_FUNCS([strerror])
|
AC_CHECK_FUNCS([strerror])
|
||||||
|
|
||||||
|
@ -21,8 +20,6 @@ PKG_CHECK_MODULES(RAUL, raul >= 0.0.0)
|
||||||
|
|
||||||
# Check for FlowCanvas
|
# Check for FlowCanvas
|
||||||
PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas >= 0.1.0)
|
PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas >= 0.1.0)
|
||||||
AC_SUBST(FLOWCANVAS_CFLAGS)
|
|
||||||
AC_SUBST(FLOWCANVAS_LIBS)
|
|
||||||
|
|
||||||
# Check for Jack
|
# Check for Jack
|
||||||
PKG_CHECK_MODULES(JACK, jack >= 0.100.0)
|
PKG_CHECK_MODULES(JACK, jack >= 0.100.0)
|
||||||
|
@ -61,8 +58,6 @@ if test "$build_lash" = "yes"; then
|
||||||
fi
|
fi
|
||||||
if test "$have_lash" = "yes"; then
|
if test "$have_lash" = "yes"; then
|
||||||
AC_DEFINE(HAVE_LASH, 1, [Has lash.h])
|
AC_DEFINE(HAVE_LASH, 1, [Has lash.h])
|
||||||
AC_SUBST(LASH_CFLAGS)
|
|
||||||
AC_SUBST(LASH_LIBS)
|
|
||||||
else
|
else
|
||||||
AC_MSG_WARN([LASH not found, session support will not be built.])
|
AC_MSG_WARN([LASH not found, session support will not be built.])
|
||||||
fi
|
fi
|
||||||
|
@ -98,22 +93,21 @@ fi
|
||||||
CXXFLAGS="$CXXFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line"
|
CXXFLAGS="$CXXFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line"
|
||||||
CFLAGS="$CFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line"
|
CFLAGS="$CFLAGS -pipe -Wall -fmessage-length=139 -fdiagnostics-show-location=every-line"
|
||||||
|
|
||||||
# Check for GTKMM
|
|
||||||
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4)
|
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4)
|
||||||
AC_SUBST(GTKMM_CFLAGS)
|
|
||||||
AC_SUBST(GTKMM_LIBS)
|
|
||||||
|
|
||||||
# Check for gnomecanvasmm
|
|
||||||
PKG_CHECK_MODULES(GNOMECANVASMM, libgnomecanvasmm-2.6)
|
PKG_CHECK_MODULES(GNOMECANVASMM, libgnomecanvasmm-2.6)
|
||||||
AC_SUBST(GNOMECANVASMM_CFLAGS)
|
|
||||||
AC_SUBST(GNOMECANVASMM_LIBS)
|
|
||||||
|
|
||||||
# Check for libglademm
|
|
||||||
PKG_CHECK_MODULES(LIBGLADEMM, libglademm-2.4)
|
PKG_CHECK_MODULES(LIBGLADEMM, libglademm-2.4)
|
||||||
AC_SUBST(LIBGLADEMM_CFLAGS)
|
|
||||||
AC_SUBST(LIBGLADEMM_LIBS)
|
|
||||||
|
|
||||||
# Write it!
|
|
||||||
AC_CONFIG_FILES([Makefile])
|
AC_CONFIG_FILES([Makefile])
|
||||||
AC_CONFIG_FILES([src/Makefile])
|
AC_CONFIG_FILES([src/Makefile])
|
||||||
|
|
||||||
AC_OUTPUT
|
AC_OUTPUT
|
||||||
|
|
||||||
|
AC_MSG_RESULT([])
|
||||||
|
AC_MSG_RESULT([**********************************************************************])
|
||||||
|
AC_MSG_RESULT([Patchage build configuration:])
|
||||||
|
AC_MSG_RESULT([])
|
||||||
|
AC_MSG_RESULT([Alsa support: $ALSA_FOUND])
|
||||||
|
AC_MSG_RESULT([Lash support: $have_lash])
|
||||||
|
AC_MSG_RESULT([**********************************************************************])
|
||||||
|
AC_MSG_RESULT([])
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <boost/shared_ptr.hpp>
|
#include <boost/shared_ptr.hpp>
|
||||||
#include <jack/jack.h>
|
#include <jack/jack.h>
|
||||||
#include "Mutex.h"
|
#include <raul/Mutex.h>
|
||||||
#include "Driver.h"
|
#include "Driver.h"
|
||||||
class Patchage;
|
class Patchage;
|
||||||
class PatchageFlowCanvas;
|
class PatchageFlowCanvas;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@
|
AM_CXXFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @JACK_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@
|
||||||
patchage_LDADD = @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@
|
patchage_LDADD = @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @JACK_LIBS@ @ALSA_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_CFLAGS@
|
||||||
|
|
||||||
EXTRA_DIST = patchage.gladep
|
EXTRA_DIST = patchage.gladep
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue