Diff of /trunk/configure.in

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

revision 112 by harbaum, Fri Mar 6 13:41:08 2009 UTC revision 165 by harbaum, Tue Apr 21 20:11:30 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.0],[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 93  PKG_CHECK_EXISTS(maemo-version, [ Line 93  PKG_CHECK_EXISTS(maemo-version, [
93    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"    CFLAGS="$CFLAGS $hildon_fm_2_CFLAGS"
94    LIBS="$LIBS $hildon_fm_2_LIBS"    LIBS="$LIBS $hildon_fm_2_LIBS"
95    
96    PKG_CHECK_EXISTS(gps-bt, [    # prefer gpsbt over liblocation as we got complaints regarding liblocation
97      # stability
98      PKG_CHECK_EXISTS(gpsbt, [
99      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
100      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
101      LIBS="$LIBS $gpsbt_LIBS"      LIBS="$LIBS $gpsbt_LIBS"
102    ], [AC_MSG_NOTICE([WARNING: No gpsbt found, disabling gps auto start!])])    ], [
103        AC_MSG_NOTICE([gpsbt not found, trying liblocation])
104    
105    PKG_CHECK_EXISTS(tablet_browser_interface, [      PKG_CHECK_EXISTS(liblocation, [
106          PKG_CHECK_MODULES([liblocation], [liblocation], [], [])
107          CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
108          LIBS="$LIBS $liblocation_LIBS"
109        ], [
110          AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])
111        ])
112      ])
113    
114      PKG_CHECK_EXISTS(tablet-browser-interface, [
115      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
116    ], [AC_MSG_NOTICE([WARNING: No table-browser-interface found, disabling microb interface!])])    ], [AC_MSG_NOTICE([WARNING: No tablet-browser-interface found, disabling microb interface!])])
117    
118      PKG_CHECK_EXISTS(maemo-version, [
119        VERSION=`pkg-config --modversion maemo-version`
120        AC_MSG_NOTICE([Configuring for Maemo $VERSION])
121        CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
122        MAJOR=`echo $VERSION | cut -b1 -`
123        CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
124      ], [
125        AC_MSG_ERROR([maemo-version not found])
126      ])
127    
128    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
129    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="dbus.o"
# Line 120  PKG_CHECK_EXISTS(maemo-version, [ Line 142  PKG_CHECK_EXISTS(maemo-version, [
142    
143    # non-maemo device use gnome to call the web browser    # non-maemo device use gnome to call the web browser
144    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])])
145    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
146    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"    LIBS="$LIBS $gnome2_LIBS"
147    
148    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
149    AC_SUBST(INSTALL_PLATTFORM)    AC_SUBST(INSTALL_PLATTFORM)
Legend:
Removed from v.112  
changed lines
  Added in v.165