From 930217732563a0d471e73e81aac86e8da6210c3d Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Mon, 2 May 2005 19:54:36 +0000
Subject: [PATCH] Test for things that MSVC doesn't have, rather than for
 things it does.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9896 a592a061-630c-0410-9148-cb99ea01b6c8
---
 ChangeLog               | 5 +++++
 config/ChangeLog        | 5 +++++
 config/spell.m4         | 2 +-
 configure.ac            | 2 +-
 src/support/ChangeLog   | 5 +++++
 src/support/socktools.C | 6 +++---
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e918780af9..bfe0e770b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-02  Angus Leeming  <leeming@lyx.org>
+
+	* configure.ac: test for something that MSVC doesn't have (fcntl)
+	as opposed to something it does (select, socket).
+
 2005-05-02  Angus Leeming  <leeming@lyx.org>
 
 	* autogen.sh (ACINCLUDE_FILES): remove [ap]spell.m4. Add spell.m4.
diff --git a/config/ChangeLog b/config/ChangeLog
index ea32d88b21..d58199eeb5 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-02  Angus Leeming  <leeming@lyx.org>
+
+	* spell.m4: test for something that MSVC doesn't have (fork)
+	as opposed to something it does (select, dup2).
+
 2005-05-02  Angus Leeming  <leeming@lyx.org>
 
 	* aspell.m4, pspell.m4: removed.
diff --git a/config/spell.m4 b/config/spell.m4
index 6f8fe40000..3081ade342 100644
--- a/config/spell.m4
+++ b/config/spell.m4
@@ -65,7 +65,7 @@ AC_DEFUN([LYX_CHECK_SPELL_ENGINES],
     dnl Do this independent of the existence of the aspell, pspell libraries.
     lyx_use_ispell=true
     AC_LANG_PUSH(C)
-    AC_CHECK_FUNCS(select dup2,, [lyx_use_ispell=false])
+    AC_CHECK_FUNCS(fork,, [lyx_use_ispell=false])
     AC_LANG_POP(C)
     AC_MSG_CHECKING([whether to use ispell])
     if $lyx_use_ispell ; then
diff --git a/configure.ac b/configure.ac
index a6dbb02b59..e2abb6f397 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,7 @@ LYX_CHECK_SPELL_ENGINES
 
 lyx_client_subdir=true
 AC_LANG_PUSH(C)
-AC_CHECK_FUNCS(select socket,, [lyx_client_subdir=false])
+AC_CHECK_FUNCS(fcntl,, [lyx_client_subdir=false])
 AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
 AC_LANG_POP(C)
 
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 0fbd71a33f..6cc7349137 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-02  Angus Leeming  <leeming@lyx.org>
+
+	* socktools.C: make compilation dependent on HAVE_FCNTL rather
+	than HAVE_SOCKET.
+
 2005-05-02  Angus Leeming  <leeming@lyx.org>
 
 	* socktool.C (listen, accept): provide stub versions for Windows.
diff --git a/src/support/socktools.C b/src/support/socktools.C
index eb6e17f4e8..d22a201c5b 100644
--- a/src/support/socktools.C
+++ b/src/support/socktools.C
@@ -12,7 +12,7 @@
 
 #include "support/socktools.h"
 
-#if !defined (HAVE_SOCKET)
+#if !defined (HAVE_FCNTL)
 // We provide stubs because we don't (yet?) support the native OS API.
 
 namespace lyx {
@@ -34,7 +34,7 @@ int accept(int)
 } // namespace support
 } // namespace lyx
 
-#else // defined (HAVE_SOCKET)
+#else // defined (HAVE_FCNTL)
 
 #include "support/lyxlib.h"
 
@@ -163,4 +163,4 @@ int accept(int sd)
 } // namespace support
 } // namespace lyx
 
-#endif // defined (HAVE_SOCKET)
+#endif // defined (HAVE_FCNTL)