Add hal option and set libs and cflags

diff --git a/configure.ac b/configure.ac
index c5efc0316f0add8e10856818ff39a771a9d09f00..a5fe5fcd9fbb0d7c94289039de0c671a9ccc73be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -102,6 +102,9 @@ AC_ARG_ENABLE([gypsy],AS_HELP_STRING([--enable-gypsy],[Use gypsy]),
 AC_ARG_ENABLE([geoclue],AS_HELP_STRING([--enable-geoclue],[Use geoclue]),
               [enable_geoclue=$enableval], [enable_geoclue=no])
 
+AC_ARG_ENABLE([hal],AS_HELP_STRING([--enable-hal],[Use HAL for special hardware keys]),
+              [enable_hal=$enableval], [enable_hal=no])
+
 AC_ARG_ENABLE([cairo],AS_HELP_STRING([--enable-cairo],[Use cairo]),
               [enable_cairo=$enableval], [enable_cairo=no])
 
@@ -130,6 +133,13 @@ else
   AC_DEFINE([WITH_DEVICE_770], 1, [With 770/N800 specific code])
 fi
 
+if test "x$enable_hal" = "xyes" ; then
+  PKG_CHECK_MODULES(HAL, hal)
+  AC_SUBST(HAL_LIBS)
+  AC_SUBST(HAL_CFLAGS)
+  AC_DEFINE([WITH_HAL], 1, [Listen to special events using hal])
+fi
+
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 if test "x$enable_itbtdbus" = "xno" ; then

diff --git a/src/Makefile.am b/src/Makefile.am
index ca73c112aaac7cca7b6a2bcc840c4d8b00f17302..f89aa567f2f77df1d2c5c5909abcbc5b7aa21767 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@ INCLUDES = -DDATADIR=\""$(datadir)"\" -DDBUS_API_SUBJECT_TO_CHANGE
 
 bin_PROGRAMS = mapper osm2db
 
-mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) \
+mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) $(CAIRO_CFLAGS) $(GTKGLEXT_CFLAGS) \
        $(OSSO_CFLAGS) $(CONIC_CFLAGS) \
        $(HILDON_CFLAGS) $(HILDONFM_CFLAGS) $(HILDON_HELP_CFLAGS) $(OSSO_HELP_CFLAGS) \
        $(GNOME_VFS_CFLAGS) $(GCONF_CFLAGS) \
@@ -31,16 +31,16 @@ mapper_CFLAGS = $(GLIBGTK_CFLAGS) $(GTKHTML_CFLAGS) \
        $(SQLITE_CFLAGS) $(LIBCURL_CFLAGS) \
        $(DBUS_GLIB_CFLAGS) \
        $(BLUEZ_CFLAGS) $(LIBGPSBT_CFLAGS) \
-       $(GYPSY_CFLAGS)
+       $(GYPSY_CFLAGS) $(HAL_CFLAGS)
 
-mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) \
+mapper_LDADD = $(GLIBGTK_LIBS) $(GTKHTML_LIBS) $(CAIRO_LIBS) $(GTKGLEXT_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) \
        $(DBUS_GLIB_LIBS) $(BLUEZ_LIBS) \
-       $(GYPSY_LIBS) $(LIBGPSBT_LIBS) \
+       $(GYPSY_LIBS) $(LIBGPSBT_LIBS) $(HAL_LIBS)\
        -lm libgtkgps.la libosmdb.la libmappergps.la
 
 mapper_SOURCES = \