[epiphany/peas: 2/6] build: remove old crap

[Diego Escalante Urrelo <diegoe src gnome org>]

commit d5f25c81b2058df01c6f6cee5f2cecc20116f110
Author: Diego Escalante Urrelo <descalante igalia com>
Date:   Sat Apr 2 12:38:06 2011 -0500

    build: remove old crap

 configure.ac              |   29 +++--------------------------
 data/epiphany.pc.in       |    2 +-
 doc/reference/Makefile.am |    5 -----
 lib/Makefile.am           |    4 ----
 src/Makefile.am           |   22 +++-------------------
 tests/Makefile.am         |    7 -------
 6 files changed, 7 insertions(+), 62 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f904976..bd47b0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -97,6 +97,7 @@ WEBKIT_GTK_REQUIRED=1.3.13
 LIBSOUP_GNOME_REQUIRED=2.33.1
 GNOME_KEYRING_REQUIRED=2.26.0
 GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1
+PEAS_REQUIRED=0.7.0
 
 # Tests
 
@@ -125,6 +126,8 @@ PKG_CHECK_MODULES([DEPENDENCIES], [
 		  libsoup-gnome-2.4 >= $LIBSOUP_GNOME_REQUIRED
 		  gnome-keyring-1 >= $GNOME_KEYRING_REQUIRED
                   gsettings-desktop-schemas >= $GSETTINGS_DESKTOP_SCHEMAS_REQUIRED
+		  libpeas-1.0 >= $PEAS_REQUIRED
+		  libpeas-gtk-1.0 >= $PEAS_REQUIRED
 		  ])
 
 # ****
@@ -195,31 +198,6 @@ if test "$found_introspection" = "yes"; then
   AC_DEFINE([ENABLE_INTROSPECTION], [1], [Define to enable introspection support])
 fi
 
-# ****
-# Seed
-# ****
-
-AC_MSG_CHECKING([whether Seed support is requested])
-AC_ARG_ENABLE([seed],
-  [AS_HELP_STRING([--enable-seed],[Enable Seed support (default: disabled)])],
-  [],[enable_seed=no])
-AC_MSG_RESULT([$enable_seed])
-
-if test "$enable_seed" = "yes" -a "$found_introspection" != "yes"; then
-  AC_MSG_ERROR([GObject introspection support must be enabled for Seed])
-fi
-
-if test "$enable_seed" = "yes"; then
-  EPIPHANY_FEATURES="$EPIPHANY_FEATURES seed"
-
-  SEED_REQUIRED=2.27.91
-  PKG_CHECK_MODULES([SEED],[seed >= $SEED_REQUIRED])
-
-  AC_DEFINE([ENABLE_SEED],[1],[Define to compile with Seed support])
-fi
-
-AM_CONDITIONAL([ENABLE_SEED],[test "$enable_seed" = "yes"])
-
 # *********************
 # CA Certificate file
 # Stolen from GIO's TLS
@@ -461,7 +439,6 @@ Epiphany was configured with the following options:
  	Zeroconf bookmarks support : $enable_zeroconf
  	NetworkManager support     : $enable_network_manager
  	GObject introspection      : $found_introspection
- 	Seed support               : $enable_seed
  	NSS support                : $enable_nss
 	Build tests		   : $enable_tests
 	CA Certificates file	   : $GTLS_SYSTEM_CA_FILE
diff --git a/data/epiphany.pc.in b/data/epiphany.pc.in
index e06bd5b..00f5290 100644
--- a/data/epiphany.pc.in
+++ b/data/epiphany.pc.in
@@ -12,6 +12,6 @@ features= EPIPHANY_FEATURES@
 Name: Epiphany Browser
 Description: GNOME Web Browser
 Version: @VERSION@
-Requires: gtk+-3.0, libxml-2.0, webkitgtk-3.0
+Requires: gtk+-3.0, libpeas-1.0, libpeas-gtk-1.0, libxml-2.0, webkitgtk-3.0
 Libs: -L${libdir}
 Cflags: -I${includedir}
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 9b5de96..3227c38 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -132,11 +132,6 @@ GTKDOC_LIBS = \
 	$(DBUS_LIBS) \
 	$(LIBINTL)
 
