+ Cairo branch merged after successful testing on Mac OS X 10.5.4, Linux Ubuntu 8.04,Windows XPSP2.

  This integration is minimum as discussed, in particular it does not feature any fltk cairo drawing substitution
  as in fltk2.
  Still it provides all the fundations to go further even in next 1.4 ... 
  By default *no* cairo features are implemented nor linked, it can only be activated by --enable-cairo
  whose default is false.
  Please visit the README.cairo for complete description.

+ fixed UTF8 compilation pb on linux ubuntu

+ minor comments fixes on the fly



git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6350 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

1 files changed, 20 insertions, 3 deletions

diff --git a/configure.in b/configure.in
index a73c40002..f842ad521 100644
--- a/configure.in
+++ b/configure.in
@@ -530,7 +530,7 @@ AC_ARG_ENABLE(localpng, [  --enable-localpng       use local PNG library, defaul
     [if test x$enable_localpng = xyes; then
 	ac_cv_lib_png_png_set_tRNS_to_alpha=no
     fi])
-
+ 
 AC_CHECK_LIB(png,png_set_tRNS_to_alpha, [
     PNGINC=""
     PNG=""
@@ -561,6 +561,17 @@ LIBS="$SAVELIBS"
 dnl See if we need a .exe extension on executables...
 AC_EXEEXT
 
+dnl Check for Cairo library unless disabled...
+AC_ARG_ENABLE(cairo,[  --enable-cairo          use Cairo graphics (default=no)])
+if test x$enable_cairo = xyes; then
+	  AC_DEFINE(HAVE_CAIRO)
+	  dnl FIXME This part should be fixed so configure do not depend on
+	  dnl we do not rely on pkg-config .
+          CXXFLAGS="`pkg-config --cflags cairo` $CXXFLAGS"
+          CAIROLIBS="-lcairo -lpixman-1" 
+	  LIBS="-lcairo -lpixman-1 $LIBS"
+fi
+
 dnl Check for pthreads for multi-threaded apps...
 have_pthread=no
 PTHREAD_FLAGS=""
@@ -703,12 +714,12 @@ case $uname in
 	    AC_MSG_WARN(Ignoring libraries \"$X_PRE_LIBS\" requested by configure.)
 	fi
 
-	LIBS="$LIBS -lXext -lX11 $X_EXTRA_LIBS"
+	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
 	CFLAGS="$CFLAGS $X_CFLAGS"
 	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
 	LDFLAGS="$X_LIBS $LDFLAGS"
 	DSOFLAGS="$X_LIBS $DSOFLAGS"
-
+	AC_DEFINE(USE_X11)
 	if test "x$x_includes" != x; then
 	    ac_cpp="$ac_cpp -I$x_includes"
 	fi
@@ -781,6 +792,8 @@ case $uname in
 	if test x$enable_xdbe != xno; then
 	    AC_CHECK_HEADER(X11/extensions/Xdbe.h, AC_DEFINE(HAVE_XDBE),,
 	        [#include <X11/Xlib.h>])
+	    AC_CHECK_LIB(Xext, XdbeQueryExtension, 
+		LIBS="-lXext $LIBS")
 	fi
 
 	dnl Check for overlay visuals...
@@ -1124,6 +1137,10 @@ if test x$ZLIB = x; then
 else
     echo "                 ZLIB=Builtin"
 fi
+if test x$enable_cairo = xyes; then
+    echo "                 CAIRO=System"
+fi
+
 
 if test x$enable_largefile != xno; then
     echo "    Large Files: YES"