pidgin/pidgin

Merge default back in
use-gresolver
2015-12-21, Gary Kramlich
ef015fb22744
Merge default back in
installed_m4=purple.m4
EXTRA_DIST=$(installed_m4) as-ac-expand.m4
m4datadir=$(datadir)/aclocal
m4data_DATA=$(installed_m4)