]] Lennart Poettering | Hmm, please don't take this the wrong way: I am not convinced I want | to have distribution tests in the configure script for every Linux | distribution on the planet. In order to keep things maintainable and | easy for the majority of users I am happy to have automatic tests for the | big distros in there, but for the lesser known distros I'd prefer having | generic configure switches, that can cover them all by simply passing | the right parameters to configure.
Please see attached patches, they also fix some other cosmetic issues. (Feel free to grab from git.err.no if that's easier for you, I've pushed them there as well.) -- Tollef Fog Heen UNIX is user friendly, it's just picky about who its friends are
>From cc66d645f6df05001bb29d2fb209cfc4ab2c5adc Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen <[email protected]> Date: Sun, 16 May 2010 11:01:44 +0200 Subject: [PATCH 1/4] Rename --with-distro=none to --with-distro=other --- configure.ac | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index a5e3613..f4423d3 100644 --- a/configure.ac +++ b/configure.ac @@ -138,7 +138,7 @@ 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)]) @@ -199,14 +199,14 @@ case $with_distro in special_syslog_service=syslog.service AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware]) ;; - none) + 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 ;; *) - 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 -- 1.7.1
>From d2e39a0e0b8bed765f9646b09970a0ace8e9e0da Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen <[email protected]> Date: Sun, 16 May 2010 11:03:34 +0200 Subject: [PATCH 2/4] Support setting path and service names from configure Allow passing --with switches for SysV init path, SysV rcN.d path, DBus and syslog service names. Also bail out if those are not passed and distro is other --- configure.ac | 36 ++++++++++++++++++++++++++++++++---- 1 files changed, 32 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index f4423d3..1c97899 100644 --- a/configure.ac +++ b/configure.ac @@ -200,16 +200,44 @@ case $with_distro in 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) -- 1.7.1
>From 1cd8984ef44d9da3837f60b8eaf91aa3c9f81109 Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen <[email protected]> Date: Sun, 16 May 2010 11:05:51 +0200 Subject: [PATCH 3/4] Point the development/bug report address at the fd.o list --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 1c97899..cf3323b 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_PREREQ(2.63) -AC_INIT([systemd],[0],[mzflfgrzq (at) 0pointer (dot) net]) +AC_INIT([systemd],[0],[[email protected]]) AC_CONFIG_SRCDIR([main.c]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -- 1.7.1
>From 694af6b2234b38e456cfba789cb8fea05a0f757d Mon Sep 17 00:00:00 2001 From: Tollef Fog Heen <[email protected]> Date: Sun, 16 May 2010 11:07:39 +0200 Subject: [PATCH 4/4] Update package URL to point to freedesktop.org --- configure.ac | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index cf3323b..ea77db3 100644 --- a/configure.ac +++ b/configure.ac @@ -24,7 +24,7 @@ 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 -- 1.7.1
_______________________________________________ systemd-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/systemd-devel
