Diff of /trunk/configure.in

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

revision 118 by harbaum, Mon Mar 9 14:28:35 2009 UTC revision 143 by harbaum, Tue Mar 24 13:22:57 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.6.14],[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 112  PKG_CHECK_EXISTS(maemo-version, [ Line 112  PKG_CHECK_EXISTS(maemo-version, [
112      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
113    ], [AC_MSG_NOTICE([WARNING: No tablet-browser-interface found, disabling microb interface!])])    ], [AC_MSG_NOTICE([WARNING: No tablet-browser-interface found, disabling microb interface!])])
114    
115      PKG_CHECK_EXISTS(maemo-version, [
116        VERSION=`pkg-config --modversion maemo-version`
117        AC_MSG_NOTICE([Configuring for Maemo $VERSION])
118        CFLAGS="$CFLAGS -DMAEMO_VERSION=\\\"$VERSION\\\""
119        MAJOR=`echo $VERSION | cut -b1 -`
120        CFLAGS="$CFLAGS -DMAEMO_VERSION_MAJOR=$MAJOR"
121      ], [
122        AC_MSG_ERROR([maemo-version not found])
123      ])
124    
125    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
126    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="dbus.o"
127    AC_SUBST(EXTRA_OBJS)    AC_SUBST(EXTRA_OBJS)
# Line 129  PKG_CHECK_EXISTS(maemo-version, [ Line 139  PKG_CHECK_EXISTS(maemo-version, [
139    
140    # non-maemo device use gnome to call the web browser    # non-maemo device use gnome to call the web browser
141    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])])
142    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS -DENABLE_BROWSER_INTERFACE"
143    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"    LIBS="$LIBS $gnome2_LIBS"
144    
145    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
146    AC_SUBST(INSTALL_PLATTFORM)    AC_SUBST(INSTALL_PLATTFORM)
Legend:
Removed from v.118  
changed lines
  Added in v.143