Merge; conditionally include OpenMP
Minor change
Support --enable-openmp