Attachment #201021 for bug #280642

Lines 75-80 Link Here

(-)configure.ac.orig (+9 lines)
75	fi	75	fi
76	AM_CONDITIONAL(USE_GSL, test x$test_gsl = xtrue)	76	AM_CONDITIONAL(USE_GSL, test x$test_gsl = xtrue)
77		77
		78	AC_ARG_ENABLE(openmp,
		79	[ --enable-openmp Enable openmp],
		80	[case "${enableval}" in
		81	yes) openmp=true ;;
		82	no) openmp=false ;;
		83	*) AC_MSG_ERROR(bad value ${enableval} for --enable-openmp) ;;
		84	esac],[openmp=true])
		85	AM_CONDITIONAL(USE_OPENMP, test x$openmp = xtrue)
		86
78	AC_ARG_ENABLE(glut,	87	AC_ARG_ENABLE(glut,
79	[ --enable-glut Turn on glut],	88	[ --enable-glut Turn on glut],
80	[case "${enableval}" in	89	[case "${enableval}" in




WIDGETS += -DWITH_GLUT
endif

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)

if USE_GSL
libmgl_la_LIBADD += $(GSL_LIBS)

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@

Return to bug 280642

Lines 16-27 Link Here

(-)mgl/Makefile.am.orig (-2 / +7 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/\" \
23	-DMOD_LIB_DIR=\"$(libdir)/mgl/\" $(HDF5_FLAGS) $(GIF_FLAGS) $(JPEG_FLAGS) $(TIFF_FLAGS) \	23	-DMOD_LIB_DIR=\"$(libdir)/mgl/\" $(HDF5_FLAGS) $(GIF_FLAGS) $(JPEG_FLAGS) $(TIFF_FLAGS) \
24	$(PNG_FLAGS) $(FLTK_FLAGS) $(ADDON_FLAGS) $(AM_CXXFLAGS) -fopenmp	24	$(PNG_FLAGS) $(FLTK_FLAGS) $(ADDON_FLAGS) $(AM_CXXFLAGS)
25		25
26	if USE_GSL	26	if USE_GSL
27	libmgl_la_LIBADD += $(GSL_LIBS)	27	libmgl_la_LIBADD += $(GSL_LIBS)
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 += -lgomp
		44	libmgl_la_CXXFLAGS += -fopenmp
		45	endif
		46
42	if USE_LTDL	47	if USE_LTDL
43	INCLUDES += @INCLTDL@	48	INCLUDES += @INCLTDL@
44	libmgl_la_LIBADD += @LIBLTDL@	49	libmgl_la_LIBADD += @LIBLTDL@