Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-21 22:09:23 +01:00
Code Releases Activity

build: Make D-Bus policy configuration install optional

Browse Source
This commit is contained in:
Marcel Holtmann 2018-01-29 02:55:54 -08:00
parent 64dcf11042
commit b4c9e63a8b
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -8,8 +8,10 @@ builtin_sources =
noinst_LTLIBRARIES = ell/libell-internal.la noinst_LTLIBRARIES = ell/libell-internal.la
if DBUSCONF
dbusdir = @DBUS_CONFDIR@/dbus-1/system.d dbusdir = @DBUS_CONFDIR@/dbus-1/system.d
dist_dbus_DATA = src/iwd-dbus.conf dist_dbus_DATA = src/iwd-dbus.conf
endif
ell_sources = ell/ell.h ell/private.h ell/missing.h \ ell_sources = ell/ell.h ell/private.h ell/missing.h \
ell/util.h ell/util.c \ ell/util.h ell/util.c \
@ -269,10 +271,12 @@ EXTRA_DIST = src/genbuiltin doc/main.conf $(manual_pages:.1=.txt)
AM_CFLAGS = -fvisibility=hidden AM_CFLAGS = -fvisibility=hidden
MAINTAINERCLEANFILES = Makefile.in configure config.h.in aclocal.m4 DISTCHECK_CONFIGURE_FLAGS = --disable-dbusconf
DISTCLEANFILES = $(BUILT_SOURCES) $(unit_tests) $(manual_pages) DISTCLEANFILES = $(BUILT_SOURCES) $(unit_tests) $(manual_pages)
MAINTAINERCLEANFILES = Makefile.in configure config.h.in aclocal.m4
BUILT_SOURCES = ell/internal src/builtin.h BUILT_SOURCES = ell/internal src/builtin.h
ell/internal: Makefile ell/internal: Makefile

2
bootstrap-configure
View File

@ -9,4 +9,4 @@ fi
--enable-debug \ --enable-debug \
--prefix=/usr \ --prefix=/usr \
--localstatedir=/var \ --localstatedir=/var \
--with-dbusconfdir=/etc $* --disable-dbusconf $*

7
configure.ac
View File

@ -89,10 +89,15 @@ AC_CHECK_HEADERS(linux/types.h linux/if_alg.h)
AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes, AC_CHECK_HEADERS(readline/readline.h, enable_readline=yes,
AC_MSG_ERROR(readline header files are required)) AC_MSG_ERROR(readline header files are required))
AC_ARG_ENABLE([dbusconf], AC_HELP_STRING([--disable-dbusconf],
[don't install D-Bus system policy file]),
[enable_dbusconf=${enableval}])
AM_CONDITIONAL(DBUSCONF, test "${enable_dbusconf}" != "no")
AC_ARG_WITH([dbusconfdir], AC_HELP_STRING([--with-dbusconfdir=DIR], AC_ARG_WITH([dbusconfdir], AC_HELP_STRING([--with-dbusconfdir=DIR],
[path to D-Bus configuration directory]), [path to D-Bus configuration directory]),
[path_dbusconfdir=${withval}]) [path_dbusconfdir=${withval}])
if (test -z "${path_dbusconfdir}"); then if (test "${enable_dbusconf}" != "no" && test -z "${path_dbusconfdir}"); then
AC_MSG_CHECKING([D-Bus configuration directory]) AC_MSG_CHECKING([D-Bus configuration directory])
path_dbusconfdir="`$PKG_CONFIG --variable=sysconfdir dbus-1`" path_dbusconfdir="`$PKG_CONFIG --variable=sysconfdir dbus-1`"
if (test -z "${path_dbusconfdir}"); then if (test -z "${path_dbusconfdir}"); then