From 614e86da5d2fbfdf101fb490f49465e8572c479f Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Fri, 12 Oct 2018 23:52:29 +0200
Subject: Fix defines: WITH_X2GO_AWARENESS, WITH_OGON_AWARENESS

They are always enabled:
- Edit debian/rules
- Remove --enable-x2go or --enable-ogon line
- Run $ debuild -b -uc -us
- Check config.log e.g.

$ cat config.log | grep WITH_X2GO_AWARENESS
| #define WITH_X2GO_AWARENESS /**/
| #define WITH_X2GO_AWARENESS /**/

$ cat config.log | grep WITH_OGON_AWARENESS
| #define WITH_OGON_AWARENESS /**/
| #define WITH_OGON_AWARENESS /**/

$ cat debian/rules
..
override_dh_auto_configure:
	dh_auto_configure $(DHFLAGS) --		\
	        --disable-silent-rules		\
	        --enable-x2go			\
	        $(NULL)
---
 configure.ac | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8821ae8..16bec65 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,8 +61,7 @@ dnl enable/disable awarenesses
 AC_ARG_ENABLE([x2go],
               [AS_HELP_STRING([--enable-x2go],
                               [enable awareness of X2Go sessions])],
-              [enable_x2go=yes],
-              [enable_x2go=no])
+              [enable_x2go=yes])
 if test "x$enable_x2go" != "x"; then
     AC_DEFINE([WITH_X2GO_AWARENESS],,[Build with X2Go awareness])
 fi
@@ -70,8 +69,7 @@ fi
 AC_ARG_ENABLE([ogon],
               [AS_HELP_STRING([--enable-ogon],
                               [enable awareness of Ogon sessions])],
-              [enable_ogon=yes],
-              [enable_ogon=no])
+              [enable_ogon=yes])
 if test "x$enable_ogon" != "x"; then
     AC_DEFINE([WITH_OGON_AWARENESS],,[Build with Ogon awareness])
 fi
-- 
cgit v1.2.3


From 9f217413cdc3f58dfd8ce58dd94d7b8943f50b4b Mon Sep 17 00:00:00 2001
From: rbuj <robert.buj@gmail.com>
Date: Sat, 13 Oct 2018 10:06:48 +0200
Subject: librda_la_SOURCES: add conditional sources

---
 src/Makefile.am | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index c770c54..4cae77f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -15,10 +15,9 @@ librdainclude_HEADERS =			\
 	$(NULL)
 
 librda_la_SOURCES =			\
-	$(rda_headers)			\
 	rda.c				\
-	rda_x2go.h			\
-	rda_x2go.c			\
+	$(if WITH_X2GO_AWARENESS, rda_x2go.c) \
+	$(if WITH_OGON_AWARENESS, rda_ogon.c) \
 	$(NULL)
 
 librda_la_CFLAGS =			\
-- 
cgit v1.2.3