Diff of /trunk/configure.in

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

revision 193 by harbaum, Tue Nov 17 20:13:09 2009 UTC revision 256 by harbaum, Wed Feb 10 19:19:55 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.9.0],[till@harbaum.org])  AC_INIT([GPXView],[0.9.3],[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 168  PKG_CHECK_EXISTS(maemo-version, [ Line 168  PKG_CHECK_EXISTS(maemo-version, [
168    # fremantle uses icons of 48x48 pixels for the app installer,    # fremantle uses icons of 48x48 pixels for the app installer,
169    # older versions used 26x26    # older versions used 26x26
170    if [[ "$MAJOR" == "5" ]]; then    if [[ "$MAJOR" == "5" ]]; then
171       ICONNAME=gpxview.48.png       ICONNAME=48x48/gpxview.png
172       datarootdir=/opt       datarootdir=/opt
173    
174           # check for libespeak (broken in diablo, hence doing it here)
175           AC_CHECK_HEADERS(espeak/speak_lib.h, [
176             CFLAGS="$CFLAGS -DESPEAK"
177             LIBS="$LIBS -lespeak"
178           ])
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)
# Line 207  XB-Maemo-Icon-26: Line 214  XB-Maemo-Icon-26:
214    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
215    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
216    
217      # check for libespeak
218      AC_CHECK_HEADERS(espeak/speak_lib.h, [
219        CFLAGS="$CFLAGS -DESPEAK"
220        LIBS="$LIBS -lespeak"
221      ])
222    
223    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
224    
225    ICON=" No icon"    ICON=" No icon"
Legend:
Removed from v.193  
changed lines
  Added in v.256