--- trunk/configure.in	2009/09/20 19:26:29	121
+++ trunk/configure.in	2009/09/21 13:15:25	122
@@ -154,9 +154,6 @@
     AC_MSG_ERROR([maemo-version not found])
   ])
 
-  # maemo uses dbus for ipc with maemo mapper
-  EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"
-
   INSTALL_PLATTFORM="install-maemo"
 
   # fremantle uses icons of 48x48 pixels for the app installer,
@@ -165,8 +162,14 @@
      ICONNAME=gpxview.48.png
   else	
      ICONNAME=gpxview.26.png
+     AC_MSG_NOTICE([Enabling Maemo Mapper support])
+     CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
+     EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
   fi
 
+  # maemo uses dbus for ipc with maemo mapper
+  EXTRA_OBJS="$EXTRA_OBJS dbus.o"
+
   AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
   
   # add icon entry to debian/control