Merge pull request #1887 from rubenk/make-xfs-optional

Add an option to disable building with XFS support

diff --combined configure.ac
index c72abd3,e432975..b3e4e7c
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -683,10 -683,26 +683,26 @@@ AC_CHECK_HEADERS([ 
    wordexp.h \
  ])
  
- AC_CHECK_HEADERS([xfs/xqm.h], [], [],
- [
- #define _GNU_SOURCE
- ])
+ # --enable-xfs {{{
+ AC_ARG_ENABLE([xfs],
+   [AS_HELP_STRING([--enable-xfs], [xfs support in df plugin @<:@default=yes@:>@])],
+   [],
+   [enable_xfs="auto"]
+ )
+ 
+ if test "x$enable_xfs" != "xno"; then
+   AC_CHECK_HEADERS([xfs/xqm.h],
+     [],
+     [
+       if test "x$enable_xfs" = "xyes"; then
+         AC_MSG_ERROR([xfs/xqm.h not found])
+       fi
+     ],
+     [[#define _GNU_SOURCE]]
+   )
+ fi
+ 
+ # }}}
  
  # For the dns plugin
  AC_CHECK_HEADERS(arpa/nameser.h)
@@@ -3332,6 -3348,9 +3348,6 @@@ AM_CONDITIONAL(BUILD_WITH_LIBNETAPP, te
  # }}}
  
  # --with-libnetsnmp {{{
 -with_snmp_config="net-snmp-config"
 -with_snmp_cflags=""
 -with_snmp_libs=""
  AC_ARG_WITH(libnetsnmp, [AS_HELP_STRING([--with-libnetsnmp@<:@=PREFIX@:>@], [Path to the Net-SNMPD library.])],
  [
        if test "x$withval" = "xno"
@@@ -3341,42 -3360,57 +3357,42 @@@
        then
                with_libnetsnmp="yes"
        else
 -              if test -x "$withval"
 -              then
 -                      with_snmp_config="$withval"
 -                      with_libnetsnmp="yes"
 -              else
 -                      with_snmp_config="$withval/bin/net-snmp-config"
 -                      with_libnetsnmp="yes"
 -              fi
 +              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
 -      with_snmp_cflags=`$with_snmp_config --cflags 2>/dev/null`
 -      snmp_config_status=$?
 -
 -      if test $snmp_config_status -ne 0
 -      then
 -              with_libnetsnmp="no ($with_snmp_config failed)"
 -      else
 -              SAVE_CPPFLAGS="$CPPFLAGS"
 -              CPPFLAGS="$CPPFLAGS $with_snmp_cflags"
 +      SAVE_CPPFLAGS="$CPPFLAGS"
 +      CPPFLAGS="$CPPFLAGS $with_libnetsnmp_cppflags"
  
 -              AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"])
 +      AC_CHECK_HEADERS(net-snmp/net-snmp-config.h, [], [with_libnetsnmp="no (net-snmp/net-snmp-config.h not found)"])
  
 -              CPPFLAGS="$SAVE_CPPFLAGS"
 -      fi
 +      CPPFLAGS="$SAVE_CPPFLAGS"
  fi
  if test "x$with_libnetsnmp" = "xyes"
  then
 -      with_snmp_libs=`$with_snmp_config --libs 2>/dev/null`
 -      snmp_config_status=$?
 +      SAVE_LDFLAGS="$LDFLAGS"
 +      LDFLAGS="$LDFLAGS $with_libnetsnmp_ldflags"
  
 -      if test $snmp_config_status -ne 0
 -      then
 -              with_libnetsnmp="no ($with_snmp_config failed)"
 -      else
 -              AC_CHECK_LIB(netsnmp, init_snmp,
 +      AC_CHECK_LIB(netsnmp, init_snmp,
                [with_libnetsnmp="yes"],
                [with_libnetsnmp="no (libnetsnmp not found)"],
                [$with_snmp_libs])
 -      fi
 +
 +      LDFLAGS="$SAVE_LDFLAGS"
  fi
  if test "x$with_libnetsnmp" = "xyes"
  then
 -      BUILD_WITH_LIBSNMP_CFLAGS="$with_snmp_cflags"
 -      BUILD_WITH_LIBSNMP_LIBS="$with_snmp_libs"
 -      AC_SUBST(BUILD_WITH_LIBSNMP_CFLAGS)
 -      AC_SUBST(BUILD_WITH_LIBSNMP_LIBS)
 +      BUILD_WITH_LIBNETSNMP_CPPFLAGS="$with_libnetsnmp_cppflags"
 +      BUILD_WITH_LIBNETSNMP_LDFLAGS="$with_libnetsnmp_ldflags"
 +      BUILD_WITH_LIBNETSNMP_LIBS="-lnetsnmp"
  fi
 -AM_CONDITIONAL(BUILD_WITH_LIBNETSNMP, test "x$with_libnetsnmp" = "xyes")
 +AC_SUBST(BUILD_WITH_LIBNETSNMP_CPPFLAGS)
 +AC_SUBST(BUILD_WITH_LIBNETSNMP_LDFLAGS)
 +AC_SUBST(BUILD_WITH_LIBNETSNMP_LIBS)
  # }}}
  
  # --with-liboconfig {{{
@@@ -3409,7 -3443,7 +3425,7 @@@ save_LDFLAGS="$LDFLAGS
  save_CPPFLAGS="$CPPFLAGS"
  LDFLAGS="$liboconfig_LDFLAGS"
  CPPFLAGS="$liboconfig_CPPFLAGS"
 -AC_CHECK_LIB(oconfig, oconfig_parse_fh,
 +AC_CHECK_LIB(oconfig, oconfig_parse_file,
  [
        with_liboconfig="yes"
        with_own_liboconfig="no"