From ab8a9e2f42a0c22297002e844258cbeee449b827 Mon Sep 17 00:00:00 2001 From: Kaj-Michael Lang Date: Fri, 19 Oct 2007 01:56:09 +0300 Subject: [PATCH] Conic and osso help --- configure.ac | 2 +- src/Makefile.am | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 508ba67..8d53ed2 100644 --- 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 ebb491e..0616c4a 100644 --- 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) \ -- 2.39.5