John C. Frickson 9 vuotta sitten
vanhempi
commit
00462697d5
4 muutettua tiedostoa jossa 12 lisäystä ja 4 poistoa
  1. 6 0
      .gitignore
  2. 1 1
      Makefile.am
  3. 3 1
      configure.ac
  4. 2 2
      plugins/check_users.c

+ 6 - 0
.gitignore

@@ -252,6 +252,12 @@ NP-VERSION-FILE
 /plugins-scripts/check_wave
 /plugins-scripts/check_file_age
 
+# /plugins-python
+/plugins-python/Makefile.in
+/plugins-python/Makefile
+plugins-python/*.py
+plugins-python/check_ncpa.py
+
 # /po/
 /po/Makefile
 /po/Makefile.in

+ 1 - 1
Makefile.am

@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = gl tap lib plugins plugins-scripts plugins-root po @PERLMODS_DIR@
+SUBDIRS = gl tap lib plugins plugins-scripts plugins-python plugins-root po @PERLMODS_DIR@
 
 EXTRA_DIST = config.rpath \
 	ABOUT-NLS ACKNOWLEDGEMENTS AUTHORS CODING ChangeLog FAQ LEGAL NEWS \

+ 3 - 1
configure.ac

@@ -115,7 +115,8 @@ fi
 AC_SUBST(NP_RELEASE)
 
 dnl Checks for programs.
-AC_PATH_PROG(PYTHON,python)
+#AC_PATH_PROG(PYTHON,python)
+AX_WITH_PYTHON([2.6], [missing])
 AC_PATH_PROG(SH,sh)
 AC_PATH_PROG(PERL,perl)
 AC_PATH_PROG(LIBGNUTLS_CONFIG,libgnutls-config)
@@ -1881,6 +1882,7 @@ AC_OUTPUT(
   plugins-scripts/Makefile
   plugins-scripts/utils.pm
   plugins-scripts/utils.sh
+  plugins-python/Makefile
   perlmods/Makefile
   test.pl
   pkg/solaris/pkginfo

+ 2 - 2
plugins/check_users.c

@@ -223,9 +223,9 @@ process_arguments (int argc, char **argv)
 	set_thresholds (&thlds, warning_range, critical_range);
 
 	if (thlds->warning->end < 0)
-		usage4 (_("Warning threshold must be a zero or greater"));
+		usage4 (_("Warning threshold must be zero or greater"));
 	if (thlds->critical->end < 0)
-		usage4 (_("Critical threshold must be a zero or greater"));
+		usage4 (_("Critical threshold must be zero or greater"));
 
 	return OK;
 }