Diff of /trunk/configure.in

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

revision 61 by harbaum, Tue Aug 18 14:32:45 2009 UTC revision 235 by harbaum, Wed Dec 9 20:08:58 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.5],[till@harbaum.org])  AC_INIT([GPXView],[0.9.1],[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    
68    # check for libcurl
69    PKG_CHECK_MODULES([libcurl], [libcurl], [], [AC_MSG_ERROR([libcurl missing])])
70    CFLAGS="$CFLAGS $libcurl_CFLAGS"
71    LIBS="$LIBS $libcurl_LIBS"
72    
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"    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o map-tool.o osm-gps-map-osd-classic.o"
76    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
77    LIBS="$LIBS $libsoup24_LIBS"    LIBS="$LIBS $libsoup24_LIBS"
78  ], [  ], [
79    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
80      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"
81      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
82      LIBS="$LIBS $libsoup22_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
83    ], [    ], [
# Line 150  PKG_CHECK_EXISTS(maemo-version, [ Line 156  PKG_CHECK_EXISTS(maemo-version, [
156      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""      CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
157      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
158      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
159    
160        MAEMO_VERSION_MAJOR=$MAJOR
161        AC_SUBST(MAEMO_VERSION_MAJOR)
162    ], [    ], [
163      AC_MSG_ERROR([maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
164    ])    ])
165    
166      INSTALL_PLATTFORM="install-maemo"
167    
168      # fremantle uses icons of 48x48 pixels for the app installer,
169      # older versions used 26x26
170      if [[ "$MAJOR" == "5" ]]; then
171         ICONNAME=48x48/gpxview.png
172         datarootdir=/opt
173      else
174         ICONNAME=26x26/gpxview.png
175         AC_MSG_NOTICE([Enabling Maemo Mapper support])
176      fi
177    
178      CFLAGS="$CFLAGS -DENABLE_MAEMO_MAPPER"
179      EXTRA_OBJS="$EXTRA_OBJS mm_poi.o"
180    
181    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
182    EXTRA_OBJS="$EXTRA_OBJS mm_poi.o dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
183    
184    INSTALL_PLATTFORM="install-maemo"    AC_MSG_NOTICE([Using application installer icon "$ICONNAME"])
185    
186      # add icon entry to debian/control
187      ICON=" Maemo icon $ICONNAME
188    XB-Maemo-Icon-26:
189    "
190    
191      # generate base64 icon, remove first and last line
192      # and add a space before each line
193      ICON="$ICON`uuencode -m data/icons/$ICONNAME $ICONNAME | sed '1d;$d;s/^/ /' -`"
194    
195  ], [  ], [
196    AC_MSG_RESULT(no)    AC_MSG_RESULT(no)
197    
198      EXTRA_OBJS="$EXTRA_OBJS bct.o"
199      CFLAGS="$CFLAGS -DBCT"
200    
201    # check for gtk+-2.0    # check for gtk+-2.0
202    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!])])
203    CFLAGS="$CFLAGS $gtk_CFLAGS"    CFLAGS="$CFLAGS $gtk_CFLAGS"
# Line 173  PKG_CHECK_EXISTS(maemo-version, [ Line 209  PKG_CHECK_EXISTS(maemo-version, [
209    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS"
210    
211    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
212    
213      ICON=" No icon"
214  ])  ])
215    
216  AC_SUBST(EXTRA_OBJS)  AC_SUBST(EXTRA_OBJS)
217    AC_SUBST(ICON)
218  AC_SUBST(INSTALL_PLATTFORM)  AC_SUBST(INSTALL_PLATTFORM)
219  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile])  AC_CONFIG_FILES([Makefile src/Makefile data/Makefile debian/control])
220    
221  AC_OUTPUT  AC_OUTPUT
Legend:
Removed from v.61  
changed lines
  Added in v.235