Remove gxs CONFIG, it's always enabled now anyways

libretroshare/src/libretroshare.pro

@@ -7,11 +7,6 @@ CONFIG -= qt
 TARGET = retroshare
 TARGET_PRL = libretroshare
 
-
-#GXS Stuff.
-# This should be disabled for releases until further notice.
-CONFIG += gxs 
-
 #CONFIG += dsdv
 
 profiling {
@@ -696,12 +691,10 @@ SOURCES +=	zeroconf/p3zcnatassist.cc \
 
 # new gxs cache system
 # this should be disabled for releases until further notice.
-gxs {
+DEFINES *= SQLITE_HAS_CODEC
-	DEFINES *= RS_ENABLE_GXS
+DEFINES *= GXS_ENABLE_SYNC_MSGS
-	DEFINES *= SQLITE_HAS_CODEC
-	DEFINES *= GXS_ENABLE_SYNC_MSGS
 
-	HEADERS += serialiser/rsnxsitems.h \
+HEADERS += serialiser/rsnxsitems.h \
 	gxs/rsgds.h \
 	gxs/rsgxs.h \
 	gxs/rsdataservice.h \
@@ -727,7 +720,7 @@ gxs {
 	gxs/rsgxsrequesttypes.h
 
 
-	SOURCES += serialiser/rsnxsitems.cc \
+SOURCES += serialiser/rsnxsitems.cc \
 	gxs/rsdataservice.cc \
 	gxs/rsgenexchange.cc \
 	gxs/rsgxsnetservice.cc \
@@ -744,81 +737,80 @@ gxs {
 	gxs/rsgxsrequesttypes.cc
 
 
-	# Identity Service
+# Identity Service
-	HEADERS += retroshare/rsidentity.h \
+HEADERS += retroshare/rsidentity.h \
 	gxs/rsgixs.h \
 	services/p3idservice.h \
 	serialiser/rsgxsiditems.h \
 	services/p3gxsreputation.h \
 	serialiser/rsgxsreputationitems.h \
 
-	SOURCES += services/p3idservice.cc \
+SOURCES += services/p3idservice.cc \
 	serialiser/rsgxsiditems.cc \
 	services/p3gxsreputation.cc \
 	serialiser/rsgxsreputationitems.cc \
 
-	# GxsCircles Service
+# GxsCircles Service
-	HEADERS += services/p3gxscircles.h \
+HEADERS += services/p3gxscircles.h \
 	serialiser/rsgxscircleitems.h \
 	retroshare/rsgxscircles.h \
 
-	SOURCES += services/p3gxscircles.cc \
+SOURCES += services/p3gxscircles.cc \
 	serialiser/rsgxscircleitems.cc \
 
-	# GxsForums Service
+# GxsForums Service
-	HEADERS += retroshare/rsgxsforums.h \
+HEADERS += retroshare/rsgxsforums.h \
 	services/p3gxsforums.h \
 	serialiser/rsgxsforumitems.h
 
-	SOURCES += services/p3gxsforums.cc \
+SOURCES += services/p3gxsforums.cc \
 	serialiser/rsgxsforumitems.cc \
 
-	# GxsChannels Service
+# GxsChannels Service
-	HEADERS += retroshare/rsgxschannels.h \
+HEADERS += retroshare/rsgxschannels.h \
 	services/p3gxschannels.h \
 	services/p3gxscommon.h \
 	serialiser/rsgxscommentitems.h \
 	serialiser/rsgxschannelitems.h \
 
-	SOURCES += services/p3gxschannels.cc \
+SOURCES += services/p3gxschannels.cc \
 	services/p3gxscommon.cc \
 	serialiser/rsgxscommentitems.cc \
 	serialiser/rsgxschannelitems.cc \
 
-	# Wiki Service
+# Wiki Service
-	HEADERS += retroshare/rswiki.h \
+HEADERS += retroshare/rswiki.h \
 	services/p3wiki.h \
 	serialiser/rswikiitems.h
 
-	SOURCES += services/p3wiki.cc \
+SOURCES += services/p3wiki.cc \
 	serialiser/rswikiitems.cc \
 
-	# Wire Service
+# Wire Service
-	HEADERS += retroshare/rswire.h \
+HEADERS += retroshare/rswire.h \
 	services/p3wire.h \
 	serialiser/rswireitems.h
 
-	SOURCES += services/p3wire.cc \
+SOURCES += services/p3wire.cc \
 	serialiser/rswireitems.cc \
 
-	# Posted Service
+# Posted Service
-	HEADERS += services/p3postbase.h \
+HEADERS += services/p3postbase.h \
 	services/p3posted.h \
 	retroshare/rsposted.h \
 	serialiser/rsposteditems.h
 
-	SOURCES +=  services/p3postbase.cc \ 
+SOURCES +=  services/p3postbase.cc \
 	services/p3posted.cc \
 	serialiser/rsposteditems.cc
 
-	#Photo Service
+#Photo Service
-	HEADERS += services/p3photoservice.h \
+HEADERS += services/p3photoservice.h \
 	retroshare/rsphoto.h \
 	serialiser/rsphotoitems.h \
 
-	SOURCES += services/p3photoservice.cc \
+SOURCES += services/p3photoservice.cc \
 	serialiser/rsphotoitems.cc \
-}
 
 
 
@@ -858,6 +850,3 @@ test_bitdht {
 
 	# ENABLED UDP NOW.
 }
-
-
-

retroshare-gui/src/retroshare-gui.pro

@@ -30,10 +30,6 @@ CONFIG += gxschannels
 CONFIG += posted
 CONFIG += gxsgui
 
-# Gxs is always enabled now.
-
-DEFINES += RS_ENABLE_GXS
-
 # Other Disabled Bits.
 #CONFIG += framecatcher
 #CONFIG += blogs

retroshare-nogui/src/retroshare-nogui.pro

@@ -10,10 +10,6 @@ CONFIG += webui
 CONFIG -= qt xml gui
 CONFIG += link_prl
 
-# if you are linking against the libretroshare with gxs.
-# this option links against the required sqlite library.
-CONFIG += gxs
-
 #CONFIG += debug
 debug {
         QMAKE_CFLAGS -= -O2

retroshare.pri

@@ -1,3 +1,6 @@
+# Gxs is always enabled now.
+DEFINES *= RS_ENABLE_GXS
+
 unix {
 	isEmpty(PREFIX)   { PREFIX   = "/usr" }
 	isEmpty(BIN_DIR)  { BIN_DIR  = "$${PREFIX}/bin" }