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

Bug 445934 - Layout linking broken in NS_OSSO disable-libxul configuration. r=ted.mielczarek

Browse Source
This commit is contained in:
Oleg Romashin 2008-09-13 07:47:45 +03:00
parent df8945bc5a
commit bed72a5865
6 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/autoconf.mk.in
View File

@ -623,6 +623,10 @@ LIBHILDONMIME_CFLAGS = @LIBHILDONMIME_CFLAGS@
LIBHILDONMIME_LIBS = @LIBHILDONMIME_LIBS@
LIBOSSO_CFLAGS = @LIBOSSO_CFLAGS@
LIBOSSO_LIBS = @LIBOSSO_LIBS@
NS_MAEMO_LOCATION = @NS_MAEMO_LOCATION@
MOZ_LOCATION_CFLAGS = @MOZ_LOCATION_CFLAGS@
MOZ_LOCATION_LIBS = @MOZ_LOCATION_LIBS@
MACOS_SDK_DIR = @MACOS_SDK_DIR@
NEXT_ROOT = @NEXT_ROOT@

12
configure.in
View File

@ -6098,6 +6098,17 @@ fi
AC_SUBST(LIBOSSO_CFLAGS)
AC_SUBST(LIBOSSO_LIBS)
PKG_CHECK_MODULES(MOZ_LOCATION, [liblocation gpsbt],
NS_MAEMO_LOCATION=1,
NS_MAEMO_LOCATION=)
if test $NS_MAEMO_LOCATION; then
AC_DEFINE(NS_MAEMO_LOCATION)
fi
AC_SUBST(MOZ_LOCATION_CFLAGS)
AC_SUBST(MOZ_LOCATION_LIBS)
dnl ========================================================
dnl =
dnl = Feature options that require extra sources to be pulled
@ -7829,6 +7840,7 @@ AC_SUBST(MOZ_UPDATE_XTERM)
AC_SUBST(MINIMO)
AC_SUBST(MOZ_PLATFORM_HILDON)
AC_SUBST(NS_OSSO)
AC_SUBST(NS_MAEMO_LOCATION)
AC_SUBST(MOZ_AUTH_EXTENSION)
AC_SUBST(MOZ_MATHML)
AC_SUBST(MOZ_PERMISSIONS)

4
dom/src/geolocation/Makefile.in
View File

@ -76,9 +76,9 @@ LOCAL_INCLUDES = \
-I$(srcdir)/../base \
$(NULL)
ifdef NS_OSSO
ifdef NS_MAEMO_LOCATION
CPPSRCS += MaemoLocationProvider.cpp
LOCAL_INCLUDES += $(MOZ_GTK2_CFLAGS)
LOCAL_INCLUDES += $(MOZ_LOCATION_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk

6
dom/src/geolocation/nsGeolocation.cpp
View File

@ -52,7 +52,7 @@
#include <math.h>
#ifdef NS_OSSO
#ifdef NS_MAEMO_LOCATION
#include "MaemoLocationProvider.h"
#endif
@ -469,8 +469,8 @@ nsGeolocationService::StartDevice()
// Check to see if there is an override in place. if so, use it.
mProvider = do_GetService(NS_GEOLOCATION_PROVIDER_CONTRACTID);
// if NS_OSSO, see if we should try the MAEMO location provider
#ifdef NS_OSSO
// if NS_MAEMO_LOCATION, see if we should try the MAEMO location provider
#ifdef NS_MAEMO_LOCATION
if (!mProvider)
{
// guess not, lets try a default one:

2
layout/build/Makefile.in
View File

@ -247,6 +247,8 @@ EXTRA_DSO_LDOPTS += $(MOZ_QT_LIBS) \
$(NULL)
endif
EXTRA_DSO_LDOPTS += $(MOZ_LOCATION_LIBS)
ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
EXTRA_DSO_LDOPTS += \
$(TK_LIBS) \

6
toolkit/library/Makefile.in
View File

@ -232,15 +232,13 @@ EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(MOZ_GTK2_LIBS) $(XT_L
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif
ifdef NS_OSSO
EXTRA_DSO_LDOPTS += -llocation -lgpsbt -losso
endif
ifeq (qt,$(MOZ_WIDGET_TOOLKIT))
EXTRA_DSO_LDOPTS += $(XLDFLAGS) $(XLIBS) $(MOZ_XFT_LIBS) $(XT_LIBS) $(MOZ_QT_LIBS) -lgthread-2.0
EXTRA_DSO_LDOPTS += $(FT2_LIBS)
endif
EXTRA_DSO_LDOPTS += $(MOZ_LOCATION_LIBS)
ifdef MOZ_ENABLE_STARTUP_NOTIFICATION
EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS)
endif