Fixed compilation errors (didn't request USING_FFTW be substituted in the configure.ac script). make distcheck still fails because automake (?) misuses tex2dvi command (complains that --output cannot be used when there is more than one argument ?)
Fixed merge conflicts (ggadt.f95 wasn't deleted)