summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmil Velikov <emil.l.velikov@gmail.com>2016-05-08 09:19:36 +0100
committerEmil Velikov <emil.l.velikov@gmail.com>2017-09-07 13:47:22 +0100
commit7ef9680caa8c223a09beb637e26fd3471128e6ba (patch)
treeb7c7b579b3f73a225cba3e65785864020d70f93c
parentab64a947b5de5b778f31ede9cfce386566023a14 (diff)
configure.ac: set TRANS_CLIENT/SERVER
Similar to ICE_t just set the define globally and remove the multiple definitions throughout the tree Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> (IRC)
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile.am3
-rw-r--r--src/icetrans.c3
3 files changed, 3 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac
index c971ab6..5345489 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,6 +35,8 @@ PKG_CHECK_MODULES(ICE, xproto xtrans)
# Transport selection macro from xtrans.m4
XTRANS_CONNECTION_FLAGS
AC_DEFINE(ICE_t, 1, [Xtrans transport type])
+AC_DEFINE(TRANS_CLIENT, 1, [Xtrans transport client code])
+AC_DEFINE(TRANS_SERVER, 1, [Xtrans transport server code])
# Checks for library functions.
AC_CHECK_LIB([bsd], [arc4random_buf])
diff --git a/src/Makefile.am b/src/Makefile.am
index a23edb2..c69ee55 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,8 +4,7 @@ AM_CPPFLAGS = -I${top_srcdir}/include
AM_CFLAGS = \
$(ICE_CFLAGS) \
- $(CWARNFLAGS) \
- -DTRANS_CLIENT -DTRANS_SERVER
+ $(CWARNFLAGS)
libICE_la_LDFLAGS = -version-number 6:3:0 -no-undefined
diff --git a/src/icetrans.c b/src/icetrans.c
index 3fa7926..bba5ad6 100644
--- a/src/icetrans.c
+++ b/src/icetrans.c
@@ -24,7 +24,4 @@
#include <config.h>
#endif
-#define TRANS_CLIENT 1
-#define TRANS_SERVER 1
-
#include <X11/Xtrans/transport.c>