make it possible to enable speex/theora/vpx using qmake QXMPP_USE_x=1

2 files changed, 16 insertions, 11 deletions

diff --git a/qxmpp.pri b/qxmpp.pri
index 86022654..8ab72af1 100644
--- a/qxmpp.pri
+++ b/qxmpp.pri
@@ -21,8 +21,7 @@ android {
 
 } else:contains(MEEGO_EDITION,harmattan) {
     # meego/harmattan has speex for sure
-    QXMPP_INTERNAL_DEFINES += QXMPP_USE_SPEEX
-    QXMPP_INTERNAL_LIBS += -lspeex
+    QXMPP_USE_SPEEX=1
 } else:symbian {
     QXMPP_INTERNAL_INCLUDES = $$APP_LAYER_SYSTEMINCLUDE
     QXMPP_INTERNAL_LIBS = -lesock
diff --git a/src/src.pro b/src/src.pro
index 3ac4a1c5..c22bbb3e 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -10,17 +10,23 @@ DEFINES += $$QXMPP_INTERNAL_DEFINES
 INCLUDEPATH += $$QXMPP_INCLUDEPATH $$QXMPP_INTERNAL_INCLUDES
 LIBS += $$QXMPP_INTERNAL_LIBS
 
-# To enable support for the Speex audio codec, uncomment the following:
-# DEFINES += QXMPP_USE_SPEEX
-# LIBS += -lspeex
+# To enable support for the Speex audio codec, pass QXMPP_USE_SPEEX=1 to qmake.
+!isEmpty(QXMPP_USE_SPEEX) {
+    DEFINES += QXMPP_USE_SPEEX
+    LIBS += -lspeex
+}
 
-# To enable support for the Theora video codec, uncomment the following:
-# DEFINES += QXMPP_USE_THEORA
-# LIBS += -ltheoradec -ltheoraenc
+# To enable support for the Theora video codec, pass QXMPP_USE_THEORA=1 to qmake.
+!isEmpty(QXMPP_USE_THEORA) {
+    DEFINES += QXMPP_USE_THEORA
+    LIBS += -ltheoradec -ltheoraenc
+}
 
-# To enable support for the Vpx video codec, uncomment the following:
-# DEFINES += QXMPP_USE_VPX
-# LIBS += -lvpx
+# To enable support for the Vpx video codec, pass QXMPP_USE_VPX=1 to qmake.
+!isEmpty(QXMPP_USE_VPX) {
+    DEFINES += QXMPP_USE_VPX
+    LIBS += -lvpx
+}
 
 # Target definition
 TARGET = $$QXMPP_LIBRARY_NAME