--- configure.ac.orig	2009-08-12 23:36:31.000000000 +1200
+++ configure.ac	2009-08-12 23:40:28.000000000 +1200
@@ -75,6 +75,15 @@
 fi
 AM_CONDITIONAL(USE_GSL, test x$test_gsl = xtrue)
 
+AC_ARG_ENABLE(openmp,
+[  --enable-openmp    Enable openmp],
+[case "${enableval}" in
+  yes) openmp=true ;;
+  no)  openmp=false ;;
+  *) AC_MSG_ERROR(bad value ${enableval} for --enable-openmp) ;;
+esac],[openmp=true])
+AM_CONDITIONAL(USE_OPENMP, test x$openmp = xtrue)
+
 AC_ARG_ENABLE(glut,
 [  --enable-glut    Turn on glut],
 [case "${enableval}" in
--- mgl/Makefile.am.orig	2009-03-05 02:22:03.000000000 +1300
+++ mgl/Makefile.am	2009-08-12 23:42:52.000000000 +1200
@@ -16,12 +16,12 @@
 WIDGETS += -DWITH_GLUT
 endif
 
-libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS) -lgomp
+libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS)
 libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
 
 libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \
     -DMOD_LIB_DIR=\"$(libdir)/mgl/\" $(HDF5_FLAGS) $(GIF_FLAGS) $(JPEG_FLAGS) $(TIFF_FLAGS) \
-    $(PNG_FLAGS) $(FLTK_FLAGS) $(ADDON_FLAGS) $(AM_CXXFLAGS) -fopenmp
+    $(PNG_FLAGS) $(FLTK_FLAGS) $(ADDON_FLAGS) $(AM_CXXFLAGS)
 
 if USE_GSL
 libmgl_la_LIBADD += $(GSL_LIBS)
@@ -39,6 +39,11 @@
 libmgl_la_LIBADD += $(JPEG_LIBS)
 endif
 
+if USE_OPENMP
+libmgl_la_LIBADD += -lgomp
+libmgl_la_CXXFLAGS += -fopenmp
+endif
+
 if USE_LTDL
 INCLUDES        += @INCLTDL@
 libmgl_la_LIBADD += @LIBLTDL@