4 files changed, 13 insertions, 6 deletions
diff --git a/gps/gnsspps/Makefile.am b/gps/gnsspps/Makefile.am
index 390c1cc..c990be0 100644
--- a/gps/gnsspps/Makefile.am
+++ b/gps/gnsspps/Makefile.am
@@ -1,6 +1,7 @@
 AM_CFLAGS = \
      $(LOCPLA_CFLAGS) \
      $(GPSUTILS_CFLAGS) \
+     -I$(WORKSPACE)/system/core/include \
      -I./
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/gps/gnsspps/configure.ac b/gps/gnsspps/configure.ac
index b0ffa77..eb87bc1 100644
--- a/gps/gnsspps/configure.ac
+++ b/gps/gnsspps/configure.ac
@@ -29,14 +29,20 @@ AC_PROG_MAKE_SET
 PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
-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])
 
+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_ARG_WITH([glib],
       AC_HELP_STRING([--with-glib],
          [enable glib, building HLOS systems which use glib]))
diff --git a/gps/gnsspps/gnsspps.c b/gps/gnsspps/gnsspps.c
index f92a862..70b23f5 100644
--- a/gps/gnsspps/gnsspps.c
+++ b/gps/gnsspps/gnsspps.c
@@ -25,7 +25,7 @@
  * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
  * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-#include <platform_lib_log_util.h>
+#include <log_util.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
diff --git a/gps/gnsspps/gnsspps.pc.in b/gps/gnsspps/gnsspps.pc.in
index 604eedd..8931ebd 100644
--- a/gps/gnsspps/gnsspps.pc.in
+++ b/gps/gnsspps/gnsspps.pc.in
@@ -4,7 +4,7 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: gnsspps
-Description: QTI GPS drplugin-client
+Description: QTI GPS gnsspps
 Version: @VERSION
 Libs: -L${libdir} -lgnsspps
 Cflags: -I${includedir}/gnsspps