Fix FTBFS for x86_64

Change-Id: I3e9be53f090a04e54d53bdceb5880c3931698c0a
Signed-off-by: Mikko Ylinen <mikko.ylinen@intel.com>

diff --git a/configure.ac b/configure.ac
index f69421a..21972bb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,6 +12,9 @@ AC_PROG_CXX
 AC_PROG_CC
 
 # Checks for libraries.
+PKG_CHECK_MODULES([GLIB], [glib-2.0])
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h unistd.h])

diff --git a/src/AmbpiComm.cpp b/src/AmbpiComm.cpp
index 13bb397..7bd4ede 100644 (file)
--- a/src/AmbpiComm.cpp
+++ b/src/AmbpiComm.cpp
@@ -167,8 +167,8 @@ bool AmbpiCommIF::send(const char *msg, const int size)
     reset_ercode();
     ico_uws_send(m_context, m_id, (unsigned char*)msg, (size_t)size);
     if ((ICO_UWS_ERR_UNKNOWN != m_ercode) && (ICO_UWS_ERR_NONE != m_ercode)) {
-        ICO_DBG("uri[%s], protocol[%s], m_context[%x], m_id[%x], msg[%s], size[%d]",
-            m_uri.c_str(), m_pNm.c_str(), (int)m_context, (int)m_id, msg, size);
+        ICO_DBG("uri[%s], protocol[%s], m_context[%p], m_id[%p], msg[%s], size[%d]",
+            m_uri.c_str(), m_pNm.c_str(), m_context, m_id, msg, size);
         return false;
     }
     return true;
@@ -267,8 +267,8 @@ void AmbpiCommIF::event_cb(const ico_uws_evt_e event, const void *id,
     switch (event) {
     case ICO_UWS_EVT_RECEIVE:
     {
-        ICO_DBG("uri[%s], protocol[%s], ICO_UWS_EVT_RECEIVE[m_id=%x]",
-            m_uri.c_str(), m_pNm.c_str(), (int)m_id);
+        ICO_DBG("uri[%s], protocol[%s], ICO_UWS_EVT_RECEIVE[m_id=%p]",
+            m_uri.c_str(), m_pNm.c_str(), m_id);
         if (NULL == d) {
             cerr << m_pNm << ":Failed Receive event" << endl;
             break;
@@ -290,8 +290,8 @@ void AmbpiCommIF::event_cb(const ico_uws_evt_e event, const void *id,
     case ICO_UWS_EVT_OPEN:
     {
         m_id = (void*)id;
-        ICO_DBG("uri[%s], protocol[%s], ICO_UWS_EVT_OPEN[m_id=%x]",
-            m_uri.c_str(), m_pNm.c_str(), (int)m_id);
+        ICO_DBG("uri[%s], protocol[%s], ICO_UWS_EVT_OPEN[m_id=%p]",
+            m_uri.c_str(), m_pNm.c_str(), m_id);
         break;
     }
     case ICO_UWS_EVT_ERROR:

diff --git a/src/Makefile.am b/src/Makefile.am
index e9762ca..d7726f0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = ico-vic-carsim
 
 ico_vic_carsim_SOURCES = AmbpiComm.h AmbpiComm.cpp CJoyStick.h CJoyStick.cpp CJoyStickEV.h CJoyStickEV.cpp CJoyStickG25.h CJoyStickG25.cpp CJoyStickG27.h CJoyStickG27.cpp CConf.h CConf.cpp CGtCtrl.h CGtCtrl.cpp CCalc.h CCalc.cpp CAvgCar.h CAvgCar.cpp CarSim_Daemon.cpp
-ico_vic_carsim_LDADD = -lpthread -ljson-glib-1.0 -lgobject-2.0 -lglib-2.0 -lrt -lico-util
-ico_vic_carsim_CPPFLAGS = -I/usr/include/glib-2.0 -I/usr/include/json-glib-1.0 -I/usr/lib/glib-2.0/include -std=c++0x
+ico_vic_carsim_LDADD = -lpthread -ljson-glib-1.0 -lgobject-2.0 $(GLIB_LIBS) -lrt -lico-util
+ico_vic_carsim_CPPFLAGS = $(GLIB_CFLAGS) -I/usr/include/json-glib-1.0 -std=c++0x
 ico_vic_carsim_LDFLAGS =