Diff of /trunk/configure.in

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

revision 200 by harbaum, Thu Jul 9 11:44:27 2009 UTC revision 209 by harbaum, Fri Jul 10 19:45:31 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.9],[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 61  CFLAGS="$CFLAGS $libcurl_CFLAGS" Line 61  CFLAGS="$CFLAGS $libcurl_CFLAGS"
61  LIBS="$LIBS $libcurl_LIBS"  LIBS="$LIBS $libcurl_LIBS"
62    
63  # check for libsoup  # check for libsoup
64  PKG_CHECK_MODULES([libsoup], [libsoup-2.4], [], [AC_MSG_ERROR([libsoup-2.4 missing])])  PKG_CHECK_MODULES([libsoup], [libsoup-2.4], [
65  CFLAGS="$CFLAGS $libsoup_CFLAGS"    EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"
66  LIBS="$LIBS $libsoup_LIBS"    CFLAGS="$CFLAGS $libsoup_CFLAGS -DENABLE_OSM_GPS_MAP"
67      LIBS="$LIBS $libsoup_LIBS"
68    ], [AC_MSG_NOTICE([WARNING: libsoup-2.4 missing, disabling internal map])])
69    
70  # check for goocanvas  # check for goocanvas
71  PKG_CHECK_MODULES([goocanvas], [goocanvas], [], [AC_MSG_ERROR([goocanvas missing])])  PKG_CHECK_MODULES([goocanvas], [goocanvas], [], [AC_MSG_ERROR([goocanvas missing])])
# Line 131  PKG_CHECK_EXISTS(maemo-version, [ Line 133  PKG_CHECK_EXISTS(maemo-version, [
133    ])    ])
134    
135    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
136    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="$EXTRA_OBJS dbus.o"
137    AC_SUBST(EXTRA_OBJS)    AC_SUBST(EXTRA_OBJS)
138    
139    INSTALL_PLATTFORM="install-maemo"    INSTALL_PLATTFORM="install-maemo"
Legend:
Removed from v.200  
changed lines
  Added in v.209