re-revert some recent GNU libtool related changes

have I mentioned that GNU libtool is annoying yet?