use dependency system for flite plugins

5 files changed, 40 insertions, 5 deletions

diff --git a/dependencies.in b/dependencies.in
index 4c758d3..70619de 100644
--- a/dependencies.in
+++ b/dependencies.in
@@ -1,59 +1,59 @@
   config LIBETPAN_DEP
     boolean "Have Libetpan >= 0.33pre"
     default "n"
 
   config LIBETPAN_LIB_DIR
     string "LIBETPAN library dir"
     depends LIBETPAN_DEP
 
   config LIBETPAN_INC_DIR
     string "LIBETPAN include dir"
     depends LIBETPAN_DEP
 
   config LIBPCAP_DEP
     boolean "Have libpcap >= 0.7.2"
     default "n"
 
   config LIBPCAP_LIB_DIR
     string "LIBPCAP library dir"
     depends LIBPCAP_DEP
 
   config LIBPCAP_INC_DIR
     string "LIBPCAP include dir"
     depends LIBPCAP_DEP
 
   config LIBSQLITE_DEP
     boolean "Have sqlite >= 3.0.7"
-    default n
+    default "n"
 
   config LIBSQLITE_LIB_DIR
     string "LIBSQLITE library dir"
     depends  LIBSQLITE_DEP
 
   config LIBSQLITE_INC_DIR
     string "LIBSQLITE include dir"
     depends LIBSQLITE_DEP
 
   config LIBXINE_DEP
     boolean "Have libxine >= 1.0rc6"
     default "n"
 
   config LIBXINE_LIB_DIR
     string "LIBXINE library dir"
     depends LIBXINE_DEP
 
   config LIBXINE_INC_DIR
     string "LIBXINE include dir"
     depends LIBXINE_DEP
 
   config LIBIPK_DEP
     boolean "Have libipkg >= 0.99.120"
     default "n"
 
   config LIBIPK_LIB_DIR
     string "libipkg library dir"
     depends LIBIPK_DEP
 
   config LIBIPK_INC_DIR
     string "libipkg include dir"
     depends LIBIPK_DEP
@@ -73,32 +73,44 @@
   config LIBSWORD_DEP
     boolean "Have libsword > = 1.5.0"
     default "n"
 
   config LIBSWORD_LIB_DIR
     string "libsword library dir"
     depends LIBSWORD_DEP
 
   config LIBSWORD_INC_DIR
     string "libsword include dir"
     depends LIBSWORD_DEP
 
   config LIBBLUEZ_DEP
     boolean "Have bluez library"
     default "n"
 
   config LIBBLUEZ_LIB_DIR
     string "libbluez library dir"
     depends LIBBLUEZ_DEP
 
   config LIBBLUEZ_INC_DIR
     string "libbluez include dir"
     depends LIBBLUEZ_DEP
 
   config LIBFREETYPE2_DEP
     boolean "Have freetype2"
     default "n"
 
   config LIBFREETYPE2_INC_DIR
     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
@@ -1,18 +1,26 @@
 DEFINES += OPIE USEQPE
 VPATH = ..
 TEMPLATE	= lib
 CONFIG		= qt warn_on release dll
 HEADERS		= flitedyn.h
 
 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
@@ -1,18 +1,28 @@
 DEFINES += OPIE USEQPE
 VPATH = ..
 TEMPLATE	= lib
 CONFIG		= qt warn_on release dll
 HEADERS		= flitedyn.h
 
 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 )