[systemd-commits] 5 commits - configure.ac Makefile.am
Lennart Poettering
lennart at kemper.freedesktop.org
Sun May 16 09:23:15 PDT 2010
Makefile.am | 9 ++++-----
configure.ac | 46 +++++++++++++++++++++++++++++++++++++---------
2 files changed, 41 insertions(+), 14 deletions(-)
New commits:
commit 05a602f468a4f00d36ee7da73f13c0b014786fea
Author: Lennart Poettering <lennart at poettering.net>
Date: Sun May 16 18:23:09 2010 +0200
build-sys: fix make distcheck
diff --git a/Makefile.am b/Makefile.am
index cf56386..b8ccc82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -143,7 +143,8 @@ EXTRA_DIST += \
list.h \
securebits.h \
linux/auto_dev-ioctl.h \
- initreq.h
+ initreq.h \
+ sd-daemon.h
dist_man_MANS = \
systemd.unit.5 \
@@ -208,14 +209,12 @@ test_loopback_LDADD = $(systemd_LDADD)
systemd_logger_SOURCES = \
$(BASIC_SOURCES) \
logger.c \
- sd-daemon.c \
- sd-daemon.h
+ sd-daemon.c
systemd_initctl_SOURCES = \
$(BASIC_SOURCES) \
initctl.c \
- sd-daemon.c \
- sd-daemon.h
+ sd-daemon.c
systemd_initctl_CPPFLAGS = \
$(AM_CPPFLAGS) \
commit 1b322bdb2a147e999c3861cba8a6b3ac0f3b712a
Author: Tollef Fog Heen <tfheen at err.no>
Date: Sun May 16 11:07:39 2010 +0200
build-sys: update package URL to point to freedesktop.org
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
commit 1b00a255225bd65bcc3f6257bd4b1e2089f231b4
Author: Tollef Fog Heen <tfheen at err.no>
Date: Sun May 16 11:05:51 2010 +0200
build-sys: point the development/bug report address at the fd.o list
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],[systemd-devel at lists.freedesktop.org])
AC_CONFIG_SRCDIR([main.c])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_HEADERS([config.h])
commit 136337ff74f05be3d42a769d9f0cb99716c5c40f
Author: Tollef Fog Heen <tfheen at err.no>
Date: Sun May 16 11:03:34 2010 +0200
build-sys: 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
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)
commit bf024b022d9f53d2bb8d26107b4878cede3167b7
Author: Tollef Fog Heen <tfheen at err.no>
Date: Sun May 16 11:01:44 2010 +0200
build-sys: rename --with-distro=none to --with-distro=other
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
More information about the systemd-commits
mailing list