shaba/ostree
1
0
Fork 0
mirror of https://github.com/ostreedev/ostree.git synced 2024-12-22 17:35:55 +03:00
Code Issues Projects Releases Wiki Activity

core: Support being built without libsoup-gnome

Browse Source 
While bootstrapping gnomeos, it's really handy if we can be built
without pull support, because libsoup-gnome pulls in a huge set of
dependencies.
This commit is contained in:
Colin Walters 2011-11-14 15:08:09 -05:00
parent 070b2cbb74
commit bcdfe03e72
3 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile-ostree.am
View File

@ -28,11 +28,14 @@ ostree_SOURCES = ostree/main.c \
ostree/ot-builtin-fsck.c \
ostree/ot-builtin-init.c \
ostree/ot-builtin-log.c \
ostree/ot-builtin-pull.c \
ostree/ot-builtin-run-triggers.c \
ostree/ot-builtin-remote.c \
ostree/ot-builtin-rev-parse.c \
ostree/ot-builtin-show.c \
$(NULL)
if USE_LIBSOUP_GNOME
ostree_SOURCES += ostree/ot-builtin-pull.c
endif
ostree_CFLAGS = $(AM_CFLAGS) -I$(srcdir)/libotutil -I$(srcdir)/libostree -I$(srcdir)/ostree -DLOCALEDIR=\"$(datadir)/locale\" $(OT_COREBIN_DEP_CFLAGS)
ostree_LDADD = libotutil.la libostree.la $(OT_COREBIN_DEP_LIBS)

20
configure.ac
View File

@ -25,8 +25,26 @@ LT_INIT
PKG_PROG_PKG_CONFIG
GIO_DEPENDENCY="gio-unix-2.0 >= 2.28"
PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0 >= 2.28])
PKG_CHECK_MODULES(OT_COREBIN_DEP, [libsoup-gnome-2.4 >= 2.34.0 gio-unix-2.0 >= 2.28])
AC_ARG_WITH(soup-gnome,
AS_HELP_STRING([--without-soup-gnome], [Do not use libsoup-gnome (implies no pull support)]),
:, with_soup_gnome=maybe)
if test x$with_soup_gnome != xno; then
PKG_CHECK_MODULES(OT_COREBIN_DEP, [libsoup-gnome-2.4 >= 2.34.0 $GIO_DEPENDENCY], have_soup_gnome=yes, have_soup_gnome=no)
if test x$have_soup_gnome = xno && test x$with_soup_gnome != xmaybe; then
AC_MSG_ERROR([libsoup-gnome is enabled but could not be found])
fi
if test x$have_soup_gnome = xyes; then
AC_DEFINE([HAVE_LIBSOUP_GNOME], [1], [Define if we have libsoup-gnome])
else
PKG_CHECK_MODULES(OT_COREBIN_DEP, [$GIO_DEPENDENCY])
fi
else
PKG_CHECK_MODULES(OT_COREBIN_DEP, [$GIO_DEPENDENCY])
fi
AM_CONDITIONAL(USE_LIBSOUP_GNOME, test $with_soup_gnome != no)
AM_PATH_PYTHON

2
ostree/main.c
View File

@ -35,7 +35,9 @@ static OstreeBuiltin builtins[] = {
{ "commit", ostree_builtin_commit, 0 },
{ "compose", ostree_builtin_compose, 0 },
{ "log", ostree_builtin_log, 0 },
#ifdef HAVE_LIBSOUP_GNOME
{ "pull", ostree_builtin_pull, 0 },
#endif
{ "fsck", ostree_builtin_fsck, 0 },
{ "remote", ostree_builtin_remote, 0 },
{ "rev-parse", ostree_builtin_rev_parse, 0 },