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
8b0ec931
Commit
8b0ec931
authored
11 years ago
by
Vittorio Giovara
Committed by
Tristan Matthews
11 years ago
Browse files
Options
Downloads
Patches
Plain Diff
daemon: prevent compiling dbus when clang is used
Change-Id: I8118635b55de2367d1990bbdeeb17159ff7a742c Refs: #46066
parent
308bb1c3
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/configure.ac
+4
-1
4 additions, 1 deletion
daemon/configure.ac
with
4 additions
and
1 deletion
daemon/configure.ac
+
4
−
1
View file @
8b0ec931
...
@@ -240,7 +240,10 @@ AS_IF([test "x$with_dbus" = "xyes"], [
...
@@ -240,7 +240,10 @@ AS_IF([test "x$with_dbus" = "xyes"], [
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files]))
PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,, AC_MSG_WARN([Missing dbus development files]))
AC_CONFIG_FILES([src/client/dbus/Makefile \
AC_CONFIG_FILES([src/client/dbus/Makefile \
doc/dbus-api/Makefile])
doc/dbus-api/Makefile])
]);
AS_IF([test "x$CLANG" = "xyes"], [
AC_MSG_ERROR([dbus does not compile when clang is used, rerun with --without-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])
AC_DEFINE_UNQUOTED([HAVE_DBUS], `if test "x$with_dbus" = "xyes"; then echo 1; else echo 0; fi`, [Define if you have dbus support])
AM_CONDITIONAL(USE_DBUS, test "x$with_dbus" = "xyes" )
AM_CONDITIONAL(USE_DBUS, test "x$with_dbus" = "xyes" )
...
...
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