From: Simon McVittie <smcv@collabora.com>
Date: Fri, 29 Sep 2017 11:18:25 +0000 (+0100)
Subject: build: Remove unused substitution DBUS_PATH_OR_ABSTRACT
X-Git-Tag: dbus-1.11.20~4
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=633a208ce72eef3d8322f97c8671ce577aa87775;p=thirdparty%2Fdbus.git

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=34905
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
---

diff --git a/cmake/ConfigureChecks.cmake b/cmake/ConfigureChecks.cmake
index 119b83e67..6815178b3 100644
--- a/cmake/ConfigureChecks.cmake
+++ b/cmake/ConfigureChecks.cmake
@@ -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)
-
diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake
index 361d0b0d1..154353b76 100644
--- a/cmake/config.h.cmake
+++ b/cmake/config.h.cmake
@@ -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
diff --git a/configure.ac b/configure.ac
index e7ce59ba7..5281db1b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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"