Reverted change in configure.ac
Merge branch 'bugfixes' into discrete-distributions