From 6fced70ee07656daf73bf13cab658bf4c2a6baac Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Fri, 2 Oct 2009 17:22:59 +0200
Subject: No IDL from eds and server.mk file in evo sources any more

Fixes build with latest eds master (after dbus-cal merge).
---
 Makefile.am  |  1 -
 configure.ac | 20 --------------------
 server.mk    |  9 ---------
 3 files changed, 30 deletions(-)
 delete mode 100644 server.mk

diff --git a/Makefile.am b/Makefile.am
index 41955fe59b..cc508d1257 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,6 @@ EXTRA_DIST = 			\
 	marshal.mk		\
 	iconv-detect.c		\
 	plugin.mk		\
-	server.mk		\
 	intltool-merge.in	\
 	intltool-update.in	\
 	intltool-extract.in	\
diff --git a/configure.ac b/configure.ac
index f937be9484..7838853424 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1430,15 +1430,6 @@ AC_DEFINE_UNQUOTED(DATASERVER_VERSION, "`${PKG_CONFIG} --modversion evolution-da
 DATASERVER_EXEC_VERSION=`${PKG_CONFIG} --variable=execversion evolution-data-server-1.2`
 AC_SUBST(DATASERVER_EXEC_VERSION)
 
-AC_MSG_CHECKING([for evolution-data-server IDL])
-DATASERVER_IDL=`${PKG_CONFIG} --variable=idldir evolution-data-server-1.2`/Evolution-DataServer.idl
-if test -f "$DATASERVER_IDL"; then
-	AC_MSG_RESULT([$DATASERVER_IDL])
-	AC_SUBST(DATASERVER_IDL)
-else
-	AC_MSG_ERROR([no])
-fi
-
 dnl **********
 dnl Test Flags
 dnl **********
@@ -1544,17 +1535,6 @@ AC_SUBST(viewsdir)
 privconduitdir='${libdir}'/evolution/$BASE_VERSION/conduits
 AC_SUBST(privconduitdir)
 
-dnl ************************
-dnl IDL/Component Versioning
-dnl ************************
-
-INTERFACE_VERSION="$BASE_VERSION"
-AC_SUBST(INTERFACE_VERSION)
-AC_DEFINE_UNQUOTED(INTERFACE_VERSION, "$INTERFACE_VERSION", [IDL interface version (Major.Minor)])
-
-EVO_SERVER_RULE=$srcdir/server.mk
-AC_SUBST_FILE(EVO_SERVER_RULE)
-
 dnl ************************
 dnl Plugins
 dnl ************************
diff --git a/server.mk b/server.mk
deleted file mode 100644
index 7796708fda..0000000000
--- a/server.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-%.server.in: %.server.in.in $(top_builddir)/config.h
-	sed -e 's|\@BINDIR_IN_SERVER_FILE\@|$(bindir_in_server_file)|'	\
-	-e 's|\@PRIVLIBEXECDIR_IN_SERVER_FILE\@|$(privlibexecdir_in_server_file)|'	\
-	-e 's|\@COMPONENTDIR_IN_SERVER_FILE\@|$(componentdir_in_server_file)|'	\
-	-e 's|\@VERSION\@|$(BASE_VERSION)|' 			\
-	-e 's|\@EXEEXT\@|$(EXEEXT)|'				\
-	-e 's|\@SOEXT\@|$(SOEXT)|'				\
-	-e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@
-
-- 
cgit v1.2.3