1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
|
other misc changes that I don't know the *exact* reason/bug for.
--- a/src/Todo.h
+++ b/src/Todo.h
@@ -8,6 +8,8 @@
using namespace std;
+class TodoDB;
+
/*
Todo is the basic data structure for each entry in the .todo database.
--- a/src/todoterm.cc
+++ b/src/todoterm.cc
@@ -2,6 +2,7 @@
#include "todoterm.h"
#ifdef USETERMCAP
+#include <cstdlib>
#include <iostream>
#include <string>
#include <stdexcept>
--- a/config.h.in
+++ b/config.h.in
@@ -116,5 +116,11 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* System configuration directory */
+#undef SYSCONFDIR
+
+/* Use termcap to get terminal width */
+#undef USETERMCAP
+
/* Version number of package */
#undef VERSION
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,10 @@
-AC_INIT(src/main.cc)
+AC_INIT
+AC_CONFIG_SRCDIR([src/main.cc])
AM_INIT_AUTOMAKE(devtodo,0.1.20)
+# don't rebuild Makefiles (=> timestamp skew due to patch)
+AM_MAINTAINER_MODE
+
# We don't want the util source to be made into a shared lib as it's
# only used locally
AC_DISABLE_SHARED
@@ -10,7 +14,7 @@
AC_PROG_INSTALL
AC_PROG_LN_S
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
# Extra options
AC_ARG_ENABLE(debug,
@@ -25,7 +29,7 @@
# Don't use termcap to obtain window size
AC_ARG_WITH(termcap, [ --without-termcap don't use termcap to obtain terminal width])
if test "${with_termcap}_" = _ -o "${with_termcap}_" = yes; then
- AC_DEFINE(USETERMCAP)
+ AC_DEFINE(USETERMCAP, 1, [ Use termcap to get terminal width])
fi
# Check for various headers and functions - although I'm not doing anything
@@ -79,13 +83,14 @@
AC_SUBST(READLINE_LIBS)
SYSCONFDIR="`eval echo $sysconfdir`"
-AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR")
+AC_DEFINE_UNQUOTED(SYSCONFDIR, "$SYSCONFDIR", [System configuration directory])
AC_SUBST(SYSCONFDIR)
AC_CHECK_PROG(HAVE_CRASH_CONFIG, crash-config, yes)
AC_SUBST(HAVE_CRASH_CONFIG)
-AM_CONFIG_HEADER(config.h)
-AC_OUTPUT(Makefile src/Makefile util/Makefile doc/Makefile doc/devtodo.1 makepackages.sh devtodo.spec devtodo.list)
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_FILES([Makefile src/Makefile util/Makefile doc/Makefile doc/devtodo.1 makepackages.sh devtodo.spec devtodo.list])
+AC_OUTPUT
chmod +x makepackages.sh
|
