result of running autogen.sh for 0mq without cherry picking

It appears as if cherry picking autotools is not as easy as I though. So just
unbreak the build and move on.