fix options, add m4 directory