Commit 633a208c authored by Simon McVittie's avatar Simon McVittie

build: Remove unused substitution DBUS_PATH_OR_ABSTRACT

This was presumably once used in constructs like
"unix:" DBUS_PATH_OR_ABSTRACT "=/var/run/dbus/foo", but git grep says
there are no remaining uses, so it can go.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=34905Signed-off-by: Simon McVittie's avatarSimon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall's avatarPhilip Withnall <withnall@endlessm.com>
parent 09d9cc2b
......@@ -177,10 +177,3 @@ if (DBUS_ENABLE_ABSTRACT_SOCKETS)
${CMAKE_SOURCE_DIR}/modules/CheckForAbstractSockets.c)
endif(DBUS_ENABLE_ABSTRACT_SOCKETS)
if(HAVE_ABSTRACT_SOCKETS)
set(DBUS_PATH_OR_ABSTRACT_VALUE abstract)
else(HAVE_ABSTRACT_SOCKETS)
set(DBUS_PATH_OR_ABSTRACT_VALUE path)
endif(HAVE_ABSTRACT_SOCKETS)
......@@ -53,16 +53,6 @@
#cmakedefine HAVE_ABSTRACT_SOCKETS 1
#cmakedefine DBUS_PATH_OR_ABSTRACT_VALUE 1
#if (defined DBUS_PATH_OR_ABSTRACT_VALUE)
#define DBUS_PATH_OR_ABSTRACT @DBUS_PATH_OR_ABSTRACT_VALUE@
#endif
#ifdef DBUS_PATH_OR_ABSTRACT_VALUE
#undef DBUS_PATH_OR_ABSTRACT_VALUE
#endif
/* selinux */
/* kqueue */
#cmakedefine HAVE_CONSOLE_OWNER_FILE 1
......
......@@ -921,17 +921,6 @@ if test x$enable_abstract_sockets = xno; then
ac_cv_have_abstract_sockets=no;
fi
if test x$ac_cv_have_abstract_sockets = xyes ; then
DBUS_PATH_OR_ABSTRACT=abstract
AC_DEFINE(HAVE_ABSTRACT_SOCKETS,1,[Have abstract socket namespace])
else
DBUS_PATH_OR_ABSTRACT=path
fi
# this is used in addresses to prefer abstract, e.g.
# unix:path=/foo or unix:abstract=/foo
AC_SUBST(DBUS_PATH_OR_ABSTRACT)
PKG_CHECK_MODULES([EXPAT], [expat])
save_cflags="$CFLAGS"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment