X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=configure.ac;h=850987d7bc5f2b89e51cca0a0445250bff687165;hp=f4423d343a65da6d84558c44ed1773ca38740d10;hb=a7b6f8e578724c3b4f0cfc8777d9b4a8e29207b0;hpb=bf024b022d9f53d2bb8d26107b4878cede3167b7 diff --git a/configure.ac b/configure.ac index f4423d343..850987d7b 100644 --- a/configure.ac +++ b/configure.ac @@ -17,14 +17,14 @@ AC_PREREQ(2.63) -AC_INIT([systemd],[0],[mzflfgrzq (at) 0pointer (dot) net]) -AC_CONFIG_SRCDIR([main.c]) +AC_INIT([systemd],[0],[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]) +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 @@ -160,58 +164,88 @@ 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 + SPECIAL_DBUS_SERVICE=messagebus.service + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_FEDORA, [], [Target is Fedora/RHEL]) ;; suse) SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc/init.d - special_dbus_service=dbus.service - special_syslog_service=syslog.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=syslog.service AC_DEFINE(TARGET_SUSE, [], [Target is OpenSUSE/SLES]) ;; debian) SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=rsyslog.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=rsyslog.service AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian/Ubuntu]) ;; arch) SYSTEM_SYSVINIT_PATH=/etc/rc.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=syslog-ng.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=syslog-ng.service AC_DEFINE(TARGET_ARCH, [], [Target is ArchLinux]) ;; gentoo) SYSTEM_SYSVINIT_PATH=/etc/init.d SYSTEM_SYSVRCND_PATH=/etc - special_dbus_service=dbus.service - special_syslog_service=syslog-ng.service + SPECIAL_DBUS_SERVICE=dbus.service + SPECIAL_SYSLOG_SERVICE=syslog-ng.service AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo]) ;; 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 + SPECIAL_SYSLOG_SERVICE=syslog.service AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware]) ;; other) - SYSTEM_SYSVINIT_PATH=/fix/the/configure/script - SYSTEM_SYSVRCND_PATH=/fix/the/configure/script - special_dbus_service=fix-the-configure-script.service - special_syslog_service=fix-the-configure-script.service + AS_IF([test "x$with_sysvinit_path" = "x"], + [AC_MSG_ERROR([With --distro=none, 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])]) + AS_IF([test "x$with_dbus_service" = "x"], + [AC_MSG_ERROR([With --distro=none, 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([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]) ;; 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"], + []) + +AC_ARG_WITH([sysvrcd-path], + [AS_HELP_STRING([--with-sysvrcd-path=PATH], + [Specify the path to the base directory for the SysV rcN.d directories @<:@default=based on distro@:>@])], + [SYSTEM_SYSVRCND_PATH="$withval"], + []) + +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"], + []) + +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"], + []) + AC_SUBST(SYSTEM_SYSVINIT_PATH) AC_SUBST(SYSTEM_SYSVRCND_PATH) +AC_SUBST(SPECIAL_DBUS_SERVICE) +AC_SUBST(SPECIAL_SYSLOG_SERVICE) AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) @@ -220,8 +254,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]), @@ -229,7 +263,6 @@ AC_ARG_WITH([udevrulesdir], [with_udevrulesdir=/lib/udev/rules.d]) AC_SUBST([udevrulesdir], [$with_udevrulesdir]) - AC_OUTPUT([Makefile]) echo " @@ -238,8 +271,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} "