Disable compiling of pegmarkdown by default, only used for wiki

- Move unfinished CONFIGs to common retroshare.pri file
- Compile and link pegmarkdown only if CONFIG+=wikipoos is set

RetroShare.pro

@@ -7,7 +7,6 @@ SUBDIRS += \
         libbitdht \
         libretroshare \
         libresapi \
-        pegmarkdown \
         retroshare_gui \
         retroshare_nogui \
         plugins
@@ -22,10 +21,8 @@ libretroshare.depends = openpgpsdk libbitdht
 libresapi.file = libresapi/src/libresapi.pro
 libresapi.depends = libretroshare
 
-pegmarkdown.file = supportlibs/pegmarkdown/pegmarkdown.pro
-
 retroshare_gui.file = retroshare-gui/src/retroshare-gui.pro
-retroshare_gui.depends = libretroshare libresapi pegmarkdown
+retroshare_gui.depends = libretroshare libresapi
 retroshare_gui.target = retroshare-gui
 
 retroshare_nogui.file = retroshare-nogui/src/retroshare-nogui.pro
@@ -35,3 +32,9 @@ retroshare_nogui.target = retroshare-nogui
 plugins.file = plugins/plugins.pro
 plugins.depends = retroshare_gui
 plugins.target = plugins
+
+wikipoos {
+    SUBDIRS += pegmarkdown
+    pegmarkdown.file = supportlibs/pegmarkdown/pegmarkdown.pro
+    retroshare_gui.depends += pegmarkdown
+}

retroshare-gui/src/retroshare-gui.pro

@@ -34,13 +34,6 @@ CONFIG += gxsgui
 
 DEFINES += RS_ENABLE_GXS
 
-unfinished {
-	CONFIG += gxscircles
-	CONFIG += gxsthewire
-	CONFIG += gxsphotoshare
-	CONFIG += wikipoos
-}
-
 # Other Disabled Bits.
 #CONFIG += framecatcher
 #CONFIG += blogs
@@ -80,8 +73,6 @@ linux-* {
 	LIBS += ../../libretroshare/src/lib/libretroshare.a
 	LIBS *= -lX11 -lXss
 
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-
 	#LIBS *= -lglib-2.0
 	LIBS *= -rdynamic -ldl
 	DEFINES *= HAVE_XSS # for idle time, libx screensaver extensions
@@ -199,7 +190,6 @@ win32 {
 	LIBS += ../../libretroshare/src/lib/libretroshare.a
 	LIBS += -L"$$LIBS_DIR/lib"
 
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 	LIBS += -lsqlcipher
 
 	LIBS += -lssl -lcrypto -lpthread -lminiupnpc -lz -lws2_32
@@ -245,8 +235,6 @@ macx {
 	LIBS += -framework CoreFoundation
 	LIBS += -framework Security
 
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
-
 	LIBS += ../../../lib/libsqlcipher.a
 	#LIBS += -lsqlite3
 
@@ -266,7 +254,6 @@ freebsd-* {
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
 
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 	LIBS += -lsqlite3
 }
 
@@ -284,7 +271,6 @@ openbsd-* {
 	LIBS *= -lgnome-keyring
 	PRE_TARGETDEPS *= ../../libretroshare/src/lib/libretroshare.a
 
-	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
 	LIBS += -lsqlite3
 
 	LIBS *= -rdynamic
@@ -302,6 +288,10 @@ openbsd-* {
 DEPENDPATH += . ../../libretroshare/src/
 INCLUDEPATH += ../../libretroshare/src/
 
+wikipoos {
+	LIBS += ../../supportlibs/pegmarkdown/lib/libpegmarkdown.a
+}
+
 # webinterface
 DEPENDPATH += ../../libresapi/src
 INCLUDEPATH += ../../libresapi/src

retroshare.pri

@@ -5,3 +5,10 @@ unix {
 	isEmpty(LIB_DIR)  { LIB_DIR  = "$${PREFIX}/lib" }
 	isEmpty(DATA_DIR) { DATA_DIR = "$${PREFIX}/share/RetroShare06" }
 }
+
+unfinished {
+	CONFIG += gxscircles
+	CONFIG += gxsthewire
+	CONFIG += gxsphotoshare
+	CONFIG += wikipoos
+}