Minor fix to allow seamless compiling on fedora (cfitsio lib
in different location) and some optimizing on conditional
compiling