From 67c0f489bcea45314472231b2dbc20404c0b9bd5 Mon Sep 17 00:00:00 2001 From: Travis Cross Date: Thu, 17 Oct 2013 13:18:26 +0000 Subject: [PATCH] Ensure that flite gets configured before building Without this change, we would only configure flite if its Makefile did not exist. However in the tarball for flite (v1.5.4), there is a Makefile even before you run configure. So the only reason this worked at all was because make was calculating the rules to run before downloading and extracting flite. If you build flite without configuring it first, you get a flite with ALSA symbols that doesn't load in FS. In discussion with the flite guys, they indicated that the presence of the Makefile in the tarball is indeed intended. This change has the side-effect of fixing mod_flite in the Debian packages. FS-5873 --resolve --- src/mod/asr_tts/mod_flite/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mod/asr_tts/mod_flite/Makefile b/src/mod/asr_tts/mod_flite/Makefile index c93b48c1ca..360eb611e1 100644 --- a/src/mod/asr_tts/mod_flite/Makefile +++ b/src/mod/asr_tts/mod_flite/Makefile @@ -21,12 +21,12 @@ $(MODNAME).lo: $(FLITE_A) $(FLITE_DIR): $(GETLIB) $(FLITE)-current.tar.bz2 -$(FLITE_BUILDDIR)/Makefile: $(FLITE_DIR) +$(FLITE_BUILDDIR)/.stamp-configure: $(FLITE_DIR) mkdir -p $(FLITE_BUILDDIR) cd $(FLITE_BUILDDIR) && $(DEFAULT_VARS) $(FLITE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(FLITE_DIR) --with-audio=none --with-pic --disable-shared - $(TOUCH_TARGET) + test -f Makefile && touch $@ -$(FLITE_A): $(FLITE_DIR) $(FLITE_BUILDDIR)/Makefile +$(FLITE_A): $(FLITE_DIR) $(FLITE_BUILDDIR)/.stamp-configure cd $(FLITE_BUILDDIR) && $(MAKE) -j1 test -d $(FLITE_LIBDIR) || mkdir $(FLITE_LIBDIR) TARGET_OS=`grep TARGET_OS $(FLITE_BUILDDIR)/config/config | sed "s/^.*= //"` ;\