added some m4 quoting (fixes docbook warning message with comma), added

warning message when python binding will not be compiled.

diff --git a/comedi_calibrate/comedi_calibrate.c b/comedi_calibrate/comedi_calibrate.c
index d070aa0e69d73467a2207b4b0f4149e9cf2e4614..a8716d838da7be9161a5b32c60b6d9e9f41421a0 100644 (file)
--- a/comedi_calibrate/comedi_calibrate.c
+++ b/comedi_calibrate/comedi_calibrate.c
@@ -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);
 

diff --git a/configure.ac b/configure.ac
index 0d8cde25730cb17bb844c6811e258cd7a438ab06..8f1507ea9f5eca056ea23febbc4c28f14d70ceae 100644 (file)
--- a/configure.ac
+++ b/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(