--- trunk/configure	2009/08/12 12:16:05	51
+++ trunk/configure	2009/11/03 07:36:35	154
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for GPXView 0.8.3.
+# Generated by GNU Autoconf 2.61 for GPXView 0.8.12.
 #
 # Report bugs to <till@harbaum.org>.
 #
@@ -574,8 +574,8 @@
 # Identity of this package.
 PACKAGE_NAME='GPXView'
 PACKAGE_TARNAME='gpxview'
-PACKAGE_VERSION='0.8.3'
-PACKAGE_STRING='GPXView 0.8.3'
+PACKAGE_VERSION='0.8.12'
+PACKAGE_STRING='GPXView 0.8.12'
 PACKAGE_BUGREPORT='till@harbaum.org'
 
 ac_unique_file="src/main.c"
@@ -656,11 +656,13 @@
 gpsbt_LIBS
 liblocation_CFLAGS
 liblocation_LIBS
+MAEMO_VERSION_MAJOR
 gtk_CFLAGS
 gtk_LIBS
 gnome2_CFLAGS
 gnome2_LIBS
 EXTRA_OBJS
+ICON
 INSTALL_PLATTFORM
 LIBOBJS
 LTLIBOBJS'
@@ -1206,7 +1208,7 @@
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures GPXView 0.8.3 to adapt to many kinds of systems.
+\`configure' configures GPXView 0.8.12 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1267,7 +1269,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of GPXView 0.8.3:";;
+     short | recursive ) echo "Configuration of GPXView 0.8.12:";;
    esac
   cat <<\_ACEOF
 
@@ -1398,7 +1400,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-GPXView configure 0.8.3
+GPXView configure 0.8.12
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1412,7 +1414,7 @@
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by GPXView $as_me 0.8.3, which was
+It was created by GPXView $as_me 0.8.12, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -3281,7 +3283,7 @@
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
-    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"
 
@@ -3365,7 +3367,7 @@
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
-    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"
 
@@ -3377,7 +3379,7 @@
         { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
 
-  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"
 
@@ -4314,6 +4316,9 @@
     MAJOR=`echo $VERSION | cut -b1 -`
     CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
 
+    MAEMO_VERSION_MAJOR=$MAJOR
+
+
 else
 
     { { echo "$as_me:$LINENO: error: maemo-version not found" >&5
@@ -4322,10 +4327,35 @@
 
 fi
 
+  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
+     { echo "$as_me:$LINENO: Enabling Maemo Mapper support" >&5
+echo "$as_me: Enabling Maemo Mapper support" >&6;}
+     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"
+  { echo "$as_me:$LINENO: Using application installer icon \"$ICONNAME\"" >&5
+echo "$as_me: Using application installer icon \"$ICONNAME\"" >&6;}
+
+  # 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/^/ /' -`"
 
 
 else
@@ -4333,6 +4363,9 @@
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 
+  EXTRA_OBJS="$EXTRA_OBJS bct.o"
+  CFLAGS="$CFLAGS -DBCT"
+
   # check for gtk+-2.0
 
 pkg_failed=no
@@ -4493,11 +4526,14 @@
 
   INSTALL_PLATTFORM="install-debian"
 
+  ICON=" No icon"
+
 fi
 
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile"
+
+ac_config_files="$ac_config_files Makefile src/Makefile data/Makefile debian/control"
 
 
 cat >confcache <<\_ACEOF
@@ -4926,7 +4962,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by GPXView $as_me 0.8.3, which was
+This file was extended by GPXView $as_me 0.8.12, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -4969,7 +5005,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-GPXView config.status 0.8.3
+GPXView config.status 0.8.12
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -5071,6 +5107,7 @@
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
     "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
+    "debian/control") CONFIG_FILES="$CONFIG_FILES debian/control" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
@@ -5208,17 +5245,19 @@
 gpsbt_LIBS!$gpsbt_LIBS$ac_delim
 liblocation_CFLAGS!$liblocation_CFLAGS$ac_delim
 liblocation_LIBS!$liblocation_LIBS$ac_delim
+MAEMO_VERSION_MAJOR!$MAEMO_VERSION_MAJOR$ac_delim
 gtk_CFLAGS!$gtk_CFLAGS$ac_delim
 gtk_LIBS!$gtk_LIBS$ac_delim
 gnome2_CFLAGS!$gnome2_CFLAGS$ac_delim
 gnome2_LIBS!$gnome2_LIBS$ac_delim
 EXTRA_OBJS!$EXTRA_OBJS$ac_delim
+ICON!$ICON$ac_delim
 INSTALL_PLATTFORM!$INSTALL_PLATTFORM$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 85; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 87; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5