Attachment #204917 for bug #280642




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

Lines 16-22 Link Here

(-)mgl/Makefile.am.orig (-1 / +5 lines)
16	WIDGETS += -DWITH_GLUT	16	WIDGETS += -DWITH_GLUT
17	endif	17	endif
18		18
19	libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS) -lgomp	19	libmgl_la_LIBADD = $(PNG_LIBS) $(GL_LIBS)
20	libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)	20	libmgl_la_LDFLAGS = -no-undefined -version-info $(MGL_CURRENT):$(MGL_REVISION):$(MGL_AGE)
21		21
22	libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \	22	libmgl_la_CXXFLAGS = $(WIDGETS) -DMGL_FONT_PATH=\"$(datadir)/$(PACKAGE)/fonts/\" \
Lines 39-44 Link Here
39	libmgl_la_LIBADD += $(JPEG_LIBS)	39	libmgl_la_LIBADD += $(JPEG_LIBS)
40	endif	40	endif
41		41
		42	if USE_OPENMP
		43	libmgl_la_LIBADD += $(OPENMP_LIBS)
		44	endif
		45
42	libmgl_la_SOURCES = \	46	libmgl_la_SOURCES = \
43	mgl_data_cf.cpp mgl_axis.cpp mgl_data_png.cpp mgl_zb2.cpp \	47	mgl_data_cf.cpp mgl_axis.cpp mgl_data_png.cpp mgl_zb2.cpp \
44	mgl_c.cpp mgl_eps.cpp mgl_font.cpp mgl_zb.cpp \	48	mgl_c.cpp mgl_eps.cpp mgl_font.cpp mgl_zb.cpp \

Return to bug 280642

Lines 87-92 Link Here

(-)configure.ac.orig (+11 lines)
87	fi	87	fi
88	AM_CONDITIONAL(USE_GSL, test x$test_gsl = xtrue)	88	AM_CONDITIONAL(USE_GSL, test x$test_gsl = xtrue)
89		89
		90	AC_ARG_ENABLE([openmp],
		91	AS_HELP_STRING([--disable-openmp], [Disable openmp]))
		92
		93	AS_IF([test "x$enable_openmp" != "xno"],
		94	[AX_OPENMP([OPENMP_LIBS="$OPENMP_CFLAGS"],
		95	[AC_MSG_ERROR([don't know how to enable OpenMP])]
		96	)
		97	]
		98	)
		99	AM_CONDITIONAL(USE_OPENMP, test x$enable_openmp = xyes)
		100
90	AC_ARG_ENABLE(glut,	101	AC_ARG_ENABLE(glut,
91	[ --enable-glut Turn on glut],	102	[ --enable-glut Turn on glut],
92	[case "${enableval}" in	103	[case "${enableval}" in