Merge pull request #1460 from rubenk/mark-lvm2app-linux-only

lvm2 plugin: mark as Linux only

diff --combined configure.ac
index 257818d,66c531b..e86ae51
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -396,7 -396,7 +396,7 @@@ AC_CHECK_HEADERS(sys/sysctl.h, [], []
  AC_MSG_CHECKING([for sysctl kern.cp_times])
  if test -x /sbin/sysctl
  then
 -      /sbin/sysctl kern.cp_times 2>/dev/null
 +      /sbin/sysctl kern.cp_times >/dev/null 2>&1
        if test $? -eq 0
        then
                AC_MSG_RESULT([yes])
@@@ -634,6 -634,8 +634,6 @@@ AC_CHECK_HEADERS(netinet/if_ether.h, []
  #endif
  ])
  
 -AC_CHECK_HEADERS(netinet/ip_compat.h)
 -
  have_net_pfvar_h="no"
  AC_CHECK_HEADERS(net/pfvar.h,
                 [have_net_pfvar_h="yes"],
@@@ -1513,46 -1515,6 +1513,46 @@@ if test "x$with_libhal" = "xyes"; the
        fi
  fi
  
 +# --with-libpthread {{{
 +AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
 +[     if test "x$withval" != "xno" \
 +              && test "x$withval" != "xyes"
 +      then
 +              LDFLAGS="$LDFLAGS -L$withval/lib"
 +              CPPFLAGS="$CPPFLAGS -I$withval/include"
 +              with_libpthread="yes"
 +      else
 +              if test "x$withval" = "xno"
 +              then
 +                      with_libpthread="no (disabled)"
 +              fi
 +      fi
 +], [with_libpthread="yes"])
 +
 +AC_SUBST([PTHREAD_LIBS])
 +if test "x$with_libpthread" = "xyes"
 +then
 +      SAVE_LIBS="$LIBS"
 +      AC_CHECK_LIB(pthread, pthread_create, [], [with_libpthread="no (Symbol 'pthread_create' not found)"], [])
 +      PTHREAD_LIBS="$LIBS"
 +      LIBS="$SAVE_LIBS"
 +fi
 +
 +if test "x$with_libpthread" = "xyes"
 +then
 +      AC_CHECK_HEADERS(pthread.h,, [with_libpthread="no (pthread.h not found)"])
 +fi
 +if test "x$with_libpthread" = "xyes"
 +then
 +      collect_pthread=1
 +else
 +      collect_pthread=0
 +fi
 +AC_DEFINE_UNQUOTED(HAVE_LIBPTHREAD, [$collect_pthread],
 +      [Wether or not to use pthread (POSIX threads) library])
 +AM_CONDITIONAL(BUILD_WITH_LIBPTHREAD, test "x$with_libpthread" = "xyes")
 +# }}}
 +
  m4_divert_once([HELP_WITH], [
  collectd additional packages:])
  
