added some m4 quoting (fixes docbook warning message with comma), added
warning message when python binding will not be compiled.
This commit is contained in:
parent
49e17577df
commit
7af1cc7f5e
2 changed files with 7 additions and 7 deletions
|
@ -975,7 +975,7 @@ double check_gain_chan_x( calibration_setup_t *setup, linear_fit_t *l,unsigned i
|
|||
sum_err=0;
|
||||
for(i=0;i*step<n;i++){
|
||||
update_caldac( setup, cdac, i*step );
|
||||
//usleep(caldac_settle_usec);
|
||||
usleep(caldac_settle_usec);
|
||||
|
||||
new_sv_measure( setup->dev, &sv);
|
||||
|
||||
|
|
12
configure.ac
12
configure.ac
|
@ -26,18 +26,18 @@ AC_SUBST(COMEDILIB_CFLAGS)
|
|||
AC_SUBST(COMEDILIB_LIBS)
|
||||
|
||||
AM_PATH_PYTHON
|
||||
AM_CHECK_PYTHON_HEADERS(HAVE_PYTHON=yes,HAVE_PYTHON=no)
|
||||
AM_CONDITIONAL(HAVE_PYTHON, test "x$HAVE_PYTHON" = xyes)
|
||||
AM_CHECK_PYTHON_HEADERS(HAVE_PYTHON=yes,[HAVE_PYTHON=no;AC_MSG_WARN([python headers not found, disabling python binding])])
|
||||
AM_CONDITIONAL(HAVE_PYTHON, [test "x$HAVE_PYTHON" = xyes])
|
||||
|
||||
AS_COMPILER_FLAG(-fno-strict-aliasing,PYTHON_QUIET="$PYTHON_QUIET -fno-strict-aliasing", true )
|
||||
AS_COMPILER_FLAG(-Wno-unused-function,PYTHON_QUIET="$PYTHON_QUIET -Wno-unused-function", true )
|
||||
AS_COMPILER_FLAG([-fno-strict-aliasing],[PYTHON_QUIET="$PYTHON_QUIET -fno-strict-aliasing"], true )
|
||||
AS_COMPILER_FLAG([-Wno-unused-function],[PYTHON_QUIET="$PYTHON_QUIET -Wno-unused-function"], true )
|
||||
AC_SUBST(PYTHON_QUIET)
|
||||
|
||||
AC_PATH_PROG(JW_PATH, jw, no)
|
||||
if test x$JW_PATH = xno ; then
|
||||
AC_MSG_WARN(docbook-tools (jw) not found, disabling documentation)
|
||||
AC_MSG_WARN([docbook-tools (jw) not found, disabling documentation])
|
||||
fi
|
||||
AM_CONDITIONAL(HAVE_DOCBOOK, test "x$JW_PATH" != xno)
|
||||
AM_CONDITIONAL(HAVE_DOCBOOK, [test "x$JW_PATH" != xno])
|
||||
|
||||
|
||||
AC_CONFIG_FILES(
|
||||
|
|
Loading…
Add table
Reference in a new issue