diff -ruN blender-2.32.orig/configure blender-2.32/configure
--- blender-2.32.orig/configure	2004-02-04 00:40:04.233004048 +0100
+++ blender-2.32/configure	2004-02-04 00:44:13.789065760 +0100
@@ -22221,8 +22221,8 @@
            with_mozilla =$withval
         fi
         if test x$with_mozilla != "yes"; then
-           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla-$MOZVER -lnspr"
-           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla-$MOZVER/nspr"
+           LDFLAGS="$LDFLAGS -L$withval/lib/mozilla -lnspr4"
+           CPPFLAGS="$CPPFLAGS -I$withval/include/mozilla/nspr"
         fi
 
 fi;
@@ -26003,7 +26003,6 @@
   fi
 
 
-  rm -f conf.sdltest
 
 
 echo "$as_me:$LINENO: checking for SDL_Init in -lSDL" >&5
diff -ruN blender-2.32.orig/release/plugins/bmake blender-2.32/release/plugins/bmake
--- blender-2.32.orig/release/plugins/bmake	2004-02-04 00:40:02.213311088 +0100
+++ blender-2.32/release/plugins/bmake	2004-02-04 00:43:52.975229944 +0100
@@ -60,7 +60,7 @@
 	LDFLAGS="-Bshareable";
 elif ( test $UNAME = "Linux" ) then
 	CC="gcc";
-	CFLAGS="-fPIC -funsigned-char -O2";
+#	CFLAGS="-fPIC -funsigned-char -O2";
 
 	LD="ld";
 	LDFLAGS="-Bshareable";
@@ -112,6 +112,8 @@
 	INCLUDES=-I..;
 elif ( test -f "../include/plugin.h" ) then
 	INCLUDES=-I../include
+elif ( test -f "../../../source/blender/blenpluginapi/plugin.h" ) then
+	INCLUDES=-I../../../source/blender/blenpluginapi
 else 
 	echo "Couldn't find plugin.h";
 	exit;
diff -ruN blender-2.32.orig/source/blender/blenlib/Makefile.am blender-2.32/source/blender/blenlib/Makefile.am
--- blender-2.32.orig/source/blender/blenlib/Makefile.am	2004-02-04 01:25:28.052920480 +0100
+++ blender-2.32/source/blender/blenlib/Makefile.am	2004-02-04 01:33:59.561159408 +0100
@@ -47,7 +47,8 @@
 
 INCLUDES = -I$(top_srcdir)/source/blender/makesdna \
 	-I$(top_srcdir)/intern/guardedalloc \
-	-I$(top_srcdir)/source/blender/include
+	-I$(top_srcdir)/source/blender/include \
+	-I$(top_srcdir)/source/blender/blenkernel
 
 EXTRA_DIST = \
 	Makefile \
diff -ruN blender-2.32.orig/source/blender/blenlib/Makefile.in blender-2.32/source/blender/blenlib/Makefile.in
--- blender-2.32.orig/source/blender/blenlib/Makefile.in	2004-02-04 01:25:28.074917136 +0100
+++ blender-2.32/source/blender/blenlib/Makefile.in	2004-02-04 01:34:28.189807192 +0100
@@ -240,7 +240,8 @@
 
 INCLUDES = -I$(top_srcdir)/source/blender/makesdna \
 	-I$(top_srcdir)/intern/guardedalloc \
-	-I$(top_srcdir)/source/blender/include
+	-I$(top_srcdir)/source/blender/include \
+	-I$(top_srcdir)/source/blender/blenkernel
 
 
 EXTRA_DIST = \