From 1aa98708841f19cf8e652f10d77921cad386aec1 Mon Sep 17 00:00:00 2001 From: Greg Lewis Date: Thu, 8 Sep 2005 18:11:41 +0000 Subject: . Fix compilation after the recent nspr split from mozilla/firefox. Although I can't reproduce this problem, it doesn't break anything for me and other users have independently verified it fixes the build for them. . Remove an unnecessary patch. PR: 85590 Submitted by: Panagiotis Astithas --- java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh') diff --git a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh index ed38417a85b6..c618b3f236be 100644 --- a/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh +++ b/java/eclipse/files/manualpatch-plugins-swt-gtk-build.sh @@ -9,9 +9,9 @@ + LD=gcc + XTEST_LIB_PATH=$X11BASE/lib + GECKO_I=${X11BASE}/include/${BROWSER} -+ GECKO_INCLUDES="-I${GECKO_I} -I${GECKO_I}/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring" ++ GECKO_INCLUDES="-I${GECKO_I} -I${LOCALBASE}/include/nspr -I${GECKO_I}/xpcom -I${GECKO_I}/string -I${GECKO_I}/embed_base -I${GECKO_I}/embedstring" + GECKO_L=${X11BASE}/lib/${BROWSER} -+ GECKO_LIBS="-L${GECKO_L} -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz" ++ GECKO_LIBS="-L${GECKO_L} -L${LOCALBASE}/lib -lxpcom -lnspr4 -lplds4 -lplc4 -lgtkembedmoz" + case $MODEL in + "amd64") + AWT_LIB_PATH=$JAVA_HOME/jre/lib/amd64 -- cgit v1.2.3