Attachment #172351 for bug #247561

Lines 435-444 Link Here

(-)configure.ac.orig (-2 / +2 lines)
435	AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no)	437	AC_ARG_WITH(combined-threads, [AC_HELP_STRING([--with-combined-threads],[combine threads into main libfftw3])], with_combined_threads=$withval, with_combined_threads=no)
436		438
437	if test "$enable_openmp"x != nox; then	439	if test "$enable_openmp"x != nox; then
438	AX_OPENMP([THREADLIBS=" "	440	AX_OPENMP([THREADLIBS="$OPENMP_LIBS"
439	AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])	441	AC_DEFINE(USING_OPENMP_THREADS, 1, [Define if we have and are using OpenMP multithreading directives])
440	CFLAGS="$CFLAGS $OPENMP_CFLAGS"],	442	CFLAGS="$CFLAGS $OPENMP_CFLAGS"],
441	[AC_MSG_ERROR([don't know how to enable OpenMP])])	443	[AC_MSG_WARN([don't know how to enable OpenMP, reverting to POSIX threads])])
442	fi	444	fi
443		445
444	dnl Check for threads library...	446	dnl Check for threads library...

Lines 59-64 Link Here

(-)m4/ax_openmp.m4.orig (+4 lines)
59	else	59	else
60	if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then	60	if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" != "xnone"; then
61	OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp	61	OPENMP_[]_AC_LANG_PREFIX[]FLAGS=$ax_cv_[]_AC_LANG_ABBREV[]_openmp
		62	OPENMP_LIBS=" "
		63	if test "x$ax_cv_[]_AC_LANG_ABBREV[]_openmp" = "x-fopenmp"; then
		64	OPENMP_LIBS="-lgomp"
		65	fi
62	fi	66	fi
63	m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])	67	m4_default([$1], [AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])])
64	fi	68	fi

Return to bug 247561