Merge branch 'next'

* next:
  hack, put tools' LDFLAGS into LDADD as well so g++ doesn't trip