Diff of /trunk/configure.in

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

revision 8 by harbaum, Thu Jun 25 19:08:48 2009 UTC revision 128 by harbaum, Tue Sep 29 07:31:18 2009 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.7.0],[till@harbaum.org])  AC_INIT([GPXView],[0.8.10],[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 64  LIBS="$LIBS $gnome_vfs_module_LIBS" Line 64  LIBS="$LIBS $gnome_vfs_module_LIBS"
64  PKG_CHECK_MODULES([libxml2], [libxml-2.0], [], [AC_MSG_ERROR([libxml-2.0 missing])])  PKG_CHECK_MODULES([libxml2], [libxml-2.0], [], [AC_MSG_ERROR([libxml-2.0 missing])])
65  CFLAGS="$CFLAGS $libxml2_CFLAGS"  CFLAGS="$CFLAGS $libxml2_CFLAGS"
66  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
67    # check for libsoup
68    PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
69      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
70      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
71      LIBS="$LIBS $libsoup24_LIBS"
72    ], [
73      PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
74        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
75        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
76        LIBS="$LIBS $libsoup22_LIBS"
77      ], [
78        AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
79      ])
80    ])
81    
82  # check for gtkhtml-3.14  # check for gtkhtml-3.14
83  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [  PKG_CHECK_MODULES([libgtkhtml3_14], [libgtkhtml-3.14], [
# Line 110  PKG_CHECK_EXISTS(maemo-version, [ Line 124  PKG_CHECK_EXISTS(maemo-version, [
124    
125    # prefer gpsbt over liblocation as we got complaints regarding liblocation    # prefer gpsbt over liblocation as we got complaints regarding liblocation
126    # stability    # stability
127  #  PKG_CHECK_EXISTS(gpsbt, [    PKG_CHECK_EXISTS(gpsbt, [
128  #    PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
129  #    CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
130  #    LIBS="$LIBS $gpsbt_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
131  #  ], [    ], [
132      AC_MSG_NOTICE([gpsbt not found, trying liblocation])      AC_MSG_NOTICE([gpsbt not found, trying liblocation])
133    
134      PKG_CHECK_EXISTS(liblocation, [      PKG_CHECK_EXISTS(liblocation, [
# Line 124  PKG_CHECK_EXISTS(maemo-version, [ Line 138  PKG_CHECK_EXISTS(maemo-version, [
138      ], [      ], [
139        AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])        AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])
140      ])      ])
141  #  ])    ])
142    
143    PKG_CHECK_EXISTS(tablet-browser-interface, [    PKG_CHECK_EXISTS(tablet-browser-interface, [
144      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
# Line 140  PKG_CHECK_EXISTS(maemo-version, [ Line 154  PKG_CHECK_EXISTS(maemo-version, [
154      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
155    ])    ])
156    
157      INSTALL_PLATTFORM="install-maemo"
158    
159      # fremantle uses icons of 48x48 pixels for the app installer,
160      # older versions used 26x26
161      if [[ "$MAJOR" == "5" ]]; then
162         ICONNAME=gpxview.48.png
163      else
164         ICONNAME=gpxview.26.png
165         AC_MSG_NOTICE([Enabling Maemo Mapper support])
166         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
167         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
168      fi
169    
170    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
171    EXTRA_OBJS="mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
   AC_SUBST(EXTRA_OBJS)  
172    
173    INSTALL_PLATTFORM="install-maemo"    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
   AC_SUBST(INSTALL_PLATTFORM)  
174    
175      # add icon entry to debian/control
176      ICON=" Maemo icon $ICONNAME
177    XB-Maemo-Icon-26:
178    "
179    
180      # generate base64 icon, remove first and last line
181      # and add a space before each line
182      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
183    
184  ], [  ], [
185    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
186    
187      EXTRA_OBJS="$EXTRA_OBJS bct.o"
188      CFLAGS="$CFLAGS -DBCT"
189    
190    # check for gtk+-2.0    # check for gtk+-2.0
191    PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])    PKG_CHECK_MODULES([gtk], [gtk+-2.0], [], [AC_MSG_ERROR([gtk+-2.0 missing!])])
192    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
# Line 161  PKG_CHECK_EXISTS(maemo-version, [ Line 198  PKG_CHECK_EXISTS(maemo-version, [
198    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
199    
200    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
   AC_SUBST(INSTALL_PLATTFORM)  
 ])  
201    
202      ICON=" No icon"
203    ])
204    
205  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_SUBST(EXTRA_OBJS)
206    AC_SUBST(ICON)
207    AC_SUBST(INSTALL_PLATTFORM)
208    AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
209    
210  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.8  
changed lines
  Added in v.128