epiphany r8682 - in trunk: . doc/reference embed embed/webkit src

[gns svn gnome org]

Author: gns
Date: Tue Jan 13 16:57:30 2009
New Revision: 8682
URL: http://svn.gnome.org/viewvc/epiphany?rev=8682&view=rev

Log:
We no longer need a separate pkg-config check for WEBKIT.

Bug #567601

Modified:
   trunk/configure.ac
   trunk/doc/reference/Makefile.am
   trunk/embed/Makefile.am
   trunk/embed/webkit/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jan 13 16:57:30 2009
@@ -204,14 +204,6 @@
 	AC_LANG_POP([C])
 fi
 
-# ******
-# WebKit
-# ******
-
-PKG_CHECK_MODULES([WEBKIT], [webkit-1.0])
-AC_SUBST([WEBKIT_CFLAGS])
-AC_SUBST([WEBKIT_LIBS])
-
 # ***************
 # Multimedia keys
 # ***************

Modified: trunk/doc/reference/Makefile.am
==============================================================================
--- trunk/doc/reference/Makefile.am	(original)
+++ trunk/doc/reference/Makefile.am	Tue Jan 13 16:57:30 2009
@@ -127,7 +127,6 @@
 		-I$(top_builddir)/lib/egg \
 		-I$(top_srcdir)/embed/webkit \
 		$(DEPENDENCIES_CFLAGS) \
-		$(WEBKIT_CFLAGS) \
 		$(DBUS_CFLAGS) \
 		$(INCINTL)
 
@@ -141,7 +140,6 @@
 	$(top_builddir)/lib/libephymisc.la \
 	$(top_builddir)/lib/egg/libegg.la \
         $(DEPENDENCIES_LIBS) \
-        $(WEBKIT_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 

Modified: trunk/embed/Makefile.am
==============================================================================
--- trunk/embed/Makefile.am	(original)
+++ trunk/embed/Makefile.am	Tue Jan 13 16:57:30 2009
@@ -76,7 +76,6 @@
 libephyembed_la_CFLAGS = \
 	-DSHARE_DIR=\"$(pkgdatadir)\"	\
 	$(DEPENDENCIES_CFLAGS) 	\
-	$(WEBKIT_CFLAGS)	\
 	$(AM_CFLAGS)
 
 libephyembedfactory_la_SOURCES =	\

Modified: trunk/embed/webkit/Makefile.am
==============================================================================
--- trunk/embed/webkit/Makefile.am	(original)
+++ trunk/embed/webkit/Makefile.am	Tue Jan 13 16:57:30 2009
@@ -14,7 +14,6 @@
 	-I$(top_srcdir)/lib	    		\
 	-I$(top_srcdir)/embed	    		\
 	-I$(top_srcdir)		    		\
-	$(WEBKIT_CFLAGS)                        \
 	-DSHARE_DIR=\"$(pkgdatadir)\"   	\
 	-DBUILDING_GDK__=1 \
 	-DBUILDING_CAIRO__=1 \

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jan 13 16:57:30 2009
@@ -213,7 +213,6 @@
 	$(top_builddir)/lib/libephymisc.la \
 	$(top_builddir)/lib/egg/libegg.la \
 	$(DEPENDENCIES_LIBS) \
-	$(WEBKIT_LIBS) \
 	$(DBUS_LIBS) \
 	$(LIBINTL)