[seed] extensions: Seed.js uses search path from @prefix@ now. Also queries gnome-js-common for moduledir.

[Robert Carr <racarr src gnome org>]

commit ef7342724d32afba2cee6bbf1fe57769e0f0aac1
Author: Robert Carr <racarr svn gnome org>
Date:   Tue May 26 03:57:08 2009 -0400

    extensions: Seed.js uses search path from @prefix@ now. Also queries gnome-js-common for moduledir. Seed depends on gnome-js-common now
---
 configure.ac                       |    4 +++-
 extensions/{Seed.js => Seed.js.in} |    2 +-
 libseed/seed-engine.c              |    4 ++--
 libseed/seed-path.h.in             |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1613fae..091f9e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,8 @@ AC_SUBST(GOBJECT_INTROSPECTION_LDFLAGS)
 
 dnl ========================GNOME-js common====================================
 PKG_CHECK_MODULES(GNOME_JS, gnome-js-common)
-m4_define([gnome-js-dir], [`pkg-config --variable=moduledir gnome-js-common`])
+GNOME_JS_DIR=`pkg-config --variable=moduledir gnome-js-common`
+AC_SUBST(GNOME_JS_DIR)
 
 dnl =============================Modules=======================================
 dnl ==== canvas ====
@@ -375,6 +376,7 @@ scripts/shave-libtool
 libseed/Makefile
 po/Makefile.in
 src/Makefile
+extensions/Seed.js
 extensions/Makefile
 tests/Makefile
 tests/javascript/Makefile
diff --git a/extensions/Seed.js b/extensions/Seed.js.in
similarity index 96%
rename from extensions/Seed.js
rename to extensions/Seed.js.in
index 08ee6e4..8b084f7 100644
--- a/extensions/Seed.js
+++ b/extensions/Seed.js.in
@@ -170,5 +170,5 @@ Seed.thread_repl = function()
 
 Seed.printf = function () { Seed.print(Seed.sprintf.apply(this, arguments)) };
 
-imports.searchPath = ["/usr/lib/gnome-js", "/usr/local/lib/gnome-js", "/usr/local/lib/seed", "/usr/lib/seed", "/usr/local/share/seed", "/usr/share/seed", "."];
+imports.searchPath = ["@GNOME_JS_DIR@", "@prefix@/lib/seed", "@prefix@/share/seed", "/usr/local/lib/seed","/usr/local/share/seed","/usr/lib/seed","/usr/share/seed","."];
 
diff --git a/libseed/seed-engine.c b/libseed/seed-engine.c
index 08e2203..5f34ecb 100644
--- a/libseed/seed-engine.c
+++ b/libseed/seed-engine.c
@@ -1357,7 +1357,7 @@ seed_init (gint * argc, gchar *** argv)
 
 
   defaults_script =
-	  JSStringCreateWithUTF8CString ("Seed.include(\""SEED_PREFIX_PATH"\");");
+	  JSStringCreateWithUTF8CString ("Seed.include(\""SEED_PREFIX_PATH"extensions/Seed.js\");");
 
   JSEvaluateScript (eng->context, defaults_script, NULL, NULL, 0, NULL);
 
@@ -1436,7 +1436,7 @@ seed_init_with_context_group (gint * argc,
   seed_gtype_init (eng);
 
   defaults_script =
-	  JSStringCreateWithUTF8CString ("Seed.include(\""SEED_PREFIX_PATH"\");");
+	  JSStringCreateWithUTF8CString ("Seed.include(\""SEED_PREFIX_PATH"extensions/Seed.js\");");
   JSEvaluateScript (eng->context, defaults_script, NULL, NULL, 0, NULL);
   JSStringRelease (defaults_script);
 
diff --git a/libseed/seed-path.h.in b/libseed/seed-path.h.in
index ef52348..b9ed979 100644
--- a/libseed/seed-path.h.in
+++ b/libseed/seed-path.h.in
@@ -1 +1 @@
-#define SEED_PREFIX_PATH "@prefix@""/lib/seed/"
+#define SEED_PREFIX_PATH "@prefix@""/share/seed/"