--- configure.in.orig	2009-07-07 15:23:17.000000000 +0300
+++ configure.in	2011-03-12 22:28:26.117914430 +0200
@@ -628,12 +628,11 @@
 		withval="";
 	fi
 	for spidermonkeydir in "$withval" "" /usr /usr/local /opt/spidermonkey /opt/js; do
-		for spidermonkeyinclude in "/include" "/include/js" "/include/smjs" "/include/mozjs"; do
 			for spidermonkeylib in js smjs mozjs; do
 				if test "$cf_result" = no &&
 				   test -f "$spidermonkeydir$spidermonkeyinclude/jsapi.h"; then
 					SPIDERMONKEY_LIBS="-L$spidermonkeydir/lib -l$spidermonkeylib"
-					SPIDERMONKEY_CFLAGS="-I$spidermonkeydir$spidermonkeyinclude"
+					SPIDERMONKEY_CFLAGS="`pkg-config --cflags libjs`"
 
 					LIBS="$SPIDERMONKEY_LIBS $LIBS_X"
 					CFLAGS="$CFLAGS_X $SPIDERMONKEY_CFLAGS"
@@ -643,7 +642,6 @@
 						     #include <jsapi.h>]], [[JS_GetReservedSlot(NULL, NULL, 0, NULL)]])],[cf_result=yes],[cf_result=no])
 				fi
 			done
-		done
 	done
 fi