-if ENABLE_SEED
-GTKDOC_LIBS += \
-	$(SEED_LIBS)
-endif
-
 # If you need to override some of the declarations, place them in the
 # $(DOC_MODULE)-overrides.txt file and uncomment the second line here.
 DOC_OVERRIDES =
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6be8ef7..fc15646 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -21,7 +21,6 @@ NOINST_H_FILES = \
 	ephy-prefs.h				\
 	ephy-profile-utils.h				\
 	ephy-print-utils.h			\
-	ephy-shlib-loader.h			\
 	ephy-signal-accumulator.h		\
 	ephy-string.h				\
 	ephy-stock-icons.h			\
@@ -34,7 +33,6 @@ TYPES_H_FILES = \
 
 INST_H_FILES = \
 	ephy-dialog.h				\
-	ephy-loader.h				\
 	ephy-node.h				\
 	ephy-node-db.h				\
 	ephy-settings.h				\
@@ -48,7 +46,6 @@ libephymisc_la_SOURCES = \
 	ephy-file-helpers.c			\
 	ephy-gui.c				\
 	ephy-langs.c				\
-	ephy-loader.c				\
 	ephy-module.c				\
 	ephy-node.c				\
 	ephy-node.h				\
@@ -61,7 +58,6 @@ libephymisc_la_SOURCES = \
 	ephy-profile-utils.h			\
 	ephy-print-utils.c			\
 	ephy-settings.c				\
-	ephy-shlib-loader.c			\
 	ephy-signal-accumulator.c		\
 	ephy-state.c				\
 	ephy-string.c				\
diff --git a/src/Makefile.am b/src/Makefile.am
index f399505..332d7f8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -124,20 +124,6 @@ libephymain_la_SOURCES += \
 libephymain_la_CFLAGS += $(NETWORK_MANAGER_CFLAGS)
 endif
 
-if ENABLE_SEED
-NOINST_H_FILES += \
-	ephy-seed-extension.h \
-	ephy-seed-loader.h \
-	$(NULL)
-
-libephymain_la_SOURCES += \
-	ephy-seed-loader.c \
-	ephy-seed-extension.c \
-	$(NULL)
-
-libephymain_la_CFLAGS += $(SEED_CFLAGS)
-endif # ENABLE_SEED
-
 epiphany_SOURCES = ephy-main.c
 
 epiphany_CPPFLAGS = \
@@ -175,10 +161,6 @@ epiphany_CFLAGS += $(INTROSPECTION_CFLAGS)
 epiphany_LDADD += $(INTROSPECTION_LIBS)
 endif
 
-if ENABLE_SEED
-epiphany_LDADD += $(SEED_LIBS)
-endif # ENABLE_SEED
-
 if ENABLE_NETWORK_MANAGER
 epiphany_LDADD += \
 	$(NETWORK_MANAGER_LIBS)
@@ -312,7 +294,7 @@ EPHY_GIR_C_FILES = \
 	$(top_srcdir)/lib/widgets/ephy-download-widget.c \
 	$(top_srcdir)/lib/widgets/ephy-search-entry.c \
 	$(top_srcdir)/src/bookmarks/ephy-bookmarks.c \
-	$(top_srcdir)/src/ephy-extension.c \
+	$(top_srcdir)/src/ephy-extension.h \
 	$(top_srcdir)/src/ephy-extensions-manager.c \
 	$(top_srcdir)/src/ephy-find-toolbar.c \
 	$(top_srcdir)/src/ephy-link-action.c \
@@ -358,6 +340,8 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: EphyEgg-$(EPIPHANY_API_VERSION).gir $(INTR
 		--include=Gtk-3.0 \
 		--include=libxml2-2.0 \
 		--include=WebKit-3.0 \
+		--include=Peas-1.0 \
+		--include=PeasGtk-1.0 \
 		--include-uninstalled=EphyEgg-$(EPIPHANY_API_VERSION).gir \
 		--program=./epiphany \
 		--output=$@ \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index bb538d8..45e387d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -26,13 +26,6 @@ LDADD = \
 	$(DBUS_LIBS) \
 	$(DEPENDENCIES_LIBS) 
 
-if ENABLE_SEED
-CFLAGS += \
-	$(SEED_CFLAGS)
-LDADD += \
-	$(SEED_LIBS)
-endif
-
 test_ephy_download_SOURCES = \
 	ephy-download.c