Hi,

The attached patches fix two small problems I ran into on non-RTAI Fedora 16. I'm working from the master branch. They document themselves.

Thanks-

        John
This silences output like the following:

checking for adeos... find: `/home/john/src/linuxcnc-dev/lib/emc2/modules': No such file or directory
not found


diff --git a/src/configure.in b/src/configure.in
index 21a9abb..2a37131 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -1111,7 +1111,7 @@ for m in adeos rtai_hal rtai_ksched rtai_fifos rtai_shm rtai_sem rtai_math \
         rtai rt_mem_mgr rtai_sched rtai_libm \
         rtl mbuff rtl_time rtl_sched rtl_posixio rtl_fifo; do
     AC_MSG_CHECKING([for $m])
-    TMP=$(find $MODULE_DIR -name $m$MODEXT)
+    TMP=$(find $MODULE_DIR -name $m$MODEXT 2>/dev/null)
     if test -z "$TMP"; then
         TMP=$(find /lib/modules/$KERNEL_VERS -name $m$MODEXT)
     fi
This corrects detection of dblatex versions with only two version
levels, such as 0.3 in Fedora 16

diff --git a/src/configure.in b/src/configure.in
index 5d2c0b4..21a9abb 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -946,7 +946,7 @@ On other systems, do what you need to install asciidoc version 8.5 or newer.])
     set -- `dblatex --version`; DBLATEX_VER=$3
     set -- `echo $DBLATEX_VER | sed 's/[[.-]]/ /g'`
 
-    if test $1 -eq 0 -a \( $2 -lt 2 -o \( $2 -eq 2 -a $3 -lt 12 \) \); then
+    if test $1 -eq 0 -a \( $2 -lt 2 -o \( $2 -eq 2 -a ${3:-0} -lt 12 \) \); then
         AC_MSG_ERROR([dblatex version $DBLATEX_VER less than 0.2.12.
 Documentation cannot be built.])
     fi
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Emc-developers mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/emc-developers

Reply via email to