Diff of /trunk/configure.in

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

revision 111 by harbaum, Fri Mar 6 13:06:08 2009 UTC revision 112 by harbaum, Fri Mar 6 13:41:08 2009 UTC
# Line 81  PKG_CHECK_EXISTS(maemo-version, [ Line 81  PKG_CHECK_EXISTS(maemo-version, [
81    MAEMO="yes"    MAEMO="yes"
82    AC_MSG_RESULT(yes)    AC_MSG_RESULT(yes)
83    
   # gthread-2.0 gpsbt  
84    PKG_CHECK_MODULES([hildon], [hildon-1], [], [AC_MSG_ERROR([hildon-1 missing])])    PKG_CHECK_MODULES([hildon], [hildon-1], [], [AC_MSG_ERROR([hildon-1 missing])])
85    CFLAGS="$CFLAGS  -DUSE_hildon $hildon_CFLAGS"    CFLAGS="$CFLAGS  -DUSE_HILDON $hildon_CFLAGS"
86    LIBS="$LIBS $hildon_LIBS"    LIBS="$LIBS $hildon_LIBS"
87    
88    PKG_CHECK_MODULES([osso], [libosso], [], [AC_MSG_ERROR([libosso missing])])    PKG_CHECK_MODULES([osso], [libosso], [], [AC_MSG_ERROR([libosso missing])])
# Line 94  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_MODULES([gpsbt], [gpsbt], [], [AC_MSG_ERROR([gpsbt missing])])    PKG_CHECK_EXISTS(gps-bt, [
97    CFLAGS="$CFLAGS $gpsbt_CFLAGS"      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
98    LIBS="$LIBS $gpsbt_LIBS"      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
99        LIBS="$LIBS $gpsbt_LIBS"
100      ], [AC_MSG_NOTICE([WARNING: No gpsbt found, disabling gps auto start!])])
101    
102      PKG_CHECK_EXISTS(tablet_browser_interface, [
103        CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
104      ], [AC_MSG_NOTICE([WARNING: No table-browser-interface found, disabling microb interface!])])
105    
106    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
107    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="dbus.o"
# Line 116  PKG_CHECK_EXISTS(maemo-version, [ Line 121  PKG_CHECK_EXISTS(maemo-version, [
121    # non-maemo device use gnome to call the web browser    # non-maemo device use gnome to call the web browser
122    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])])
123    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS"
124    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"
125    
126    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
127    AC_SUBST(INSTALL_PLATTFORM)    AC_SUBST(INSTALL_PLATTFORM)
Legend:
Removed from v.111  
changed lines
  Added in v.112