diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-02-09 22:04:04 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2015-02-09 22:04:04 +0100 |
| commit | d9dd27e74544ed616b517b0a3f0fadcc4029cf67 (patch) | |
| tree | 5be32f7194972a777d7371f23d0c2a43cb3d3b72 | |
| parent | 2c01f66a8dbad9dbb80ab83ec1fde35880bdc4f3 (diff) | |
| parent | 70d8c855a51a76c857a20d59247e89251a7e2dd5 (diff) | |
Merge branch 'master' into cliopt
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | drumgizmo/Makefile.am | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index 9ee8234..070677c 100644 --- a/configure.ac +++ b/configure.ac @@ -300,16 +300,10 @@ AS_IF( dnl dgplugindir=${libdir}/drumgizmo AC_SUBST([dgplugindir]) - INPUT_PLUGIN_DIR=${dgplugindir}/input OUTPUT_PLUGIN_DIR=${dgplugindir}/output AC_SUBST([INPUT_PLUGIN_DIR]) - AC_SUBST([OUTPUT_PLUGIN_DIR]) - - AC_DEFINE_UNQUOTED(INPUT_PLUGIN_DIR, "${libdir}/drumgizmo/input", - [Input plugin dir]) - AC_DEFINE_UNQUOTED(OUTPUT_PLUGIN_DIR, "${libdir}/drumgizmo/output", - [Output plugin dir])], + AC_SUBST([OUTPUT_PLUGIN_DIR])], [AC_MSG_RESULT([*** Command line interface disabled per user request ***]) enable_cli=no] diff --git a/drumgizmo/Makefile.am b/drumgizmo/Makefile.am index 687485d..5220ae3 100644 --- a/drumgizmo/Makefile.am +++ b/drumgizmo/Makefile.am @@ -12,7 +12,9 @@ drumgizmo_LDADD = $(DRUMGIZMO_LIBS) $(PTHREAD_LIBS) -ldl $(JACK_LIBS) drumgizmo_CXXFLAGS = $(SNDFILE_CXXFLAGS) $(PTHREAD_CFLAGS) $(EXPAT_CFLAGS) \ -I$(top_srcdir)/include -I$(top_srcdir)/src \ - -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX $(JACK_CFLAGS) $(SSEFLAGS) + -I$(top_srcdir)/hugin -DWITH_HUG_MUTEX $(JACK_CFLAGS) $(SSEFLAGS) \ + -DINPUT_PLUGIN_DIR=\"${INPUT_PLUGIN_DIR}\" \ + -DOUTPUT_PLUGIN_DIR=\"${OUTPUT_PLUGIN_DIR}\" drumgizmo_SOURCES = \ audioinputenginedl.cc \ |