From: Marc-André Lureau Date: Thu, 19 May 2022 15:29:51 +0000 (+0200) Subject: cmake: drop -DDBUS_CONSOLE_AUTH_DIR= X-Git-Tag: dbus-1.15.0~51^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5705d14cf03367797d8fab9f084f9835f625f07d;p=thirdparty%2Fdbus.git cmake: drop -DDBUS_CONSOLE_AUTH_DIR= Signed-off-by: Marc-André Lureau --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b7d60899e..0914f07bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -601,8 +601,6 @@ endif() # Not used on Windows, where there is no system bus set(DBUS_SYSTEM_PID_FILE ${DBUS_RUNSTATEDIR}/dbus/pid) -set(DBUS_CONSOLE_AUTH_DIR "" CACHE STRING "Directory to check for pam_console/pam_foreground flag files, or empty to ignore") - # This won't work on Windows. It's not meant to - the system bus is # meaningless on Windows anyway. # @@ -784,12 +782,6 @@ message(" System bus PID file: ${DBUS_SYSTEM_PID_FILE} " message(" System bus user: ${DBUS_USER} ") message(" Session bus socket dir: ${DBUS_SESSION_SOCKET_DIR} ") -if(DBUS_CONSOLE_AUTH_DIR) -message(" pam_console auth dir: ${DBUS_CONSOLE_AUTH_DIR} ") -else() -message(" pam_console auth dir: (none) ") -endif() - message(" 'make check' socket dir: ${TEST_SOCKET_DIR} ") endif() message(" Test listen address: ${TEST_LISTEN} ") diff --git a/cmake/config.h.cmake b/cmake/config.h.cmake index 358f9d822..68c3dbfab 100644 --- a/cmake/config.h.cmake +++ b/cmake/config.h.cmake @@ -34,7 +34,6 @@ # define _XOPEN_SOURCE 500 #endif -#cmakedefine DBUS_CONSOLE_AUTH_DIR "@DBUS_CONSOLE_AUTH_DIR@" #cmakedefine DBUS_DATADIR "@DBUS_DATADIR@" #cmakedefine DBUS_BINDIR "@DBUS_BINDIR@" #cmakedefine DBUS_PREFIX "@DBUS_PREFIX@"