diff options
| author | Gustavo Noronha Silva <gns@src.gnome.org> | 2009-01-14 00:57:30 +0800 |
|---|---|---|
| committer | Gustavo Noronha Silva <gns@src.gnome.org> | 2009-01-14 00:57:30 +0800 |
| commit | 374c991ae2df34a3b8a4ea46b1ec6519b97fcf18 (patch) | |
| tree | dfb6330ba81e03c7e91e6d99f079065c53d1586d | |
| parent | 744e5d0149971b61659a5ff3f5970c5c9540d43b (diff) | |
| download | gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.tar gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.tar.gz gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.tar.bz2 gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.tar.lz gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.tar.xz gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.tar.zst gsoc2013-epiphany-374c991ae2df34a3b8a4ea46b1ec6519b97fcf18.zip | |
We no longer need a separate pkg-config check for WEBKIT.
Bug #567601
svn path=/trunk/; revision=8682
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | doc/reference/Makefile.am | 2 | ||||
| -rw-r--r-- | embed/Makefile.am | 1 | ||||
| -rw-r--r-- | embed/webkit/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
5 files changed, 0 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index c8f6fe633..910904b73 100644 --- a/configure.ac +++ b/configure.ac @@ -204,14 +204,6 @@ if test "$enable_maintainer_mode" = "yes"; then AC_LANG_POP([C]) fi -# ****** -# WebKit -# ****** - -PKG_CHECK_MODULES([WEBKIT], [webkit-1.0]) -AC_SUBST([WEBKIT_CFLAGS]) -AC_SUBST([WEBKIT_LIBS]) - # *************** # Multimedia keys # *************** diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am index aaeaa4cba..e3d99693a 100644 --- a/doc/reference/Makefile.am +++ b/doc/reference/Makefile.am @@ -127,7 +127,6 @@ GTKDOC_CFLAGS = -DEPIPHANY_COMPILATION \ -I$(top_builddir)/lib/egg \ -I$(top_srcdir)/embed/webkit \ $(DEPENDENCIES_CFLAGS) \ - $(WEBKIT_CFLAGS) \ $(DBUS_CFLAGS) \ $(INCINTL) @@ -141,7 +140,6 @@ GTKDOC_LIBS = \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(WEBKIT_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) diff --git a/embed/Makefile.am b/embed/Makefile.am index 114d0881e..e9486b1fa 100644 --- a/embed/Makefile.am +++ b/embed/Makefile.am @@ -76,7 +76,6 @@ libephyembed_la_CPPFLAGS = \ libephyembed_la_CFLAGS = \ -DSHARE_DIR=\"$(pkgdatadir)\" \ $(DEPENDENCIES_CFLAGS) \ - $(WEBKIT_CFLAGS) \ $(AM_CFLAGS) libephyembedfactory_la_SOURCES = \ diff --git a/embed/webkit/Makefile.am b/embed/webkit/Makefile.am index a91155e2c..33b5b3b42 100644 --- a/embed/webkit/Makefile.am +++ b/embed/webkit/Makefile.am @@ -14,7 +14,6 @@ libephywebkitembed_la_CPPFLAGS = \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/embed \ -I$(top_srcdir) \ - $(WEBKIT_CFLAGS) \ -DSHARE_DIR=\"$(pkgdatadir)\" \ -DBUILDING_GDK__=1 \ -DBUILDING_CAIRO__=1 \ diff --git a/src/Makefile.am b/src/Makefile.am index ad7ff3646..c290f8252 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -213,7 +213,6 @@ epiphany_LDADD = \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ $(DEPENDENCIES_LIBS) \ - $(WEBKIT_LIBS) \ $(DBUS_LIBS) \ $(LIBINTL) |