summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSivaiah Nallagatla <snallagatla@novell.com>2004-04-13 10:29:26 +0000
committerSivaiah Nallagatla <siva@src.gnome.org>2004-04-13 10:29:26 +0000
commit8df81e7f2a8693eb629ecb19efa8e3b6aa0a5914 (patch)
tree7e71d8cf87cfa898c35675dd90b4754a0e8a2a9f
parent0ad5e5e4155427861e19ca9e00457a448eeeb636 (diff)
downloadevolution-data-server-8df81e7f2a8693eb629ecb19efa8e3b6aa0a5914.tar.gz
added LIBEGROUPWISE_* variables and corresponding AC_SUBST for assinging
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
-rw-r--r--ChangeLog12
-rw-r--r--configure.in13
-rw-r--r--servers/groupwise/Makefile.am23
-rw-r--r--servers/groupwise/libegroupwise-1.0.pc.in16
4 files changed, 59 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index c18369a90..6b6e71c5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/configure.in b/configure.in
index 5fe27a1ff..fbc68a8f8 100644
--- a/configure.in
+++ b/configure.in
@@ -28,6 +28,10 @@ LIBEBOOK_CURRENT=5
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(LIBEBOOK_AGE)
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_CFLAGS)
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/Makefile
libedataserver/libedataserver-1.0.pc
servers/Makefile
servers/groupwise/Makefile
+servers/groupwise/libegroupwise-1.0.pc
src/Makefile
docs/Makefile
docs/reference/Makefile
diff --git a/servers/groupwise/Makefile.am b/servers/groupwise/Makefile.am
index d38ccc0ff..a7d6779de 100644
--- a/servers/groupwise/Makefile.am
+++ b/servers/groupwise/Makefile.am
@@ -1,3 +1,4 @@
+
INCLUDES = \
-DG_LOG_DOMAIN=\"libegroupwise\" \
-I$(top_srcdir) \
@@ -5,7 +6,7 @@ INCLUDES = \
$(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_SOURCES = soap-test.c
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_SOURCES = \
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)
diff --git a/servers/groupwise/libegroupwise-1.0.pc.in b/servers/groupwise/libegroupwise-1.0.pc.in
new file mode 100644
index 000000000..88c319cfa
--- /dev/null
+++ b/servers/groupwise/libegroupwise-1.0.pc.in
@@ -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