Index: configure.in
===================================================================
--- configure.in	(revision 29903)
+++ configure.in	(working copy)
@@ -186,6 +186,7 @@
 LOC_ARG_WITH(blas, BLAS, no)
 LOC_ARG_WITH(lapack, LAPACK, no)
 LOC_ARG_WITH(motif, Motif, no)
+LOC_ARG_WITH(cairo, Cairo, no)
 LOC_ARG_WITH(freetype, FreeType, no)
 LOC_ARG_WITH(glw, GLw, no)
 LOC_ARG_WITH(nls, NLS, no)
@@ -254,6 +255,9 @@
 LOC_ARG_WITH_INC(motif, Motif)
 LOC_ARG_WITH_LIB(motif, Motif)
 
+LOC_ARG_WITH_INC(cairo, Cairo) 
+LOC_ARG_WITH_LIB(cairo, Cairo)
+
 LOC_ARG_WITH_INC(freetype, FreeType)
 LOC_ARG_WITH_LIB(freetype, FreeType)
 
@@ -1000,6 +1004,7 @@
 
 LOC_CHECK_INCLUDES(avcodec.h,FFMPEG,$FFMPEGINCPATH)
 LOC_CHECK_INCLUDES(avformat.h,FFMPEG,$FFMPEGINCPATH)
+LOC_CHECK_INCLUDES(swscale.h,FFMPEG,$FFMPEGINCPATH)
 
 AC_DEFINE(HAVE_FFMPEG)
 
@@ -1419,6 +1424,35 @@
 
 # Done checking Motif
 
+# Enable Cairo display driver option
+
+LOC_CHECK_USE(cairo,Cairo,USE_CAIRO)
+
+CAIROINC=
+CAIROLIB=
+
+if test -n "$USE_CAIRO"; then
+
+# With Cairo includes directory
+
+LOC_CHECK_INC_PATH(cairo,Cairo,CAIROINC)
+
+LOC_CHECK_INCLUDES(cairo/cairo.h,Cairo,$CAIROINC)
+
+# With Cairo library directory
+
+LOC_CHECK_LIB_PATH(cairo,Cairo,CAIROLIB)
+
+LOC_CHECK_LIBS(cairo,cairo_create,Cairo,$CAIROLIB,CAIROLIB,,,,)
+Xm,XmStringCreate,Motif,$XMLIB,XMLIB,$X_LIBS -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS,,)
+
+fi # $USE_CAIRO
+
+AC_SUBST(CAIROINC)
+AC_SUBST(CAIROLIB)
+
+# Done checking Cairo
+
 # Enable GLw option
 
 LOC_CHECK_USE(glw,GLw,USE_GLW)