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
This commit is contained in:
parent
b643f56ebe
commit
d9a54af54e
17
configure.ac
17
configure.ac
|
@ -60,21 +60,8 @@ AM_CONDITIONAL(BUILD_IU, test "x$osmo_ac_iu" = "xyes")
|
||||||
AC_SUBST(osmo_ac_iu)
|
AC_SUBST(osmo_ac_iu)
|
||||||
|
|
||||||
|
|
||||||
found_libgtp=yes
|
PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.0.0)
|
||||||
PKG_CHECK_MODULES(LIBGTP, libgtp >= 1.0.0, , found_libgtp=no)
|
PKG_CHECK_MODULES(LIBCARES, libcares)
|
||||||
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)
|
|
||||||
|
|
||||||
dnl checks for header files
|
dnl checks for header files
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
|
|
|
@ -36,15 +36,9 @@ OSMO_LIBS = \
|
||||||
|
|
||||||
bin_PROGRAMS = \
|
bin_PROGRAMS = \
|
||||||
osmo-gbproxy \
|
osmo-gbproxy \
|
||||||
$(NULL)
|
|
||||||
if HAVE_LIBGTP
|
|
||||||
if HAVE_LIBCARES
|
|
||||||
bin_PROGRAMS += \
|
|
||||||
osmo-sgsn \
|
osmo-sgsn \
|
||||||
osmo-gtphub \
|
osmo-gtphub \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
osmo_gbproxy_SOURCES = \
|
osmo_gbproxy_SOURCES = \
|
||||||
gb_proxy.c \
|
gb_proxy.c \
|
||||||
|
|
|
@ -1,15 +1,7 @@
|
||||||
SUBDIRS = \
|
SUBDIRS = \
|
||||||
gprs \
|
gprs \
|
||||||
gbproxy \
|
gbproxy \
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
if HAVE_LIBGTP
|
|
||||||
SUBDIRS += \
|
|
||||||
gtphub \
|
gtphub \
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
if HAVE_LIBCARES
|
|
||||||
SUBDIRS += \
|
|
||||||
sgsn \
|
sgsn \
|
||||||
oap \
|
oap \
|
||||||
xid \
|
xid \
|
||||||
|
@ -17,8 +9,6 @@ SUBDIRS += \
|
||||||
slhc \
|
slhc \
|
||||||
v42bis \
|
v42bis \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
|
# The `:;' works around a Bash 3.2 bug when the output is not writeable.
|
||||||
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
$(srcdir)/package.m4: $(top_srcdir)/configure.ac
|
||||||
|
|
|
@ -16,13 +16,9 @@ EXTRA_DIST = \
|
||||||
gtphub_test.ok \
|
gtphub_test.ok \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
if HAVE_LIBGTP
|
|
||||||
if HAVE_LIBCARES
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
gtphub_test \
|
gtphub_test \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
gtphub_test_SOURCES = \
|
gtphub_test_SOURCES = \
|
||||||
gtphub_test.c \
|
gtphub_test.c \
|
||||||
|
|
|
@ -15,13 +15,9 @@ EXTRA_DIST = \
|
||||||
oap_client_test.err \
|
oap_client_test.err \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
if HAVE_LIBGTP
|
|
||||||
if HAVE_LIBCARES
|
|
||||||
noinst_PROGRAMS = \
|
noinst_PROGRAMS = \
|
||||||
oap_client_test \
|
oap_client_test \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
endif
|
|
||||||
endif
|
|
||||||
|
|
||||||
oap_client_test_SOURCES = \
|
oap_client_test_SOURCES = \
|
||||||
oap_client_test.c \
|
oap_client_test.c \
|
||||||
|
|
Loading…
Reference in New Issue