Merge pull request #117 from alexander-zimmermann/next

Improve autotool magic for multi OS support