Add the m4 directory back

Some versions of aclocal treat this as an error and autoreconf runs
aclocal before libtoolize so the m4 directory doesn't exist at this point.
Add incr_set and decr_set

These functions will increase or decrease, respectively, an existing
key or initialise it if doesn't exist.