X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=386008843a8177da64675a3c667565acaf92ce2f;hp=bef2418ed73d8982e90fa8670bc4a2d901e306bf;hb=54ecda32c60c6f2548f74703bfd324694393edaa;hpb=204fa33c82588c47ebeef3f8c4c0b7da750e37f7 diff --git a/configure.ac b/configure.ac index bef2418ed..386008843 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.63) -AC_INIT([systemd],[42],[systemd-devel@lists.freedesktop.org]) +AC_INIT([systemd],[43],[systemd-devel@lists.freedesktop.org]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) @@ -45,6 +45,7 @@ AC_SUBST(GETTEXT_PACKAGE) AC_PROG_MKDIR_P AC_PROG_LN_S AC_PROG_SED +AC_PROG_GREP AC_PROG_AWK AC_PROG_CC @@ -296,77 +297,78 @@ AM_CONDITIONAL(HAVE_LIBCRYPTSETUP, [test "$have_libcryptsetup" = "yes"]) have_binfmt=no AC_ARG_ENABLE(binfmt, AS_HELP_STRING([--disable-binfmt], [disable binfmt tool])) if test "x$enable_binfmt" != "xno"; then - have_binfmt=yes + have_binfmt=yes fi AM_CONDITIONAL(ENABLE_BINFMT, [test "$have_binfmt" = "yes"]) have_vconsole=no AC_ARG_ENABLE(vconsole, AS_HELP_STRING([--disable-vconsole], [disable vconsole tool])) if test "x$enable_vconsole" != "xno"; then - have_vconsole=yes + have_vconsole=yes fi AM_CONDITIONAL(ENABLE_VCONSOLE, [test "$have_vconsole" = "yes"]) have_readahead=no AC_ARG_ENABLE(readahead, AS_HELP_STRING([--disable-readahead], [disable readahead tools])) if test "x$enable_readahead" != "xno"; then - have_readahead=yes + have_readahead=yes fi AM_CONDITIONAL(ENABLE_READAHEAD, [test "$have_readahead" = "yes"]) have_quotacheck=no AC_ARG_ENABLE(quotacheck, AS_HELP_STRING([--disable-quotacheck], [disable quotacheck tools])) if test "x$enable_quotacheck" != "xno"; then - have_quotacheck=yes + have_quotacheck=yes fi AM_CONDITIONAL(ENABLE_QUOTACHECK, [test "$have_quotacheck" = "yes"]) have_randomseed=no AC_ARG_ENABLE(randomseed, AS_HELP_STRING([--disable-randomseed], [disable randomseed tools])) if test "x$enable_randomseed" != "xno"; then - have_randomseed=yes + have_randomseed=yes fi AM_CONDITIONAL(ENABLE_RANDOMSEED, [test "$have_randomseed" = "yes"]) have_logind=no AC_ARG_ENABLE(logind, AS_HELP_STRING([--disable-logind], [disable login daemon])) if test "x$enable_logind" != "xno"; then - have_logind=yes + have_logind=yes fi AM_CONDITIONAL(ENABLE_LOGIND, [test "$have_logind" = "yes"]) +AS_IF([test "$have_logind" = "yes"], [ AC_DEFINE(HAVE_LOGIND, [1], [Logind support available]) ]) have_hostnamed=no AC_ARG_ENABLE(hostnamed, AS_HELP_STRING([--disable-hostnamed], [disable hostname daemon])) if test "x$enable_hostnamed" != "xno"; then - have_hostnamed=yes + have_hostnamed=yes fi AM_CONDITIONAL(ENABLE_HOSTNAMED, [test "$have_hostnamed" = "yes"]) have_timedated=no AC_ARG_ENABLE(timedated, AS_HELP_STRING([--disable-timedated], [disable timedate daemon])) if test "x$enable_timedated" != "xno"; then - have_timedated=yes + have_timedated=yes fi AM_CONDITIONAL(ENABLE_TIMEDATED, [test "$have_timedated" = "yes"]) have_localed=no AC_ARG_ENABLE(localed, AS_HELP_STRING([--disable-localed], [disable locale daemon])) if test "x$enable_localed" != "xno"; then - have_localed=yes + have_localed=yes fi AM_CONDITIONAL(ENABLE_LOCALED, [test "$have_localed" = "yes"]) have_coredump=no AC_ARG_ENABLE(coredump, AS_HELP_STRING([--disable-coredump], [disable coredump hook])) if test "x$enable_coredump" != "xno"; then - have_coredump=yes + have_coredump=yes fi AM_CONDITIONAL(ENABLE_COREDUMP, [test "$have_coredump" = "yes"]) have_manpages=no AC_ARG_ENABLE(manpages, AS_HELP_STRING([--disable-manpages], [disable manpages])) if test "x$enable_manpages" != "xno"; then - have_manpages=yes + have_manpages=yes fi AM_CONDITIONAL(ENABLE_MANPAGES, [test "$have_manpages" = "yes"]) @@ -394,29 +396,15 @@ AM_CONDITIONAL(HAVE_XSLTPROC, test x"$XSLTPROC" != x) AC_PATH_PROG([M4], [m4]) -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux or other])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, meego, mageia, angstrom or other])) if test "z$with_distro" = "z"; then if test "$cross_compiling" = yes; then AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) else - test -f "/etc/redhat-release" && with_distro="fedora" - test -f "/etc/SuSE-release" && with_distro="suse" - test -f "/etc/debian_version" && with_distro="debian" - test -f "/etc/arch-release" && with_distro="arch" - test -f "/etc/gentoo-release" && with_distro="gentoo" - test -f "/etc/slackware-version" && with_distro="slackware" - test -f "/etc/frugalware-release" && with_distro="frugalware" - test -f "/etc/altlinux-release" && with_distro="altlinux" - test -f "/etc/mandriva-release" && with_distro="mandriva" - test -f "/etc/meego-release" && with_distro="meego" - test -f "/etc/angstrom-version" && with_distro="angstrom" - test -f "/etc/mageia-release" && with_distro="mageia" - if test "x`lsb_release -is 2>/dev/null`" = "xUbuntu"; then - with_distro="ubuntu" - fi + with_distro=$($GREP '^ID=' /etc/os-release | $SED 's/ID=//'); fi if test "z$with_distro" = "z"; then - with_distro=`uname -s` + with_distro=other fi fi with_distro=`echo ${with_distro} | tr '[[:upper:]]' '[[:lower:]]' ` @@ -436,7 +424,7 @@ case $with_distro in M4_DEFINES=-DTARGET_FEDORA=1 have_plymouth=yes ;; - suse) + opensuse|suse) SYSTEM_SYSVRCND_PATH=/etc/init.d AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE]) M4_DEFINES=-DTARGET_SUSE=1 @@ -492,7 +480,7 @@ case $with_distro in SYSTEM_SYSVRCND_PATH= AC_DEFINE(TARGET_MEEGO, [], [Target is MeeGo]) M4_DEFINES=-DTARGET_MEEGO=1 - ;; + ;; angstrom) SYSTEM_SYSVRCND_PATH=/etc AC_DEFINE(TARGET_ANGSTROM, [], [Target is Ångström]) @@ -512,10 +500,10 @@ case $with_distro in esac AC_ARG_WITH([sysvinit-path], - [AS_HELP_STRING([--with-sysvinit-path=PATH], - [Specify the path to where the SysV init scripts are located @<:@default=based on distro@:>@])], - [SYSTEM_SYSVINIT_PATH="$withval"], - []) + [AS_HELP_STRING([--with-sysvinit-path=PATH], + [Specify the path to where the SysV init scripts are located @<:@default=based on distro@:>@])], + [SYSTEM_SYSVINIT_PATH="$withval"], + []) AC_ARG_WITH([sysvrcd-path], [AS_HELP_STRING([--with-sysvrcd-path=PATH],