gjs r101 - trunk

[tko svn gnome org]

Author: tko
Date: Thu Nov 13 14:39:08 2008
New Revision: 101
URL: http://svn.gnome.org/viewvc/gjs?rev=101&view=rev

Log:
Bug 560506 â linking problem

	* Makefile-gi.am:
	* Makefile-modules.am:
	* configure.ac: Expliclity link gjs-gi with mozjs since we're
	using functions from it.

Modified:
   trunk/Makefile-gi.am
   trunk/Makefile-modules.am
   trunk/configure.ac

Modified: trunk/Makefile-gi.am
==============================================================================
--- trunk/Makefile-gi.am	(original)
+++ trunk/Makefile-gi.am	Thu Nov 13 14:39:08 2008
@@ -4,11 +4,10 @@
 
 libgjs_gi_la_CFLAGS =			\
         $(AM_CFLAGS)			\
-        $(GJS_CFLAGS)			\
-        $(GOBJECT_INTROSPECTION_CFLAGS)
+        $(GJS_GI_CFLAGS)
 libgjs_gi_la_LIBADD =			\
         libgjs.la			\
-        $(GOBJECT_INTROSPECTION_LIBS)
+        $(GJS_GI_LIBS)
 libgjs_gi_la_LDFLAGS = \
 	-export-symbols-regex "^[^_].*" -version-info 0:0:0 -rdynamic
 

Modified: trunk/Makefile-modules.am
==============================================================================
--- trunk/Makefile-modules.am	(original)
+++ trunk/Makefile-modules.am	Thu Nov 13 14:39:08 2008
@@ -19,11 +19,11 @@
 
 gi_la_CFLAGS = 					\
 	$(JS_NATIVE_MODULE_CFLAGS) 		\
-	$(GOBJECT_INTROSPECTION_CFLAGS)
+	$(GJS_GI_CFLAGS)
 gi_la_LIBADD = \
 	libgjs-gi.la				\
 	$(JS_NATIVE_MODULE_LIBADD) 		\
-	$(GOBJECT_INTROSPECTION_LIBS)
+	$(GJS_GI_LIBS)
 gi_la_LDFLAGS = 				\
 	$(JS_NATIVE_MODULE_LDFLAGS)
 
@@ -31,13 +31,11 @@
 	modules/gi.h	\
 	modules/gi.c
 
-mainloop_la_CFLAGS = 					\
-	$(JS_NATIVE_MODULE_CFLAGS) 		\
-	$(GOBJECT_INTROSPECTION_CFLAGS)
+mainloop_la_CFLAGS = 				\
+	$(JS_NATIVE_MODULE_CFLAGS)
 mainloop_la_LIBADD = \
 	libgjs-gi.la				\
-	$(JS_NATIVE_MODULE_LIBADD) 		\
-	$(GOBJECT_INTROSPECTION_LIBS)
+	$(JS_NATIVE_MODULE_LIBADD)
 mainloop_la_LDFLAGS = 				\
 	$(JS_NATIVE_MODULE_LDFLAGS)
 

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Nov 13 14:39:08 2008
@@ -65,7 +65,9 @@
              [AC_MSG_ERROR([SpiderMonkey is too old, Firefox 3 is required])],
              [$JS_LIBS])
 
-gjs_packages="gmodule-2.0 gobject-2.0 >= gobject_required_version $JS_PACKAGE"
+common_packages="gobject-2.0 >= gobject_required_version $JS_PACKAGE"
+gjs_packages="gmodule-2.0 $common_packages"
+gjs_gi_packages="gobject-introspection-1.0 >= 0.6.0 $common_packages"
 gjstests_packages="$gjstests_packages $gjs_packages"
 PKG_CHECK_MODULES([GJS], [$gjs_packages])
 
@@ -100,7 +102,8 @@
 AC_SUBST([js_include_dir])
 
 
-PKG_CHECK_MODULES([GOBJECT_INTROSPECTION], [gobject-introspection-1.0 >= 0.6.0])
+PKG_CHECK_MODULES([GJS_GI], [$gjs_gi_packages])
+GJS_GI_CFLAGS="$GJS_GI_CFLAGS -I$js_include_dir"
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST