seed r711 - in trunk: . libseed

[hortont svn gnome org]

Author: hortont
Date: Sun Jan 11 22:48:30 2009
New Revision: 711
URL: http://svn.gnome.org/viewvc/seed?rev=711&view=rev

Log:
Fixed build on OS X. Robb has to fix the flat namespace thing, and then we're golden.



Modified:
   trunk/configure.ac
   trunk/libseed/Makefile.am
   trunk/libseed/seed-engine.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sun Jan 11 22:48:30 2009
@@ -1,4 +1,6 @@
 AC_INIT(seed, 0.3)
+AC_CANONICAL_BUILD
+AC_CANONICAL_HOST
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_CONFIG_HEADERS([config.h])
@@ -113,9 +115,19 @@
 AC_SUBST(SEED_PROFILE_CFLAGS)
 AC_SUBST(SEED_PROFILE_LDFLAGS)
 
+dnl ===========================Darwin Build====================================
+SEED_OSX_CFLAGS=
+SEED_OSX_LDFLAGS=
+
+SEED_OSX_CFLAGS="-F/Applications/WebKit.app/Contents/Frameworks/10.5 -framework JavaScriptCore"
+SEED_OSX_LDFLAGS="-F/Applications/WebKit.app/Contents/Frameworks/10.5 -framework JavaScriptCore"
+
+AC_SUBST(SEED_OSX_CFLAGS)
+AC_SUBST(SEED_OSX_LDFLAGS)
+
 dnl ===========================Packages========================================
-PKG_CHECK_MODULES(SEED, gobject-introspection-1.0 webkit-1.0)
-PKG_CHECK_MODULES(LIBSEED, gobject-introspection-1.0 webkit-1.0)
+PKG_CHECK_MODULES(SEED, gobject-introspection-1.0)
+PKG_CHECK_MODULES(LIBSEED, gobject-introspection-1.0)
 
 AC_CONFIG_FILES([
 seed.pc])

Modified: trunk/libseed/Makefile.am
==============================================================================
--- trunk/libseed/Makefile.am	(original)
+++ trunk/libseed/Makefile.am	Sun Jan 11 22:48:30 2009
@@ -22,24 +22,16 @@
 	seed-types.c \
 	seed-types.h
 
-libseed_la_LIBADD = \
-	$(LIBSEED_LIBS)
+libseed_la_LIBADD = $(LIBSEED_LIBS)
 
-AM_CPPFLAGS = \
-        -lgmodule-2.0 \
-	$(LIBSEED_CFLAGS)
+AM_CPPFLAGS = -lgmodule-2.0 $(LIBSEED_CFLAGS) $(SEED_OSX_CFLAGS)
 
-seedheaders_HEADERS = \
-	seed.h
+seedheaders_HEADERS = seed.h
 
-seedheadersdir = \
-	$(pkgincludedir)
+seedheadersdir = $(pkgincludedir)
 
-EXTRA_DIST = \
-	$(seedheaders_HEADERS)
-
-LIBSEED_CFLAGS+= -Wall -Werror $(SEED_DEBUG_CFLAGS) $(SEED_PROFILE_CFLAGS)
-AM_LDFLAGS=$(SEED_PROFILE_LDFLAGS)
-
-## File created by the gnome-build tools
+EXTRA_DIST = $(seedheaders_HEADERS)
 
+LIBSEED_CFLAGS += -Wall -Werror $(SEED_DEBUG_CFLAGS) \
+                  $(SEED_PROFILE_CFLAGS) $(SEED_OSX_CFLAGS)
+AM_LDFLAGS = $(SEED_PROFILE_LDFLAGS) $(SEED_OSX_LDFLAGS)

Modified: trunk/libseed/seed-engine.c
==============================================================================
--- trunk/libseed/seed-engine.c	(original)
+++ trunk/libseed/seed-engine.c	Sun Jan 11 22:48:30 2009
@@ -710,7 +710,7 @@
 			goto found;
 		else
 		{
-			GIFieldInfo *field;
+			GIFieldInfo *field = 0;
 			GIBaseInfo *info = (GIBaseInfo *)
 				g_irepository_find_by_gtype(0, G_OBJECT_TYPE(b));
 			gint n;