[PATCH] Adjust include locations so that the Speech Dispatcher driver builds against newer Speech Dispatcher versions

[Luke Yelavich]

---
 Drivers/Speech/SpeechDispatcher/Makefile.in | 2 +-
 configure.ac                                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Drivers/Speech/SpeechDispatcher/Makefile.in b/Drivers/Speech/SpeechDispatcher/Makefile.in
index e7eb2ec..8b6e5f4 100644
--- a/Drivers/Speech/SpeechDispatcher/Makefile.in
+++ b/Drivers/Speech/SpeechDispatcher/Makefile.in
@@ -25,5 +25,5 @@ SPK_OBJS = @speech_libraries_sd@
 include $(SRC_TOP)speech.mk
 
 speech.$O:
-	$(CC) $(SPK_CFLAGS) -I$(SPEECHD_ROOT)/include -c $(SRC_DIR)/speech.c
+	$(CC) $(SPK_CFLAGS) -I$(SPEECHD_ROOT)/include/speech-dispatcher -c $(SRC_DIR)/speech.c
 
diff --git a/configure.ac b/configure.ac
index 0795dd8..91ec0bd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1631,7 +1631,7 @@ BRLTTY_ARG_DISABLE(
    BRLTTY_SPEECH_DRIVER([fv], [Festival])
    BRLTTY_SPEECH_DRIVER([gs], [GenericSay])
    BRLTTY_IF_PACKAGE([Mikropuhe], [mikropuhe], [mpwrfile.h], [BRLTTY_IF_PTHREADS([BRLTTY_SPEECH_DRIVER([mp], [Mikropuhe], [-L$(MPLINUX_ROOT) -lmplinux])])])
-   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-L$(SPEECHD_ROOT)/lib -lspeechd])])
+   BRLTTY_IF_PACKAGE([speech-dispatcher], [speechd], [include/speech-dispatcher/libspeechd.h], [BRLTTY_SPEECH_DRIVER([sd], [SpeechDispatcher], [-L$(SPEECHD_ROOT)/lib -lspeechd])])
    BRLTTY_IF_PACKAGE([Swift], [swift], [include/swift.h], [BRLTTY_SPEECH_DRIVER([sw], [Swift], [-L$(SWIFT_ROOT)/lib -lswift -lm])])
    BRLTTY_IF_PACKAGE([Theta], [theta], [include/theta.h], [BRLTTY_SPEECH_DRIVER([th], [Theta], [-L$(THETA_ROOT)/lib -ltheta])])
    BRLTTY_IF_PACKAGE([ViaVoice], [viavoice], [include/eci.h], [BRLTTY_SPEECH_DRIVER([vv], [ViaVoice], [-L$(VIAVOICE_ROOT)/lib -libmeci50])])
-- 
2.1.4


--wRRV7LY7NUeQGEoC--