Diff of /trunk/configure.in

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

revision 36 by harbaum, Thu Jul 30 12:41:20 2009 UTC revision 154 by harbaum, Tue Nov 3 07:36:35 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.4],[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 150  PKG_CHECK_EXISTS(maemo-version, [ Line 150  PKG_CHECK_EXISTS(maemo-version, [
150      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
151      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
152      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
153    
154        MAEMO_VERSION_MAJOR=$MAJOR
155        AC_SUBST(MAEMO_VERSION_MAJOR)
156    ], [    ], [
157      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
158    ])    ])
159    
160      INSTALL_PLATTFORM="install-maemo"
161    
162      # fremantle uses icons of 48x48 pixels for the app installer,
163      # older versions used 26x26
164      if [[ "$MAJOR" == "5" ]]; then
165         ICONNAME=gpxview.48.png
166         datarootdir=/opt
167      else
168         ICONNAME=gpxview.26.png
169         AC_MSG_NOTICE([Enabling Maemo Mapper support])
170         CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
171         EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
172      fi
173    
174    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
175    EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
176    
177    INSTALL_PLATTFORM="install-maemo"    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
178    
179      # add icon entry to debian/control
180      ICON=" Maemo icon $ICONNAME
181    XB-Maemo-Icon-26:
182    "
183    
184      # generate base64 icon, remove first and last line
185      # and add a space before each line
186      ICON="$ICON`uuencode -m data/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
187    
188  ], [  ], [
189    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
190    
191      EXTRA_OBJS="$EXTRA_OBJS bct.o"
192      CFLAGS="$CFLAGS -DBCT"
193    
194    # check for gtk+-2.0    # check for gtk+-2.0
195    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!])])
196    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
# Line 173  PKG_CHECK_EXISTS(maemo-version, [ Line 202  PKG_CHECK_EXISTS(maemo-version, [
202    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
203    
204    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
205    
206      ICON=" No icon"
207  ])  ])
208    
209  AC_SUBST(EXTRA_OBJS)  AC_SUBST(EXTRA_OBJS)
210    AC_SUBST(ICON)
211  AC_SUBST(INSTALL_PLATTFORM)  AC_SUBST(INSTALL_PLATTFORM)
212  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
213    
214  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.36  
changed lines
  Added in v.154