Fix problems with compilation (2)
Merge branch 'haskell' of github.com:casadi/casadi into haskell