From fdd31c3dd95a42d2666235ad8c2478b7ceead261 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Thu, 05 May 2005 22:02:55 +0000
Subject: use dependency system for flite plugins

---
diff --git a/dependencies.in b/dependencies.in
index 4c758d3..70619de 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -24,7 +24,7 @@
 
   config LIBSQLITE_DEP
     boolean "Have sqlite >= 3.0.7"
-    default n
+    default "n"
 
   config LIBSQLITE_LIB_DIR
     string "LIBSQLITE library dir"
@@ -102,3 +102,15 @@
     string "freetype2 include dir"
     depends LIBFREETYPE2_DEP
  
+  config LIBFLITE_DEP
+    boolean "Have flite library"
+    default "n"
+
+  config LIBFLITE_INC_DIR
+    string "libflite include dir"
+    depends LIBFLITE_DEP
+
+  config LIBFLITE_LIB_DIR
+    string "libflite library dir"
+    depends LIBFLITE_DEP
+
diff --git a/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro b/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
index 54927f5..5d03f91 100644
--- a/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
+++ b/noncore/apps/opie-reader/FliteDyn/FliteDyn.pro
@@ -10,9 +10,17 @@ SOURCES		= flitedyn.cpp
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/outcodecs
 TARGET		= flitedyn
-LIBS            += -L/home/tim/flite/flite-1.2-release/lib -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite
+LIBS            += -lflite_cmu_us_kal -lflite_usenglish -lflite_cmulex -lflite
 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 
 include( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBFLITE_INC_DIR ) {
+    INCLUDEPATH = $$LIBFLITE_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBFLITE_LIB_DIR ) {
+    LIBS = -L$$LIBFLITE_LIB_DIR $$LIBS
+}
+
diff --git a/noncore/apps/opie-reader/FliteDyn/config.in b/noncore/apps/opie-reader/FliteDyn/config.in
index 4a791f9..d2db3c3 100644
--- a/noncore/apps/opie-reader/FliteDyn/config.in
+++ b/noncore/apps/opie-reader/FliteDyn/config.in
@@ -1,4 +1,7 @@
   config OPIE-READER-FLITEDYN
     boolean "opie-reader flite plugin (speech output via lib in 8kHz)"
     default "n"
-    depends OPIE-READER
+    depends OPIE-READER && LIBFLITE_DEP
+    comment "opie-reader flite plugin needs libflite"
+    depends !( OPIE-READER && LIBFLITE_DEP )
+
diff --git a/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro b/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
index 0f92e49..9fb7a56 100644
--- a/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
+++ b/noncore/apps/opie-reader/FliteDyn16/FliteDyn16.pro
@@ -10,9 +10,19 @@ SOURCES		= flitedyn.cpp
 INTERFACES	= 
 DESTDIR		= $(OPIEDIR)/plugins/reader/outcodecs
 TARGET		= flitedyn
-LIBS            += -L/home/tim/flite/flite-1.2-release/lib -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite
+LIBS            += -lflite_cmu_us_kal16 -lflite_usenglish -lflite_cmulex -lflite
 
 INCLUDEPATH	+= $(OPIEDIR)/include
 DEPENDPATH      += $(OPIEDIR)/include
 
 include( $(OPIEDIR)/include.pro )
+
+!isEmpty( LIBFLITE_INC_DIR ) {
+    INCLUDEPATH = $$LIBFLITE_INC_DIR $$INCLUDEPATH
+}
+!isEmpty( LIBFLITE_LIB_DIR ) {
+    LIBS = -L$$LIBFLITE_LIB_DIR $$LIBS
+}
+
+
+
diff --git a/noncore/apps/opie-reader/FliteDyn16/config.in b/noncore/apps/opie-reader/FliteDyn16/config.in
index 869fddc..c6f73e5 100644
--- a/noncore/apps/opie-reader/FliteDyn16/config.in
+++ b/noncore/apps/opie-reader/FliteDyn16/config.in
@@ -1,4 +1,6 @@
   config OPIE-READER-FLITEDYN16
     boolean "opie-reader flite plugin (speech output via lib in 16kHz)"
     default "n"
-    depends OPIE-READER
+    depends OPIE-READER && LIBFLITE_DEP
+    comment "opie-reader flite plugin needs libflite"
+    depends !( OPIE-READER && LIBFLITE_DEP )
--
cgit v0.9.0.2