* Tools/speech/GNUmakefile,

* configure.ac: Give up on dynamic library detecion.
* configure: Regnerate
This commit is contained in:
fredkiefer 2018-01-29 18:37:19 +01:00
parent 94289c1636
commit b17b443266
4 changed files with 12 additions and 12 deletions

View file

@ -1,3 +1,9 @@
2018-01-29 Fred Kiefer <FredKiefer@gmx.de>
* Tools/speech/GNUmakefile,
* configure.ac: Give up on dynamic library detecion.
* configure: Regnerate
2018-01-29 Fred Kiefer <FredKiefer@gmx.de>
* configure.ac: Correct last commit.

View file

@ -19,7 +19,11 @@ GSSpeechServer_OBJC_FILES = \
GSSpeechSynthesizer.m \
main.m
ifeq ($(GSSPEECHENGINE), Flite)
FLITE_BASE_LIBS = -lflite_usenglish -lflite_cmulex -lflite
FLITE_EXTRA_LIBS = -lflite_cmu_us_kal16
GSSpeechServer_OBJC_FILES += FliteSpeechEngine.m
GSSpeechServer_INCLUDE_DIRS += -I/usr/local/include/flite -I../../Headers \
-I../../Headers/Additions

8
configure vendored
View file

@ -635,8 +635,6 @@ GSCUPS_LIBS
GSCUPS_LDFLAGS
GSCUPS_CFLAGS
have_cups
FLITE_EXTRA_LIBS
FLITE_BASE_LIBS
BUILD_SPEECH
BUILD_SOUND
HAVE_ICU
@ -5630,16 +5628,12 @@ else
have_kal16=no
fi
if test $have_kal16 = yes; then
FLITE_EXTRA_LIBS="-lflite_cmu_us_kal16"
else
if test $have_kal16 = no; then
BUILD_SPEECH=
fi
fi
#--------------------------------------------------------------------
# Find CUPS
#--------------------------------------------------------------------

View file

@ -530,15 +530,11 @@ if test $have_flite = yes -a $have_speech = yes -a $enable_speech = yes; then
BUILD_SPEECH="speech say"
FLITE_BASE_LIBS="-lflite_usenglish -lflite_cmulex -lflite"
AC_CHECK_LIB(flite_cmu_us_kal16, register_cmu_us_kal16, have_kal16=yes, have_kal16=no, $FLITE_BASE_LIBS)
if test $have_kal16 = yes; then
FLITE_EXTRA_LIBS="-lflite_cmu_us_kal16"
else
if test $have_kal16 = no; then
BUILD_SPEECH=
fi
fi
AC_SUBST(BUILD_SPEECH)
AC_SUBST(FLITE_BASE_LIBS)
AC_SUBST(FLITE_EXTRA_LIBS)
#--------------------------------------------------------------------
# Find CUPS