Better hiding of syslog modules

diff --git a/syslog-ng/module.info b/syslog-ng/module.info
index 12300d2..a6d6390 100644 (file)
--- a/syslog-ng/module.info
+++ b/syslog-ng/module.info
@@ -1,6 +1,5 @@
 desc=System Logs NG
 category=system
 depends=proc
-os_support={&has_command("syslog-ng") || -x "/usr/local/sbin/syslog-ng"}
 longdesc=Configure the Syslog-NG server on your system and view its log files.
 desc_ca=Registres del Sistema NG

diff --git a/syslog/install_check.pl b/syslog/install_check.pl
index 09e74bf..0a44032 100644 (file)
--- a/syslog/install_check.pl
+++ b/syslog/install_check.pl
@@ -9,12 +9,6 @@ do 'syslog-lib.pl';
 sub is_installed
 {
 return 0 if (!-r $config{'syslog_conf'});
-if ($_[0]) {
-       if ($config{'m4_conf'}) {
-               return 1 if (!&needs_m4());
-               }
-       return 2;
-       }
-return 1;
+return $_[0] ? 2 : 1;
 }
 

diff --git a/syslog/module.info b/syslog/module.info
index 3fd5b22..055037d 100644 (file)
--- a/syslog/module.info
+++ b/syslog/module.info
@@ -9,7 +9,7 @@ desc_zh_CN=ϵͳ
 desc_pt=Historiais do Sistema
 category=system
 desc_tr=Sistem Kayýtlarý
-os_support=solaris open-linux redhat-linux{-r "/etc/syslog.conf" || -r "/etc/rsyslog.conf"} mandrake-linux debian-linux suse-linux{-r "/etc/syslog.conf"} united-linux slackware-linux freebsd openbsd turbo-linux corel-linux macos hpux cobalt-linux irix unixware aix netbsd msc-linux generic-linux openserver gentoo-linux trustix-linux sol-linux coherent-linux
+os_support=solaris *-linux freebsd openbsd macos hpux irix unixware aix netbsd openserver
 desc=System Logs
 desc_es=Históricos (Logs) del Sistema
 desc_sv=Systemloggar