Changeset 1215

Timestamp:

14/12/2006 23:57:57 (5 years ago)

Author:

chris

Message:

Don't check for nanosleep, random device, or flock/F_SETLK on any mingw32
platform (including mingw32msvc). (merges [1070])

File:

• box/trunk/configure.ac (modified) (3 diffs)

box/trunk/configure.ac

@@ -37 +37 @@
 ### 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])
@@ -127 +132 @@
 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
@@ -171 +180 @@
 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