X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=configure.ac;h=90acfb8dfda997059a3dc70480276c1fd692b708;hb=ac295b96842daff60631573c806150487467fa4a;hp=cbad867e21ce839c7490d6002aec216adf63b538;hpb=6466fcb423f2a7f4af2a4558b9871488c5628671;p=collectd.git

diff --git a/configure.ac b/configure.ac
index cbad867e..90acfb8d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,6 @@ dnl we don't really need the 'u' even in older toolchains.  Then there is
 dnl older libtool, which spelled it AR_FLAGS
 m4_divert_text([DEFAULTS], [: "${ARFLAGS=cr} ${AR_FLAGS=cr}"])
 
-m4_include([m4/ax_compare_version.m4])
-
 LT_INIT([dlopen disable-static])
 
 AM_INIT_AUTOMAKE([subdir-objects tar-pax dist-bzip2 no-dist-gzip foreign])
@@ -62,9 +60,9 @@ if test "x$collectd_cv_prog_bison" = "xno" && test ! -f "${srcdir}/src/liboconfi
   AC_MSG_ERROR([bison is missing and you do not have ${srcdir}/src/liboconfig/parser.c. Please install bison])
 fi
 
-AS_IF([test "x$lt_cv_dlopen" = "xno"],
-  [AC_MSG_ERROR([Your system does not support dlopen])]
-)
+if test "x$lt_cv_dlopen" = "xno"; then
+  AC_MSG_ERROR([Your system does not support dlopen])
+fi
 
 AC_SUBST([DLOPEN_LIBS], [$lt_cv_dlopen_libs])
 
@@ -3772,22 +3770,22 @@ AC_SUBST([LIBNETAPP_LIBS])
 AC_ARG_WITH([libnetsnmp],
   [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Path to libnetsnmp.])],
   [
-	  if test "x$withval" = "xno"; then
-		  with_libnetsnmp="no"
-	  else if test "x$withval" = "xyes"; then
-		  with_libnetsnmp="yes"
-	  else
-		  with_libnetsnmp_cppflags="-I$withval/include"
-		  with_libnetsnmp_ldflags="-I$withval/lib"
-		  with_libnetsnmp="yes"
-	  fi; fi
+    if test "x$withval" = "xno"; then
+     with_libnetsnmp="no"
+    else if test "x$withval" = "xyes"; then
+     with_libnetsnmp="yes"
+    else
+      with_libnetsnmp_cppflags="-I$withval/include"
+      with_libnetsnmp_ldflags="-I$withval/lib"
+      with_libnetsnmp="yes"
+    fi; fi
   ],
   [with_libnetsnmp="yes"]
 )
 
 if test "x$with_libnetsnmp" = "xyes"; then
-	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
+  SAVE_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
 
   AC_CHECK_HEADERS([net-snmp/net-snmp-config.h],
     [with_libnetsnmp="yes"],
@@ -3804,25 +3802,25 @@ if test "x$with_libnetsnmp" = "xyes"; then
     ]]
   )
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
+  CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 
 if test "x$with_libnetsnmp" = "xyes"; then
-	SAVE_LDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags"
+  SAVE_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags"
 
