Merge endris setup into main configure file
also add config options and error checks