Fix memory leak: free marks when destroying containers (#2578)

[i3/i3] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8829fed92a30fa59bdf795e2c65d257ad3c5bfb4..b57f9efaf3eb793dcfe3d585ff641a6b768b342b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 # Run autoreconf -fi to generate a configure script from this file.
 
 AC_PREREQ([2.69])
-AC_INIT([i3], [4.12], [https://github.com/i3/i3/issues])
+AC_INIT([i3], [4.13], [https://github.com/i3/i3/issues])
 # For AX_EXTEND_SRCDIR
 AX_ENABLE_BUILDDIR
 AM_INIT_AUTOMAKE([foreign subdir-objects -Wall no-dist-gzip dist-bzip2])
@@ -15,6 +15,12 @@ AC_CONFIG_SRCDIR([libi3/ipc_recv_message.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
+dnl Verify macros defined in m4/ such as AX_SANITIZERS are not present in the
+dnl output, i.e. are replaced as expected. This line results in a better error
+dnl message when using aclocal < 1.13 (which does not understand
+dnl AC_CONFIG_MACRO_DIR) without passing the -I m4 parameter.
+m4_pattern_forbid([AX_SANITIZERS])
+
 # Verify we are using GNU make because we use '%'-style pattern rules in
 # Makefile.am, which are a GNU make extension. Pull requests to replace
 # '%'-style pattern rules with a more portable alternative are welcome.
@@ -146,6 +152,15 @@ else
        print_BUILD_MANS=no
 fi
 
+git_dir=`git rev-parse --git-dir 2>/dev/null`
+if test -n "$git_dir"; then
+       srcdir=`dirname "$git_dir"`
+       exclude_dir=`pwd | sed "s,^$srcdir,,g"`
+       if ! grep -q "^$exclude_dir" "$git_dir/info/exclude"; then
+               echo "$exclude_dir" >> "$git_dir/info/exclude"
+       fi
+fi
+
 echo \
 "--------------------------------------------------------------------------------
 build configured: