[patch] patch configure.ac and mgl/Makefile.am to add openmp configurability

mathgl-1.9.0.1-openmp.patch (text/plain), 1.27 KB, created by François Bissey on 2009-09-22 12:22:20 UTC

--- configure.ac.orig	2009-09-21 22:46:39.000000000 +1200
+++ configure.ac	2009-09-22 22:05:25.000000000 +1200
@@ -87,6 +87,17 @@
 fi
 AM_CONDITIONAL(USE_GSL, test x$test_gsl = xtrue)
 
+AC_ARG_ENABLE([openmp],
+    AS_HELP_STRING([--disable-openmp], [Disable openmp]))
+
+AS_IF([test "x$enable_openmp" != "xno"], 
+    [AX_OPENMP([OPENMP_LIBS="$OPENMP_CFLAGS"],
+	      [AC_MSG_ERROR([don't know how to enable OpenMP])]
+	      )
+    ]
+)
+AM_CONDITIONAL(USE_OPENMP, test x$enable_openmp = xyes)
+
 AC_ARG_ENABLE(glut,
 [  --enable-glut    Turn on glut],
 [case "${enableval}" in
--- mgl/Makefile.am.orig	2009-09-21 23:17:31.000000000 +1200
+++ mgl/Makefile.am	2009-09-22 15:01:46.000000000 +1200
@@ -16,7 +16,7 @@
 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/\" \
@@ -39,6 +39,10 @@
 libmgl_la_LIBADD += $(JPEG_LIBS)
 endif
 
+if USE_OPENMP
+libmgl_la_LIBADD += $(OPENMP_LIBS)
+endif
+
 libmgl_la_SOURCES = \
 mgl_data_cf.cpp	   mgl_axis.cpp     mgl_data_png.cpp  mgl_zb2.cpp \
 mgl_c.cpp          mgl_eps.cpp      mgl_font.cpp      mgl_zb.cpp \