1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-03 12:38:38 +00:00

Merge branch 'master' into lua

This commit is contained in:
Brenden Matthews 2009-05-15 13:51:43 -06:00
commit 08fbc21c19

View File

@ -655,7 +655,12 @@ dnl
dnl Check for OpenMP support
dnl
AX_OPENMP([
AC_ARG_ENABLE([openmp],
AC_HELP_STRING([--enable-openmp], [enable if you want OpenMP support @<:@default=no@:>@]),
[want_openmp="$enableval"], [want_openmp=no])
if test x$want_openmp = xyes; then
AX_OPENMP([
gcc_version=`$CC -dumpversion`
gcc_major=`echo $gcc_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gcc_minor=`echo $gcc_version | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
@ -663,9 +668,12 @@ AX_OPENMP([
if test ! "x$GCC" = "xyes" -o $gcc_major -ge 4 -a $gcc_minor -ge 3; then
AC_DEFINE(HAVE_OPENMP,1,[Define if OpenMP is enabled])
CFLAGS="$CFLAGS $OPENMP_CFLAGS"
else
want_openmp=no
fi
])
])
fi
dnl
dnl Check doc stuff
@ -795,6 +803,7 @@ $PACKAGE $VERSION configured successfully:
XMMS2: $want_xmms2
* General:
OpenMP: $want_openmp
math: $want_math
hddtemp: $want_hddtemp
portmon: $want_portmon