diff options
| -rw-r--r-- | configure.ac | 35 | ||||
| -rw-r--r-- | src/progs/ingenuity/Makefile.am | 4 | ||||
| -rw-r--r-- | src/progs/patch_loader/Makefile.am | 4 | ||||
| -rw-r--r-- | src/progs/server/Makefile.am | 2 |
4 files changed, 9 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 83c2b189..1f9ce7eb 100644 --- a/configure.ac +++ b/configure.ac @@ -33,8 +33,6 @@ AC_HEADER_DIRENT # Check for liblo PKG_CHECK_MODULES(LOSC, liblo >= 0.22) -AC_SUBST(LOSC_LIBS) -AC_SUBST(LOSC_CFLAGS) # Check for pthreads AC_CHECK_LIB(pthread, pthread_create, [], @@ -53,8 +51,6 @@ if test "$build_lash" = "yes"; then fi if test "$build_lash" = "yes"; then AC_DEFINE(HAVE_LASH, 1, [Has lash.h]) - AC_SUBST(LASH_CFLAGS) - AC_SUBST(LASH_LIBS) else AC_MSG_WARN([LASH not found, session support will not be built.]) fi @@ -223,8 +219,6 @@ if test "$build_server" = "yes" -o "$monolothic_ingenuity"; then # Check for Jack PKG_CHECK_MODULES(JACK, jack >= 0.99.0) - AC_SUBST(JACK_LIBS) - AC_SUBST(JACK_CFLAGS) # Check for Jack MIDI if test "$build_jack_midi" = "yes"; then @@ -238,8 +232,6 @@ if test "$build_server" = "yes" -o "$monolothic_ingenuity"; then # Check for ALSA if test "$build_alsa_midi" = "yes" -o "$build_dssi" = "yes"; then PKG_CHECK_MODULES(ALSA, alsa >= 1.0.0, [have_alsa_midi="yes"], [have_alsa_midi="no"]) - AC_SUBST(ALSA_CFLAGS) - AC_SUBST(ALSA_LIBS) fi if test "$build_alsa_midi" = "yes"; then @@ -266,8 +258,6 @@ if test "$build_server" = "yes" -o "$monolothic_ingenuity"; then if test "$build_lv2" = "yes"; then build_lv2="no" PKG_CHECK_MODULES(SLV2, libslv2 >= 0.0.1, [build_lv2="yes"], [build_lv2="no"]) - AC_SUBST(SLV2_CFLAGS) - AC_SUBST(SLV2_LIBS) fi if test "$build_lv2" = "yes"; then AC_DEFINE(HAVE_SLV2, 1, [Has libslv2]) @@ -313,23 +303,15 @@ if test "$build_console_clients" = "yes"; then # Check for libxml2 # FIXME: deprecated, make optional PKG_CHECK_MODULES(LXML2, libxml-2.0 >= 2.6.0) - AC_SUBST(LXML2_LIBS) - AC_SUBST(LXML2_CFLAGS) # Check for raptor (for RDF serialization) PKG_CHECK_MODULES(RAPTOR, raptor >= 0.21, build_raptor="yes", build_raptor="no") - AC_SUBST(RAPTOR_CFLAGS) - AC_SUBST(RAPTOR_LIBS) # Check for rasqal (for RDF querying) #PKG_CHECK_MODULES(RASQAL, rasqal >= 0.9.11, build_rasqal="yes", build_rasqal="no") - #AC_SUBST(RASQAL_CFLAGS) - #AC_SUBST(RASQAL_LIBS) # Check for sigc++ (FIXME: make this only necessary where.. uh.. necessary) PKG_CHECK_MODULES(LSIGCPP, sigc++-2.0) - AC_SUBST(LSIGCPP_CFLAGS) - AC_SUBST(LSIGCPP_LIBS) else AC_MSG_WARN([Console clients will be built!]) fi @@ -353,20 +335,9 @@ if test "$build_gtk_client" = "yes"; then AC_CHECK_FUNCS([gettimeofday mkdir strcasecmp strchr strdup strtol]) PKG_CHECK_MODULES(GTKMM, gtkmm-2.4) - AC_SUBST(GTKMM_CFLAGS) - AC_SUBST(GTKMM_LIBS) - PKG_CHECK_MODULES(GNOMECANVASMM, libgnomecanvasmm-2.6) - AC_SUBST(GNOMECANVASMM_CFLAGS) - AC_SUBST(GNOMECANVASMM_LIBS) - PKG_CHECK_MODULES(LIBGLADEMM, libglademm-2.4) - AC_SUBST(LIBGLADEMM_CFLAGS) - AC_SUBST(LIBGLADEMM_LIBS) - PKG_CHECK_MODULES(FLOWCANVAS, flowcanvas >= 0.1.0) - AC_SUBST(FLOWCANVAS_CFLAGS) - AC_SUBST(FLOWCANVAS_LIBS) if test "$monolithic_ingenuity" = "yes"; then AC_DEFINE(MONOLITHIC_INGENUITY, 1, [Whether to build an internal engine into Ingenuity]) @@ -402,10 +373,11 @@ AC_CONFIG_FILES([src/progs/patch_loader/Makefile]) AC_CONFIG_FILES([src/progs/ingenuity/Makefile]) AC_CONFIG_FILES([patches/Makefile]) AC_CONFIG_FILES([doc/Doxyfile]) + AC_OUTPUT -# Display summary AC_MSG_RESULT([]) +AC_MSG_RESULT([**********************************************************************]) AC_MSG_RESULT([Ingen build configuration:]) AC_MSG_RESULT([]) AC_MSG_RESULT([Building server: $build_engine]) @@ -425,5 +397,6 @@ AC_MSG_RESULT([ Monolithic: $monolithic_ingenuity]) AC_MSG_RESULT([]) AC_MSG_RESULT([]) AC_MSG_RESULT([Building with flags: $CXXFLAGS]) -AC_MSG_RESULT([]) AC_MSG_RESULT([Please note the above and see README for performance information.]) +AC_MSG_RESULT([**********************************************************************]) +AC_MSG_RESULT([]) diff --git a/src/progs/ingenuity/Makefile.am b/src/progs/ingenuity/Makefile.am index 24b818cb..85a23011 100644 --- a/src/progs/ingenuity/Makefile.am +++ b/src/progs/ingenuity/Makefile.am @@ -6,8 +6,8 @@ MAINTAINERCLEANFILES = Makefile.in sharefilesdir = $(pkgdatadir) dist_sharefiles_DATA = ingenuity.glade om-icon.png -ingenuity_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ -ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ ../../libs/client/libingenclient.la +ingenuity_CXXFLAGS = -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/client -DPKGDATADIR=\"$(pkgdatadir)\" @GTKMM_CFLAGS@ @LIBGLADEMM_CFLAGS@ @GNOMECANVASMM_CFLAGS@ @LOSC_CFLAGS@ @LASH_CFLAGS@ @FLOWCANVAS_CFLAGS@ @RAUL_CFLAGS@ +ingenuity_LDADD = @GTKMM_LIBS@ @LIBGLADEMM_LIBS@ @GNOMECANVASMM_LIBS@ @LOSC_LIBS@ @LASH_LIBS@ @FLOWCANVAS_LIBS@ @RAUL_LIBS@ ../../libs/client/libingenclient.la ingenuity_DEPENDENCIES = ../../libs/client/libingenclient.la # FIXME: make engine have a separate include dir diff --git a/src/progs/patch_loader/Makefile.am b/src/progs/patch_loader/Makefile.am index 33947a36..5b5d5db9 100644 --- a/src/progs/patch_loader/Makefile.am +++ b/src/progs/patch_loader/Makefile.am @@ -1,7 +1,7 @@ EXTRA_DIST = README -ingen_load_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common @LSIGCPP_CFLAGS@ -ingen_load_LDADD = ../../libs/client/libingenclient.la +ingen_load_CXXFLAGS = -I$(top_srcdir)/src/libs/client -I$(top_srcdir)/src/common @LSIGCPP_CFLAGS@ @RAUL_CFLAGS@ +ingen_load_LDADD = ../../libs/client/libingenclient.la @RAUL_LIBS@ @LSIGCPP_LIBS@ bin_PROGRAMS = ingen_load diff --git a/src/progs/server/Makefile.am b/src/progs/server/Makefile.am index e2a38742..9388b12a 100644 --- a/src/progs/server/Makefile.am +++ b/src/progs/server/Makefile.am @@ -1,4 +1,4 @@ -AM_CXXFLAGS = @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events +AM_CXXFLAGS = @RAUL_CFLAGS@ @JACK_CFLAGS@ @LOSC_CFLAGS@ @ALSA_CFLAGS@ @LASH_CFLAGS@ @SLV2_CFLAGS@ -I$(top_srcdir)/src/common -I$(top_srcdir)/src/libs/engine -I$(top_srcdir)/src/libs/engine/events MAINTAINERCLEANFILES = Makefile.in |