Diff of /trunk/configure.in

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

revision 212 by harbaum, Sat Jul 11 11:59:58 2009 UTC revision 214 by harbaum, Sun Jul 12 11:28:15 2009 UTC
# 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], [  PKG_CHECK_MODULES([libsoup24], [libsoup-2.4], [
65    EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"    EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
66    CFLAGS="$CFLAGS $libsoup_CFLAGS -DENABLE_OSM_GPS_MAP"    CFLAGS="$CFLAGS $libsoup24_CFLAGS -DENABLE_OSM_GPS_MAP"
67    LIBS="$LIBS $libsoup_LIBS"    LIBS="$LIBS $libsoup24_LIBS"
68  ], [  ], [
69    PKG_CHECK_MODULES([libsoup], [libsoup-2.2], [    PKG_CHECK_MODULES([libsoup22], [libsoup-2.2], [
70      EXTRA_OBJS="$EXTRA_OBJS  converter.o osm-gps-map.o"      EXTRA_OBJS="$EXTRA_OBJS converter.o osm-gps-map.o"
71      CFLAGS="$CFLAGS $libsoup_CFLAGS -DSOUP22 -DENABLE_OSM_GPS_MAP"      CFLAGS="$CFLAGS $libsoup22_CFLAGS -DLIBSOUP22 -DENABLE_OSM_GPS_MAP"
72      LIBS="$LIBS $libsoup_LIBS"      LIBS="$LIBS $libsoup22_LIBS"
73    ], [    ], [
74      AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])      AC_MSG_NOTICE([WARNING: libsoup-2.4/2.2 missing, disabling internal map])
75    ])    ])
Legend:
Removed from v.212  
changed lines
  Added in v.214