[evolution-patches] patch to make groupwise apis(present in e-d-s) installable
- From: Sivaiah N <snallagatla novell com>
- To: evolution-patches lists ximian com
- Subject: [evolution-patches] patch to make groupwise apis(present in e-d-s) installable
- Date: 13 Apr 2004 13:26:56 +0530
Hi,
The attached patch has changes made to configure.in,
servers/groupwise/Makefile.am etc to make groupwise apis header files
and libegroupwise installable so that they can be used in evolution .
The files for groupwise apis are present under servers/groupwise in
e-d-s
Thanks,
Sivaiah
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/ChangeLog,v
retrieving revision 1.112
diff -u -r1.112 ChangeLog
--- ChangeLog 2 Apr 2004 16:28:16 -0000 1.112
+++ ChangeLog 13 Apr 2004 07:48:11 -0000
@@ -1,3 +1,15 @@
+2004-04-13 Sivaiah Nallagatla <snallagatla novell com>
+
+ * configure.in : added LIBEGROUPWISE_* variables and corresponding AC_SUBST for
+ assinging libegroupwise version number. Defined a varible LIBSOUP_REQUIRED.
+ added servers/groupwise/libegroupwise-1.0.pc for AC_OUTPUT section
+
+ * servers/groupwise/Makefile.am : added libegroupwiseinclude_HEADERS,
+ libegroupwise_la_LDFLAGS etc to make groupwise apis installable
+
+ * servers/groupwise/libegroupwise-1.0.pc.in :new pc.in file
+ libegroupwise
+
2004-04-02 JP Rosevear <jpr ximian com>
* configure.in: bump version, libtool numbers
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution-data-server/configure.in,v
retrieving revision 1.46
diff -u -r1.46 configure.in
--- configure.in 2 Apr 2004 16:28:16 -0000 1.46
+++ configure.in 13 Apr 2004 07:48:12 -0000
@@ -28,6 +28,10 @@
LIBEBOOK_REVISION=2
LIBEBOOK_AGE=0
+LIBEGROUPWISE_CURRENT=0
+LIBEGROUPWISE_REVISION=0
+LIBEGROUPWISE_AGE=0
+
AC_SUBST(LIBEDATASERVER_CURRENT)
AC_SUBST(LIBEDATASERVER_REVISION)
AC_SUBST(LIBEDATASERVER_AGE)
@@ -43,6 +47,9 @@
AC_SUBST(LIBEDATABOOK_CURRENT)
AC_SUBST(LIBEDATABOOK_REVISION)
AC_SUBST(LIBEDATABOOK_AGE)
+AC_SUBST(LIBEGROUPWISE_CURRENT)
+AC_SUBST(LIBEGROUPWISE_REVISION)
+AC_SUBST(LIBEGROUPWISE_AGE)
dnl Put the ACLOCAL flags in the Makefile
@@ -199,8 +206,9 @@
AC_SUBST(EVOLUTION_CALENDAR_LIBS)
dnl --- Groupwise flags
-
-EVO_SET_COMPILE_FLAGS(SOUP, libsoup-2.2 >= 2.1.9)
+LIBSOUP_REQUIRED="2.1.9"
+AC_SUBST(LIBSOUP_REQUIRED)
+EVO_SET_COMPILE_FLAGS(SOUP, libsoup-2.2 >= $LIBSOUP_REQUIRED)
AC_SUBST(SOUP_CFLAGS)
AC_SUBST(SOUP_LIBS)
@@ -298,6 +306,7 @@
libedataserver/libedataserver-1.0.pc
servers/Makefile
servers/groupwise/Makefile
+servers/groupwise/libegroupwise-1.0.pc
src/Makefile
docs/Makefile
docs/reference/Makefile
Index: servers/groupwise/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/groupwise/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- servers/groupwise/Makefile.am 17 Mar 2004 20:45:20 -0000 1.6
+++ servers/groupwise/Makefile.am 13 Apr 2004 07:48:12 -0000
@@ -1,3 +1,4 @@
+
INCLUDES = \
-DG_LOG_DOMAIN=\"libegroupwise\" \
-I$(top_srcdir) \
@@ -5,7 +6,7 @@
$(SOUP_CFLAGS) \
$(E_DATA_SERVER_CFLAGS)
-noinst_PROGRAMS = create-account soap-test
+noinst_PROGRAMS = create-account soap-test
create_account_SOURCES = create-account.c
create_account_LDADD = \
@@ -17,9 +18,9 @@
soap_test_LDADD = \
$(SOUP_LIBS) \
$(top_builddir)/servers/groupwise/libegroupwise.la \
- $(E_DATA_SERVER_LIBS)
+ $(E_DATA_SERVER_LIBS)
-noinst_LTLIBRARIES = libegroupwise.la
+lib_LTLIBRARIES = libegroupwise.la
libegroupwise_la_SOURCES = \
e-gw-connection.c \
@@ -35,3 +36,19 @@
libegroupwise_la_LIBADD = \
$(SOUP_LIBS)
+libegroupwise_la_LDFLAGS = \
+ -version-info $(LIBEGROUPWISE_CURRENT):$(LIBEGROUPWISE_REVISION):$(LIBEGROUPWISE_AGE)
+
+libegroupwiseincludedir = $(privincludedir)/groupwise
+
+libegroupwiseinclude_HEADERS = \
+ e-gw-connection.h \
+ e-gw-container.h \
+ e-gw-message.h \
+ e-gw-item.h \
+ e-gw-filter.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = libegroupwise-1.0.pc
+
+EXTRA_DIST = $(pkgconfig_DATA:.pc=.pc.in)
--- servers/groupwise/libegroupwise-1.0.pc.in.orig 2004-04-13 13:18:42.000000000 +0530
+++ servers/groupwise/libegroupwise-1.0.pc.in 2004-04-13 11:33:54.000000000 +0530
@@ -0,0 +1,16 @@
+prefix= prefix@
+exec_prefix= exec_prefix@
+libdir= libdir@
+includedir= includedir@
+
+idldir= idldir@
+IDL_INCLUDES=-I ${idldir} @IDL_INCLUDES@
+
+privincludedir= privincludedir@
+
+Name: libegroupwise
+Description: Client library for accessing groupwise POA through SOAP interface
+Version: @VERSION@
+Requires: libsoup-2.2 >= @LIBSOUP_REQUIRED@
+Libs: -L${libdir} -legroupwise
+Cflags: -I${privincludedir}/groupwise
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]