Fix FUNCNAME usage for latest bash versions

FUNCNAME appears to be somehow broken, since checking its size gives different
results from checking its values; we use the size to detect whether we're in a
function or not
Update autotools files from new autotool version
Merge branch 'master' into python3

Conflicts:
	configure
	configure.ac