Define NO_UNDEFINED as -no-undefined and SOCKET_LIBS as -lws2_32 (the

2005-05-24  Tor Lillqvist  <tml@novell.com>

	* configure.in: Define NO_UNDEFINED as -no-undefined and
	SOCKET_LIBS as -lws2_32 (the WinSock2 library) on Win32. AC_SUBST
	them. Check for strtok_r. Add gobject-2.0 to
	EVOLUTION_ADDRESSBOOK_DEPS and EVOLUTION_CALENDAR_DEPS.

diff --git a/ChangeLog b/ChangeLog
index 188cf92..7106b2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2005-05-24  Tor Lillqvist  <tml@novell.com>
 
+       * configure.in: Define NO_UNDEFINED as -no-undefined and
+       SOCKET_LIBS as -lws2_32 (the WinSock2 library) on Win32. AC_SUBST
+       them. Check for strtok_r. Add gobject-2.0 to
+       EVOLUTION_ADDRESSBOOK_DEPS and EVOLUTION_CALENDAR_DEPS.
+       
+2005-05-24  Tor Lillqvist  <tml@novell.com>
+
        Make libdb as included in e-d-s build on Win32 with mingw. (The
        official build setup for libdb uses MSVC.)
 

diff --git a/configure.in b/configure.in
index 3b213fb..335387f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -138,15 +138,21 @@ 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)
 
 AC_CHECK_HEADERS(pthread.h semaphore.h sys/wait.h)
-AC_CHECK_FUNCS(fsync strptime)
+AC_CHECK_FUNCS(fsync strptime strtok_r)
 
 dnl alloca()
 AC_CHECK_HEADERS(alloca.h)
@@ -1084,7 +1090,7 @@ AC_SUBST(E_DATA_SERVER_UI_LIBS)
 
 dnl --- evolution-addressbook flags
 
-EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
+EVOLUTION_ADDRESSBOOK_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS)
 AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
@@ -1092,7 +1098,7 @@ AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
 
 dnl --- evolution-calendar flags
 
-EVOLUTION_CALENDAR_DEPS="libxml-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
+EVOLUTION_CALENDAR_DEPS="libxml-2.0 gobject-2.0 gconf-2.0 libbonobo-2.0 >= $LIBBONOBO_REQUIRED libgnome-2.0 gnome-vfs-2.0"
 
 EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, $EVOLUTION_CALENDAR_DEPS)
 AC_SUBST(EVOLUTION_CALENDAR_CFLAGS)