Browse Source

debian wheezy fixes; bump version number to 1 in anticipation of release.

David Mazieres 6 years ago
parent
commit
09b0e0b7a5
5 changed files with 18 additions and 5 deletions
  1. 1
    0
      Makefile.am
  2. 10
    1
      NEWS
  3. 4
    3
      configure.ac
  4. 2
    1
      muchsync.cc
  5. 1
    0
      sqlstmt.h

+ 1
- 0
Makefile.am View File

@@ -1,4 +1,5 @@
1 1
 
2
+ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS} -I m4
2 3
 AM_CPPFLAGS = $(sqlite3_CFLAGS) $(libcrypto_CFLAGS) $(xapian_CPPFLAGS)
3 4
 LDADD = $(sqlite3_LIBS)	$(libcrypto_LIBS) $(xapian_LIBS) -lnotmuch
4 5
 

+ 10
- 1
NEWS View File

@@ -1,7 +1,16 @@
1 1
 * Changes in release 1
2 2
 
3
+Various compabitility fixes for Debian Wheezy (thanks Simó Albert i
4
+Beltran).
5
+
6
+Allow ./configure WFLAGS="-Wall -Werror" to specify warnings (still
7
+use -Wall by default).
8
+
9
+For git only, make autogen.sh fetch pre-formatted muchsync.1 over http
10
+when pandoc not available.
11
+
3 12
 Fix a bug where tags containing '%' characters were not properly
4
-handled.
13
+handled (thanks Brian Sniffen).
5 14
 
6 15
 Portability fixes for Mac OS X, which does not have clock_gettime.
7 16
 

+ 4
- 3
configure.ac View File

@@ -2,7 +2,7 @@
2 2
 # Process this file with autoconf to produce a configure script.
3 3
 
4 4
 AC_PREREQ([2.69])
5
-AC_INIT(muchsync, 0)
5
+AC_INIT(muchsync, 1)
6 6
 AM_INIT_AUTOMAKE([-Wall])
7 7
 AC_CONFIG_SRCDIR([configure.ac])
8 8
 AC_CONFIG_MACRO_DIR([m4])
@@ -11,7 +11,8 @@ dnl On arch, clang++ is not compatible with all libraries
11 11
 dnl AC_PROG_CXX([clang++ eg++ g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC])
12 12
 AC_PROG_CXX
13 13
 AX_CXX_COMPILE_STDCXX_11(noext,mandatory)
14
-CXXFLAGS="$CXXFLAGS -Wall"
14
+: ${WFLAGS=-Wall}
15
+CXXFLAGS="$CXXFLAGS $WFLAGS"
15 16
 dnl AC_USE_SYSTEM_EXTENSIONS
16 17
 AC_LANG(C++)
17 18
 # -pthread Seems to be required by g++ -stc=c++11
@@ -34,7 +35,7 @@ AC_COMPILE_IFELSE(
34 35
 [AC_LANG_PROGRAM([#include <time.h>
35 36
 #include <sys/time.h>
36 37
 #include <sys/stat.h>],
37
-[int sz = sizeof(stat::st_mtim);])],
38
+[return sizeof(stat::st_mtim) > 0;])],
38 39
 have_st_mtim=yes, have_st_mtim=no)
39 40
 AC_MSG_RESULT($have_st_mtim)
40 41
 

+ 2
- 1
muchsync.cc View File

@@ -104,7 +104,8 @@ tag_stderr(string tag)
104 104
   cerr.rdbuf(isb);
105 105
 }
106 106
 
107
-[[noreturn]] void
107
+//[[noreturn]]
108
+void
108 109
 usage (int code = 1)
109 110
 {
110 111
   (code ? cerr : cout) << "\

+ 1
- 0
sqlstmt.h View File

@@ -6,6 +6,7 @@
6 6
 #include <cassert>
7 7
 #include <string>
8 8
 #include <tuple>
9
+#include <stdexcept>
9 10
 #include <sqlite3.h>
10 11
 
11 12
 using i64 = sqlite3_int64;

Loading…
Cancel
Save