Diff of /trunk/configure.in

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

revision 197 by harbaum, Wed Jul 8 15:45:38 2009 UTC revision 222 by harbaum, Mon Jul 13 20:13:07 2009 UTC
# Line 21  Line 21 
21  # along with OSM2Go.  If not, see <http://www.gnu.org/licenses/>.  # along with OSM2Go.  If not, see <http://www.gnu.org/licenses/>.
22    
23  AC_PREREQ(2.61)  AC_PREREQ(2.61)
24  AC_INIT([OSM2Go],[0.7.8],[osm2go-users@garage.maemo.org])  AC_INIT([OSM2Go],[0.7.11],[osm2go-users@garage.maemo.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 60  PKG_CHECK_MODULES([libcurl], [libcurl], Line 60  PKG_CHECK_MODULES([libcurl], [libcurl],
60  CFLAGS="$CFLAGS $libcurl_CFLAGS"  CFLAGS="$CFLAGS $libcurl_CFLAGS"
61  LIBS="$LIBS $libcurl_LIBS"  LIBS="$LIBS $libcurl_LIBS"
62    
63    # check for libsoup
64    PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
65      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
66      CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
67      LIBS="$LIBS $libsoup24_LIBS"
68    ], [
69      PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
70        EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
71        CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
72        LIBS="$LIBS $libsoup22_LIBS"
73      ], [
74        AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
75      ])
76    ])
77    
78  # check for goocanvas  # check for goocanvas
79  PKG_CHECK_MODULES([goocanvas], [goocanvas], [], [AC_MSG_ERROR([goocanvas missing])])  PKG_CHECK_MODULES([goocanvas], [goocanvas], [], [AC_MSG_ERROR([goocanvas missing])])
80  CFLAGS="$CFLAGS -DUSE_GOOCANVAS $goocanvas_CFLAGS"  CFLAGS="$CFLAGS -DUSE_GOOCANVAS $goocanvas_CFLAGS"
# Line 126  PKG_CHECK_EXISTS(maemo-version, [ Line 141  PKG_CHECK_EXISTS(maemo-version, [
141    ])    ])
142    
143    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
144    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
145    AC_SUBST(EXTRA_OBJS)    AC_SUBST(EXTRA_OBJS)
146    
147    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
Legend:
Removed from v.197  
changed lines
  Added in v.222