Diff of /trunk/configure.in

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

revision 246 by harbaum, Tue Jan 19 20:26:37 2010 UTC revision 297 by harbaum, Wed Aug 25 12:24:38 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.2],[till@harbaum.org])  AC_INIT([GPXView],[0.9.5],[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    
 # check for libespeak (consider moving this to maemo5)  
 AC_CHECK_HEADERS(espeak/speak_lib.h, [  
 CFLAGS="$CFLAGS -DESPEAK"  
 LIBS="$LIBS -lespeak"  
 ])  
   
73  # check for libsoup  # check for libsoup
74  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
75    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 176  PKG_CHECK_EXISTS(maemo-version, [ Line 170  PKG_CHECK_EXISTS(maemo-version, [
170    if [[ "$MAJOR" == "5" ]]; then    if [[ "$MAJOR" == "5" ]]; then
171       ICONNAME=48x48/gpxview.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=26x26/gpxview.png       ICONNAME=26x26/gpxview.png
181       AC_MSG_NOTICE([Enabling Maemo Mapper support])       AC_MSG_NOTICE([Enabling Maemo Mapper support])
# Line 214  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      # check for libgps
224      PKG_CHECK_MODULES([gps], [libgps], [
225        CFLAGS="$CFLAGS $gps_CFLAGS -DUSE_LIBGPS"
226        LIBS="$LIBS $gps_LIBS"
227      ], [AC_MSG_NOTICE([No libgps found, using direct GPSD])])
228    
229    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
230    
231    ICON=" No icon"    ICON=" No icon"
Legend:
Removed from v.246  
changed lines
  Added in v.297