Generalize functions used by both hspace and hcheck

[ganeti-local] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7520c67..d2b2483 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [6])
 m4_define([gnt_version_revision], [0])
 m4_define([gnt_version_major], [2])
 m4_define([gnt_version_minor], [6])
 m4_define([gnt_version_revision], [0])

-m4_define([gnt_version_suffix], [~beta1])
+m4_define([gnt_version_suffix], [~beta2])

 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,
 m4_define([gnt_version_full],
           m4_format([%d.%d.%d%s],
                     gnt_version_major, gnt_version_minor,

@@ -235,7 +235,7 @@ AC_ARG_ENABLE([drbd-barriers],
       DRBD_BARRIERS=n
       DRBD_NO_META_FLUSH=False
     else
       DRBD_BARRIERS=n
       DRBD_NO_META_FLUSH=False
     else

-      DRBD_BARRIERS=bfd
+      DRBD_BARRIERS=bf

       DRBD_NO_META_FLUSH=True
     fi
   ]],
       DRBD_NO_META_FLUSH=True
     fi
   ]],

@@ -387,6 +387,7 @@ if test -z "$PEP8"
 then
   AC_MSG_WARN([pep8 not found, checking code will not be complete])
 fi
 then
   AC_MSG_WARN([pep8 not found, checking code will not be complete])
 fi

+AM_CONDITIONAL([HAS_PEP8], [test "$PEP8"])

 
 # Check for socat
 AC_ARG_VAR(SOCAT, [socat path])
 
 # Check for socat
 AC_ARG_VAR(SOCAT, [socat path])

@@ -518,6 +519,14 @@ if test "$HADDOCK" && test "$HSCOLOUR"; then
 fi
 AC_SUBST(HTOOLS_APIDOC)
 
 fi
 AC_SUBST(HTOOLS_APIDOC)
 

+# Check for hlint
+HLINT=no
+AC_ARG_VAR(HLINT, [hlint path])
+AC_PATH_PROG(HLINT, [hlint], [])
+if test -z "$HLINT"; then
+  AC_MSG_WARN([hlint not found, checking code will not be possible])
+fi
+

 fi # end if enable_htools, define automake conditions
 
 if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then
 fi # end if enable_htools, define automake conditions
 
 if test "$HTOOLS" != "yes" && test "$HS_CONFD" = "True"; then

@@ -528,6 +537,7 @@ fi
 AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes])
 AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$GHC_PKG_QUICKCHECK" != x])
 AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])
 AM_CONDITIONAL([WANT_HTOOLS], [test x$HTOOLS = xyes])
 AM_CONDITIONAL([WANT_HTOOLSTESTS], [test "x$GHC_PKG_QUICKCHECK" != x])
 AM_CONDITIONAL([WANT_HTOOLSAPIDOC], [test x$HTOOLS_APIDOC = xyes])

+AM_CONDITIONAL([HAS_HLINT], [test "$HLINT"])

 
 # Check for fakeroot
 AC_ARG_VAR(FAKEROOT_PATH, [fakeroot path])
 
 # Check for fakeroot
 AC_ARG_VAR(FAKEROOT_PATH, [fakeroot path])