[gnome-boxes] Require libarchive 3
- From: Zeeshan Ali Khattak <zeeshanak src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-boxes] Require libarchive 3
- Date: Fri, 1 Aug 2014 10:45:08 +0000 (UTC)
commit ce69528d667a4866a22bc4974d42b41262fae028
Author: Lasse Schuirmann <lasse schuirmann net>
Date: Tue May 20 18:07:02 2014 +0200
Require libarchive 3
Libarchive will be used for archive handling for the express
installation feature. E.g. debian based OSes require the installation
script to be injected into the initrd archive. This will be applied in
the following patches.
https://bugzilla.gnome.org/show_bug.cgi?id=730640
configure.ac | 6 +++++-
src/Makefile.am | 4 +++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a889cda..559c8c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,6 +63,7 @@ OSINFO_MIN_VERSION=0.2.9
TRACKER_SPARQL=0.13.1
UUID_REQUIRED=1.41.3
LIBSOUP_REQUIRED=2.38
+LIBARCHIVE_MIN_VERSION=3.0.0
PKG_CHECK_MODULES(BOXES, [
glib-2.0 >= $GLIB_MIN_VERSION
@@ -77,6 +78,7 @@ PKG_CHECK_MODULES(BOXES, [
libosinfo-1.0 >= $OSINFO_MIN_VERSION
uuid >= $UUID_REQUIRED
libsoup-2.4 >= $LIBSOUP_REQUIRED
+ libarchive >= $LIBARCHIVE_MIN_VERSION
])
@@ -93,6 +95,7 @@ VALA_ADD_CHECKFILE([src/gnome_boxes_vala.stamp])
PKG_CHECK_MODULES(BOXES_COMMON, [
glib-2.0 >= $GLIB_MIN_VERSION
gio-2.0 >= $GLIB_MIN_VERSION
+ libarchive >= $LIBARCHIVE_MIN_VERSION
])
VALA_ADD_CHECKFILE([src/libcommon_vala.stamp])
@@ -127,12 +130,13 @@ else
fi
AM_CONDITIONAL([HAVE_OVIRT], [test "x$have_govirt" = "xyes"])
-VALA_CHECK([0.23.3.1], [
+VALA_CHECK([0.24.0.65], [
gdk-pixbuf-2.0
glib-2.0
gtk+-3.0
gtk-vnc-2.0
gudev-1.0
+ libarchive
libosinfo-1.0
libsoup-2.4
libvirt-gconfig-1.0
diff --git a/src/Makefile.am b/src/Makefile.am
index df8c1cf..0bd6a1b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,8 @@ AM_VALAFLAGS = \
--pkg glib-2.0 \
--pkg gtk-vnc-2.0 \
--pkg gudev-1.0 \
- --pkg libsoup-2.4 \
+ --pkg libarchive \
+ --pkg libsoup-2.4 \
--pkg libosinfo-1.0 \
--pkg libvirt-gconfig-1.0 \
--pkg libvirt-gobject-1.0 \
@@ -72,6 +73,7 @@ libcommon_vala.stamp: $(libcommon_a_VALASOURCES)
--pkg config \
--pkg glib-2.0 \
--pkg gio-2.0 \
+ --pkg libarchive \
-C -H libcommon.h --library common $^
@touch $(libcommon_a_DEPENDENCIES)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]