Diff of /trunk/configure.in

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

revision 124 by harbaum, Tue Mar 17 12:04:48 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.8.13],[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 93  PKG_CHECK_EXISTS(maemo-version, [ Line 108  PKG_CHECK_EXISTS(maemo-version, [
108    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"
109    LIBS="$LIBS $hildon_fm_2_LIBS"    LIBS="$LIBS $hildon_fm_2_LIBS"
110    
111    # prefer liblocation over gpsbt to control gps    # prefer gpsbt over liblocation as we got complaints regarding liblocation
112    PKG_CHECK_EXISTS(liblocation, [    # stability
113      PKG_CHECK_MODULES([liblocation], [liblocation], [], [])    PKG_CHECK_EXISTS(gpsbt, [
114      CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
115      LIBS="$LIBS $liblocation_LIBS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
116        LIBS="$LIBS $gpsbt_LIBS"
117    ], [    ], [
118      AC_MSG_NOTICE([WARNING: liblocation not found, trying deprecated gpsbt])      AC_MSG_NOTICE([gpsbt not found, trying liblocation])
119    
120      PKG_CHECK_EXISTS(gpsbt, [      PKG_CHECK_EXISTS(liblocation, [
121        PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])        PKG_CHECK_MODULES([liblocation], [liblocation], [], [])
122        CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
123        LIBS="$LIBS $gpsbt_LIBS"        LIBS="$LIBS $liblocation_LIBS"
124      ], [AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])])      ], [
125    ])        AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])
126        ])
127      ])
128    
129    PKG_CHECK_EXISTS(tablet-browser-interface, [    PKG_CHECK_EXISTS(tablet-browser-interface, [
130      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
# Line 119  PKG_CHECK_EXISTS(maemo-version, [ Line 137  PKG_CHECK_EXISTS(maemo-version, [
137      MAJOR=`echo $VERSION | cut -b1 -`      MAJOR=`echo $VERSION | cut -b1 -`
138      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"      CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
139    ], [    ], [
140      AC_MSG_NOTICE([WARNING: maemo-version not found])      AC_MSG_ERROR([maemo-version not found])
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"
# Line 139  PKG_CHECK_EXISTS(maemo-version, [ Line 157  PKG_CHECK_EXISTS(maemo-version, [
157    
158    # non-maemo device use gnome to call the web browser    # non-maemo device use gnome to call the web browser
159    PKG_CHECK_MODULES([gnome2], [libgnome-2.0], [], [AC_MSG_ERROR([libgnome-2.0 missing])])    PKG_CHECK_MODULES([gnome2], [libgnome-2.0], [], [AC_MSG_ERROR([libgnome-2.0 missing])])
160    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
161    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"    LIBS="$LIBS $gnome2_LIBS"
162    
163    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
164    AC_SUBST(INSTALL_PLATTFORM)    AC_SUBST(INSTALL_PLATTFORM)
Legend:
Removed from v.124  
changed lines
  Added in v.222