Hi! The attached patch makes a few tweaks to the build system so that when building the EDS integration on Gentoo everything plays nicely. Basically, in the current version, trying to build the plugins, a sandbox violation occurs during the install, since an attempt is made to install the plugin libraries to their final destination rather than within the Gentoo sandbox image. So, basically what I did was add three options to ./configure: --with-eds-extensiondir, --with-evo-plugindir, and --enable-sandbox. The two --with options allow the user to specify the evolution-data-server extensions directory and the evolution plugin directory, respectively. These directories are the installation locations of the binary libraries and the .eplug file. By default, these two locations are equal to the locations reported by pkg-config. When the --enable-sandbox flag is enabled, an additional realplugindir is specified by querying pkg-config to find where the real plugin directory is on the system for substitution into the .eplug file. If not enabled, realplugindir is set to evo_plugindir. -- Gregory Symons Software Engineer GPG Public Key available at http://www.gsconsulting.biz/PGP/gsymons.asc
diff -Naur planner-0.13.orig/configure planner-0.13/configure
--- planner-0.13.orig/configure 2005-05-15 19:19:49.000000000 -0400
+++ planner-0.13/configure 2005-05-15 23:08:35.000000000 -0400
@@ -463,7 +463,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS WARN_CFLAGS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT mkdir_p UPDATE_MIME_DATABASE HAVE_NEW_MIME_TRUE HAVE_NEW_MIME_FALSE UPDATE_DESKTOP_DATABASE HAVE_NEWER_MIME_TRUE HAVE_NEWER_MIME_FALSE ENABLE_UPDATE_MIMEDB_TRUE ENABLE_UPDATE_MIMEDB_FALSE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GDA_CFLAGS GDA_LIBS HAVE_GDA_TRUE HAVE_GDA_FALSE PLANNER_CFLAGS PLANNER_LIBS LIBPLANNER_CFLAGS LIBPLANNER_LIBS XSLT_CFLAGS XSLT_LIBS SCROLLKEEPER_CONFIG GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYTHON_LDFLAGS PYGTK_CFLAGS PYGTK_LIBS PYGTK_CODEGEN PYGTK_DEFSDIR HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE HAVE_PYTHON_PLUGIN_TRUE HAVE_PYTHON_PLUGIN_FALSE EDS_CFLAGS EDS_LIBS HAVE_EDS_PLUGIN_TRUE HAVE_EDS_PLUGIN_FALSE EDS_BACKEND_CFLAGS EDS_BACKEND_LIBS extensiondir plugindir HAVE_EDS_BACKEND_TRUE HAVE_EDS_BACKEND_FALSE ACLOCAL_AMFLAGS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS WARN_CFLAGS INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT mkdir_p UPDATE_MIME_DATABASE HAVE_NEW_MIME_TRUE HAVE_NEW_MIME_FALSE UPDATE_DESKTOP_DATABASE HAVE_NEWER_MIME_TRUE HAVE_NEWER_MIME_FALSE ENABLE_UPDATE_MIMEDB_TRUE ENABLE_UPDATE_MIMEDB_FALSE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE GDA_CFLAGS GDA_LIBS HAVE_GDA_TRUE HAVE_GDA_FALSE PLANNER_CFLAGS PLANNER_LIBS LIBPLANNER_CFLAGS LIBPLANNER_LIBS XSLT_CFLAGS XSLT_LIBS SCROLLKEEPER_CONFIG GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir PYTHON_INCLUDES PYTHON_LDFLAGS PYGTK_CFLAGS PYGTK_LIBS PYGTK_CODEGEN PYGTK_DEFSDIR HAVE_PYTHON_TRUE HAVE_PYTHON_FALSE HAVE_PYTHON_PLUGIN_TRUE HAVE_PYTHON_PLUGIN_FALSE EDS_CFLAGS EDS_LIBS HAVE_EDS_PLUGIN_TRUE HAVE_EDS_PLUGIN_FALSE EDS_BACKEND_CFLAGS EDS_BACKEND_LIBS extensiondir plugindir realplugindir HAVE_EDS_BACKEND_TRUE HAVE_EDS_BACKEND_FALSE ACLOCAL_AMFLAGS LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1044,6 +1044,7 @@
--enable-python-plugin build python plugin default=no
--enable-eds build evolution-data-server support default=no
--enable-eds-backend build evolution-data-server backend support default=no
+ --enable-sandbox add support for building in a sandboxed environment default=no
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
@@ -1057,6 +1058,8 @@
--with-gconf-source=sourceaddress Config database for installing schema files.
--with-gconf-schema-file-dir=dir Directory for installing schema files.
--with-html-dir=PATH path to installed docs
+ --with-eds-extensiondir=path install backend extension into path (uses pkg-config by default)
+ --with-evo-plugindir=path install evolution plugin into path (uses pkg-config by default)
Some influential environment variables:
CC C compiler command
@@ -4946,7 +4949,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4949 "configure"' > conftest.$ac_ext
+ echo '#line 4952 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6117,7 +6120,7 @@
# Provide some information about the compiler.
-echo "$as_me:6120:" \
+echo "$as_me:6123:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7174,11 +7177,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7177: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7180: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7181: \$? = $ac_status" >&5
+ echo "$as_me:7184: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7417,11 +7420,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7420: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7423: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7424: \$? = $ac_status" >&5
+ echo "$as_me:7427: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -7477,11 +7480,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7480: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7483: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7484: \$? = $ac_status" >&5
+ echo "$as_me:7487: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8812,7 +8815,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8815 "configure"' > conftest.$ac_ext
+ echo '#line 8818 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9683,7 +9686,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9686 "configure"
+#line 9689 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9781,7 +9784,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9784 "configure"
+#line 9787 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11974,11 +11977,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11977: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11980: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11981: \$? = $ac_status" >&5
+ echo "$as_me:11984: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -12034,11 +12037,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12037: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12040: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12041: \$? = $ac_status" >&5
+ echo "$as_me:12044: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12545,7 +12548,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12548 "configure"' > conftest.$ac_ext
+ echo '#line 12551 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13416,7 +13419,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13419 "configure"
+#line 13422 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13514,7 +13517,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 13517 "configure"
+#line 13520 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14351,11 +14354,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14354: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14357: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14358: \$? = $ac_status" >&5
+ echo "$as_me:14361: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -14411,11 +14414,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14414: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14417: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14418: \$? = $ac_status" >&5
+ echo "$as_me:14421: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15726,7 +15729,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15729 "configure"' > conftest.$ac_ext
+ echo '#line 15732 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16467,11 +16470,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16470: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16473: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16474: \$? = $ac_status" >&5
+ echo "$as_me:16477: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16710,11 +16713,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16713: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16716: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16717: \$? = $ac_status" >&5
+ echo "$as_me:16720: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings
@@ -16770,11 +16773,11 @@
-e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16773: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16776: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16777: \$? = $ac_status" >&5
+ echo "$as_me:16780: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18105,7 +18108,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18108 "configure"' > conftest.$ac_ext
+ echo '#line 18111 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -18976,7 +18979,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 18979 "configure"
+#line 18982 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -19074,7 +19077,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 19077 "configure"
+#line 19080 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -24064,6 +24067,9 @@
+EVOLUTION_PACKAGE=2.2
+PKG_CONFIG_EXTDIR=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
+PKG_CONFIG_PLUGINDIR=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
# Check whether --enable-eds_backend or --disable-eds_backend was given.
if test "${enable_eds_backend+set}" = set; then
enableval="$enable_eds_backend"
@@ -24072,10 +24078,30 @@
enable_eds_backend=no
fi;
+# Check whether --with-eds_extensiondir or --without-eds_extensiondir was given.
+if test "${with_eds_extensiondir+set}" = set; then
+ withval="$with_eds_extensiondir"
+ extensiondir="$withval"
+else
+ extensiondir="$PKG_CONFIG_EXTDIR"
+fi;
+
+# Check whether --with-evo_plugindir or --without-evo_plugindir was given.
+if test "${with_evo_plugindir+set}" = set; then
+ withval="$with_evo_plugindir"
+ plugindir="$withval"
+else
+ plugindir="$PKG_CONFIG_PLUGINDIR"
+fi;
+# Check whether --enable-sandbox or --disable-sandbox was given.
+if test "${enable_sandbox+set}" = set; then
+ enableval="$enable_sandbox"
+
+fi;
+
if test "x$enable_eds_backend" = "xyes" ; then
EDS_REQUIRED=1.1.0
EDS_PACKAGE=1.2
- EVOLUTION_PACKAGE=2.2
EVOLUTION_REQUIRED=2.1.3
succeeded=no
@@ -24215,9 +24241,19 @@
{ (exit 1); exit 1; }; }
fi
- extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
- plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
+
+
+#if we're in a sandbox, then we need to know where the _real_ plugin directory
+#is so evolution can load our plugin properly.
+
+ if test "x$enable_sandbox" = "xyes"; then
+ realplugindir=$PKG_CONFIG_PLUGINDIR
+
+ else
+ realplugindir=$plugindir
+
+ fi
use_eds_backend=yes
else
@@ -25196,6 +25232,7 @@
s,@EDS_BACKEND_LIBS@,$EDS_BACKEND_LIBS,;t t
s,@extensiondir@,$extensiondir,;t t
s,@plugindir@,$plugindir,;t t
+s,@realplugindir@,$realplugindir,;t t
s,@HAVE_EDS_BACKEND_TRUE@,$HAVE_EDS_BACKEND_TRUE,;t t
s,@HAVE_EDS_BACKEND_FALSE@,$HAVE_EDS_BACKEND_FALSE,;t t
s,@ACLOCAL_AMFLAGS@,$ACLOCAL_AMFLAGS,;t t
@@ -25967,17 +26004,25 @@
echo
-echo "Planner prefix : $prefix"
-echo "Build API docs : $enable_gtk_doc"
-echo "Python bindings : $have_python"
-echo "Python plugin : $enable_python_plugin"
+echo "Planner prefix : $prefix"
+echo "Build API docs : $enable_gtk_doc"
+echo "Python bindings : $have_python"
+echo "Python plugin : $enable_python_plugin"
#echo "Dotnet bindings : $have_dotnet"
-echo "Database/GDA support : $use_gda"
-echo "Evolution Data Server import : $use_eds"
-echo "Evolution Data Server backend: $use_eds_backend"
+echo "Database/GDA support : $use_gda"
+echo "Evolution Data Server import : $use_eds"
+echo "Evolution Data Server backend : $use_eds_backend"
echo
if test "x$enable_eds_backend" = "xyes" ; then
+ echo "Evolution Data Server extension directory: $extensiondir"
+ echo "Evolution plugin directory : $plugindir"
+
+ if test "x$enable_sandbox" = "xyes"; then
+ echo "Real plugin directory : $realplugindir"
+ fi
+ echo
echo "*** Note: The Evolution backend is experimental. Don't use it in production systems ***"
+ echo
fi
diff -Naur planner-0.13.orig/configure.in planner-0.13/configure.in
--- planner-0.13.orig/configure.in 2005-05-15 19:19:49.000000000 -0400
+++ planner-0.13/configure.in 2005-05-15 23:08:08.000000000 -0400
@@ -253,12 +253,17 @@
dnl -------------------------------------
dnl | Evolution Data Server Backend check |--------------------------------------
dnl -------------------------------------
+EVOLUTION_PACKAGE=2.2
+PKG_CONFIG_EXTDIR=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
+PKG_CONFIG_PLUGINDIR=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
AC_ARG_ENABLE(eds_backend, [ --enable-eds-backend build evolution-data-server backend support [default=no]], enable_eds_backend="$enableval", enable_eds_backend=no)
+AC_ARG_WITH(eds_extensiondir, [ --with-eds-extensiondir=path install backend extension into path (uses pkg-config by default)], extensiondir="$withval", extensiondir="$PKG_CONFIG_EXTDIR")
+AC_ARG_WITH(evo_plugindir, [ --with-evo-plugindir=path install evolution plugin into path (uses pkg-config by default)], plugindir="$withval", plugindir="$PKG_CONFIG_PLUGINDIR")
+AC_ARG_ENABLE(sandbox, [ --enable-sandbox add support for building in a sandboxed environment [default=no]])
if test "x$enable_eds_backend" = "xyes" ; then
EDS_REQUIRED=1.1.0
EDS_PACKAGE=1.2
- EVOLUTION_PACKAGE=2.2
EVOLUTION_REQUIRED=2.1.3
PKG_CHECK_MODULES(EDS_BACKEND,
[
@@ -267,10 +272,18 @@
libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
])
- extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
AC_SUBST(extensiondir)
- plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
AC_SUBST(plugindir)
+
+#if we're in a sandbox, then we need to know where the _real_ plugin directory
+#is so evolution can load our plugin properly.
+
+ if test "x$enable_sandbox" = "xyes"; then
+ AC_SUBST(realplugindir, $PKG_CONFIG_PLUGINDIR)
+ else
+ AC_SUBST(realplugindir, $plugindir)
+ fi
+
use_eds_backend=yes
else
use_eds_backend=no
@@ -320,17 +333,25 @@
])
echo
-echo "Planner prefix : $prefix"
-echo "Build API docs : $enable_gtk_doc"
-echo "Python bindings : $have_python"
-echo "Python plugin : $enable_python_plugin"
+echo "Planner prefix : $prefix"
+echo "Build API docs : $enable_gtk_doc"
+echo "Python bindings : $have_python"
+echo "Python plugin : $enable_python_plugin"
#echo "Dotnet bindings : $have_dotnet"
-echo "Database/GDA support : $use_gda"
-echo "Evolution Data Server import : $use_eds"
-echo "Evolution Data Server backend: $use_eds_backend"
+echo "Database/GDA support : $use_gda"
+echo "Evolution Data Server import : $use_eds"
+echo "Evolution Data Server backend : $use_eds_backend"
echo
if test "x$enable_eds_backend" = "xyes" ; then
+ echo "Evolution Data Server extension directory: $extensiondir"
+ echo "Evolution plugin directory : $plugindir"
+
+ if test "x$enable_sandbox" = "xyes"; then
+ echo "Real plugin directory : $realplugindir"
+ fi
+ echo
echo "*** Note: The Evolution backend is experimental. Don't use it in production systems ***"
+ echo
fi
diff -Naur planner-0.13.orig/eds-backend/planner-source/Makefile.in planner-0.13/eds-backend/planner-source/Makefile.in
--- planner-0.13.orig/eds-backend/planner-source/Makefile.in 2005-05-15 19:19:49.000000000 -0400
+++ planner-0.13/eds-backend/planner-source/Makefile.in 2005-05-16 00:09:25.000000000 -0400
@@ -232,6 +232,7 @@
pkgpyexecdir = @pkgpyexecdir@
pkgpythondir = @pkgpythondir@
plugindir = @plugindir@
+realplugindir = @realplugindir@
prefix = @prefix@
program_transform_name = @program_transform_name@
pyexecdir = @pyexecdir@
@@ -572,7 +573,7 @@
%.eplug: %.eplug.in
- sed -e 's|\ PLUGINDIR\@|$(plugindir)|' $< > $@
+ sed -e 's|\ PLUGINDIR\@|$(realplugindir)|' $< > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Attachment:
signature.asc
Description: This is a digitally signed message part