Fix libgcrypt-config and bitlbee configure
Cleanup