Diff of /trunk/configure.in

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

revision 117 by harbaum, Fri Mar 6 13:41:08 2009 UTC revision 118 by harbaum, Mon Mar 9 14:28:35 2009 UTC
# 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 liblocation over gpsbt to control gps
97      PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])    PKG_CHECK_EXISTS(liblocation, [
98      CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"      PKG_CHECK_MODULES([liblocation], [liblocation], [], [])
99      LIBS="$LIBS $gpsbt_LIBS"      CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
100    ], [AC_MSG_NOTICE([WARNING: No gpsbt found, disabling gps auto start!])])      LIBS="$LIBS $liblocation_LIBS"
101      ], [
102        AC_MSG_NOTICE([WARNING: liblocation not found, trying deprecated gpsbt])
103    
104    PKG_CHECK_EXISTS(tablet_browser_interface, [      PKG_CHECK_EXISTS(gpsbt, [
105          PKG_CHECK_MODULES([gpsbt], [gpsbt], [], [])
106          CFLAGS="$CFLAGS -DENABLE_GPSBT $gpsbt_CFLAGS"
107          LIBS="$LIBS $gpsbt_LIBS"
108        ], [AC_MSG_NOTICE([WARNING: No liblocation nor gpsbt found, disabling gps auto start!])])
109      ])
110    
111      PKG_CHECK_EXISTS(tablet-browser-interface, [
112      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"      CFLAGS="$CFLAGS -DENABLE_BROWSER_INTERFACE"
113    ], [AC_MSG_NOTICE([WARNING: No table-browser-interface found, disabling microb interface!])])    ], [AC_MSG_NOTICE([WARNING: No tablet-browser-interface found, disabling microb interface!])])
114    
115    # maemo uses dbus for ipc with maemo mapper    # maemo uses dbus for ipc with maemo mapper
116    EXTRA_OBJS="dbus.o"    EXTRA_OBJS="dbus.o"
Legend:
Removed from v.117  
changed lines
  Added in v.118