-	AC_CHECK_LIB([netsnmp], [init_snmp],
-		[],
-		[with_libnetsnmp="no (libnetsnmp not found)"]
+  AC_CHECK_LIB([netsnmp], [init_snmp],
+    [with_libnetsmp="yes"],
+    [with_libnetsnmp="no (libnetsnmp not found)"]
   )
 
-	LDFLAGS="$SAVE_LDFLAGS"
+  LDFLAGS="$SAVE_LDFLAGS"
 fi
 
 if test "x$with_libnetsnmp" = "xyes"; then
-	BUILD_WITH_LIBNETSNMP_CPPFLAGS="$with_libnetsnmp_cppflags"
-	BUILD_WITH_LIBNETSNMP_LDFLAGS="$with_libnetsnmp_ldflags"
-	BUILD_WITH_LIBNETSNMP_LIBS="-lnetsnmp"
+  BUILD_WITH_LIBNETSNMP_CPPFLAGS="$with_libnetsnmp_cppflags"
+  BUILD_WITH_LIBNETSNMP_LDFLAGS="$with_libnetsnmp_ldflags"
+  BUILD_WITH_LIBNETSNMP_LIBS="-lnetsnmp"
 fi
 
 AC_SUBST([BUILD_WITH_LIBNETSNMP_CPPFLAGS])
@@ -3834,22 +3832,22 @@ AC_SUBST([BUILD_WITH_LIBNETSNMP_LIBS])
 AC_ARG_WITH([libnetsnmpagent],
   [AS_HELP_STRING([--with-libnetsnmpagent@<:@=PREFIX@:>@], [Path to libnetsnmpagent.])],
   [
-	  if test "x$withval" = "xno"; then
-		  with_libnetsnmpagent="no"
-	  else if test "x$withval" = "xyes"; then
-		  with_libnetsnmpagent="yes"
-	  else
-		  with_libnetsnmpagent_cppflags="-I$withval/include"
-		  with_libnetsnmpagent_ldflags="-I$withval/lib"
-		  with_libnetsnmpagent="yes"
-	  fi; fi
+    if test "x$withval" = "xno"; then
+      with_libnetsnmpagent="no"
+    else if test "x$withval" = "xyes"; then
+      with_libnetsnmpagent="yes"
+    else
+      with_libnetsnmpagent_cppflags="-I$withval/include"
+      with_libnetsnmpagent_ldflags="-I$withval/lib"
+      with_libnetsnmpagent="yes"
+    fi; fi
   ],
   [with_libnetsnmpagent="yes"]
 )
 
 if test "x$with_libnetsnmpagent" = "xyes"; then
-	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_libnetsnmpagent_cppflags"
+  SAVE_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $with_libnetsnmpagent_cppflags"
 
   AC_CHECK_HEADERS([net-snmp/agent/net-snmp-agent-includes.h],
     [],
@@ -3864,23 +3862,31 @@ if test "x$with_libnetsnmpagent" = "xyes"; then
     ]]
   )
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
+  CPPFLAGS="$SAVE_CPPFLAGS"
 fi
 
 if test "x$with_libnetsnmpagent" = "xyes"; then
-	SAVE_LDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS $with_libnetsnmpagent_ldflags"
+  SAVE_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $with_libnetsnmpagent_ldflags"
+
+  # older versions of libnetsnmpagent fail to link
+  # against the helpers library, so do that explicitly
+  AC_CHECK_LIB([netsnmphelpers], [netsnmp_init_helpers],
+    [libnetsnmphelpers="-lnetsnmphelpers"],
+    [libnetsnmphelpers=""]
+  )
 
