From 7bb383a45c7684b7df078edc2bdadd473b52365c Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 2 May 2017 12:59:15 +0200 Subject: Make pcap dependency optional Previously we required pcap.h unconditionally which causes embedded build failure because it's not included in current version of out poky toolchain. We can add it to toolchain but it's only necessary for utils/osmo-meas-pcap2db which is not built for sysmobts anyway so it's easier to just make this dependency optional and build osmo-meas-pcap2db only if it's available - similar to the way we build osmo-meas-udp2db. Related: SYS#3610 Change-Id: I77a5f7eafe0282abedacffad6a9bcb0a8f2b5caa --- openbsc/configure.ac | 5 ++++- openbsc/src/utils/Makefile.am | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/openbsc/configure.ac b/openbsc/configure.ac index 7e244bc65..c6ae15974 100644 --- a/openbsc/configure.ac +++ b/openbsc/configure.ac @@ -120,7 +120,10 @@ AC_SUBST(found_libgtp_and_libcares) dnl checks for header files AC_HEADER_STDC AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed)) -AC_CHECK_HEADERS(pcap/pcap.h,,AC_MSG_ERROR(PCAP library is not installed)) + +found_pcap=yes +AC_CHECK_HEADERS(pcap/pcap.h,,found_pcap=no) +AM_CONDITIONAL(HAVE_PCAP, test "$found_pcap" = yes) found_cdk=yes AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no) diff --git a/openbsc/src/utils/Makefile.am b/openbsc/src/utils/Makefile.am index ab4f3ced6..9c3837a36 100644 --- a/openbsc/src/utils/Makefile.am +++ b/openbsc/src/utils/Makefile.am @@ -29,9 +29,13 @@ bin_PROGRAMS = \ $(NULL) if HAVE_SQLITE3 bin_PROGRAMS += \ - osmo-meas-pcap2db \ osmo-meas-udp2db \ $(NULL) +if HAVE_PCAP +bin_PROGRAMS += \ + osmo-meas-pcap2db \ + $(NULL) +endif endif if HAVE_LIBCDK bin_PROGRAMS += \ -- cgit v1.2.3