X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=ffdedeedff94d7e1d6c37a83be0d5060a2206290;hp=cf3323bdd4d662fa438c48351df3eab308b3834f;hb=8640e111358257bbdd19582c0cac6166e87bd277;hpb=1b00a255225bd65bcc3f6257bd4b1e2089f231b4 diff --git a/configure.ac b/configure.ac index cf3323bdd..ffdedeedf 100644 --- a/configure.ac +++ b/configure.ac @@ -18,13 +18,13 @@ AC_PREREQ(2.63) AC_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org]) -AC_CONFIG_SRCDIR([main.c]) +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]) +AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax subdir-objects]) -AC_SUBST(PACKAGE_URL, [http://git.0pointer.de/?p=systemd.git]) +AC_SUBST(PACKAGE_URL, [http://www.freedesktop.org/wiki/Software/systemd]) AC_CANONICAL_HOST @@ -37,6 +37,10 @@ AS_IF([test "x$STOW" = "xyes" && test -d /usr/local/stow], [ ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" ]) +AC_PROG_MKDIR_P +AC_PROG_LN_S +AC_PROG_SED + AC_PROG_CC AC_PROG_CC_C99 AM_PROG_CC_C_O @@ -88,7 +92,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) @@ -100,6 +104,10 @@ 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) + have_gtk=no AC_ARG_ENABLE(gtk, AS_HELP_STRING([--disable-gtk], [disable GTK tools])) if test "x$enable_gtk" != "xno"; then @@ -113,32 +121,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_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo or other])) +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, 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)]) @@ -156,58 +148,75 @@ if test "z$with_distro" = "z"; then 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 +SYSTEM_SYSVINIT_PATH=/etc/init.d + +M4_DISTRO_FLAG= + case $with_distro in fedora) SYSTEM_SYSVINIT_PATH=/etc/rc.d/init.d SYSTEM_SYSVRCND_PATH=/etc/rc.d - special_dbus_service=messagebus.service - special_syslog_service=rsyslog.service + + # A little background why we define these 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 + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) + M4_DISTRO_FLAG=-DTARGET_FEDORA=1 ;; suse) - SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc/init.d - special_dbus_service=dbus.service - special_syslog_service=syslog.service - AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES]) + AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLE]) + M4_DISTRO_FLAG=-DTARGET_SUSE=1 ;; debian) - SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=rsyslog.service + 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_dbus_service=dbus.service - special_syslog_service=syslog-ng.service + SPECIAL_SYSLOG_SERVICE=syslog-ng.service AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux]) + M4_DISTRO_FLAG=-DTARGET_ARCH=1 ;; gentoo) - SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=syslog-ng.service + 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 - special_syslog_service=syslog.service + 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]) @@ -229,17 +238,20 @@ AC_ARG_WITH([sysvrcd-path], AC_ARG_WITH([dbus-service], [AS_HELP_STRING([--with-dbus-service=PATH], [Specify the name of the special DBus service @<:@default=based on distro@:>@])], - [special_dbus_service="$withval"], + [SPECIAL_DBUS_SERVICE="$withval"], []) AC_ARG_WITH([syslog-service], [AS_HELP_STRING([--with-syslog-service=PATH], [Specify the name of the special syslog service @<:@default=based on distro@:>@])], - [special_syslog_service="$withval"], + [SPECIAL_SYSLOG_SERVICE="$withval"], []) 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) @@ -248,8 +260,8 @@ 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_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([udevrulesdir], AS_HELP_STRING([--with-udevrulesdir=DIR], [Diectory for udev rules]), @@ -257,7 +269,6 @@ AC_ARG_WITH([udevrulesdir], [with_udevrulesdir=/lib/udev/rules.d]) AC_SUBST([udevrulesdir], [$with_udevrulesdir]) - AC_OUTPUT([Makefile]) echo " @@ -266,8 +277,8 @@ echo " Distribution: ${with_distro} SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} - Syslog service: ${special_syslog_service} - D-Bus service: ${special_dbus_service} + Syslog service: ${SPECIAL_SYSLOG_SERVICE} + D-Bus service: ${SPECIAL_DBUS_SERVICE} Gtk: ${have_gtk} udev rules dir: ${with_udevrulesdir} "