--- trunk/configure.in	2009/09/19 19:19:42	120
+++ trunk/configure.in	2009/10/14 11:26:50	135
@@ -21,7 +21,7 @@
 # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GPXView],[0.8.10],[till@harbaum.org])
+AC_INIT([GPXView],[0.8.12],[till@harbaum.org])
 AC_CONFIG_SRCDIR([src/main.c])
 # AC_CONFIG_HEADER([src/config.h])
 
@@ -154,19 +154,23 @@
     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,
   # older versions used 26x26
   if [[ "$MAJOR" == "5" ]]; then
      ICONNAME=gpxview.48.png
+     datarootdir=/opt
   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
@@ -181,6 +185,9 @@
 ], [
   AC_MSG_RESULT(no)
 
+  EXTRA_OBJS="$EXTRA_OBJS bct.o"
+  CFLAGS="$CFLAGS -DBCT"
+
   # check for gtk+-2.0
   PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])
   CFLAGS="$CFLAGS $gtk_CFLAGS"