meas: Unbreak the build once more
The code assumes that sqlite3.h is in the standard include path. Maybe sqlite3 wasn't installed or resides in a non standard (/usr/local) location? Fix the build as it has been broken since 1st of January.
This commit is contained in:
parent
a67704753a
commit
bb06eb9d7c
|
@ -88,6 +88,11 @@ found_cdk=yes
|
||||||
AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no)
|
AC_CHECK_HEADERS(cdk/cdk.h,,found_cdk=no)
|
||||||
AM_CONDITIONAL(HAVE_LIBCDK, test "$found_cdk" = yes)
|
AM_CONDITIONAL(HAVE_LIBCDK, test "$found_cdk" = yes)
|
||||||
|
|
||||||
|
found_sqlite3=yes
|
||||||
|
PKG_CHECK_MODULES(SQLITE3, sqlite3, ,found_sqlite3=no)
|
||||||
|
AM_CONDITIONAL(HAVE_SQLITE3, test "$found_sqlite3" = yes)
|
||||||
|
AC_SUBST(found_sqlite3)
|
||||||
|
|
||||||
|
|
||||||
dnl Checks for typedefs, structures and compiler characteristics
|
dnl Checks for typedefs, structures and compiler characteristics
|
||||||
|
|
||||||
|
|
|
@ -1,13 +1,15 @@
|
||||||
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
AM_CPPFLAGS = $(all_includes) -I$(top_srcdir)/include -I$(top_builddir)
|
||||||
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS)
|
AM_CFLAGS=-Wall $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS) $(LIBOSMOVTY_CFLAGS) $(LIBOSMOABIS_CFLAGS) $(COVERAGE_CFLAGS) $(SQLITE3_CFLAGS)
|
||||||
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
AM_LDFLAGS = $(COVERAGE_LDFLAGS)
|
||||||
|
|
||||||
noinst_HEADERS = meas_db.h
|
noinst_HEADERS = meas_db.h
|
||||||
|
|
||||||
|
bin_PROGRAMS = bs11_config isdnsync
|
||||||
|
if HAVE_SQLITE3
|
||||||
|
bin_PROGRAMS += osmo-meas-pcap2db osmo-meas-udp2db
|
||||||
|
endif
|
||||||
if HAVE_LIBCDK
|
if HAVE_LIBCDK
|
||||||
bin_PROGRAMS = bs11_config isdnsync osmo-meas-pcap2db osmo-meas-udp2db meas_vis
|
bin_PROGRAMS += meas_vis
|
||||||
else
|
|
||||||
bin_PROGRAMS = bs11_config isdnsync osmo-meas-pcap2db osmo-meas-udp2db
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if BUILD_SMPP
|
if BUILD_SMPP
|
||||||
|
@ -31,9 +33,9 @@ meas_vis_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lcdk -lncurses
|
||||||
meas_vis_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
meas_vis_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
||||||
|
|
||||||
osmo_meas_pcap2db_SOURCES = meas_pcap2db.c meas_db.c
|
osmo_meas_pcap2db_SOURCES = meas_pcap2db.c meas_db.c
|
||||||
osmo_meas_pcap2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lpcap -lsqlite3
|
osmo_meas_pcap2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lpcap $(SQLITE3_LIBS)
|
||||||
osmo_meas_pcap2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
osmo_meas_pcap2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
||||||
|
|
||||||
osmo_meas_udp2db_SOURCES = meas_udp2db.c meas_db.c
|
osmo_meas_udp2db_SOURCES = meas_udp2db.c meas_db.c
|
||||||
osmo_meas_udp2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) -lsqlite3
|
osmo_meas_udp2db_LDADD = $(LIBOSMOCORE_LIBS) $(LIBOSMOGSM_LIBS) $(SQLITE3_LIBS)
|
||||||
osmo_meas_udp2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
osmo_meas_udp2db_CFLAGS = $(LIBOSMOCORE_CFLAGS) $(LIBOSMOGSM_CFLAGS)
|
||||||
|
|
Loading…
Reference in New Issue