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
This commit is contained in:
parent
6d8e5198ad
commit
7bb383a45c
|
@ -120,7 +120,10 @@ AC_SUBST(found_libgtp_and_libcares)
|
||||||
dnl checks for header files
|
dnl checks for header files
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
AC_CHECK_HEADERS(dbi/dbd.h,,AC_MSG_ERROR(DBI library is not installed))
|
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
|
found_cdk=yes
|
||||||
AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no)
|
AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no)
|
||||||
|
|
|
@ -29,9 +29,13 @@ bin_PROGRAMS = \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
if HAVE_SQLITE3
|
if HAVE_SQLITE3
|
||||||
bin_PROGRAMS += \
|
bin_PROGRAMS += \
|
||||||
osmo-meas-pcap2db \
|
|
||||||
osmo-meas-udp2db \
|
osmo-meas-udp2db \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
if HAVE_PCAP
|
||||||
|
bin_PROGRAMS += \
|
||||||
|
osmo-meas-pcap2db \
|
||||||
|
$(NULL)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
if HAVE_LIBCDK
|
if HAVE_LIBCDK
|
||||||
bin_PROGRAMS += \
|
bin_PROGRAMS += \
|
||||||
|
|
Loading…
Reference in New Issue