Diff of /trunk/configure.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 169 by harbaum, Mon Nov 9 14:26:13 2009 UTC revision 246 by harbaum, Tue Jan 19 20:26:37 2010 UTC
# Line 21  Line 21 
21  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.  # along with GPXView.  If not, see <http://www.gnu.org/licenses/>.
22    
23  AC_PREREQ(2.61)  AC_PREREQ(2.61)
24  AC_INIT([GPXView],[0.8.13],[till@harbaum.org])  AC_INIT([GPXView],[0.9.2],[till@harbaum.org])
25  AC_CONFIG_SRCDIR([src/main.c])  AC_CONFIG_SRCDIR([src/main.c])
26  # AC_CONFIG_HEADER([src/config.h])  # AC_CONFIG_HEADER([src/config.h])
27    
# Line 70  PKG_CHECK_MODULES([libcurl], [libcurl], Line 70  PKG_CHECK_MODULES([libcurl], [libcurl],
70  CFLAGS="$CFLAGS $libcurl_CFLAGS"  CFLAGS="$CFLAGS $libcurl_CFLAGS"
71  LIBS="$LIBS $libcurl_LIBS"  LIBS="$LIBS $libcurl_LIBS"
72    
73    # check for libespeak (consider moving this to maemo5)
74    AC_CHECK_HEADERS(espeak/speak_lib.h, [
75    CFLAGS="$CFLAGS -DESPEAK"
76    LIBS="$LIBS -lespeak"
77    ])
78    
79  # check for libsoup  # check for libsoup
80  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
81    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
# Line 168  PKG_CHECK_EXISTS(maemo-version, [ Line 174  PKG_CHECK_EXISTS(maemo-version, [
174    # fremantle uses icons of 48x48 pixels for the app installer,    # fremantle uses icons of 48x48 pixels for the app installer,
175    # older versions used 26x26    # older versions used 26x26
176    if [[ "$MAJOR" == "5" ]]; then    if [[ "$MAJOR" == "5" ]]; then
177       ICONNAME=gpxview.48.png       ICONNAME=48x48/gpxview.png
178       datarootdir=/opt       datarootdir=/opt
179    else    else
180       ICONNAME=gpxview.26.png       ICONNAME=26x26/gpxview.png
181       AC_MSG_NOTICE([Enabling Maemo Mapper support])       AC_MSG_NOTICE([Enabling Maemo Mapper support])
      CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"  
      EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"  
182    fi    fi
183    
184      CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
185      EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
186    
187    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
188    EXTRA_OBJS="$EXTRA_OBJS dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
189    
# Line 189  XB-Maemo-Icon-26: Line 196  XB-Maemo-Icon-26:
196    
197    # generate base64 icon, remove first and last line    # generate base64 icon, remove first and last line
198    # and add a space before each line    # and add a space before each line
199    ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"    ICON="$ICON`uuencode -m data/icons/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
200    
201  ], [  ], [
202    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
Legend:
Removed from v.169  
changed lines
  Added in v.246