Changed occurance of ../configure to $(srcdir)/configure. (../configure doesn't work on my machine, and I don't quite understand how it did on Travis CI.
Fixed incorrect options in Makefile.am/.in.
Fix --disable--std-c, --disable--std-c++ only (don't fix --enable-std-c++11 yet, because that test doesn't pass on clang)
Merge pull request #187 from arstrube/mk02

Fixed incorrect options in Makefile.am/.in.
Merge pull request #185 from arstrube/mk01

Fixed  ../configure in Makefile