From 7ef9680caa8c223a09beb637e26fd3471128e6ba Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Sun, 8 May 2016 09:19:36 +0100 Subject: 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 Reviewed-by: Adam Jackson Reviewed-by: Eric Engestrom (IRC) --- configure.ac | 2 ++ src/Makefile.am | 3 +-- src/icetrans.c | 3 --- 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 #endif -#define TRANS_CLIENT 1 -#define TRANS_SERVER 1 - #include -- cgit v1.2.1