[systemd-commits] configure.ac hostname-setup.c

[Lennart Poettering]

 configure.ac     |    9 +++++++++
 hostname-setup.c |    4 ++--
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit 65c8976ab12f13fc339a16d108e620bf2fd703f4
Author: Malcolm Studd <mestudd at gmail.com>
Date:   Fri May 14 20:52:59 2010 -0400

    build-sys: slackware support
    
    Attached is a patch for slackware support. If you want it some other
    way, let me know; I haven't used git before.
    
    Slackware doesn't have gnome or vala, and I'm having some issues with
    the vala programs in systemd. I installed the vala compiler, and the
    configure script says I have everything required, but compilation
    fails (log attached). Is there something I'm missing? I installed
    systemd by commenting out the vala programs in Makefile.am.
    
    Malcolm

diff --git a/configure.ac b/configure.ac
index cd7aaff..a5e3613 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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,6 +192,13 @@ case $with_distro in
                 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
+                AC_DEFINE(TARGET_SLACKWARE, [], [Target is Slackware])
+                ;;
         none)
                 SYSTEM_SYSVINIT_PATH=/fix/the/configure/script
                 SYSTEM_SYSVRCND_PATH=/fix/the/configure/script
@@ -210,6 +218,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])
diff --git a/hostname-setup.c b/hostname-setup.c
index 71a3f75..3b988d4 100644
--- a/hostname-setup.c
+++ b/hostname-setup.c
@@ -34,7 +34,7 @@
 
 #if defined(TARGET_FEDORA)
 #define FILENAME "/etc/sysconfig/network"
-#elif defined(TARGET_SUSE)
+#elif defined(TARGET_SUSE) || defined(TARGET_SLACKWARE)
 #define FILENAME "/etc/HOSTNAME"
 #elif defined(TARGET_DEBIAN)
 #define FILENAME "/etc/hostname"
@@ -111,7 +111,7 @@ finish:
         fclose(f);
         return r;
 
-#elif defined(TARGET_SUSE) || defined(TARGET_DEBIAN)
+#elif defined(TARGET_SUSE) || defined(TARGET_DEBIAN) || defined(TARGET_SLACKWARE)
         int r;
         char *s, *k;