>>>>> "Angus" == Angus Leeming <[EMAIL PROTECTED]> writes:

Angus> Well, see how you like this, which extends the previous patch
Angus> as you suggest. It leads to the following variables being
Angus> defined in config.h

The code for lyxserver, lyxsocket.

Concerning socktools, I do not understand why you need the makefile
conditional now that you have a proper stub for windows.

For the ispell code, I like it too, but I would have defined the stub
implementation in SpellBase.C. 

Finally, for the configure code, I think I'd prefer something like
the attached patch. I only tested that it compiles and runs. I guess
the USE_SOCKTOOLS conditional is unneeded (see above).

JMarc

Index: configure.ac
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/configure.ac,v
retrieving revision 1.47
diff -u -p -r1.47 configure.ac
--- configure.ac	11 Mar 2005 10:49:09 -0000	1.47
+++ configure.ac	26 Apr 2005 14:34:19 -0000
@@ -289,7 +289,31 @@ dnl We aim to remove this eventually, si
 dnl possible with the compiler which will use the functions (JMarc)
 AC_LANG_PUSH(C)
 AC_CHECK_FUNCS(mkfifo mkstemp mktemp lstat readlink)
+if test $USING_PSPELL = no && test $USING_ASPELL = no ; then
+  lyx_use_ispell=true
+  AC_CHECK_FUNCS(select dup2,, [lyx_use_ispell=false])
+  AC_MSG_CHECKING([whether to use ispell])
+  if $lyx_use_ispell ; then
+    AC_MSG_RESULT(yes)
+    AC_DEFINE(USE_ISPELL, 1, [Define as 1 to use an external ispell process for spell-checking.])
+    lyx_flags="$lyx_flags use-ispell"
+  else
+    AC_MSG_RESULT(no)
+  fi
+else
+  lyx_use_ispell=false
+fi
+AM_CONDITIONAL(USE_ISPELL, $lyx_use_ispell)
+
+lyx_client_subdir=true
+AC_CHECK_FUNCS(select socket,, [lyx_client_subdir=false])
+AM_CONDITIONAL(BUILD_CLIENT_SUBDIR, $lyx_client_subdir)
+
+AC_CHECK_FUNCS(socket, [lyx_use_socktools=true], [lyx_use_socktools=false])
+AM_CONDITIONAL(USE_SOCKTOOLS, $lyx_use_socktools)
+
 AC_LANG_POP(C)
+
 
 AC_FUNC_SELECT_ARGTYPES
 

Reply via email to