diff --git a/test/configure.ac b/test/configure.ac
index a22e1a98e..7aad98fe4 100644
--- a/test/configure.ac
+++ b/test/configure.ac
@@ -80,7 +80,15 @@ case "$host" in
         ISUNIX="true"
         EXE=""
         MATHLIB="-lm"
+        dnl Use the new libOpenGL if present.
+        have_glvnd=no
+        AC_CHECK_LIB(OpenGL, glBegin,
+        [   
+        dnl have_glvnd=yes
+        SYS_GL_LIBS="-lOpenGL"
+        ],[ 
         SYS_GL_LIBS="-lGL"
+        ])  
         ;;
 esac
 AC_SUBST(EXE)