[evolution-patches] Win32 portability patch to Evolution's configure.in

[Tor Lillqvist <tml novell com>]

This is the current Win32 patch to Evolution's configure.in. It should
be pretty obvious. It removes the file locking and sendmail checks,
those aren't used by Evolution as far as I can see. This stuff is now
in e-d-s.

--tml

Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.811
diff -p -u -2 -r1.811 configure.in
--- configure.in	25 May 2005 10:50:50 -0000	1.811
+++ configure.in	7 Jun 2005 15:14:39 -0000
@@ -93,4 +93,23 @@ AM_DISABLE_STATIC
 AM_PROG_LIBTOOL
 
+dnl Win32
+AC_MSG_CHECKING([for Win32])
+case "$host" in
+*-mingw*)
+    os_win32=yes
+    AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes])
+    NO_UNDEFINED='-no-undefined'
+    SOCKET_LIBS='-lws2_32'
+    ;;
+*)  os_win32=no
+    NO_UNDEFINED=''
+    SOCKET_LIBS=''
+    ;;
+esac
+AC_MSG_RESULT([$os_win32])
+AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
+AC_SUBST(NO_UNDEFINED)
+AC_SUBST(SOCKET_LIBS)
+
 dnl alloca()
 AC_CHECK_HEADERS(alloca.h)
@@ -461,55 +480,21 @@ AC_DEFINE(ENABLE_THREADS,1,[Required])
 
 
+dnl *********
+dnl Libraries
+dnl *********
+
 dnl **************************************************
-dnl * File locking
+dnl * regex
 dnl **************************************************
-
-AC_ARG_ENABLE(dot-locking, 
-[  --enable-dot-locking=[yes/no] Enable support for locking mail files with dot locking],,enable_dot_locking=yes)
-if test "x$enable_dot_locking" = "xyes"; then
-  AC_DEFINE(USE_DOT,1,[Define to use dot locking for mbox files])
-  msg_dot=yes
-else
-  msg_dot=no	
-fi
-
-AC_ARG_ENABLE(file-locking, 
-[  --enable-file-locking=[fcntl/flock/no] Enable support for locking mail files with file locking],,enable_file_locking=fcntl)
-if test "x$enable_file_locking" = "xfcntl"; then
-  AC_DEFINE(USE_FCNTL,1,[Define to use fcntl locking for mbox files])
-  msg_file=fcntl
-else
-  if test "x$enable_file_locking" = "xflock"; then
-    AC_DEFINE(USE_FLOCK,1,[Define to use flock locking for mbox files])
-    msg_file=flock
-  else
-    msg_file=no	
-  fi
-fi
-
+AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
+				      [REGEX_LIBS=-lregex
+				       AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
+				      [AC_MSG_ERROR([No regex library found])])])
+AC_SUBST(REGEX_LIBS)
 
 dnl **************************************************
-dnl * sendmail operation
+dnl * gtkhtml
 dnl **************************************************
 
-AC_MSG_CHECKING(for SunOS broken spool format)
-if test "x$host_os" = "xsunos" ; then
-   with_broken_spool="yes"
-fi
-
-AC_ARG_WITH(broken-spool, 
-[  --with-broken-spool=[yes/no] Using SunOS/Solaris sendmail which has a broken spool format],,with_broken_spool=${with_broken_spool:=no})
-
-if test "x$with_broken_spool" = "xyes"; then
-  AC_DEFINE(HAVE_BROKEN_SPOOL,1,[Define if mail delivered to the system mail directory is in broken Content-Length format])
-fi
-
-AC_MSG_RESULT($with_broken_spool)
-
-
-dnl *********
-dnl Libraries
-dnl *********
-
 PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.8)
 AC_SUBST(GTKHTML_CFLAGS)
@@ -1170,5 +1155,5 @@ AC_SUBST(E_WIDGETS_CFLAGS)
 AC_SUBST(E_WIDGETS_LIBS)
  
-EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
+EVO_SET_COMPILE_FLAGS(IMPORTERS, camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED)
 AC_SUBST(IMPORTERS_CFLAGS)
 AC_SUBST(IMPORTERS_LIBS)
@@ -1519,4 +1504,5 @@ AC_SUBST(EVOLUTION_DIR)
 AC_OUTPUT([ po/Makefile.in
 Makefile
+win32/Makefile
 a11y/Makefile
 a11y/addressbook/Makefile
@@ -1648,6 +1634,4 @@ echo "\
 	SMIME support:    $msg_smime
 	IPv6 support:     $msg_ipv6
-	Dot Locking:	  $msg_dot
-	File Locking:	  $msg_file
 	Plugins:	  $msg_plugins
 	Gtk-doc:	  $enable_gtk_doc