Author: juha
Date: 2007-02-21 15:05:21 +0000 (Wed, 21 Feb 2007)
New Revision: 25004
Modified:
xfcalendar/trunk/INSTALL
xfcalendar/trunk/TODO
xfcalendar/trunk/configure.in.in
xfcalendar/trunk/src/main.c
Log:
several fixes in autotools:
1) Bug 2923: dbus is now optional
2) use only included libical (it contains many fixes, so that standard is not
ok)
Modified: xfcalendar/trunk/INSTALL
===================================================================
--- xfcalendar/trunk/INSTALL 2007-02-21 01:47:50 UTC (rev 25003)
+++ xfcalendar/trunk/INSTALL 2007-02-21 15:05:21 UTC (rev 25004)
@@ -1,7 +1,7 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004 Free
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
@@ -102,16 +102,16 @@
Installation Names
==================
-By default, `make install' will install the package's files in
-`/usr/local/bin', `/usr/local/man', etc. You can specify an
-installation prefix other than `/usr/local' by giving `configure' the
-option `--prefix=PREFIX'.
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc. You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
-give `configure' the option `--exec-prefix=PREFIX', the package will
-use PREFIX as the prefix for installing programs and libraries.
-Documentation and other data files will still use the regular prefix.
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
@@ -159,7 +159,7 @@
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
-use the `--target=TYPE' option to select the type of system they will
+use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
@@ -189,9 +189,14 @@
./configure CC=/usr/local2/bin/gcc
-will cause the specified gcc to be used as the C compiler (unless it is
-overridden in the site shell script).
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script). Here is a another example:
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
`configure' Invocation
======================
Modified: xfcalendar/trunk/TODO
===================================================================
--- xfcalendar/trunk/TODO 2007-02-21 01:47:50 UTC (rev 25003)
+++ xfcalendar/trunk/TODO 2007-02-21 15:05:21 UTC (rev 25004)
@@ -40,3 +40,15 @@
*** DONE 4.5 ***
10) more alarm possibilities (like libnotify BUG 2831 and email)
+
+11) Day, Week, Month view
+
+12) Exclude possiblity in repeating rule
+
+13) Repeating rule visual presentation
+ Show when events actually happen
+
+14) Alarm before the end of the event.
+ Needed for TODOs
+
+15) Internal: build own message/warning system
Modified: xfcalendar/trunk/configure.in.in
===================================================================
--- xfcalendar/trunk/configure.in.in 2007-02-21 01:47:50 UTC (rev 25003)
+++ xfcalendar/trunk/configure.in.in 2007-02-21 15:05:21 UTC (rev 25004)
@@ -2,21 +2,21 @@
dnl
dnl Orage - Calendar application for Xfce
dnl
-dnl Copyright (c) 2003-2007
+dnl Copyright (c) 2003-2006
dnl The Xfce development team. All rights reserved.
dnl
-dnl Written for Xfce by Mickael Graf <[EMAIL PROTECTED]>.
+dnl Written for Xfce by Juha Kautto <[EMAIL PROTECTED]>
dnl
dnl Version information
-m4_define([orage_version_major], [4])
-m4_define([orage_version_minor], [5])
-m4_define([orage_version_micro], [7])
-m4_define([orage_version_nano], [0]) dnl leave this empty to have no nano
version
-m4_define([orage_version_tag], [svn])
-m4_define([orage_version],
[orage_version_major().orage_version_minor().orage_version_micro()ifelse(orage_version_nano(),
[], [], [.orage_version_nano()])orage_version_tag()])
+m4_define([orage_version], [4.5.8.0svn])
+m4_define([gtk_minimum_version], [2.6.0])
+m4_define([xfce_minimum_version], [4.4.0])
+m4_define([dbus_minimum_version], [0.34])
+m4_define([intltool_minimum_version], [0.31])
+
dnl # DO NOT MODIFY ANYTHING BELOW THIS LINE, UNLESS YOU KNOW WHAT
dnl # YOU ARE DOING.
@@ -25,7 +25,7 @@
AC_COPYRIGHT([Copyright (c) 2003-2007
The Xfce development team. All rights reserved.
-Written for Xfce by Mickael Graf <[EMAIL PROTECTED]>.])
+Written for Xfce by Juha Kautto <[EMAIL PROTECTED]>.])
AC_INIT([orage], [orage_version()], [EMAIL PROTECTED])
AC_CANONICAL_SYSTEM()
AC_PREREQ([2.50])
@@ -46,7 +46,7 @@
dnl Check for basic programs
AC_PROG_CC()
AC_PROG_INSTALL()
-AC_PROG_INTLTOOL([0.31], [no-xml])
+AC_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
AC_PROG_LIBTOOL()
AC_PROG_YACC()
AC_PROG_LN_S()
@@ -73,113 +73,108 @@
XDT_I18N([EMAIL PROTECTED]@])
dnl Check for required packages
-XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0], [4.4.0])
-XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4MCS_CLIENT], [libxfce4mcs-client-1.0],
[xfce_minimum_version])
+XDT_CHECK_PACKAGE([LIBXFCEGUI4], [libxfcegui4-1.0], [xfce_minimum_version])
dnl Needed for panel plugin
-XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [xfce_minimum_version])
dnl configure the mcs plugin
-XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [4.4.0])
+XDT_XFCE_MCS_PLUGIN([XFCE_MCS_MANAGER], [xfce_minimum_version])
dnl the ical magic
-XDT_CHECK_PACKAGE([ICAL], [libical-0.24], [0.24],
-[
- ac_INCLUDED_LIBICAL=no
-],
-[
- ac_INCLUDED_LIBICAL=yes
+ac_INCLUDED_LIBICAL=yes
- AC_MSG_CHECKING(for Berkeley DB4 support)
- AC_ARG_WITH(bdb4, [ --with-bdb4 Add support for Berkeley DB
4.0],
- [case $with_bdb4 in
- yes) AC_MSG_RESULT(yes)
- AC_MSG_RESULT( Adding Berkeley DB support)
- WITH_BDB4="yes"
- ;;
- no) AC_MSG_RESULT(no)
- ;;
- *) AC_MSG_RESULT(no)
- AC_MSG_RESULT(Ignoring unknown argument to --with-bdb4: $with_bdb4)
- ;;
- esac],
- AC_MSG_RESULT(no))
+AC_MSG_CHECKING(for Berkeley DB4 support)
+AC_ARG_WITH(bdb4, [ --with-bdb4 Add support for Berkeley DB 4.0],
+[case $with_bdb4 in
+ yes) AC_MSG_RESULT(yes)
+ AC_MSG_RESULT( Adding Berkeley DB support)
+ WITH_BDB4="yes"
+ ;;
+ no) AC_MSG_RESULT(no)
+ ;;
+ *) AC_MSG_RESULT(no)
+ AC_MSG_RESULT(Ignoring unknown argument to --with-bdb4: $with_bdb4)
+ ;;
+esac],
+AC_MSG_RESULT(no))
- if test x$WITH_BDB4 = xyes; then
- AC_ARG_WITH(bdb4_dir, [ --with-bdb4-dir=PATH Use PATH as location of
BerkeleyDB 4.0],
- BDB_DIR=$withval,
- BDB_DIR=/usr/local/BerkeleyDB.4.0
- )
+if test x$WITH_BDB4 = xyes; then
+ AC_ARG_WITH(bdb4_dir, [ --with-bdb4-dir=PATH Use PATH as location of
BerkeleyDB 4.0],
+ BDB_DIR=$withval,
+ BDB_DIR=/usr/local/BerkeleyDB.4.0
+ )
- AC_MSG_CHECKING(for Berkeley DB include files)
- if test -f $BDB_DIR/include/db.h; then
- BDB_DIR_INCLUDE=$BDB_DIR/include
+ AC_MSG_CHECKING(for Berkeley DB include files)
+ if test -f $BDB_DIR/include/db.h; then
+ BDB_DIR_INCLUDE=$BDB_DIR/include
+ AC_MSG_RESULT($BDB_DIR_INCLUDE)
+ else
+ if test -f $BDB_DIR/include/db4/db.h; then
+ BDB_DIR_INCLUDE=$BDB_DIR/include/db4
AC_MSG_RESULT($BDB_DIR_INCLUDE)
else
- if test -f $BDB_DIR/include/db4/db.h; then
- BDB_DIR_INCLUDE=$BDB_DIR/include/db4
- AC_MSG_RESULT($BDB_DIR_INCLUDE)
- else
- WITH_BDB4="no"
- AC_MSG_RESULT(not found!)
- fi
+ WITH_BDB4="no"
+ AC_MSG_RESULT(not found!)
fi
+ fi
- AC_MSG_CHECKING(for Berkeley DB libraries)
- if test -f $BDB_DIR/lib/libdb-4.0.la; then
+ AC_MSG_CHECKING(for Berkeley DB libraries)
+ if test -f $BDB_DIR/lib/libdb-4.0.la; then
+ BDB_DIR_LIB=$BDB_DIR/lib
+ BDB_LIB=libdb-4.0.la
+ AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB)
+ else
+ if test -f $BDB_DIR/lib/libdb4.la; then
BDB_DIR_LIB=$BDB_DIR/lib
- BDB_LIB=libdb-4.0.la
+ BDB_LIB=libdb4.la
AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB)
else
- if test -f $BDB_DIR/lib/libdb4.la; then
- BDB_DIR_LIB=$BDB_DIR/lib
- BDB_LIB=libdb4.la
- AC_MSG_RESULT($BDB_DIR_LIB $BDB_LIB)
- else
- WITH_BDB4="no"
- AC_MSG_RESULT(not found!)
- fi
+ WITH_BDB4="no"
+ AC_MSG_RESULT(not found!)
fi
-
- AC_SUBST(BDB_DIR)
- AC_SUBST(BDB_DIR_INCLUDE)
- AC_SUBST(BDB_DIR_LIB)
- AC_SUBST(BDB_LIB)
- dnl 4.0 is required...
- BDB_VERSION="4.0"
- AC_SUBST(BDB_VERSION)
fi
- AC_MSG_CHECKING(whether to define _REENTRANT)
- AC_ARG_ENABLE(reentrant, [ --enable-reentrant define _REENTRANT to
enable reentrant system calls],
- [ case "${enableval}" in
- no)
- AC_MSG_RESULT(no)
- ac_cv_reentrant=no
- ;;
- *)
- AC_MSG_RESULT(yes)
- AC_DEFINE([ICAL_REENTRANT], ,[Define if we want _REENTRANT])
[CFLAGS="$CFLAGS -D_REENTRANT"]
- ac_cv_reentrant=yes
- ;;
- esac ],
+ AC_SUBST(BDB_DIR)
+ AC_SUBST(BDB_DIR_INCLUDE)
+ AC_SUBST(BDB_DIR_LIB)
+ AC_SUBST(BDB_LIB)
+ dnl 4.0 is required...
+ BDB_VERSION="4.0"
+ AC_SUBST(BDB_VERSION)
+fi
+
+AC_MSG_CHECKING(whether to define _REENTRANT)
+AC_ARG_ENABLE(reentrant, [ --enable-reentrant define _REENTRANT to
enable reentrant system calls],
+[ case "${enableval}" in
+ no)
AC_MSG_RESULT(no)
- )
- case "${host}" in
- *-*-freebsdelf4* )
- AC_MSG_RESULT(checking for pthread_create in -lpthread... -pthread
(FreeBSD 4.x style))
- AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
- PTHREAD_LIBS=-pthread;;
+ ac_cv_reentrant=no
+ ;;
+ *)
+ AC_MSG_RESULT(yes)
+ AC_DEFINE([ICAL_REENTRANT], ,[Define if we want _REENTRANT])
[CFLAGS="$CFLAGS -D_REENTRANT"]
+ ac_cv_reentrant=yes
+ ;;
+ esac ],
+ AC_MSG_RESULT(no)
+)
+case "${host}" in
+ *-*-freebsdelf4* )
+ AC_MSG_RESULT(checking for pthread_create in -lpthread... -pthread
(FreeBSD 4.x style))
+ AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
+ PTHREAD_LIBS=-pthread;;
- *)
- AC_CHECK_LIB([pthread], [pthread_create], [have_pthread=yes])
- if test "x$have_pthread" = xyes; then
- AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
- PTHREAD_LIBS=-lpthread
- fi;;
- esac
- AC_SUBST([PTHREAD_LIBS])
-])
+ *)
+ AC_CHECK_LIB([pthread], [pthread_create], [have_pthread=yes])
+ if test "x$have_pthread" = xyes; then
+ AC_DEFINE(HAVE_PTHREAD, ,[Define if we have pthread.])
+ PTHREAD_LIBS=-lpthread
+ fi;;
+esac
+AC_SUBST([PTHREAD_LIBS])
+
AM_CONDITIONAL([INCLUDED_LIBICAL], [test x"$ac_INCLUDED_LIBICAL" = x"yes"])
AM_CONDITIONAL([HAVE_PTHREAD], [test x"$have_pthread" = x"yes"])
AM_CONDITIONAL([WITH_BDB4], [test x"$WITH_BDB4" = x"yes"])
@@ -188,7 +183,7 @@
dnl *** Optional support for D-BUS ***
dnl **********************************
XDT_CHECK_OPTIONAL_PACKAGE([DBUS], [dbus-glib-1],
- [0.34], [dbus], [D-BUS support])
+ [dbus_minimum_version], [dbus], [D-BUS support])
dnl Check for debugging support
dnl BM_DEBUG_SUPPORT()
@@ -221,7 +216,7 @@
])
dnl ***************************
-dnl *** Print configuration ***
+dnl *** Print configuration ***
dnl ***************************
echo
echo "Build Configuration:"
@@ -231,4 +226,3 @@
else
echo "* D-BUS support: no"
fi
-
Modified: xfcalendar/trunk/src/main.c
===================================================================
--- xfcalendar/trunk/src/main.c 2007-02-21 01:47:50 UTC (rev 25003)
+++ xfcalendar/trunk/src/main.c 2007-02-21 15:05:21 UTC (rev 25004)
@@ -54,9 +54,10 @@
#include "ical-code.h"
#include "tray_icon.h"
#include "parameters.h"
+#ifdef HAVE_DBUS
#include "orage-dbus.h"
+#endif
-
/* session client handler */
static SessionClient *session_client = NULL;
static GdkAtom atom_alive;
@@ -253,13 +254,18 @@
static void print_version(void)
{
- g_print("\tThis is %s version %s for Xfce %s\n\n"
+ g_print(_("\tThis is %s version %s for Xfce %s\n\n")
, PACKAGE, VERSION, xfce_version_string());
- g_print("\tReleased under the terms of the GNU General Public License.\n");
- g_print("\tCompiled against GTK+-%d.%d.%d, "
+ g_print(_("\tReleased under the terms of the GNU General Public
License.\n"));
+ g_print(_("\tCompiled against GTK+-%d.%d.%d, ")
, GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
- g_print("using GTK+-%d.%d.%d.\n"
+ g_print(_("using GTK+-%d.%d.%d.\n")
, gtk_major_version, gtk_minor_version, gtk_micro_version);
+#ifdef HAVE_DBUS
+ g_print(_("\tusing DBUS for import.\n"));
+#else
+ g_print(_("\tnot using DBUS. import works only partially.\n"));
+#endif
g_print("\n");
}
@@ -271,14 +277,19 @@
static void print_help(void)
{
- g_print("Usage: orage [options] files\n\n");
- g_print("Options:\n");
- g_print("--version (-v) \t\tshow version of orage\n");
- g_print("--help (-h) \t\tprint this text\n");
- g_print("--preferences (-p) \tshow preferences form\n");
- g_print("--toggle (-t) \t\tmake orage visible/unvisible\n");
+ g_print(_("Usage: orage [options] files\n\n"));
+ g_print(_("Options:\n"));
+ g_print(_("--version (-v) \t\tshow version of orage\n"));
+ g_print(_("--help (-h) \t\tprint this text\n"));
+ g_print(_("--preferences (-p) \tshow preferences form\n"));
+ g_print(_("--toggle (-t) \t\tmake orage visible/unvisible\n"));
g_print("\n");
- g_print("files=ical files to load into orage\n");
+ g_print(_("files=ical files to load into orage\n"));
+#ifndef HAVE_DBUS
+ g_print(_("\tdbus not included in orage. \n"));
+ g_print(_("\tfiles for running orage not supported without dbus \n"));
+ g_print(_("\tfiles can only be used when starting orage \n"));
+#endif
g_print("\n");
}
@@ -286,10 +297,14 @@
{
if (running && !initialized)
/* let's use dbus since server is running there already */
+#ifdef HAVE_DBUS
if (orage_dbus_import_file(file_name))
g_message("import done file=%s", file_name);
else
g_warning("import failed file=%s\n", file_name);
+#else
+ g_warning("Can not do import without dbus. import failed file=%s\n",
file_name);
+#endif
else if (!running && initialized) /* do it self directly */
if (xfical_import_file(file_name))
g_message("import done file=%s", file_name);
@@ -299,7 +314,7 @@
static gboolean process_args(int argc, char *argv[], gboolean running
, gboolean initialized)
-{ /* we need dbus if orage is already running and we just want to add file */
+{
int argi;
gboolean end = FALSE;
@@ -413,7 +428,9 @@
* directory and check for config files in old location.
*/
ensure_basedir_spec();
+#ifdef HAVE_DBUS
orage_dbus_start();
+#endif
/*
* Create the orage.
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
