Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
475c2183
Commit
475c2183
authored
11 years ago
by
Tristan Matthews
Browse files
Options
Downloads
Patches
Plain Diff
* #27352: daemon: dbus is now optional
parent
0b5e2b3e
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
daemon/configure-android.sh
+1
-1
1 addition, 1 deletion
daemon/configure-android.sh
daemon/configure.ac
+11
-8
11 additions, 8 deletions
daemon/configure.ac
with
12 additions
and
9 deletions
daemon/configure-android.sh
+
1
−
1
View file @
475c2183
./configure
--without-alsa
--without-pulse
--without-tls
--without-iax2
--without-zrtp
--without-sdes
--without-speexdsp
--without-speex
./configure
--without-dbus
--without-alsa
--without-pulse
--without-tls
--without-iax2
--without-zrtp
--without-sdes
--without-speexdsp
--without-speex
This diff is collapsed.
Click to expand it.
daemon/configure.ac
+
11
−
8
View file @
475c2183
...
@@ -183,15 +183,18 @@ AS_IF([test "x$with_zrtp" = "xyes"], [
...
@@ -183,15 +183,18 @@ AS_IF([test "x$with_zrtp" = "xyes"], [
AC_DEFINE_UNQUOTED([HAVE_ZRTP], `if test "x$with_zrtp" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have zrtp support])
AC_DEFINE_UNQUOTED([HAVE_ZRTP], `if test "x$with_zrtp" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have zrtp support])
AM_CONDITIONAL(BUILD_ZRTP, test "x$with_zrtp" = "xyes" )
AM_CONDITIONAL(BUILD_ZRTP, test "x$with_zrtp" = "xyes" )
# DBUSCPP
dnl Check for dbuscpp, the C++ bindings for D-Bus
DBUS_CPP_MIN_VERSION=0.0.0-pre1
AC_ARG_WITH([dbus],
[AS_HELP_STRING([--without-dbus], [disable support for dbus])],
[],
[with_dbus=yes])
AS_IF([test "x$with_dbus" = "xyes"], [
PKG_CHECK_MODULES(DBUSCPP, dbus-++-1 >= DBUS_CPP_MIN_VERSION,, AC_MSG_WARN([Missing dbus development package: libdbuscpp-dev]))
]);
# DBUS
AC_DEFINE_UNQUOTED([HAVE_DBUS], `if test "x$with_dbus" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have dbus support])
# required dependency(ies): libdbus-c++
dnl DBus-C++ detection
dnl pkg-config doesn't like 0.6.0-pre1 version number, it assumes that it is
dnl more recent than (unreleased) 0.6.0
DBUS_CPP_REQUIRED_VERSION=0.6.0-pre1
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1, AC_DEFINE_UNQUOTED(HAVE_DBUS, 1, [D-Bus support enabled]),
AC_MSG_ERROR([You need the DBus-c++ libraries (version $DBUS_CPP_REQUIRED_VERSION or better)]))
# Instant Messaging
# Instant Messaging
# required dependency(ies): libxpat
# required dependency(ies): libxpat
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment