Update m4 macros from upstream to fix configure issue with detection
of libboost.

Cherry-picked from: 5220ecb6 937d6d31 8224a7d4