[PATCH] add support for out-of-tree platform implementation
- From: Rob Taylor <rob taylor codethink co uk>
- To: tinymail-devel-list <tinymail-devel-list gnome org>
- Subject: [PATCH] add support for out-of-tree platform implementation
- Date: Mon, 12 May 2008 17:31:20 +0100
This allow the passing of 'none' to the --with-platform configure
option. The patch also fixes up the python bindings to work in this
case. Other bindings will probably also need some simple changes.
Thanks,
Rob
diff --git a/ChangeLog b/ChangeLog
index 922dc04..749b8e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-05-12 Rob Taylor <rob taylor codethink co uk>
+ * configure.ac: Add --with-platform option 'none'.
+ * bindings/python/Makefile.am: Fix up python bindings to work when
+ built with no platform.
+
+2008-05-12 Rob Taylor <rob taylor codethink co uk>
+
* libtinymail/tny-error.c: Fix documentation
2008-05-12 Rob Taylor <rob taylor codethink co uk>
diff --git a/bindings/python/Makefile.am b/bindings/python/Makefile.am
index 80b53b3..2501f85 100644
--- a/bindings/python/Makefile.am
+++ b/bindings/python/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(PYTHON_INCLUDES) $(LIBTINYMAIL_CFLAGS) $(PYGTK_CFLAGS) \
$(LIBTINYMAILUI_GTK_CFLAGS) $(TINYMAIL_PYTHON_CFLAGS) \
-I$(top_srcdir)/libtinymail -I$(top_srcdir)/libtinymailui \
-I$(top_srcdir)/libtinymailui-gtk -I$(top_srcdir)/libtinymail-camel \
- -I$(top_srcdir)/$(PLATFORMDIR) -I$(top_srcdir)/libtinymail-camel/camel-lite
+ @PLATFORM_CFLAGS@ -I$(top_srcdir)/libtinymail-camel/camel-lite
common_ldflags = -module -avoid-version
@@ -46,7 +46,7 @@ camel_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initcamel
camel_la_LIBADD = $(LIBTINYMAILUI_LIBS) $(LIBTINYMAIL_LIBS) \
$(TINYMAIL_PYTHON_LIBS) \
$(top_builddir)/libtinymail/libtinymail-$(API_VERSION).la \
- $(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la \
+ @PLATFORM_LIBS@ \
$(top_builddir)/libtinymail-camel/libtinymail-camel-$(API_VERSION).la
camel_la_SOURCES = tinymail-camelmodule.c pytny-session-camel.c
nodist_camel_la_SOURCES = tinymail-camel-glue.c
diff --git a/configure.ac b/configure.ac
index e35bec5..4204eb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -74,6 +74,8 @@ enable_deprecated=true
PLATFORMDIR=libtinymail-gnome-desktop
PLATFORMSPECIFICNAME=Gnome
PLATFORM=1
+PLATFORM_LIBS='$(top_builddir)/$(PLATFORMDIR)/$(PLATFORMDIR)-$(API_VERSION).la'
+PLATFORM_CFLAGS='-I$(top_srcdir)/$(PLATFORM)'
dnl ### Debugging ###
AC_ARG_ENABLE(debug,
@@ -135,6 +137,15 @@ AC_HELP_STRING([--with-platform=gnome-desktop],
build_demoui=true
PLATFORM=4
;;
+ none)
+ PLATFORMDIR=
+ PLATFORMSPECIFICNAME=
+ build_uigtk=false
+ build_demoui=false
+ PLATFORM=0
+ PLATFORM_LIBS=
+ PLATFORM_CFLAGS=
+ ;;
*)
PLATFORMDIR=${with_platform}
PLATFORMSPECIFICNAME=
@@ -147,6 +158,8 @@ esac], [PLATFORMDIR=libtinymail-gnome-desktop
AC_SUBST(PLATFORMDIR)
AC_SUBST(PLATFORM)
AC_SUBST(PLATFORMSPECIFICNAME)
+AC_SUBST(PLATFORM_LIBS)
+AC_SUBST(PLATFORM_CFLAGS)
dnl ### Select the html component ##
AC_ARG_WITH(html-component,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]