diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in | 2 | ||||
| -rw-r--r-- | calendar/gui/GNOME_Evolution_Calendar.server.in.in | 2 | ||||
| -rw-r--r-- | calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in | 2 | ||||
| -rw-r--r-- | configure.in | 42 | ||||
| -rw-r--r-- | mail/GNOME_Evolution_Mail.server.in.in | 2 | ||||
| -rw-r--r-- | server.mk | 7 | ||||
| -rw-r--r-- | shell/GNOME_Evolution_Shell.server.in.in | 4 | ||||
| -rw-r--r-- | shell/GNOME_Evolution_Test.server.in.in | 2 |
9 files changed, 59 insertions, 26 deletions
@@ -1,3 +1,25 @@ +2005-12-06 Tor Lillqvist <tml@novell.com> + + * configure.in: Include libedataserver-$EDS_PACKAGE in the + requirement list for E_WIDGETS. + + Set bindir_in_server_file, privlibexecdir_in_server_file and + componentdir_in_server_file. On Unix, they are the same as bindir, + privlibexecdir and componentdir respectively. On Win32, use paths + relative from lib/bonobo/servers. AC_SUBST these variables. + + * server.mk: Substitute the values above new variables for the + corresponding @..._IN_SERVER_FILE@ strings in the .server.in.in + files. + + * addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in + * calendar/gui/GNOME_Evolution_Calendar.server.in.in + * calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in + * mail/GNOME_Evolution_Mail.server.in.in + * shell/GNOME_Evolution_Shell.server.in.in + * shell/GNOME_Evolution_Test.server.in.in: Correspondingly, use + the @..._IN_SERVER_FILE@ strings. + 2005-12-13 Chenthill Palanisamy <pchenthill@novell.com> * configure.in: added a new variable to include all diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in index 7b8e15cdb1..602212f2cb 100644 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Addressbook_Factory:@VERSION@" type="shlib" - location="@COMPONENTDIR@/libevolution-addressbook@SOEXT@"> + location="@COMPONENTDIR_IN_SERVER_FILE@/libevolution-addressbook@SOEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/calendar/gui/GNOME_Evolution_Calendar.server.in.in b/calendar/gui/GNOME_Evolution_Calendar.server.in.in index f930ff9e72..72821e9d45 100644 --- a/calendar/gui/GNOME_Evolution_Calendar.server.in.in +++ b/calendar/gui/GNOME_Evolution_Calendar.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_Factory:@VERSION@" type="shlib" - location="@COMPONENTDIR@/libevolution-calendar@SOEXT@"> + location="@COMPONENTDIR_IN_SERVER_FILE@/libevolution-calendar@SOEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in index 91007dece2..885af33fb5 100644 --- a/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in +++ b/calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Calendar_AlarmNotify_Factory:@VERSION@" type="exe" - location="@LIBEXECDIR@/evolution-alarm-notify"> + location="@PRIVLIBEXECDIR_IN_SERVER_FILE@/evolution-alarm-notify@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> diff --git a/configure.in b/configure.in index 4979050b39..6bc846810d 100644 --- a/configure.in +++ b/configure.in @@ -1150,7 +1150,7 @@ EVO_SET_COMPILE_FLAGS(CAMEL, camel-provider-$EDS_PACKAGE) AC_SUBST(CAMEL_CFLAGS) AC_SUBST(CAMEL_LIBS) -EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED) +EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED) AC_SUBST(CAMEL_GROUPWISE_CFLAGS) AC_SUBST(CAMEL_GROUPWISE_LIBS) @@ -1173,7 +1173,7 @@ EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIR AC_SUBST(E_NAME_CFLAGS) AC_SUBST(E_NAME_LIBS) -EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeprintui-2.2 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) +EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libgnomeprintui-2.2 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) AC_SUBST(E_UTIL_CFLAGS) AC_SUBST(E_UTIL_LIBS) @@ -1181,7 +1181,7 @@ EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FU AC_SUBST(TZDIALOG_CFLAGS) AC_SUBST(TZDIALOG_LIBS) -EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 libedataserverui-$EDS_PACKAGE) +EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) AC_SUBST(E_WIDGETS_CFLAGS) AC_SUBST(E_WIDGETS_LIBS) @@ -1286,18 +1286,6 @@ dnl --- etc) privlibdir='${libdir}'/evolution/$BASE_VERSION AC_SUBST(privlibdir) -if test "$os_win32" = yes; then - # On Win32 there is no "rpath" mechanism. We install the private - # shared libraries in $libdir, meaning the DLLs will actually be in - # $bindir. This means just having $bindir in PATH will be enough. This - # also means gnome_win32_get_prefixes() will be able to deduce the - # installation folder correctly. - privsolibdir=$libdir -else - privsolibdir=$privlibdir -fi -AC_SUBST(privsolibdir) - privlibexecdir='${libexecdir}'/evolution/$BASE_VERSION AC_SUBST(privlibexecdir) @@ -1328,6 +1316,30 @@ AC_SUBST(imagesdir) images16dir="$privdatadir/images/16x16" AC_SUBST(images16dir) +if test "$os_win32" = yes; then + # On Win32 there is no "rpath" mechanism. We install the private + # shared libraries in $libdir, meaning the DLLs will actually be in + # $bindir. This means just having $bindir in PATH will be enough. This + # also means gnome_win32_get_prefixes() will be able to deduce the + # installation folder correctly. + privsolibdir=$libdir + # On Win32, use a relative path to the executables in .server + # files. The path is relative to the folder where the .server file + # is, i.e. $prefix/lib/bonobo/servers. + bindir_in_server_file=../../../bin + privlibexecdir_in_server_file=../../../libexec/evolution/$BASE_VERSION + componentdir_in_server_file=../../../lib/evolution/$BASE_VERSION/components +else + privsolibdir=$privlibdir + bindir_in_server_file="$bindir" + privlibexecdir_in_server_file='${libexecdir}'/evolution/$BASE_VERSION + componentdir_in_server_file="$componentdir" +fi +AC_SUBST(privsolibdir) +AC_SUBST(bindir_in_server_file) +AC_SUBST(privlibexecdir_in_server_file) +AC_SUBST(componentdir_in_server_file) + dnl images18dir="$privdatadir/images/18x18" dnl AC_SUBST(images18dir) diff --git a/mail/GNOME_Evolution_Mail.server.in.in b/mail/GNOME_Evolution_Mail.server.in.in index 0a310915ff..2c512c31af 100644 --- a/mail/GNOME_Evolution_Mail.server.in.in +++ b/mail/GNOME_Evolution_Mail.server.in.in @@ -5,7 +5,7 @@ <!-- (factory) --> <oaf_server iid="OAFIID:GNOME_Evolution_Mail_Factory:@VERSION@" type="shlib" - location="@COMPONENTDIR@/libevolution-mail@SOEXT@"> + location="@COMPONENTDIR_IN_SERVER_FILE@/libevolution-mail@SOEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> @@ -1,8 +1,7 @@ %.server.in: %.server.in.in - sed -e 's|\@BINDIR\@|$(bindir)|' \ - -e 's|\@LIBEXECDIR\@|$(privlibexecdir)|' \ - -e 's|\@COMPONENTDIR\@|$(componentdir)|' \ - -e 's|\@IMPORTERSDIR\@|$(importersdir)|' \ + 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)|' \ diff --git a/shell/GNOME_Evolution_Shell.server.in.in b/shell/GNOME_Evolution_Shell.server.in.in index a4543dd25b..596c312e10 100644 --- a/shell/GNOME_Evolution_Shell.server.in.in +++ b/shell/GNOME_Evolution_Shell.server.in.in @@ -2,7 +2,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Shell:@VERSION@" type="exe" - location="@BINDIR@/evolution-@VERSION@@EXEEXT@"> + location="@BINDIR_IN_SERVER_FILE@/evolution-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/Evolution/Shell:@VERSION@"/> @@ -14,7 +14,7 @@ <oaf_server iid="OAFIID:GNOME_Evolution_Shell_Config_Factory:@VERSION@" type="exe" - location="@BINDIR@/evolution-@VERSION@"> + location="@BINDIR_IN_SERVER_FILE@/evolution-@VERSION@@EXEEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/GenericFactory:1.0"/> diff --git a/shell/GNOME_Evolution_Test.server.in.in b/shell/GNOME_Evolution_Test.server.in.in index 24789ea089..ef0db8b1ac 100644 --- a/shell/GNOME_Evolution_Test.server.in.in +++ b/shell/GNOME_Evolution_Test.server.in.in @@ -3,7 +3,7 @@ <!-- (factory) --> <oaf_server iid="OAFIID:GNOME_Evolution_Test_Factory:@VERSION@" type="shlib" - location="@COMPONENTDIR@/libevolution-test@SOEXT@"> + location="@COMPONENTDIR_IN_SERVER_FILE@/libevolution-test@SOEXT@"> <oaf_attribute name="repo_ids" type="stringv"> <item value="IDL:GNOME/ObjectFactory:1.0"/> |