Switched to calcurse-2.4_beta. Fixed compiler flags overwriting and added locale.h include (thanks Cedric for your patch)

4 files changed, 13 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index f0eefe7..02ed58c 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2008-12-08  Frederic Culot  <frederic@culot.org>
 
 	* src/custom.c (custom_color_config_bar): new function
+
+	* configure.ac
+	* TODO: update for 2.4_beta
+
+	* configure.ac: do not overwrite CFLAGS
+
+	* src/i18n.h: include locale.h in case we have ENABLE_NLS
 	
 2008-12-07  Frederic Culot  <frederic@culot.org>
 
diff --git a/TODO b/TODO
index 472cea1..6bdd2e3 100755
--- a/TODO
+++ b/TODO
@@ -17,12 +17,12 @@ High
 
 Average
 -------
-  o  Make keys user configurable
   o  Add searching capabilities with support for regex
   o  Implement a daemon to notify user of upcoming appointments even when
      calcurse is not running
   o  Add an auto-save function
   o  Add support for CalDAV protocol (rfc4791)
+  o  Implement categories to classify appointments and tasks
 
 
 Low
diff --git a/configure.ac b/configure.ac
index a4e8ccf..8fadb8a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-#	$calcurse: configure.ac,v 1.22 2008/10/15 16:15:40 culot Exp $
+#	$calcurse: configure.ac,v 1.23 2008/12/08 19:40:23 culot Exp $
 
 #-------------------------------------------------------------------------------
 #                                                                           Init
 #-------------------------------------------------------------------------------
 AC_PREREQ(2.59)
-AC_INIT(calcurse, 2.3, frederic@culot.org)
+AC_INIT(calcurse, 2.4_beta, frederic@culot.org)
 AM_INIT_AUTOMAKE
 AM_GNU_GETTEXT([external])
 AC_CONFIG_SRCDIR([src/calcurse.c])
@@ -56,7 +56,7 @@ AC_CHECK_HEADERS([math.h], [
 #-------------------------------------------------------------------------------
 #                                                            Compilation options
 #-------------------------------------------------------------------------------
-CFLAGS="-O2 -Wall -g"
+CFLAGS+="-Wall -g"
 #-------------------------------------------------------------------------------
 #                                                               Create Makefiles
 #-------------------------------------------------------------------------------
diff --git a/src/i18n.h b/src/i18n.h
index 082a7c7..846af74 100755
--- a/src/i18n.h
+++ b/src/i18n.h
@@ -1,4 +1,4 @@
-/*	$calcurse: i18n.h,v 1.2 2008/04/12 21:14:03 culot Exp $	*/
+/*	$calcurse: i18n.h,v 1.3 2008/12/08 19:40:23 culot Exp $	*/
 
 /*
  * Calcurse - text-based organizer
@@ -32,6 +32,7 @@
 #endif /* HAVE_CONFIG_H */
 
 #if ENABLE_NLS
+#include <locale.h>
 #include <libintl.h>
 #undef _
 #define _(String) gettext(String)