Diff of /trunk/configure.in

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

revision 51 by harbaum, Wed Aug 12 12:16:05 2009 UTC revision 135 by harbaum, Wed Oct 14 11:26:50 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.8.3],[till@harbaum.org])  AC_INIT([GPXView],[0.8.12],[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 66  CFLAGS="$CFLAGS $libxml2_CFLAGS" Line 66  CFLAGS="$CFLAGS $libxml2_CFLAGS"
66  LIBS="$LIBS $libxml2_LIBS"  LIBS="$LIBS $libxml2_LIBS"
67  # check for libsoup  # check for libsoup
68  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
69    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"
70    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
71    LIBS="$LIBS $libsoup24_LIBS"    LIBS="$LIBS $libsoup24_LIBS"
72  ], [  ], [
73    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
74      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"
75      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
76      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
77    ], [    ], [
# Line 154  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         datarootdir=/opt
164      else
165         ICONNAME=gpxview.26.png
166         AC_MSG_NOTICE([Enabling Maemo Mapper support])
167         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
168         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
169      fi
170    
171    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
172    EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
173    
174    INSTALL_PLATTFORM="install-maemo"    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
175    
176      # add icon entry to debian/control
177      ICON=" Maemo icon $ICONNAME
178    XB-Maemo-Icon-26:
179    "
180    
181      # generate base64 icon, remove first and last line
182      # and add a space before each line
183      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
184    
185  ], [  ], [
186    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
187    
188      EXTRA_OBJS="$EXTRA_OBJS bct.o"
189      CFLAGS="$CFLAGS -DBCT"
190    
191    # check for gtk+-2.0    # check for gtk+-2.0
192    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!])])
193    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
# Line 173  PKG_CHECK_EXISTS(maemo-version, [ Line 199  PKG_CHECK_EXISTS(maemo-version, [
199    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
200    
201    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
202    
203      ICON=" No icon"
204  ])  ])
205    
206  AC_SUBST(EXTRA_OBJS)  AC_SUBST(EXTRA_OBJS)
207    AC_SUBST(ICON)
208  AC_SUBST(INSTALL_PLATTFORM)  AC_SUBST(INSTALL_PLATTFORM)
209  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
210    
211  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.51  
changed lines
  Added in v.135