@@@ -2221,6 -2183,9 +2221,6 @@@ if test "x$with_java_home" = "x
  then
        with_java_home="/usr/lib/jvm"
  fi
 -with_java_vmtype="client"
 -with_java_cflags=""
 -with_java_libs=""
  JAVAC="$JAVAC"
  JAR="$JAR"
  AC_ARG_WITH(java, [AS_HELP_STRING([--with-java@<:@=PREFIX@:>@], [Path to Java home.])],
@@@ -2313,10 -2278,6 +2313,10 @@@ if test "x$JAVA_LDFLAGS" != "x
  then
        AC_MSG_NOTICE([Building with JAVA_LDFLAGS set to: $JAVA_LDFLAGS])
  fi
 +if test "x$JAVA_LIBS" != "x"
 +then
 +      AC_MSG_NOTICE([Building with JAVA_LIBS set to: $JAVA_LIBS])
 +fi
  if test "x$JAVAC" = "x"
  then
        with_javac_path="$PATH"
@@@ -2357,11 -2318,9 +2357,11 @@@ f
  SAVE_CPPFLAGS="$CPPFLAGS"
  SAVE_CFLAGS="$CFLAGS"
  SAVE_LDFLAGS="$LDFLAGS"
 +SAVE_LIBS="$LIBS"
  CPPFLAGS="$CPPFLAGS $JAVA_CPPFLAGS"
  CFLAGS="$CFLAGS $JAVA_CFLAGS"
  LDFLAGS="$LDFLAGS $JAVA_LDFLAGS"
 +LIBS="$LIBS $JAVA_LIBS"
  
  if test "x$with_java" = "xyes"
  then
@@@ -2371,7 -2330,7 +2371,7 @@@ if test "x$with_java" = "xyes
  then
        AC_CHECK_LIB(jvm, JNI_CreateJavaVM,
        [with_java="yes"],
 -      [with_java="no (libjvm not found)"],
 +      [with_java="no (Symbol 'JNI_CreateJavaVM' not found)"],
        [$JAVA_LIBS])
  fi
  if test "x$with_java" = "xyes"
@@@ -2383,7 -2342,6 +2383,7 @@@ f
  CPPFLAGS="$SAVE_CPPFLAGS"
  CFLAGS="$SAVE_CFLAGS"
  LDFLAGS="$SAVE_LDFLAGS"
 +LIBS="$SAVE_LIBS"
  
  AC_SUBST(JAVA_CPPFLAGS)
  AC_SUBST(JAVA_CFLAGS)
@@@ -2455,17 -2413,25 +2455,25 @@@ with_liblvm2app_cppflags="
  with_liblvm2app_ldflags=""
  AC_ARG_WITH(liblvm2app, [AS_HELP_STRING([--with-liblvm2app@<:@=PREFIX@:>@], [Path to liblvm2app.])],
  [
-         if test "x$withval" != "xno" && test "x$withval" != "xyes"
-         then
-                 with_liblvm2app_cppflags="-I$withval/include"
-                 with_liblvm2app_ldflags="-L$withval/lib"
-                 with_liblvm2app="yes"
-         else
-                 with_liblvm2app="$withval"
+       if test "x$withval" = "xno"
+       then
+               with_liblvm2app="no"
+       else
+               with_liblvm2app="yes"
+               if test "x$withval" != "xyes"
+               then
+                       with_liblvm2app_cppflags="-I$withval/include"
+                       with_liblvm2app_ldflags="-L$withval/lib"
+               fi
          fi
  ],
  [
-         with_liblvm2app="yes"
+       if test "x$ac_system" = "xLinux"
+       then
+               with_liblvm2app="yes"
+       else
+               with_liblvm2app="no (Linux only library)"
+       fi
  ])
  if test "x$with_liblvm2app" = "xyes"
  then
@@@ -3009,7 -2975,7 +3017,7 @@@ the
  
        if test "x$LIBNETAPP_LIBS" = "x"
        then
 -              LIBNETAPP_LIBS="-lpthread -lxml -ladt -lssl -lm -lcrypto -lz"
 +              LIBNETAPP_LIBS="$PTHREAD_LIBS -lxml -ladt -lssl -lm -lcrypto -lz"
        fi
        AC_MSG_NOTICE([netapp LIBS: $LIBNETAPP_LIBS])
  
@@@ -3277,13 -3243,13 +3285,13 @@@ f
  
  # --with-libowcapi {{{
  with_libowcapi_cppflags=""
 -with_libowcapi_libs="-lowcapi"
 +with_libowcapi_ldflags=""
  AC_ARG_WITH(libowcapi, [AS_HELP_STRING([--with-libowcapi@<:@=PREFIX@:>@], [Path to libowcapi.])],
  [
        if test "x$withval" != "xno" && test "x$withval" != "xyes"
        then
                with_libowcapi_cppflags="-I$withval/include"
 -              with_libowcapi_libs="-L$withval/lib -lowcapi"
 +              with_libowcapi_ldflags="-L$withval/lib"
                with_libowcapi="yes"
        else
                with_libowcapi="$withval"
@@@ -3295,7 -3261,7 +3303,7 @@@
  if test "x$with_libowcapi" = "xyes"
  then
        SAVE_CPPFLAGS="$CPPFLAGS"
 -      CPPFLAGS="$with_libowcapi_cppflags"
 +      CPPFLAGS="$CPPFLAGS $with_libowcapi_cppflags"
  
        AC_CHECK_HEADERS(owcapi.h, [with_libowcapi="yes"], [with_libowcapi="no (owcapi.h not found)"])
  
@@@ -3305,7 -3271,7 +3313,7 @@@ if test "x$with_libowcapi" = "xyes
  then
        SAVE_LDFLAGS="$LDFLAGS"
        SAVE_CPPFLAGS="$CPPFLAGS"
 -      LDFLAGS="$with_libowcapi_libs"
 +      LDFLAGS="$LDFLAGS $with_libowcapi_ldflags"
        CPPFLAGS="$with_libowcapi_cppflags"
  
        AC_CHECK_LIB(owcapi, OW_get, [with_libowcapi="yes"], [with_libowcapi="no (libowcapi not found)"])
@@@ -3316,10 -3282,8 +3324,10 @@@ f
  if test "x$with_libowcapi" = "xyes"
  then
        BUILD_WITH_LIBOWCAPI_CPPFLAGS="$with_libowcapi_cppflags"
 -      BUILD_WITH_LIBOWCAPI_LIBS="$with_libowcapi_libs"
 +      BUILD_WITH_LIBOWCAPI_LDFLAGS="$with_libowcapi_ldflags"
 +      BUILD_WITH_LIBOWCAPI_LIBS="-lowcapi"
        AC_SUBST(BUILD_WITH_LIBOWCAPI_CPPFLAGS)
 +      AC_SUBST(BUILD_WITH_LIBOWCAPI_LDFLAGS)
        AC_SUBST(BUILD_WITH_LIBOWCAPI_LIBS)
  fi
  # }}}
@@@ -3648,6 -3612,41 +3656,6 @@@ f
  AM_CONDITIONAL(BUILD_WITH_LIBPQ, test "x$with_libpq" = "xyes")
  # }}}
  
 -# --with-libpthread {{{
 -AC_ARG_WITH(libpthread, [AS_HELP_STRING([--with-libpthread=@<:@=PREFIX@:>@], [Path to libpthread.])],
 -[     if test "x$withval" != "xno" \
 -              && test "x$withval" != "xyes"
 -      then
 -              LDFLAGS="$LDFLAGS -L$withval/lib"
 -              CPPFLAGS="$CPPFLAGS -I$withval/include"
 -              with_libpthread="yes"
 -      else
 -              if test "x$withval" = "xno"
 -              then
 -                      with_libpthread="no (disabled)"
 -              fi
 -      fi
 -], [with_libpthread="yes"])
 -if test "x$with_libpthread" = "xyes"
 -then
 -      AC_CHECK_LIB(pthread, pthread_create, [with_libpthread="yes"], [with_libpthread="no (libpthread not found)"], [])
 -fi
 -
 -if test "x$with_libpthread" = "xyes"
 -then
 -      AC_CHECK_HEADERS(pthread.h,, [with_libpthread="no (pthread.h not found)"])
 -fi
 -if test "x$with_libpthread" = "xyes"
 -then
 -      collect_pthread=1
 -else
 -      collect_pthread=0
 -fi
 -AC_DEFINE_UNQUOTED(HAVE_LIBPTHREAD, [$collect_pthread],
 -      [Wether or not to use pthread (POSIX threads) library])
 -AM_CONDITIONAL(BUILD_WITH_LIBPTHREAD, test "x$with_libpthread" = "xyes")
 -# }}}
 -
  # --with-python {{{
  with_python_prog=""
  with_python_path="$PATH"
@@@ -4094,6 -4093,11 +4102,6 @@@ the
        SAVE_CPPFLAGS="$CPPFLAGS"
        CPPFLAGS="$CPPFLAGS $with_sensors_cflags"
  
 -#     AC_CHECK_HEADERS(sensors/sensors.h,
 -#     [
 -#             AC_DEFINE(HAVE_SENSORS_SENSORS_H, 1, [Define to 1 if you have the <sensors/sensors.h> header file.])
 -#     ],
 -#     [with_libsensors="no (sensors/sensors.h not found)"])
        AC_CHECK_HEADERS(sensors/sensors.h, [], [with_libsensors="no (sensors/sensors.h not found)"])
  
        CPPFLAGS="$SAVE_CPPFLAGS"
@@@ -4749,7 -4753,7 +4757,7 @@@ AC_ARG_WITH(mic,[AS_HELP_STRING([--with
                AC_MSG_NOTICE([Not checking for Intel Mic: Manually configured])
                with_mic_cflags="-I$withval/include"
                with_mic_ldpath="-L$withval/lib/Linux"
 -              with_mic_libs="-lMicAccessSDK -lscif -lpthread"
 +              with_mic_libs="$PTHREAD_LIBS -lMicAccessSDK -lscif"
                with_mic="yes"
        fi; fi; fi
  ],
@@@ -4771,8 -4775,8 +4779,8 @@@ the
  
        AC_CHECK_LIB(MicAccessSDK, MicInitAPI,
                        [with_mic_ldpath="$with_mic_ldpath"
 -                      with_mic_libs="-lMicAccessSDK -lscif -lpthread"],
 -                      [with_mic="no (symbol MicInitAPI not found)"],[-lscif -lpthread])
 +                      with_mic_libs="$PTHREAD_LIBS -lMicAccessSDK -lscif"],
 +                      [with_mic="no (symbol MicInitAPI not found)"],[$PTHREAD_LIBS -lscif])
  
        CPPFLAGS="$SAVE_CPPFLAGS"
        LDFLAGS="$SAVE_LDFLAGS"
@@@ -5129,8 -5133,11 +5137,8 @@@ AM_CONDITIONAL(BUILD_WITH_LIBATASMART, 
  
  PKG_CHECK_MODULES([LIBNOTIFY], [libnotify],
                [with_libnotify="yes"],
 -              [if test "x$LIBNOTIFY_PKG_ERRORS" = "x"; then
 -                       with_libnotify="no"
 -               else
 -                       with_libnotify="no ($LIBNOTIFY_PKG_ERRORS)"
 -               fi])
 +              [with_libnotify="no (pkg-config doesn't know libnotify)"]
 +)
  
  # Check for enabled/disabled features
  #
@@@ -5418,6 -5425,7 +5426,6 @@@ the
  fi
  
  # libi2c-dev
 -with_libi2c="no"
  if test "x$ac_system" = "xLinux"
  then
  AC_CHECK_DECL(i2c_smbus_read_i2c_block_data,
@@@ -5425,8 -5433,6 +5433,8 @@@
        [with_libi2c="no (symbol i2c_smbus_read_i2c_block_data not found - have you installed libi2c-dev ?)"],
        [[#include <stdlib.h>
        #include <linux/i2c-dev.h>]])
 +else
 +      with_libi2c="no (Linux only)"
  fi
  
  if test "x$with_libi2c" = "xyes"