summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Nierlein <sven@nierlein.de>2018-10-24 07:54:20 (GMT)
committerSven Nierlein <sven@nierlein.de>2018-10-24 07:54:20 (GMT)
commit7061a76f89a21872c4af365035e4fdb9e4629663 (patch)
treeaf05e2e619ad48807f569318aeac8f0aab532f15
parent7a46c98f830526a0e682d28d5a9db3d838ac9f36 (diff)
downloadmonitoring-plugins-7061a76f89a21872c4af365035e4fdb9e4629663.tar.gz
builds: alway put picohttpparser into the dist tarball
substituting PICOHTTPPARSER_DIR only when curl gets build, leads to different dist tarballs depending on wether libcurl was available or not. This then breaks later builds from this tarball because of the missing files.
-rw-r--r--configure.ac3
-rw-r--r--plugins/Makefile.am2
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 725bf0f..3b5ca6b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,9 +418,6 @@ URIPARSER_CHECK(yes, 0.7.5, [
418dnl prerequisites met, enable the plugin 418dnl prerequisites met, enable the plugin
419if test x$_can_enable_check_curl = xyes; then 419if test x$_can_enable_check_curl = xyes; then
420 EXTRAS="$EXTRAS check_curl\$(EXEEXT)" 420 EXTRAS="$EXTRAS check_curl\$(EXEEXT)"
421
422 dnl Enable bundled picohttpparser library (for now)
423 AC_SUBST(PICOHTTPPARSER_DIR, picohttpparser)
424fi 421fi
425AM_CONDITIONAL([WITH_CHECK_CURL], [test "$_can_enable_check_curl" = "yes"]) 422AM_CONDITIONAL([WITH_CHECK_CURL], [test "$_can_enable_check_curl" = "yes"])
426AM_COND_IF([WITH_CHECK_CURL], 423AM_COND_IF([WITH_CHECK_CURL],
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index ee78177..3fde54d 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -40,7 +40,7 @@ EXTRA_PROGRAMS = check_mysql check_radius check_pgsql check_snmp check_hpjd \
40 check_nagios check_by_ssh check_dns check_nt check_ide_smart \ 40 check_nagios check_by_ssh check_dns check_nt check_ide_smart \
41 check_procs check_mysql_query check_apt check_dbi check_curl 41 check_procs check_mysql_query check_apt check_dbi check_curl
42 42
43SUBDIRS = @PICOHTTPPARSER_DIR@ 43SUBDIRS = picohttpparser
44 44
45EXTRA_DIST = t tests 45EXTRA_DIST = t tests
46 46