diff options
| author | Ting-Wei Lan <lantw44@gmail.com> | 2013-07-31 02:15:44 +0800 |
|---|---|---|
| committer | LAN-TW <lantw44@gmail.com> | 2013-09-16 22:04:48 +0800 |
| commit | 1b051fa170cdae424dce4582b4d4a5cca4708010 (patch) | |
| tree | 2af186a0a1c93d9620b8ac0bff3412989755b6df | |
| parent | 46bcad5e9d62075e4f99d6f173b95b29f6e45bd2 (diff) | |
| download | gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.tar gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.tar.gz gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.tar.bz2 gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.tar.lz gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.tar.xz gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.tar.zst gsoc2013-epiphany-1b051fa170cdae424dce4582b4d4a5cca4708010.zip | |
Remove all things related to autoarchive, which becomes a shared library
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | embed/ephy-download.h | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 1 |
3 files changed, 2 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index cd1327f4b..fce9dbad0 100644 --- a/configure.ac +++ b/configure.ac @@ -77,7 +77,6 @@ GSETTINGS_DESKTOP_SCHEMAS_REQUIRED=0.0.1 LIBNOTIFY_REQUIRED=0.5.1 GCR_REQUIRED=3.5.5 AVAHI_REQUIRED=0.6.22 -LIBARCHIVE_REQUIRED=3.0.0 WEBKIT_GTK_PC_NAME=webkit2gtk-3.0 AC_DEFINE([HAVE_WEBKIT2],[1],[Define if building with WebKit2]) @@ -114,7 +113,7 @@ PKG_CHECK_MODULES([DEPENDENCIES], [ gcr-3 >= $GCR_REQUIRED avahi-gobject >= $AVAHI_REQUIRED avahi-client >= $AVAHI_REQUIRED - libarchive >= $LIBARCHIVE_REQUIRED + gnome-autoar ]) PKG_CHECK_MODULES(WEB_EXTENSION, [ diff --git a/embed/ephy-download.h b/embed/ephy-download.h index 7d140693b..6aa38f2a3 100644 --- a/embed/ephy-download.h +++ b/embed/ephy-download.h @@ -29,8 +29,8 @@ #ifndef _EPHY_DOWNLOAD_H #define _EPHY_DOWNLOAD_H -#include <autoarchive/autoarchive.h> #include <glib-object.h> +#include <gnome-autoar/autoar.h> #include <webkit2/webkit2.h> G_BEGIN_DECLS diff --git a/src/Makefile.am b/src/Makefile.am index e9c5a18e5..0046e6789 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -163,7 +163,6 @@ epiphany_LDADD = \ $(top_builddir)/lib/history/libephyhistory.la \ $(top_builddir)/lib/libephymisc.la \ $(top_builddir)/lib/egg/libegg.la \ - $(top_builddir)/autoarchive/libautoarchive.la \ $(DEPENDENCIES_LIBS) \ $(CODE_COVERAGE_LDFLAGS) \ $(LIBINTL) |