Harald Welte has submitted this change and it was merged.

Change subject: mandatory depend on libc-ares and libgtp
......................................................................


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
---
M configure.ac
M src/gprs/Makefile.am
M tests/Makefile.am
M tests/gtphub/Makefile.am
M tests/oap/Makefile.am
5 files changed, 2 insertions(+), 39 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/configure.ac b/configure.ac
index ba82eb1..504157b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,21 +60,8 @@
 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 b0fca6f..4c7f730 100644
--- a/src/gprs/Makefile.am
+++ b/src/gprs/Makefile.am
@@ -36,15 +36,9 @@
 
 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 3cd8bff..f6a1efc 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 @@
        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 f2a6b88..523df61 100644
--- a/tests/gtphub/Makefile.am
+++ b/tests/gtphub/Makefile.am
@@ -16,13 +16,9 @@
        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 5f8bbc5..ccc6d8c 100644
--- a/tests/oap/Makefile.am
+++ b/tests/oap/Makefile.am
@@ -15,13 +15,9 @@
        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 \

-- 
To view, visit https://gerrit.osmocom.org/6209
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id608165ae490cb6c84aac1fe70412b2cb2b2587b
Gerrit-PatchSet: 2
Gerrit-Project: osmo-sgsn
Gerrit-Branch: master
Gerrit-Owner: lynxis lazus <lyn...@fe80.eu>
Gerrit-Reviewer: Harald Welte <lafo...@gnumonks.org>
Gerrit-Reviewer: Jenkins Builder

Reply via email to