Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 10:44:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Conditionally check for -lSM & -lICE if -lXt test fails.

Browse Source 
Use XT_LIBS variable for -lXt and its dependencies.
Link XT_LIBS in static xlib builds.
Use same modulename for xlib module in Makefile as the code uses.
Bug #126163 & Bug #144182 r=bryner
This commit is contained in:
seawood%netscape.com 2002-05-14 04:04:23 +00:00
parent 1f5fb463c3
commit 7abea1092f
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/autoconf.mk.in
View File

@ -344,6 +344,7 @@ MOZ_ENABLE_XINERAMA = @MOZ_ENABLE_XINERAMA@
MOZ_XINERAMA_LIBS = @MOZ_XINERAMA_LIBS@
MOZ_XIE_LIBS = @MOZ_XIE_LIBS@
XT_LIBS = @XT_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@

4
config/static-config.mk
View File

@ -86,8 +86,8 @@ ifdef MOZ_SVG
STATIC_EXTRA_LIBS += $(MOZ_LIBART_LIBS)
endif
ifdef MOZ_ENABLE_GTK
STATIC_EXTRA_LIBS += $(XLDFLAGS) -lXt
ifneq (,$(MOZ_ENABLE_GTK)$(MOZ_ENABLE_XLIB))
STATIC_EXTRA_LIBS += $(XLDFLAGS) $(XT_LIBS)
endif
ifdef MOZ_ENABLE_XINERAMA

14
configure.in
View File

@ -1644,11 +1644,17 @@ else
[MISSING_X="$MISSING_X -lX11"], $XLIBS)
AC_CHECK_LIB(Xext, XextAddDisplay, [XEXT_LIBS="-lXext"],
[MISSING_X="$MISSING_X -lXext"], $XLIBS)
AC_CHECK_LIB(ICE, IceFlush, [XICE_LIBS="-lICE"],, $XLIBS)
AC_CHECK_LIB(SM, SmcCloseConnection, [XSM_LIBS="-lSM"],, $XLIBS)
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"],
[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XLIBS)
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt"], [
unset ac_cv_lib_Xt_XtFree
AC_CHECK_LIB(ICE, IceFlush, [XT_LIBS="-lICE $XT_LIBS"],, $XT_LIBS $XLIBS)
AC_CHECK_LIB(SM, SmcCloseConnection, [XT_LIBS="-lSM $XT_LIBS"],, $XT_LIBS $XLIBS)
AC_CHECK_LIB(Xt, XtFree, [ XT_LIBS="-lXt $XT_LIBS"],
[MISSING_X="$MISSING_X -lXt"], $X_PRE_LIBS $XT_LIBS $XLIBS)
])
AC_SUBST(XT_LIBS)
dnl ========================================================
dnl = Check for Xinerama
dnl ========================================================

2
widget/src/xlib/Makefile.in
View File

@ -31,7 +31,7 @@ MODULE = widget
LIBRARY_NAME = widget_xlib
EXPORT_LIBRARY = 1
IS_COMPONENT = 1
MODULE_NAME = nsWidgetXLibModule
MODULE_NAME = nsWidgetXLIBModule
REQUIRES = xpcom \
string \
appshell \