Merge branch 'develop' into release-1.8

Makefile.am

@@ -1,36 +1,42 @@
+#
+# @configure_input@
+#
 SUBDIRS = include src converters tools python
 DIST_SUBDIRS = $(SUBDIRS)
 
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
+srcdir = @srcdir@
+VPATH = @srcdir@
+
 # pkgconfig
 pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libsixel.pc
+pkgconfig_DATA = $(builddir)/libsixel.pc
 
-CLEANFILES = valgrind.log test.log unittest.log test-output.png
+CLEANFILES = $(builddir)/valgrind.log $(builddir)/test.log $(builddir)/unittest.log
 
 all-am:
-	cp package.json.in package.json
+	cp $(builddir)/package.json.in $(builddir)/package.json
 
 check-am:
 
 unittest: all
-	cd src && $(MAKE) unittest 2>&1 |tee unittest.log
+	cd $(srcdir)/src && $(MAKE) unittest 2>&1 |tee $(builddir)/unittest.log
 
 test: all
-	cd src && $(MAKE) unittest 2>&1 |tee ../test.log
-	cd converters && $(MAKE) test 2>&1 |tee -a ../test.log
+	cd src && $(MAKE) unittest 2>&1 |tee $(builddir)/test.log
+	cd converters && $(MAKE) test 2>&1 |tee -a $(builddir)/test.log
 
 winetest: all
 	cd converters && $(MAKE) winetest
 
 valgrind: all
 	valgrind --leak-check=full --show-reachable=no --error-limit=no img2sixel images/snake.jpg -dfs 2>&1 \
 		| grep ^== \
-		| tee valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+		| tee $(builddir)/valgrind.log
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "definitely lost: 0 bytes in 0 blocks" valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "indirectly lost: 0 bytes in 0 blocks" valgrind.log
 
 coveralls:

Makefile.in

@@ -14,7 +14,6 @@
 
 @SET_MAKE@
 
-VPATH = @srcdir@
 am__is_gnu_make = { \
   if test -z '$(MAKELEVEL)'; then \
     false; \
@@ -237,6 +236,7 @@ distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
+VPATH = @srcdir@
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
 AM_CFLAGS = @AM_CFLAGS@
@@ -386,11 +386,15 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 zshcompletiondir = @zshcompletiondir@
+
+#
+# @configure_input@
+#
 SUBDIRS = include src converters tools python
 DIST_SUBDIRS = $(SUBDIRS)
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
-pkgconfig_DATA = libsixel.pc
-CLEANFILES = valgrind.log test.log unittest.log test-output.png
+pkgconfig_DATA = $(builddir)/libsixel.pc
+CLEANFILES = $(builddir)/valgrind.log $(builddir)/test.log $(builddir)/unittest.log
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
@@ -907,27 +911,27 @@ uninstall-am: uninstall-pkgconfigDATA
 
 
 all-am:
-	cp package.json.in package.json
+	cp $(builddir)/package.json.in $(builddir)/package.json
 
 check-am:
 
 unittest: all
-	cd src && $(MAKE) unittest 2>&1 |tee unittest.log
+	cd $(srcdir)/src && $(MAKE) unittest 2>&1 |tee $(builddir)/unittest.log
 
 test: all
-	cd src && $(MAKE) unittest 2>&1 |tee ../test.log
-	cd converters && $(MAKE) test 2>&1 |tee -a ../test.log
+	cd src && $(MAKE) unittest 2>&1 |tee $(builddir)/test.log
+	cd converters && $(MAKE) test 2>&1 |tee -a $(builddir)/test.log
 
 winetest: all
 	cd converters && $(MAKE) winetest
 
 valgrind: all
 	valgrind --leak-check=full --show-reachable=no --error-limit=no img2sixel images/snake.jpg -dfs 2>&1 \
 		| grep ^== \
-		| tee valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+		| tee $(builddir)/valgrind.log
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "definitely lost: 0 bytes in 0 blocks" valgrind.log
-	grep "All heap blocks were freed" valgrind.log || \
+	grep "All heap blocks were freed" $(builddir)/valgrind.log || \
 		grep "indirectly lost: 0 bytes in 0 blocks" valgrind.log
 
 coveralls:

config.h.in

@@ -108,6 +108,9 @@
 /* define 1 if GCC supports -Wuninitialized */
 #undef HAVE_DIAGNOSTIC_UNINITIALIZED
 
+/* define 1 if GCC supports -Wunused-but-set-variable */
+#undef HAVE_DIAGNOSTIC_UNUSED_BUT_SET_VARIABLE
+
 /* define 1 if GCC supports -Wunused-function */
 #undef HAVE_DIAGNOSTIC_UNUSED_FUNCTION
 

configure

@@ -14109,6 +14109,36 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    CFLAGS="$saved_cflags"
 
 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Wunused-but-set-variable" >&5
+$as_echo_n "checking if $CC supports -Wunused-but-set-variable... " >&6; }
+   saved_cflags="$CFLAGS"
+   CFLAGS="-Wunused-but-set-variable -Werror"
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_DIAGNOSTIC_UNUSED_BUT_SET_VARIABLE 1" >>confdefs.h
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+                      :
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+   CFLAGS="$saved_cflags"
+
+
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC supports -Bsymbolic" >&5
 $as_echo_n "checking if $CC supports -Bsymbolic... " >&6; }
    saved_cflags="$CFLAGS"

configure.ac

@@ -13,7 +13,7 @@ AC_SUBST([PACKAGE_DESCRIPTION],
 
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([foreign subdir-objects])
 LT_INIT
 AC_CONFIG_SRCDIR([src/fromsixel.c])
 AC_CONFIG_HEADERS([config.h])
@@ -210,6 +210,8 @@ LS_CHECK_CFLAG([-Wunused-function],
                [AC_DEFINE(HAVE_DIAGNOSTIC_UNUSED_FUNCTION, 1, [define 1 if GCC supports -Wunused-function])])
 LS_CHECK_CFLAG([-Wclobbered],
                [AC_DEFINE(HAVE_DIAGNOSTIC_CLOBBERED, 1, [define 1 if GCC supports -Wclobbered])])
+LS_CHECK_CFLAG([-Wunused-but-set-variable],
+               [AC_DEFINE(HAVE_DIAGNOSTIC_UNUSED_BUT_SET_VARIABLE, 1, [define 1 if GCC supports -Wunused-but-set-variable])])
 LS_CHECK_CFLAG([-Bsymbolic],
                [AM_CFLAGS="$AM_CFLAGS -Bsymbolic"
                 AC_DEFINE(HAVE_BSYMBOLIC, 1, [define 1 if GCC supports -Bsymbolic])])