-	AC_CHECK_LIB([netsnmpagent], [init_agent],
-		[],
-		[with_libnetsnmpagent="no (libnetsnmpagent not found)"]
+  AC_CHECK_LIB([netsnmpagent], [init_agent],
+    [with_libnetsnmpagent="yes"],
+    [with_libnetsnmpagent="no (libnetsnmpagent not found)"],
+    [$libnetsnmphelpers]
   )
 
-	LDFLAGS="$SAVE_LDFLAGS"
+  LDFLAGS="$SAVE_LDFLAGS"
 fi
 
 if test "x$with_libnetsnmpagent" = "xyes"; then
-	BUILD_WITH_LIBNETSNMPAGENT_LIBS="-lnetsnmpagent"
+  BUILD_WITH_LIBNETSNMPAGENT_LIBS="-lnetsnmpagent $libnetsnmphelpers"
 fi
 
 AC_SUBST([BUILD_WITH_LIBNETSNMPAGENT_CPPFLAGS])
@@ -4381,62 +4387,74 @@ AC_SUBST([BUILD_WITH_LIBPQ_LIBS])
 # }}}
 
 # --with-libpqos {{{
-with_libpqos_cppflags=""
-with_libpqos_ldflags=""
-AC_ARG_WITH(libpqos, [AS_HELP_STRING([--with-libpqos@<:@=PREFIX@:>@], [Path to libpqos.])],
-[
-	if test "x$withval" != "xno" && test "x$withval" != "xyes"
-	then
-		with_libpqos_cppflags="-I$withval/include"
-		with_libpqos_ldflags="-L$withval/lib"
-		with_libpqos="yes"
-	else
-		with_libpqos="$withval"
-	fi
-],
-[
-	with_libpqos="yes"
-])
-if test "x$with_libpqos" = "xyes"
-then
-	SAVE_CPPFLAGS="$CPPFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_libpqos_cppflags"
+AC_ARG_WITH([libpqos],
+  [AS_HELP_STRING([--with-libpqos@<:@=PREFIX@:>@], [Path to libpqos.])],
+  [
+    if test "x$withval" != "xno" && test "x$withval" != "xyes"; then
+      with_libpqos_cppflags="-I$withval/include"
+      with_libpqos_ldflags="-L$withval/lib"
+      with_libpqos="yes"
+    else
+      with_libpqos="$withval"
+    fi
+  ],
+  [with_libpqos="yes"]
+)
 
-	AC_CHECK_HEADERS(pqos.h, [with_libpqos="yes"], [with_libpqos="no (pqos.h not found)"])
+if test "x$with_libpqos" = "xyes"; then
+  SAVE_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $with_libpqos_cppflags"
+
+  AC_CHECK_HEADERS([pqos.h],
+    [with_libpqos="yes"],
+    [with_libpqos="no (pqos.h not found)"]
+  )
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
+  CPPFLAGS="$SAVE_CPPFLAGS"
 fi
-if test "x$with_libpqos" = "xyes"
-then
-	SAVE_CPPFLAGS="$CPPFLAGS"
-	SAVE_LDFLAGS="$LDFLAGS"
-	CPPFLAGS="$CPPFLAGS $with_libpqos_cppflags"
-	LDFLAGS="$LDFLAGS $with_libpqos_ldflags"
 
-	AC_CHECK_LIB(pqos, pqos_init, [with_libpqos="yes"], [with_libpqos="no (Can't find libpqos)"])
+if test "x$with_libpqos" = "xyes"; then
+  SAVE_LDFLAGS="$LDFLAGS"
+  LDFLAGS="$LDFLAGS $with_libpqos_ldflags"
+
+  AC_CHECK_LIB([pqos], [pqos_init],
+    [with_libpqos="yes"],
+    [with_libpqos="no (Can't find libpqos)"]
+  )
 
-	CPPFLAGS="$SAVE_CPPFLAGS"
-	LDFLAGS="$SAVE_LDFLAGS"
+  LDFLAGS="$SAVE_LDFLAGS"
 fi
-if test "x$with_libpqos" = "xyes"
-then
+
+if test "x$with_libpqos" = "xyes"; then
   SAVE_CPPFLAGS="$CPPFLAGS"
   CPPFLAGS="$CPPFLAGS $with_libpqos_cppflags"
-  AC_RUN_IFELSE([AC_LANG_PROGRAM(
-    [[#include <pqos.h>]],
-    [[return !(PQOS_VERSION >= 106)]])],
-    [with_libpqos="yes"], [with_libpqos="no (pqos library version 1.06 or higher is required)"])
+  AC_RUN_IFELSE(
+    [
+      AC_LANG_PROGRAM(
+        [[
+          #include <pqos.h>
+        ]],
+        [[
+          return !(PQOS_VERSION >= 106)
+        ]]
+      )
+    ],
+    [with_libpqos="yes"],
+    [with_libpqos="no (pqos library version 1.06 or higher is required)"]
+  )
+
   CPPFLAGS="$SAVE_CPPFLAGS"
 fi
-if test "x$with_libpqos" = "xyes"
-then
-	BUILD_WITH_LIBPQOS_CPPFLAGS="$with_libpqos_cppflags"
-	BUILD_WITH_LIBPQOS_LDFLAGS="$with_libpqos_ldflags"
-	BUILD_WITH_LIBPQOS_LIBS="-lpqos"
-	AC_SUBST(BUILD_WITH_LIBPQOS_CPPFLAGS)
-	AC_SUBST(BUILD_WITH_LIBPQOS_LDFLAGS)
-	AC_SUBST(BUILD_WITH_LIBPQOS_LIBS)
+
+if test "x$with_libpqos" = "xyes"; then
+  BUILD_WITH_LIBPQOS_CPPFLAGS="$with_libpqos_cppflags"
+  BUILD_WITH_LIBPQOS_LDFLAGS="$with_libpqos_ldflags"
+  BUILD_WITH_LIBPQOS_LIBS="-lpqos"
 fi
+
+AC_SUBST([BUILD_WITH_LIBPQOS_CPPFLAGS])
+AC_SUBST([BUILD_WITH_LIBPQOS_LDFLAGS])
+AC_SUBST([BUILD_WITH_LIBPQOS_LIBS])
 # }}}
 
 # --with-libprotobuf {{{
@@ -6722,15 +6740,14 @@ AC_ARG_WITH(perl-bindings, [AS_HELP_STRING([--with-perl-bindings@<:@=OPTIONS@:>@
   fi
 ])
 
-if test "x$with_perl_bindings" = "xyes"
-then
-	AC_MSG_CHECKING([for the ExtUtils::MakeMaker module])
-	if $PERL -MExtUtils::MakeMaker -e '' 2>/dev/null; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		with_perl_bindings="no (ExtUtils::MakeMaker not found)"
-	fi
+if test "x$with_perl_bindings" = "xyes"; then
+  AC_MSG_CHECKING([for the ExtUtils::MakeMaker module])
+  if $PERL -MExtUtils::MakeMaker -e '' 2>/dev/null; then
+    AC_MSG_RESULT([yes])
+  else
+    AC_MSG_RESULT([no])
+    with_perl_bindings="no (ExtUtils::MakeMaker not found)"
+  fi
 fi
 
 if test "x$with_perl_bindings" = "xyes"