--- trunk/configure.in	2009/08/06 20:23:12	47
+++ trunk/configure.in	2009/11/03 07:36:35	154
@@ -21,7 +21,7 @@
 # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
 
 AC_PREREQ(2.61)
-AC_INIT([GPXView],[0.8.1],[till@harbaum.org])
+AC_INIT([GPXView],[0.8.12],[till@harbaum.org])
 AC_CONFIG_SRCDIR([src/main.c])
 # AC_CONFIG_HEADER([src/config.h])
 
@@ -66,12 +66,12 @@
 LIBS="$LIBS $libxml2_LIBS"
 # check for libsoup
 PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
-  EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
+  EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
   CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
   LIBS="$LIBS $libsoup24_LIBS"
 ], [
   PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
-    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o"
+    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
     CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
     LIBS="$LIBS $libsoup22_LIBS"
   ], [
@@ -150,18 +150,47 @@
     CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
     MAJOR=`echo $VERSION | cut -b1 -`
     CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
+
+    MAEMO_VERSION_MAJOR=$MAJOR
+    AC_SUBST(MAEMO_VERSION_MAJOR)
   ], [
     AC_MSG_ERROR([maemo-version not found])
   ])
 
+  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 mm_poi.o dbus.o"
+  EXTRA_OBJS="$EXTRA_OBJS dbus.o"
 
-  INSTALL_PLATTFORM="install-maemo"
+  AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
   
+  # add icon entry to debian/control
+  ICON=" Maemo icon $ICONNAME
+XB-Maemo-Icon-26:
+"
+
+  # generate base64 icon, remove first and last line 
+  # and add a space before each line
+  ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
+
 ], [
   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"
@@ -173,10 +202,13 @@
   LIBS="$LIBS $gnome2_LIBS"
 
   INSTALL_PLATTFORM="install-debian"
+
+  ICON=" No icon"
 ])
 
 AC_SUBST(EXTRA_OBJS)
+AC_SUBST(ICON)
 AC_SUBST(INSTALL_PLATTFORM)
-AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
 
 AC_OUTPUT