diff options
author | Kevin Tang <zhikait@codeaurora.org> | 2016-09-12 17:20:55 -0700 |
---|---|---|
committer | Mike Cailean <mcailean@codeaurora.org> | 2018-01-16 13:35:38 -0800 |
commit | 61de97e13003a5dea9917cb6e943ecd8e142b05b (patch) | |
tree | 31ddbc97199253187cbee24932f8712e2216f83d /configure.ac | |
parent | 438abebca035fe4f956e7e6232a1b98074e4c673 (diff) | |
download | gps-61de97e13003a5dea9917cb6e943ecd8e142b05b.tar.gz |
LE clean up
separated utils, core, ds and loc-api-v02 from loc-hal into their
own independent packages; simplified loc-pla; moved pla to the
root of project; removed loc-stub.
Change-Id: I373f02f9306646addf55ae90d71c4ba8e3741d09
CRs-Fixed: 2172544
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/configure.ac b/configure.ac index ec41c86..0ab8e68 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ AM_INIT_AUTOMAKE([foreign]) # Disables auto rebuilding of configure, Makefile.ins AM_MAINTAINER_MODE # Verifies the --srcdir is correct by checking for the path -AC_CONFIG_SRCDIR([utils/loc_cfg.cpp]) +AC_CONFIG_SRCDIR([Makefile.am]) # defines some macros variable to be included by source AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) @@ -29,26 +29,14 @@ AC_PROG_MAKE_SET PKG_PROG_PKG_CONFIG # Checks for libraries. -PKG_CHECK_MODULES([QMI], [qmi]) -AC_SUBST([QMI_CFLAGS]) -AC_SUBST([QMI_LIBS]) - -PKG_CHECK_MODULES([QMIF], [qmi-framework]) -AC_SUBST([QMIF_CFLAGS]) -AC_SUBST([QMIF_LIBS]) - -PKG_CHECK_MODULES([DATA], [data]) -AC_SUBST([DATA_CFLAGS]) -AC_SUBST([DATA_LIBS]) - -PKG_CHECK_MODULES([LOCPLA], [loc-pla]) -AC_SUBST([LOCPLA_CFLAGS]) -AC_SUBST([LOCPLA_LIBS]) - PKG_CHECK_MODULES([GPSUTILS], [gps-utils]) AC_SUBST([GPSUTILS_CFLAGS]) AC_SUBST([GPSUTILS_LIBS]) +PKG_CHECK_MODULES([LOCCORE], [loc-core]) +AC_SUBST([LOCCORE_CFLAGS]) +AC_SUBST([LOCCORE_LIBS]) + AC_ARG_WITH([core_includes], AC_HELP_STRING([--with-core-includes=@<:@dir@:>@], [Specify the location of the core headers]), @@ -59,6 +47,16 @@ if test "x$with_core_includes" != "xno"; then CPPFLAGS="${CPPFLAGS} -I${core_incdir}" fi +AC_ARG_WITH([locpla_includes], + AC_HELP_STRING([--with-locpla-includes=@<:@dir@:>@], + [specify the path to locpla-includes in loc-pla_git.bb]), + [locpla_incdir=$withval], + with_locpla_includes=no) + +if test "x$with_locpla_includes" != "xno"; then + AC_SUBST(LOCPLA_CFLAGS, "-I${locpla_incdir}") +fi + AC_SUBST([CPPFLAGS]) AC_ARG_WITH([glib], @@ -82,8 +80,6 @@ AM_CONDITIONAL(USE_GLIB, test "x${with_glib}" = "xyes") AC_CONFIG_FILES([ \ Makefile \ - core/Makefile \ - location/Makefile \ gnss/Makefile \ loc-hal.pc \ ]) |