From 810e89f091b825e0528ff6e2a13c7985f89f075a Mon Sep 17 00:00:00 2001 From: "seawood%netscape.com" Date: Thu, 13 Feb 2003 19:24:24 +0000 Subject: [PATCH] Fix cross-compiling by replacing hardcoded -L/usr/X11R6/lib Bug #193062 r=peterl a=asa git-svn-id: svn://10.0.0.236/trunk@137779 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/Makefile.in | 2 +- mozilla/modules/plugin/tools/sdk/samples/basic/unix/Makefile.in | 2 +- .../plugin/tools/sdk/samples/scriptable/unix/Makefile.in | 2 +- mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index e3a10e01e6a..ec399ca567b 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -145,7 +145,7 @@ EXTRA_DSO_LDOPTS += -lgtkxtbin $(XLDFLAGS) $(XT_LIBS) $(MOZ_GTK2_LIBS) $(XLIBS) endif #MOZ_ENABLE_GTK2 ifdef MOZ_ENABLE_XLIB -EXTRA_DSO_LDOPTS += -lxlibxtbin -lxlibrgb -L/usr/X11R6/lib $(XT_LIBS) +EXTRA_DSO_LDOPTS += -lxlibxtbin -lxlibrgb $(XLDFLAGS) $(XT_LIBS) ifndef MOZ_MONOLITHIC_TOOLKIT CXXFLAGS += $(MOZ_XLIB_CFLAGS) CFLAGS += $(MOZ_XLIB_CFLAGS) diff --git a/mozilla/modules/plugin/tools/sdk/samples/basic/unix/Makefile.in b/mozilla/modules/plugin/tools/sdk/samples/basic/unix/Makefile.in index 8acea86c806..73f594ebb28 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/basic/unix/Makefile.in +++ b/mozilla/modules/plugin/tools/sdk/samples/basic/unix/Makefile.in @@ -43,7 +43,7 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DMOZILLA_STRICT_API -EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt +EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt INSTALL_PLUGIN = $(CONFIG_TOOLS)/nsinstall -R INSTALL = true diff --git a/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in b/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in index ec4a32d90bf..93b0b6c35eb 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in +++ b/mozilla/modules/plugin/tools/sdk/samples/scriptable/unix/Makefile.in @@ -46,7 +46,7 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DMOZILLA_STRICT_API -EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt +EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt INSTALL_PLUGIN = $(CONFIG_TOOLS)/nsinstall -R INSTALL = true diff --git a/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in b/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in index 6a273dd3176..838899c1c14 100644 --- a/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in +++ b/mozilla/modules/plugin/tools/sdk/samples/simple/Makefile.in @@ -53,7 +53,7 @@ include $(topsrcdir)/config/rules.mk DEFINES += -DMOZILLA_STRICT_API ifeq ($(OS_ARCH),Linux) -EXTRA_DSO_LDOPTS += -L/usr/lib -L/usr/X11R6/lib -rdynamic -lXi -lXext -lX11 -lm -lXt +EXTRA_DSO_LDOPTS += $(XLDFLAGS) -rdynamic -lXi -lXext -lX11 -lm -lXt endif LOCAL_INCLUDES = -I./$(XPIDL_GEN_DIR) \