Fix merged code to be C99 compiliant. Try to fix dev_arygon under linux (could not be tested here, sorry). Try to fix MacOSX makefile (could not be tested here, sorry). Adjust src/Makefile.am to compile/dist all new files.