X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=39ae389c205871d59bda0c41cd81db2013b95478;hb=7d9239c9c78cb6d0b9c282376fcf3cda1de23209;hp=d04215600d1c9d28408feb9758b8980da79e92cc;hpb=78ef897dc74f0c74abe7cc164d91568a454f92ff;p=platform%2Fupstream%2Fdbus.git diff --git a/configure.ac b/configure.ac index d042156..39ae389 100644 --- a/configure.ac +++ b/configure.ac @@ -156,6 +156,7 @@ AC_ARG_ENABLE(console-owner-file, AS_HELP_STRING([--enable-console-owner-file],[ AC_ARG_ENABLE(userdb-cache, AS_HELP_STRING([--enable-userdb-cache],[build with userdb-cache support]),enable_userdb_cache=$enableval,enable_userdb_cache=yes) AC_ARG_ENABLE(launchd, AS_HELP_STRING([--enable-launchd],[build with launchd auto-launch support]),enable_launchd=$enableval,enable_launchd=auto) AC_ARG_ENABLE(systemd, AS_HELP_STRING([--enable-systemd],[build with systemd at_console support]),enable_systemd=$enableval,enable_systemd=auto) +AC_ARG_ENABLE(kdbus-transport, AS_HELP_STRING([--enable-kdbus-transport],[build with kdbus transport support]),enable_kdbus_transport=$enableval,enable_kdbus_transport=no) AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) AC_ARG_WITH(session-socket-dir, AS_HELP_STRING([--with-session-socket-dir=[dirname]],[Where to put sockets for the per-login-session message bus])) @@ -1271,13 +1272,17 @@ AC_DEFINE_UNQUOTED([DBUS_DEFAULT_MESSAGE_UNIX_FDS], [Default for dbus_connection_get_max_message_unix_fds()]) AC_SUBST([DEFAULT_MESSAGE_UNIX_FDS]) -### kdbus related libs -AC_CHECK_LIB(crypto, MD5_Init, - [ AC_CHECK_HEADERS(openssl/md5.h, [], - [AC_MSG_ERROR([Could not find md5.h, check config.log for failed attempts])]) ], - [ AC_MSG_ERROR([Explicitly requested crypto but crypto not found]) ]) -KDBUS_LIBS="-lcrypto" -#AC_SUBST([KDBUS_LIBS]) +### kdbus support +if test x$enable_kdbus_transport = xyes; then + KDBUS_LIBS= + #"-lcrypto" + #AC_SUBST([KDBUS_LIBS]) + AC_DEFINE(ENABLE_KDBUS_TRANSPORT,1,[Enable kdbus transport support]) +else + KDBUS_LIBS= +fi + +AM_CONDITIONAL([ENABLE_KDBUS_TRANSPORT], [test x$enable_kdbus_transport = xyes]) #### Set up final flags LIBDBUS_LIBS="$THREAD_LIBS $NETWORK_libs $KDBUS_LIBS"