evolution-data-server r9961 - in trunk: . calendar/backends/caldav src win32

[strba svn gnome org]

Author: strba
Date: Wed Jan 21 12:47:43 2009
New Revision: 9961
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9961&view=rev

Log:
allow to cross-compile e-d-s for win32 and fix some minor win32 hick-ups

Modified:
   trunk/ChangeLog
   trunk/calendar/backends/caldav/Makefile.am
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/win32/Makefile.am

Modified: trunk/calendar/backends/caldav/Makefile.am
==============================================================================
--- trunk/calendar/backends/caldav/Makefile.am	(original)
+++ trunk/calendar/backends/caldav/Makefile.am	Wed Jan 21 12:47:43 2009
@@ -18,9 +18,10 @@
 	$(top_builddir)/calendar/libedata-cal/libedata-cal-1.2.la \
 	$(top_builddir)/calendar/libecal/libecal-1.2.la \
 	$(top_builddir)/libedataserver/libedataserver-1.2.la \
+	$(top_builddir)/libebackend/libebackend-1.2.la			\
 	$(EVOLUTION_CALENDAR_LIBS) \
 	$(SOUP_LIBS)
 
 
 libecalbackendcaldav_la_LDFLAGS =		\
-	-module -avoid-version
+	-module -avoid-version $(NO_UNDEFINED)

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Jan 21 12:47:43 2009
@@ -307,20 +307,18 @@
 AC_ARG_WITH(libiconv, 
   AC_HELP_STRING( [--with-libiconv],
 		  [Prefix where libiconv is installed]))
-case $withval in
-/*)
+if test -d $withval; then
     ICONV_CFLAGS="-I$withval/include"
     ICONV_LIBS="-L$withval/lib"
-    ;;
-esac
+fi
 
 save_CFLAGS="$CFLAGS"
 save_LIBS="$LIBS"
 CFLAGS="$CFLAGS $ICONV_CFLAGS"
 LIBS="$LIBS $ICONV_LIBS -liconv"
-AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_RUN([
+AC_CACHE_CHECK(for iconv in -liconv, ac_cv_libiconv, AC_TRY_LINK([
 #include <iconv.h>
-#include <stdlib.h>
+#include <stdlib.h>],[
 
 int main (int argc, char **argv)
 {
@@ -328,7 +326,7 @@
 	cd = iconv_open ("UTF-8", "ISO-8859-1");
 	exit (0);
 }
-], ac_cv_libiconv=yes, ac_cv_libiconv=no, ac_cv_libiconv=no))
+], ac_cv_libiconv=yes, ac_cv_libiconv=no))
 if test $ac_cv_libiconv = yes; then
 	ICONV_LIBS="$ICONV_LIBS -liconv"
 	if test $os_win32 = yes; then
@@ -379,7 +377,7 @@
 		exit (1);
 
 	exit (0);
-}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], [ac_cv_libiconv_utf8=no; have_iconv=no]))
+}], ac_cv_libiconv_utf8=yes, [ac_cv_libiconv_utf8=no; have_iconv=no], ac_cv_libiconv_utf8=HOPEFULLY))
 fi
 
 if test "$have_iconv" = no; then
@@ -404,7 +402,24 @@
 	*** iconv library. It is suggested that you install a
 	*** working iconv library such as the one found at
 	*** ftp://ftp.gnu.org/pub/gnu/libiconv
-	])
+])
+],[
+  if test x$os_win32 = xyes; then
+    AC_MSG_RESULT(using cached win32 result)
+    echo "/* This is an auto-generated header, DO NOT EDIT! */" > iconv-detect.h
+    echo "" >>iconv-detect.h
+    echo "#define ICONV_ISO_D_FORMAT \"iso-%d-%d\"" >>iconv-detect.h
+    echo "#define ICONV_ISO_S_FORMAT \"iso-%d-%s\"" >>iconv-detect.h
+    echo "#define ICONV_10646 \"UCS-4BE\"" >>iconv-detect.h
+  else
+	AC_MSG_RESULT(unknown)
+	AC_WARN([
+	*** The iconv-detect program was unable to determine the
+	*** preferred charset formats recognized by your system
+	*** iconv library. You are crosscompiling and supposed
+	*** to know what you are doing. (:-)
+    ])
+  fi
 ])
 
 CFLAGS="$save_CFLAGS"
@@ -723,6 +738,8 @@
 AC_SUBST(MANUAL_NSS_CFLAGS)
 AC_SUBST(MANUAL_NSS_LIBS)
 
+if test $os_win32 != yes; then
+
 dnl check for socklen_t (in Unix98)
 AC_MSG_CHECKING(for socklen_t)
 AC_TRY_COMPILE([#include <sys/types.h>
@@ -738,6 +755,8 @@
 AC_MSG_RESULT(int)
 AC_DEFINE(socklen_t,int)])])
 
+fi
+
 dnl
 dnl system mail stuff
 dnl
@@ -1462,7 +1481,7 @@
 esac
 
 PKG_CHECK_MODULES(ORBIT, ORBit-2.0 >= ORBit_minimum_version)
-ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`
+test x$ORBIT_IDL = x && ORBIT_IDL=`$PKG_CONFIG --variable=orbit_idl ORBit-2.0`
 AC_SUBST(ORBIT_CFLAGS)
 AC_SUBST(ORBIT_LIBS)
 AC_SUBST(ORBIT_IDL)

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Jan 21 12:47:43 2009
@@ -61,7 +61,7 @@
 
 install-evolution-data-servers:
 	$(mkinstalldirs) $(DESTDIR)$(libexecdir)
-	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)
+	$(LIBTOOL) --mode=install $(INSTALL_PROGRAM) evolution-data-server EXEEXT@ $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)@EXEEXT@
 
 SERVER_IN_FILE=GNOME_Evolution_DataServer.server.in.in
 
@@ -83,7 +83,7 @@
 install-exec-local: install-evolution-data-servers
 
 uninstall-local:
-	rm -f $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)
+	rm -f $(DESTDIR)$(libexecdir)/evolution-data-server-$(BASE_VERSION)@EXEEXT@
 
 dist-hook:
 	cd $(distdir); rm -f $(BUILT_SOURCES)
@@ -93,7 +93,7 @@
 
 all-local: evolution-data-server.pure
 
-evolution-data-server.pure: evolution-data-server
+evolution-data-server.pure: evolution-data-server EXEEXT@
 	@rm -f evolution-data-server.pure
 	$(PLINK) $(evolution_data_server_LDFLAGS) $(evolution_data_server_OBJECTS) $(evolution_data_server_LDADD) $(LIBS)
 

Modified: trunk/win32/Makefile.am
==============================================================================
--- trunk/win32/Makefile.am	(original)
+++ trunk/win32/Makefile.am	Wed Jan 21 12:47:43 2009
@@ -14,6 +14,6 @@
 libedataserverui-1.2.la: dummy.la libedataserverui.def
 	sed -e s!%DLL%!libedataserverui-1.2-$(libedataserverui_current_minus_age)! -e s!%LIB%!libedataserverui-1.2! -e s!%PFX%!$(prefix)! <dummy.la >$@
 	mkdir -p .libs
-	dlltool --output-lib=.libs/libedataserverui-1.2.dll.a --dllname=libedataserverui-1.2-$(libedataserverui_current_minus_age).dll --input-def=libedataserverui.def
+	$(DLLTOOL) --output-lib=.libs/libedataserverui-1.2.dll.a --dllname=libedataserverui-1.2-$(libedataserverui_current_minus_age).dll --input-def=libedataserverui.def
 
 CLEANFILES = $(BOOTSTRAP_LIBS)