diff options
| author |  Sven Nierlein <sven@nierlein.de>
| 2018-10-24 09:54:20 +0200 |
|---|---|---|
| committer | Sven Nierlein <sven@nierlein.de>
| 2018-10-24 09:54:20 +0200 |
| commit | 7061a76f89a21872c4af365035e4fdb9e4629663 (patch) | |
| tree | af05e2e619ad48807f569318aeac8f0aab532f15 | |
| parent | 7a46c98f830526a0e682d28d5a9db3d838ac9f36 (diff) | |
| download | monitoring-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.ac | 3 | ||||
| -rw-r--r-- | plugins/Makefile.am | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 725bf0ff..3b5ca6b9 100644 --- a/configure.ac +++ b/configure.ac @@ -418,9 +418,6 @@ URIPARSER_CHECK(yes, 0.7.5, [ dnl prerequisites met, enable the plugin if test x$_can_enable_check_curl = xyes; then EXTRAS="$EXTRAS check_curl\$(EXEEXT)" - - dnl Enable bundled picohttpparser library (for now) - AC_SUBST(PICOHTTPPARSER_DIR, picohttpparser) fi AM_CONDITIONAL([WITH_CHECK_CURL], [test "$_can_enable_check_curl" = "yes"]) AM_COND_IF([WITH_CHECK_CURL], diff --git a/plugins/Makefile.am b/plugins/Makefile.am index ee781779..3fde54d6 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 \ check_nagios check_by_ssh check_dns check_nt check_ide_smart \ check_procs check_mysql_query check_apt check_dbi check_curl -SUBDIRS = @PICOHTTPPARSER_DIR@ +SUBDIRS = picohttpparser EXTRA_DIST = t tests |