Fixed the OSMesa configure check so that OSMesa won't be linked in if it's

incompatible with the GLX implementation (e.g. nvidia).
Removed the old "OSMesa not found" warning.
This commit is contained in:
Ove Kaaven 2001-05-02 01:11:10 +00:00 committed by Alexandre Julliard
parent f24f23c2d3
commit a627873ab2
2 changed files with 166 additions and 168 deletions

327
configure vendored

File diff suppressed because it is too large Load Diff

View File

@ -322,11 +322,10 @@ then
AC_CHECK_LIB(OSMesa, OSMesaCreateContext, AC_CHECK_LIB(OSMesa, OSMesaCreateContext,
[ AC_DEFINE(HAVE_OSMESA) [ AC_DEFINE(HAVE_OSMESA)
X_PRE_LIBS="$X_PRE_LIBS -lOSMesa" X_PRE_LIBS="$X_PRE_LIBS -lOSMesa"
]), ],,-lGL $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS),
$X_LIBS -lXext -lX11 $X_EXTRA_LIBS $X_LIBS -lXext -lX11 -lm $X_EXTRA_LIBS
) )
], ]
AC_MSG_WARN([OSMesa not found!!])
) )
fi fi
fi fi