X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=configure.ac;h=ea77db37da3765d80a06dfdae001e4205e79cfc8;hb=1b322bdb2a147e999c3861cba8a6b3ac0f3b712a;hp=de61b2d52f97984e56ba8c28532b7c592ea15117;hpb=d1ab0ca07372649dad70a0348d75e394f254e1b6;p=elogind.git

diff --git a/configure.ac b/configure.ac
index de61b2d52..ea77db37d 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_INIT([systemd],[0],[systemd-devel@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([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])
 
-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
 
@@ -132,13 +132,13 @@ PKG_CHECK_MODULES( CGROUP, [ libcgroup >= 0.35 ], [], [
 AC_SUBST(CGROUP_CFLAGS)
 AC_SUBST(CGROUP_LIBS)
 
-AM_PROG_VALAC([0.7])
+AM_PROG_VALAC([0.8])
 AC_SUBST(VAPIDIR)
 
 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 none]))
+AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo 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)])
@@ -148,6 +148,7 @@ if test "z$with_distro" = "z"; then
                 AC_CHECK_FILE(/etc/debian_version,with_distro="debian")
                 AC_CHECK_FILE(/etc/arch-release,with_distro="arch")
                 AC_CHECK_FILE(/etc/gentoo-release,with_distro="gentoo")
+                AC_CHECK_FILE(/etc/slackware-version,with_distro="slackware")
         fi
         if test "z$with_distro" = "z"; then
                 with_distro=`uname -s`
@@ -191,17 +192,52 @@ case $with_distro in
                 special_syslog_service=syslog-ng.service
                 AC_DEFINE(TARGET_GENTOO, [], [Target is Gentoo])
                 ;;
-        none)
-                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
+        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
+                AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
+                ;;
+        other)
+                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=none to skip this check])
+                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)
 
@@ -210,6 +246,7 @@ AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse)
 AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian)
 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])