Conic and osso help

diff --git a/configure.ac b/configure.ac
index 508ba67fe79c64bc019b5938fc7e70fb4bc09fbd..8d53ed2650b1cce22aa43412612e1b78abb6fb72 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -126,7 +126,7 @@ if test "x$HAVE_HILDON" = "xyes"; then
 
  PKG_CHECK_MODULES(CONIC, conic, CONIC=yes, CONIC=no)
  if test "x$CONIC" = "xyes"; then
-  AC_DEFINE(CONIC, 1, [build with Nokia Internet Connectivity library])
+  AC_DEFINE(WITH_CONIC, 1, [build with Nokia Internet Connectivity library])
   AC_SUBST(CONIC_LIBS)
   AC_SUBST(CONIC_CFLAGS)
  else

diff --git a/src/Makefile.am b/src/Makefile.am
index ebb491e73f7b83a5462ced8ae0f6f0093f457b94..0616c4a8883bc8b8f2d48358b642441d59f68332 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,16 +24,16 @@ INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE
 bin_PROGRAMS = mapper osm2db
 
 mapper_CFLAGS = $(GLIBGTK_CFLAGS) \
-       $(OSSO_CFLAGS) \
-       $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) \
+       $(OSSO_CFLAGS) $(CONIC_CFLAGS) \
+       $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) $(OSSO_HELP_CFLAGS) \
        $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) \
        $(LIBXML2_CFLAGS) $(GSTREAMER_CFLAGS) $(ESPEAK_CFLAGS) \
        $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) \
        $(DBUS_GLIB_CFLAGS) $(BLUEZ_CFLAGS)
 
 mapper_LDADD = $(GLIBGTK_LIBS) \
-       $(OSSO_LIBS) \
-       $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) \
+       $(OSSO_LIBS) $(CONIC_LIBS) \
+       $(HILDON_LIBS) $(HILDONFM_LIBS) $(HILDON_HELP_LIBS) $(OSSO_HELP_LIBS) \
        $(GNOME_VFS_LIBS) $(GCONF_LIBS) \
        $(LIBXML2_LIBS) $(GSTREAMER_LIBS) $(ESPEAK_LIBS) \
        $(SQLITE_LIBS) $(LIBCURL_LIBS) \