Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 21:22:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 556962 - Maemo geolocation provider is not compiling on Maemo 6. r=dougt.

Browse Source
This commit is contained in:
Oleg Romashin 2010-04-14 05:42:43 -04:00
parent 76a060d358
commit 863f6433d2
4 changed files with 17 additions and 10 deletions

1
config/autoconf.mk.in

@ -617,6 +617,7 @@ MOZ_DISTRIBUTION_ID = @MOZ_DISTRIBUTION_ID@
MOZ_PLATFORM_MAEMO = @MOZ_PLATFORM_MAEMO@
MOZ_PLATFORM_MAEMO_CFLAGS = @MOZ_PLATFORM_MAEMO_CFLAGS@
MOZ_PLATFORM_MAEMO_LIBS = @MOZ_PLATFORM_MAEMO_LIBS@
MOZ_MAEMO_LIBLOCATION = @MOZ_MAEMO_LIBLOCATION@
MOZ_ENABLE_LIBCONIC = @MOZ_ENABLE_LIBCONIC@
LIBCONIC_CFLAGS = @LIBCONIC_CFLAGS@

20
configure.in

@ -6558,9 +6558,10 @@ if test $MOZ_PLATFORM_MAEMO; then
if test -z "$MOZ_ENABLE_DBUS"; then
AC_MSG_ERROR([DBus is required when building for Maemo])
fi
MOZ_GFX_OPTIMIZE_MOBILE=1
MOZ_WEBGL_GLX=
MOZ_MAEMO_LIBLOCATION=
if test $MOZ_PLATFORM_MAEMO = 5; then
dnl if we have Xcomposite we should also have Xdamage and Xfixes
@ -6593,14 +6594,19 @@ if test $MOZ_PLATFORM_MAEMO; then
AC_MSG_ERROR([Hildon FM-2 is required when building for Maemo])
fi
PKG_CHECK_MODULES(LIBLOCATION,liblocation, _LIB_FOUND=1, _LIB_FOUND=)
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBLOCATION_LIBS"
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBLOCATION_CFLAGS"
if test -z "$_LIB_FOUND"; then
AC_MSG_ERROR([liblocation is required when building for Maemo])
fi
fi
PKG_CHECK_MODULES(LIBLOCATION,liblocation, _LIB_FOUND=1, _LIB_FOUND=)
MOZ_PLATFORM_MAEMO_LIBS="$MOZ_PLATFORM_MAEMO_LIBS $LIBLOCATION_LIBS"
MOZ_PLATFORM_MAEMO_CFLAGS="$MOZ_PLATFORM_MAEMO_CFLAGS $LIBLOCATION_CFLAGS"
if test "$_LIB_FOUND"; then
MOZ_MAEMO_LIBLOCATION=1
AC_DEFINE(MOZ_MAEMO_LIBLOCATION)
else
AC_MSG_WARN([Cannot liblocation-dev. Disabling Maemo geolocation.])
fi
AC_SUBST(MOZ_MAEMO_LIBLOCATION)
AC_SUBST(MOZ_PLATFORM_MAEMO_LIBS)
AC_SUBST(MOZ_PLATFORM_MAEMO_CFLAGS)
fi

2
dom/src/geolocation/Makefile.in

@ -65,7 +65,7 @@ ifdef WINCE_WINDOWS_MOBILE
CPPSRCS += WinMobileLocationProvider.cpp
endif
ifdef MOZ_PLATFORM_MAEMO
ifdef MOZ_MAEMO_LIBLOCATION
CPPSRCS += MaemoLocationProvider.cpp
LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS)
endif

4
dom/src/geolocation/nsGeolocation.cpp

@ -57,7 +57,7 @@
#include "WinMobileLocationProvider.h"
#endif
#ifdef MOZ_PLATFORM_MAEMO
#ifdef MOZ_MAEMO_LIBLOCATION
#include "MaemoLocationProvider.h"
#endif
@ -420,7 +420,7 @@ nsresult nsGeolocationService::Init()
mProviders.AppendObject(provider);
#endif
#ifdef MOZ_PLATFORM_MAEMO
#ifdef MOZ_MAEMO_LIBLOCATION
provider = new MaemoLocationProvider();
if (provider)
mProviders.AppendObject(provider);