From d9a54af54e82326095511d559eec4b005b361928 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Tue, 30 Jan 2018 15:59:40 +0100
Subject: mandatory depend on libc-ares and libgtp

Both library are required to build osmo-sgsn.
The optional dependency was correct when osmo-sgsn
was part of openbsc.

Change-Id: Id608165ae490cb6c84aac1fe70412b2cb2b2587b
---
 configure.ac             | 17 ++---------------
 src/gprs/Makefile.am     |  6 ------
 tests/Makefile.am        | 10 ----------
 tests/gtphub/Makefile.am |  4 ----
 tests/oap/Makefile.am    |  4 ----
 5 files changed, 2 insertions(+), 39 deletions(-)

diff --git a/configure.ac b/configure.ac
index ba82eb15a..504157bca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,21 +60,8 @@ AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes")
 AC_SUBST(osmo_ac_iu)
 
 
-found_libgtp=yes
-PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.0.0, , found_libgtp=no)
-AM_CONDITIONAL(HAVE_LIBGTP, test "$found_libgtp" = yes)
-AC_SUBST(found_libgtp)
-
-found_libcares=yes
-PKG_CHECK_MODULES([LIBCARES], [libcares], [], [found_libcares=no])
-AM_CONDITIONAL(HAVE_LIBCARES, test "$found_libcares" = yes)
-AC_SUBST(found_libcares)
-
-found_libgtp_and_libcares=no
-if test "$found_libgtp" = "yes" -a "$found_libcares" = "yes"; then
-    found_libgtp_and_libcares=yes
-fi
-AC_SUBST(found_libgtp_and_libcares)
+PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.0.0)
+PKG_CHECK_MODULES(LIBCARES, libcares)
 
 dnl checks for header files
 AC_HEADER_STDC
diff --git a/src/gprs/Makefile.am b/src/gprs/Makefile.am
index b0fca6f9c..4c7f730a4 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -36,15 +36,9 @@ OSMO_LIBS = \
 
 bin_PROGRAMS = \
 	osmo-gbproxy \
-	$(NULL)
-if HAVE_LIBGTP
-if HAVE_LIBCARES
-bin_PROGRAMS += \
 	osmo-sgsn \
 	osmo-gtphub \
 	$(NULL)
-endif
-endif
 
 osmo_gbproxy_SOURCES = \
 	gb_proxy.c \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3cd8bffe7..f6a1efc9e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,15 +1,7 @@
 SUBDIRS = \
 	gprs \
 	gbproxy \
-	$(NULL)
-
-if HAVE_LIBGTP
-SUBDIRS += \
 	gtphub \
-	$(NULL)
-
-if HAVE_LIBCARES
-SUBDIRS += \
 	sgsn \
 	oap \
 	xid \
@@ -17,8 +9,6 @@ SUBDIRS += \
 	slhc \
 	v42bis \
 	$(NULL)
-endif
-endif
 
 # The `:;' works around a Bash 3.2 bug when the output is not writeable.
 $(srcdir)/package.m4: $(top_srcdir)/configure.ac
diff --git a/tests/gtphub/Makefile.am b/tests/gtphub/Makefile.am
index f2a6b888e..523df61d7 100644
--- a/tests/gtphub/Makefile.am
+++ b/tests/gtphub/Makefile.am
@@ -16,13 +16,9 @@ EXTRA_DIST = \
 	gtphub_test.ok \
 	$(NULL)
 
-if HAVE_LIBGTP
-if HAVE_LIBCARES
 noinst_PROGRAMS = \
 	gtphub_test \
 	$(NULL)
-endif
-endif
 
 gtphub_test_SOURCES = \
 	gtphub_test.c \
diff --git a/tests/oap/Makefile.am b/tests/oap/Makefile.am
index 5f8bbc5c2..ccc6d8cfd 100644
--- a/tests/oap/Makefile.am
+++ b/tests/oap/Makefile.am
@@ -15,13 +15,9 @@ EXTRA_DIST = \
 	oap_client_test.err \
 	$(NULL)
 
-if HAVE_LIBGTP
-if HAVE_LIBCARES
 noinst_PROGRAMS = \
 	oap_client_test \
 	$(NULL)
-endif
-endif
 
 oap_client_test_SOURCES = \
 	oap_client_test.c \
-- 
cgit v1.2.3