# Configure script for Ganeti
m4_define([gnt_version_major], [2])
-m4_define([gnt_version_minor], [4])
-m4_define([gnt_version_revision], [2])
-m4_define([gnt_version_suffix], [])
+m4_define([gnt_version_minor], [5])
+m4_define([gnt_version_revision], [0])
+m4_define([gnt_version_suffix], [~rc5])
m4_define([gnt_version_full],
m4_format([%d.%d.%d%s],
gnt_version_major, gnt_version_minor,
AC_PROG_INSTALL
AC_PROG_LN_S
+# Check for the ip command
+AC_ARG_VAR(IP_PATH, [ip path])
+AC_PATH_PROG(IP_PATH, [ip], [])
+if test -z "$IP_PATH"
+then
+ AC_MSG_ERROR([ip command not found])
+fi
+
# Check for pandoc
AC_ARG_VAR(PANDOC, [pandoc path])
AC_PATH_PROG(PANDOC, [pandoc], [])
AC_MSG_WARN([pylint not found, checking code will not be possible])
fi
+# Check for pep8
+AC_ARG_VAR(PEP8, [pep8 path])
+AC_PATH_PROG(PEP8, [pep8], [])
+if test -z "$PEP8"
+then
+ AC_MSG_WARN([pep8 not found, checking code will not be complete])
+fi
+
# Check for socat
AC_ARG_VAR(SOCAT, [socat path])
AC_PATH_PROG(SOCAT, [socat], [])
AC_SUBST(HTOOLS_NOCURL)
AC_MSG_CHECKING([parallel])
GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-3.*')
- if test -z "$GHC_PKG_PARALLEL"
+ if test -n "$GHC_PKG_PARALLEL"
then
+ HTOOLS_PARALLEL3=-DPARALLEL3
+ else
GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-2.*')
fi
if test -z "$GHC_PKG_PARALLEL"
GHC_PKG_PARALLEL=$($GHC_PKG --simple-output list 'parallel-1.*')
fi
AC_SUBST(GHC_PKG_PARALLEL)
+ AC_SUBST(HTOOLS_PARALLEL3)
AC_MSG_RESULT($GHC_PKG_PARALLEL)
AC_MSG_CHECKING([json])
GHC_PKG_JSON=$($GHC_PKG latest json)
AC_MSG_CHECKING([network])
GHC_PKG_NETWORK=$($GHC_PKG latest network)
AC_MSG_RESULT($GHC_PKG_NETWORK)
- AC_MSG_CHECKING([QuickCheck 1.x])
- GHC_PKG_QUICKCHECK=$($GHC_PKG --simple-output list 'QuickCheck-1.*')
+ AC_MSG_CHECKING([QuickCheck 2.x])
+ GHC_PKG_QUICKCHECK=$($GHC_PKG --simple-output list 'QuickCheck-2.*')
AC_MSG_RESULT($GHC_PKG_QUICKCHECK)
if test -z "$GHC_PKG_PARALLEL" || test -z "$GHC_PKG_JSON" || \
test -z "$GHC_PKG_NETWORK"; then
HTOOLS_MODULES="-package $GHC_PKG_PARALLEL"
fi
if test -z "$GHC_PKG_QUICKCHECK"; then
- AC_MSG_WARN(m4_normalize([The QuickCheck 1.x module was not found,
+ AC_MSG_WARN(m4_normalize([The QuickCheck 2.x module was not found,
you won't be able to run Haskell unittests]))
fi
fi
fi # end if enable_htools, define automake conditions
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])
SOCAT_USE_ESCAPE=