Diff of /trunk/configure.in

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

revision 110 by harbaum, Fri Mar 6 13:06:08 2009 UTC revision 118 by harbaum, Mon Mar 9 14:28:35 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])])    # prefer liblocation over gpsbt to control gps
97    CFLAGS="$CFLAGS $gpsbt_CFLAGS"    PKG_CHECK_EXISTS(liblocation, [
98    LIBS="$LIBS $gpsbt_LIBS"      PKG_CHECK_MODULES([liblocation], [liblocation], [], [])
99        CFLAGS="$CFLAGS -DENABLE_LIBLOCATION $liblocation_CFLAGS"
100        LIBS="$LIBS $liblocation_LIBS"
101      ], [
102        AC_MSG_NOTICE([WARNING: liblocation not found, trying deprecated gpsbt])
103    
104        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"
113      ], [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"
# Line 116  PKG_CHECK_EXISTS(maemo-version, [ Line 130  PKG_CHECK_EXISTS(maemo-version, [
130    # non-maemo device use gnome to call the web browser    # non-maemo device use gnome to call the web browser
131    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])])
132    CFLAGS="$CFLAGS $gnome2_CFLAGS"    CFLAGS="$CFLAGS $gnome2_CFLAGS"
133    LIBS="$LIBS $gnome2_LIBS"    LIBS="$LIBS $gnome2_LIBS -DENABLE_BROWSER_INTERFACE"
134    
135    INSTALL_PLATTFORM="install-debian"    INSTALL_PLATTFORM="install-debian"
136    AC_SUBST(INSTALL_PLATTFORM)    AC_SUBST(INSTALL_PLATTFORM)
Legend:
Removed from v.110  
changed lines
  Added in v.118