X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=3bdd1dd71ac913822de19499fd3cceb4e79ed94d;hp=8636262b4a42fcb246e07f0bdbfb4c7fe8c3c26b;hb=2105e76a7725d6a29ebfe0af0bf23b3279e466a2;hpb=5e6afdd3d359fc42de7ac432243e98673577e81f diff --git a/configure.ac b/configure.ac index 8636262b4..3bdd1dd71 100644 --- a/configure.ac +++ b/configure.ac @@ -17,12 +17,12 @@ AC_PREREQ(2.63) -AC_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org]) +AC_INIT([systemd],[1],[systemd-devel@lists.freedesktop.org]) AC_CONFIG_SRCDIR([src/main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects]) +AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects dist-bzip2]) AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd]) @@ -48,14 +48,12 @@ AC_PROG_GCC_TRADITIONAL AC_USE_SYSTEM_EXTENSIONS CC_CHECK_CFLAGS_APPEND([ \ + -pipe \ -Wall \ -W \ -Wextra \ - -pipe \ - -Wno-long-long \ -Winline \ -Wvla \ - -Wno-overlength-strings \ -Wundef \ -Wformat=2 \ -Wlogical-op \ @@ -78,12 +76,19 @@ CC_CHECK_CFLAGS_APPEND([ \ -Wcast-align \ -Wstrict-aliasing=2 \ -Wwrite-strings \ + -Wno-long-long \ + -Wno-overlength-strings \ -Wno-unused-parameter \ - -ffast-math \ + -Wno-missing-field-initializers \ + -Wno-unused-result \ -Wp,-D_FORTIFY_SOURCE=2 \ + -ffast-math \ -fno-common \ -fdiagnostics-show-option \ - -Wno-missing-field-initializers]) + -fno-strict-aliasing]) + +LT_PREREQ(2.2) +LT_INIT AC_SEARCH_LIBS([clock_gettime], [rt], [], [AC_MSG_ERROR([*** POSIX RT library not found])]) AC_SEARCH_LIBS([cap_init], [cap], [], [AC_MSG_ERROR([*** POSIX caps library not found])]) @@ -92,7 +97,7 @@ 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 ]) +PKG_CHECK_MODULES(UDEV, [ libudev >= 154 ]) AC_SUBST(UDEV_CFLAGS) AC_SUBST(UDEV_LIBS) @@ -104,6 +109,71 @@ PKG_CHECK_MODULES(DBUSGLIB, [ dbus-glib-1 ]) AC_SUBST(DBUSGLIB_CFLAGS) AC_SUBST(DBUSGLIB_LIBS) +PKG_CHECK_MODULES(CGROUP, [ libcgroup >= 0.36 ]) +AC_SUBST(CGROUP_CFLAGS) +AC_SUBST(CGROUP_LIBS) + +AC_ARG_ENABLE([tcpwrap], + AS_HELP_STRING([--disable-tcpwrap],[Disable optional TCP wrappers support]), + [case "${enableval}" in + yes) have_tcpwrap=yes ;; + no) have_tcpwrap=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-tcpwrap) ;; + esac], + [have_tcpwrap=auto]) + +if test "x${have_tcpwrap}" != xno ; then + ACX_LIBWRAP + if test "x${LIBWRAP_LIBS}" = x ; then + if test "x$have_tcpwrap" = xyes ; then + AC_MSG_ERROR([*** TCP wrappers support not found.]) + fi + have_tcpwrap=no + else + have_tcpwrap=yes + fi +else + LIBWRAP_LIBS= +fi +AC_SUBST(LIBWRAP_LIBS) + +AC_ARG_ENABLE([pam], + AS_HELP_STRING([--disable-pam],[Disable optional PAM support]), + [case "${enableval}" in + yes) have_pam=yes ;; + no) have_pam=no ;; + *) AC_MSG_ERROR(bad value ${enableval} for --disable-pam) ;; + esac], + [have_pam=auto]) + +if test "x${have_pam}" != xno ; then + AC_CHECK_HEADERS( + [security/pam_modules.h security/pam_modutil.h security/pam_ext.h], + [have_pam=yes], + [if test "x$have_pam" = xyes ; then + AC_MSG_ERROR([*** PAM headers not found.]) + fi]) + + AC_CHECK_LIB( + [pam], + [pam_syslog], + [have_pam=yes], + [if test "x$have_pam" = xyes ; then + AC_MSG_ERROR([*** libpam not found.]) + fi]) + + if test "x$have_pam" = xyes ; then + PAM_LIBS="-lpam -lpam_misc" + AC_DEFINE(HAVE_PAM, 1, [PAM available]) + else + have_pam=no + fi +else + PAM_LIBS= +fi +AC_SUBST(PAM_LIBS) +AM_CONDITIONAL([HAVE_PAM], [test "x$have_pam" != xno]) + have_gtk=no AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools])) if test "x$enable_gtk" != "xno"; then @@ -117,34 +187,16 @@ if test "x$enable_gtk" != "xno"; then fi AM_CONDITIONAL(HAVE_GTK, [test "$have_gtk" = "yes"]) -PKG_CHECK_MODULES( CGROUP, [ libcgroup >= 0.35 ], [], [ - AC_CHECK_HEADER( [libcgroup.h], [], [AC_MSG_ERROR([*** libcgroup.h not found])], ) - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - CGROUP_LIBS=${CGROUP_LIBS:--lcgroup} - LIBS="$LIBS $CGROUP_LIBS" - CPPFLAGS="$CPPFLAGS $CGROUP_CFLAGS" - AC_MSG_CHECKING([for libcgroup >= 0.35]) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[#include ]], [[ CGFLAG_DELETE_RECURSIVE; cgroup_init(); ]])], - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no]); AC_MSG_ERROR([*** systemd needs libcgroup 0.35 or newer])], - [${CGROUP_LIBS}]) - CPPFLAGS="$save_CPPFLAGS" - LIBS="$save_LIBS" -]) -AC_SUBST(CGROUP_CFLAGS) -AC_SUBST(CGROUP_LIBS) - AM_PROG_VALAC([0.8]) AC_SUBST(VAPIDIR) +AM_CONDITIONAL(HAVE_VALAC, test x"$VALAC" != x) AC_PATH_PROG([XSLTPROC], [xsltproc]) 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, arch, gentoo or other])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo, slackware 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)]) @@ -169,6 +221,8 @@ SPECIAL_SYSLOG_SERVICE=syslog.service # Location of the init scripts as mandated by LSB SYSTEM_SYSVINIT_PATH=/etc/init.d +M4_DISTRO_FLAG= + case $with_distro in fedora) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d @@ -187,42 +241,48 @@ case $with_distro in SPECIAL_DBUS_SERVICE=messagebus.service SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) + M4_DISTRO_FLAG=-DTARGET_FEDORA=1 ;; suse) SYSTEM_SYSVRCND_PATH=/etc/init.d - AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES]) + AC_DEFINE(TARGET_SUSE, [], [Target is openSUSE/SLE]) + M4_DISTRO_FLAG=-DTARGET_SUSE=1 ;; debian) SYSTEM_SYSVRCND_PATH=/etc SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu]) + M4_DISTRO_FLAG=-DTARGET_DEBIAN=1 ;; arch) SYSTEM_SYSVINIT_PATH=/etc/rc.d SYSTEM_SYSVRCND_PATH=/etc SPECIAL_SYSLOG_SERVICE=syslog-ng.service AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux]) + M4_DISTRO_FLAG=-DTARGET_ARCH=1 ;; gentoo) SYSTEM_SYSVRCND_PATH=/etc SPECIAL_SYSLOG_SERVICE=syslog-ng.service AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo]) + M4_DISTRO_FLAG=-DTARGET_GENTOO=1 ;; 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 ;; other) AS_IF([test "x$with_sysvinit_path" = "x"], - [AC_MSG_ERROR([With --distro=none, you must pass --with-sysvinit-path= to configure])]) + [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=none, you must pass --with-sysvrcd-path= to configure])]) + [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=none, you must pass --with-dbus-service= to configure])]) + [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=none, you must pass --with-syslog-service= to configure])]) + [AC_MSG_ERROR([With --distro=other, you must pass --with-syslog-service= to configure])]) ;; *) AC_MSG_ERROR([Your distribution (${with_distro}) is not yet supported, SysV init scripts could not be found! (patches welcome); you can specify --with-distro=other to skip this check]) @@ -242,13 +302,13 @@ AC_ARG_WITH([sysvrcd-path], []) AC_ARG_WITH([dbus-service], - [AS_HELP_STRING([--with-dbus-service=PATH], + [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=PATH], + [AS_HELP_STRING([--with-syslog-service=UNIT], [Specify the name of the special syslog service @<:@default=based on distro@:>@])], [SPECIAL_SYSLOG_SERVICE="$withval"], []) @@ -257,6 +317,7 @@ 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) AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) @@ -268,13 +329,51 @@ 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], + AS_HELP_STRING([--with-dbuspolicydir=DIR], [D-Bus policy directory]), + [], + [with_dbuspolicydir=`pkg-config --variable=sysconfdir dbus-1`/dbus-1/system.d]) + +AC_ARG_WITH([dbussessionservicedir], + AS_HELP_STRING([--with-dbussessionservicedir=DIR], [D-Bus session service directory]), + [], + [with_dbussessionservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`]) + +AC_ARG_WITH([dbussystemservicedir], + AS_HELP_STRING([--with-dbussystemservicedir=DIR], [D-Bus system service directory]), + [], + [with_dbussystemservicedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../system-services]) + +AC_ARG_WITH([dbusinterfacedir], + AS_HELP_STRING([--with-dbusinterfacedir=DIR], [D-Bus interface directory]), + [], + [with_dbusinterfacedir=`pkg-config --variable=session_bus_services_dir dbus-1`/../interfaces]) + 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]), + [], + [with_rootdir=${ac_default_prefix}]) + +AC_SUBST([dbuspolicydir], [$with_dbuspolicydir]) +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_OUTPUT([Makefile]) +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT echo " $PACKAGE_NAME $VERSION @@ -285,5 +384,14 @@ echo " 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} + dbus interfaces dir: ${with_dbusinterfacedir} "