23 Nov
2015
23 Nov
'15
3:02 p.m.
About below commit: Sorry / Thanks! I forgot to move gtphub into the
HAVE_LIBCARES conditional when I added ares...
The gtphub tests wrap the ares functions away, so they build without libc-ares.
But does it make sense to enable the gtphub test when the binary isn't built?
~Neels
commit 97b6bfa996ed1745d27c5598186c4583f7e90861
Author: Harald Welte <laforge(a)gnumonks.org>
Date: Sat Nov 21 13:16:08 2015 +0100
Fix compilation with no libc-ares present on the system
This build failure was introduced with the OAP and gtphub changes.
diff --git a/openbsc/src/gprs/Makefile.am b/openbsc/src/gprs/Makefile.am
index 5212c67..5e115eb 100644
--- a/openbsc/src/gprs/Makefile.am
+++ b/openbsc/src/gprs/Makefile.am
@@ -11,9 +11,8 @@ noinst_HEADERS = gprs_sndcp.h
bin_PROGRAMS = osmo-gbproxy
if HAVE_LIBGTP
-bin_PROGRAMS += osmo-gtphub
if HAVE_LIBCARES
-bin_PROGRAMS += osmo-sgsn
+bin_PROGRAMS += osmo-sgsn osmo-gtphub
endif
endif
diff --git a/openbsc/tests/Makefile.am b/openbsc/tests/Makefile.am
index 995660a..04b8e34 100644
--- a/openbsc/tests/Makefile.am
+++ b/openbsc/tests/Makefile.am
@@ -13,7 +13,10 @@ SUBDIRS += smpp
endif
if HAVE_LIBGTP
-SUBDIRS += sgsn oap gtphub
+SUBDIRS += gtphub
+if HAVE_LIBCARES
+SUBDIRS += sgsn oap
+endif
endif