Updating branch refs/heads/master
to 692c918d7fcfcc6d86dfd7da5ab7061a9ebe59d7 (commit)
from 614d4bfad3404fce868e99e67c402121883ae783 (commit)
commit 692c918d7fcfcc6d86dfd7da5ab7061a9ebe59d7
Author: Juha Kautto <j...@xfce.org>
Date: Mon Dec 21 15:06:57 2009 +0200
4.5.7.4 Fixed configure.in.in to work again with older autotools
Only recent autotools can use variables with AC_OUTPUT. Reverted back to
old version.
Removed reference to .git from autogen.sh.
Removed double notification from reminder.
autogen.sh | 3 +--
configure.in.in | 22 +++++++++++++++++++---
src/reminder.c | 11 +++++------
3 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/autogen.sh b/autogen.sh
index b0bf71a..1cc3c2e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,9 +29,8 @@ EOF
# substitute revision and linguas
linguas=`sed -e '/^#/d' po/LINGUAS`
-revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
+# revision=`LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}'`
sed -e "s/@LINGUAS@/${linguas}/g" \
- -e "s/@REVISION@/${revision}/g" \
< "configure.in.in" > "configure.in"
exec xdt-autogen $@
diff --git a/configure.in.in b/configure.in.in
index cd3eadc..62150e7 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <j...@xfce.org>
dnl
dnl Version information
-m4_define([orage_version], [4.7.5.3-git])
+m4_define([orage_version], [4.7.5.4-git])
m4_define([gtk_minimum_version], [2.10.0])
m4_define([xfce_minimum_version], [4.6.0])
@@ -239,7 +239,7 @@ dnl ************************************************
have_archive="no"
AC_ARG_ENABLE([archive],
AC_HELP_STRING([--enable-archive], [use automatic archiving (defaut=yes)])
-AC_HELP_STRING([--disable-archive], [don't use automatic archiving]),
+AC_HELP_STRING([--disable-archive], [do not use automatic archiving]),
[], [enable_archive=yes])
if test x"$enable_archive" = x"yes"; then
AC_DEFINE([HAVE_ARCHIVE], [1], [Define to enable archiving])
@@ -251,9 +251,25 @@ dnl Check for debugging support
dnl BM_DEBUG_SUPPORT()
XDT_FEATURE_DEBUG
+dnl the intention was to use variable
+dnl $LIBICAL_DIRS
+dnl to control if libical is being compiled or not, but only very
+dnl recent autotools can have such variables in AC_OUTPUT.
+dnl Revertign back to full list until time is right for using it.
+dnl This causes some extra work at compile time, but should not cause
+dnl any issues to users.
+
AC_OUTPUT([
Makefile
-$LIBICAL_DIRS
+libical/Makefile
+libical/design-data/Makefile
+libical/doc/Makefile
+libical/scripts/Makefile
+libical/src/Makefile
+libical/src/libical/Makefile
+libical/src/libical/icalversion.h
+libical/src/libicalss/Makefile
+libical/zoneinfo/Makefile
xfcalendar.spec
icons/Makefile
icons/48x48/Makefile
diff --git a/src/reminder.c b/src/reminder.c
index 2a616dc..93bc6a1 100644
--- a/src/reminder.c
+++ b/src/reminder.c
@@ -738,11 +738,6 @@ static void create_orage_reminder(alarm_struct *alarm)
gtk_box_pack_end(GTK_BOX(vbReminder), e_hbox, FALSE, FALSE, 0);
ddmmhh_hbox->dialog = wReminder;
-#if GTK_CHECK_VERSION(2,16,0)
- e_label = gtk_label_new(_("Remind me again after the specified time:"));
- gtk_box_pack_end(GTK_BOX(vbReminder), e_label, FALSE, FALSE, 5);
-#endif
-
/* ACTION AREA */
daaReminder = GTK_DIALOG(wReminder)->action_area;
gtk_dialog_set_has_separator(GTK_DIALOG(wReminder), FALSE);
@@ -774,7 +769,11 @@ static void create_orage_reminder(alarm_struct *alarm)
btRecreateReminder = gtk_button_new_from_stock("gtk-execute");
#if GTK_CHECK_VERSION(2,16,0)
gtk_widget_set_tooltip_text(btRecreateReminder
- , _("Remind me again after the specified time:"));
+ , _("Remind me again after the specified time"));
+#else
+ /* Note that this goes to the main area. Temporary for the version */
+ e_label = gtk_label_new(_("Press <Execute> to remind me again after the
specified time:"));
+ gtk_box_pack_end(GTK_BOX(vbReminder), e_label, FALSE, FALSE, 5);
#endif
gtk_dialog_add_action_widget(GTK_DIALOG(wReminder)
, btRecreateReminder, GTK_RESPONSE_OK);
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
