[Box Backup-commit] COMMIT r1070 - box/chris/merge

[boxbackup-dev at fluffy.co.uk]

Author: chris
Date: 2006-10-16 20:23:47 +0100 (Mon, 16 Oct 2006)
New Revision: 1070

Modified:
   box/chris/merge/configure.ac
Log:
Don't check for nanosleep, random device, or flock/F_SETLK on any mingw32
platform (including mingw32msvc). (refs #3)


Modified: box/chris/merge/configure.ac
===================================================================
--- box/chris/merge/configure.ac	2006-10-15 23:05:51 UTC (rev 1069)
+++ box/chris/merge/configure.ac	2006-10-16 19:23:47 UTC (rev 1070)
@@ -36,10 +36,15 @@
 
 ### Checks for libraries.
 
-if test "$target_os" != "mingw32" -a "$target_os" != "winnt"; then
+case $target_os in
+mingw32*) ;;
+winnt)    ;;
+*)
   AC_SEARCH_LIBS([nanosleep], [rt], [ac_have_nanosleep=yes],
                  [AC_MSG_ERROR([[cannot find a short sleep function (nanosleep)]])])
-fi
+	;;
+esac
+
 AC_CHECK_LIB([z], [zlibVersion],, [AC_MSG_ERROR([[cannot find zlib]])])
 VL_LIB_READLINE([have_libreadline=yes], [have_libreadline=no])
 
@@ -126,12 +131,16 @@
   AX_BSWAP64
 fi
 
-if test "$target_os" != "mingw32"; then
+case $target_os in
+mingw32*) ;;
+winnt*)   ;;
+*)
   AX_RANDOM_DEVICE
   AX_CHECK_MOUNT_POINT(,[
     AC_MSG_ERROR([[cannot work out how to discover mount points on your platform]])
   ])
-fi
+;;
+esac
 
 AX_CHECK_MALLOC_WORKAROUND
 
@@ -170,13 +179,19 @@
 AC_CHECK_FUNCS([flock])
 AC_CHECK_DECLS([O_EXLOCK],,, [[#include <fcntl.h>]])
 AC_CHECK_DECLS([F_SETLK],,, [[#include <fcntl.h>]])
+
+case $target_os in
+mingw32*) ;;
+winnt*)   ;;
+*)
 if test "x$ac_cv_func_flock" != "xyes" && \
    test "x$ac_cv_have_decl_O_EXLOCK" != "xyes" && \
-   test "x$ac_cv_have_decl_F_SETLK" != "xyes" && \
-   test "$target_os" != "mingw32" -a "$target_os" != "winnt"
+   test "x$ac_cv_have_decl_F_SETLK" != "xyes"
 then
   AC_MSG_ERROR([[cannot work out how to do file locking on your platform]])
 fi
+;;
+esac
 
 ## Get tmpdir
 temp_directory_name="/tmp"