Fix:Build:Correctly build modules when plugins are disabled

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3266 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/speech/cmdline/Makefile.am b/navit/navit/speech/cmdline/Makefile.am
index ac1d7aa..4597bd9 100644 (file)
--- a/navit/navit/speech/cmdline/Makefile.am
+++ b/navit/navit/speech/cmdline/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_cmdline
+if PLUGINS
 modulespeech_LTLIBRARIES = libspeech_cmdline.la
+else
+noinst_LTLIBRARIES = libspeech_cmdline.la
+endif
 libspeech_cmdline_la_SOURCES = speech_cmdline.c
 libspeech_cmdline_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@

diff --git a/navit/navit/speech/espeak/Makefile.am b/navit/navit/speech/espeak/Makefile.am
index 1bdeb38..b48150a 100644 (file)
--- a/navit/navit/speech/espeak/Makefile.am
+++ b/navit/navit/speech/espeak/Makefile.am
@@ -1,5 +1,9 @@
 include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=speech_espeak
+if PLUGINS
 modulespeech_LTLIBRARIES = libspeech_espeak.la
+else
+noinst_LTLIBRARIES = libspeech_espeak.la
+endif
 libspeech_espeak_la_SOURCES = speak.c 
 libspeech_espeak_la_LDFLAGS = -module -avoid-version @NAVIT_MODULE_LDFLAGS@ -L$(top_builddir)/navit/support/espeak -lsupport_espeak -Wl,-lwinmm