X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=6b98442d1a69cfec3b32c23e927ea83f4881d7fc;hp=cdcb71cec15471599720d45d35956fbafa7713be;hb=f1dfb62962fd25c1fba9d9479cb5df2d23e6712d;hpb=139be57d9441b5c890e1e4ee69e15aad03276fde diff --git a/configure.ac b/configure.ac index cdcb71cec..6b98442d1 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.63) -AC_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org]) +AC_INIT([systemd],[2],[systemd-devel@lists.freedesktop.org]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -52,7 +52,7 @@ CC_CHECK_CFLAGS_APPEND([ \ -Wall \ -W \ -Wextra \ - -Winline \ + -Wno-inline \ -Wvla \ -Wundef \ -Wformat=2 \ @@ -97,11 +97,11 @@ AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers n # This makes sure pkg.m4 is available. m4_pattern_forbid([^_?PKG_[A-Z_]+$],[*** pkg.m4 missing, please install pkg-config]) -PKG_CHECK_MODULES(UDEV, [ libudev >= 154 ]) +PKG_CHECK_MODULES(UDEV, [ libudev >= 160 ]) AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) -PKG_CHECK_MODULES(DBUS, [ dbus-1 ]) +PKG_CHECK_MODULES(DBUS, [ dbus-1 >= 1.3.2 ]) AC_SUBST(DBUS_CFLAGS) AC_SUBST(DBUS_LIBS) @@ -215,7 +215,6 @@ fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` # Default generic names -SPECIAL_DBUS_SERVICE=dbus.service SPECIAL_SYSLOG_SERVICE=syslog.service # Location of the init scripts as mandated by LSB @@ -228,17 +227,16 @@ case $with_distro in SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d - # A little background why we define these special unit + # A little background why we define this special unit # names here in configure.ac: SysV services currently # cannot have aliases. As long as syslog is started - # via a SysV init script we hence define these names - # to the actual SysV name here. Later on when SysV - # init scripts are not used anymore it is advisable to - # use the generic names instead and use symlinks in - # the unit directories to point to the right native - # unit file. - - SPECIAL_DBUS_SERVICE=messagebus.service + # via a SysV init script we hence define this name to + # the actual SysV name here. Later on when SysV init + # scripts are not used anymore it is advisable to use + # the generic name instead and use symlinks in the + # unit directories to point to the right native unit + # file. + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) M4_DISTRO_FLAG=-DTARGET_FEDORA=1 @@ -270,7 +268,6 @@ case $with_distro in slackware) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d - SPECIAL_DBUS_SERVICE=messagebus.service AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware]) M4_DISTRO_FLAG=-DTARGET_SLACKWARE=1 ;; @@ -279,8 +276,6 @@ case $with_distro in [AC_MSG_ERROR([With --distro=other, you must pass --with-sysvinit-path= to configure])]) AS_IF([test "x$with_sysvrcd_path" = "x"], [AC_MSG_ERROR([With --distro=other, you must pass --with-sysvrcd-path= to configure])]) - AS_IF([test "x$with_dbus_service" = "x"], - [AC_MSG_ERROR([With --distro=other, you must pass --with-dbus-service= to configure])]) AS_IF([test "x$with_syslog_service" = "x"], [AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to configure])]) ;; @@ -301,12 +296,6 @@ AC_ARG_WITH([sysvrcd-path], [SYSTEM_SYSVRCND_PATH="$withval"], []) -AC_ARG_WITH([dbus-service], - [AS_HELP_STRING([--with-dbus-service=UNIT], - [Specify the name of the special DBus service @<:@default=based on distro@:>@])], - [SPECIAL_DBUS_SERVICE="$withval"], - []) - AC_ARG_WITH([syslog-service], [AS_HELP_STRING([--with-syslog-service=UNIT], [Specify the name of the special syslog service @<:@default=based on distro@:>@])], @@ -315,7 +304,6 @@ AC_ARG_WITH([syslog-service], AC_SUBST(SYSTEM_SYSVINIT_PATH) AC_SUBST(SYSTEM_SYSVRCND_PATH) -AC_SUBST(SPECIAL_DBUS_SERVICE) AC_SUBST(SPECIAL_SYSLOG_SERVICE) AC_SUBST(M4_DISTRO_FLAG) @@ -326,7 +314,6 @@ AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) -AC_DEFINE_UNQUOTED(SPECIAL_DBUS_SERVICE, ["$SPECIAL_DBUS_SERVICE"], [D-Bus service name]) AC_DEFINE_UNQUOTED(SPECIAL_SYSLOG_SERVICE, ["$SPECIAL_SYSLOG_SERVICE"], [Syslog service name]) AC_ARG_WITH([dbuspolicydir], @@ -352,7 +339,12 @@ AC_ARG_WITH([dbusinterfacedir], AC_ARG_WITH([udevrulesdir], AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]), [], - [with_udevrulesdir=/lib/udev/rules.d]) + [with_udevrulesdir=`pkg-config --variable=udevdir udev`/rules.d]) + +AC_ARG_WITH([pamlibdir], + AS_HELP_STRING([--with-pamlibdir=DIR], [Diectory for PAM modules]), + [], + [with_pamlibdir=/lib/`$CC -print-multi-os-directory`/security]) AC_ARG_WITH([rootdir], AS_HELP_STRING([--with-rootdir=DIR], [Root directory for files necessary for boot]), @@ -364,6 +356,7 @@ AC_SUBST([dbussessionservicedir], [$with_dbussessionservicedir]) AC_SUBST([dbussystemservicedir], [$with_dbussystemservicedir]) AC_SUBST([dbusinterfacedir], [$with_dbusinterfacedir]) AC_SUBST([udevrulesdir], [$with_udevrulesdir]) +AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([rootdir], [$with_rootdir]) AC_CONFIG_FILES([Makefile]) @@ -376,13 +369,13 @@ echo " SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Syslog service: ${SPECIAL_SYSLOG_SERVICE} - D-Bus service: ${SPECIAL_DBUS_SERVICE} Gtk: ${have_gtk} tcpwrap: ${have_tcpwrap} PAM: ${have_pam} prefix: ${prefix} root dir: ${with_rootdir} udev rules dir: ${with_udevrulesdir} + pam modules dir: ${with_pamlibdir} dbus policy dir: ${with_dbuspolicydir} dbus session dir: ${with_dbussessionservicedir} dbus system dir: ${with_dbussystemservicedir}