[GRASS-SVN] r47581 - in grass/branches/develbranch_6: .
lib/cairodriver
svn_grass at osgeo.org
svn_grass at osgeo.org
Thu Aug 11 18:01:53 EDT 2011
Author: neteler
Date: 2011-08-11 15:01:53 -0700 (Thu, 11 Aug 2011)
New Revision: 47581
Modified:
grass/branches/develbranch_6/configure
grass/branches/develbranch_6/configure.in
grass/branches/develbranch_6/lib/cairodriver/Graph.c
Log:
backport of r47311
Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure 2011-08-11 22:01:16 UTC (rev 47580)
+++ grass/branches/develbranch_6/configure 2011-08-11 22:01:53 UTC (rev 47581)
@@ -14465,10 +14465,16 @@
if test -n "$USE_CAIRO"; then
-cairo="cairo cairo-ft"
+cairo="cairo"
+pkgs="cairo-ft cairo-fc"
if test -n "$USE_X11"; then
- cairo="$cairo cairo-xlib-xrender"
+ pkgs="$pkgs cairo-xlib-xrender"
fi
+for pkg in $pkgs ; do
+ if pkg-config --exists $pkg ; then
+ cairo="$cairo $pkg"
+ fi
+done
# With Cairo includes directory
#FIXME: somehow quote dirs with spaces in $cairo ?
@@ -14476,7 +14482,7 @@
echo $ac_n "checking for location of cairo includes""... $ac_c" 1>&6
-echo "configure:14480: checking for location of cairo includes" >&5
+echo "configure:14486: checking for location of cairo includes" >&5
case "$with_cairo_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-includes." 1>&2; exit 1; }
@@ -14502,15 +14508,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14506: checking for $ac_hdr" >&5
+echo "configure:14512: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14509 "configure"
+#line 14515 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14520: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14546,7 +14552,7 @@
echo $ac_n "checking for location of cairo library""... $ac_c" 1>&6
-echo "configure:14550: checking for location of cairo library" >&5
+echo "configure:14556: checking for location of cairo library" >&5
case "$with_cairo_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-libs." 1>&2; exit 1; }
@@ -14566,7 +14572,7 @@
echo $ac_n "checking for cairo linking flags""... $ac_c" 1>&6
-echo "configure:14570: checking for cairo linking flags" >&5
+echo "configure:14576: checking for cairo linking flags" >&5
case "$with_cairo_ldflags" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-cairo-ldflags." 1>&2; exit 1; }
@@ -14582,10 +14588,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
-echo "configure:14586: checking for cairo_create" >&5
+echo "configure:14592: checking for cairo_create" >&5
cat > conftest.$ac_ext <<EOF
-#line 14589 "configure"
+#line 14595 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_create(); below. */
@@ -14608,7 +14614,7 @@
; return 0; }
EOF
-if { (eval echo configure:14612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_create=yes"
else
@@ -14642,10 +14648,10 @@
LIBS=" $CAIROLIB $LIBS"
LDFLAGS=" $LDFLAGS"
echo $ac_n "checking for cairo_xlib_surface_create_with_xrender_format""... $ac_c" 1>&6
-echo "configure:14646: checking for cairo_xlib_surface_create_with_xrender_format" >&5
+echo "configure:14652: checking for cairo_xlib_surface_create_with_xrender_format" >&5
cat > conftest.$ac_ext <<EOF
-#line 14649 "configure"
+#line 14655 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char cairo_xlib_surface_create_with_xrender_format(); below. */
@@ -14668,7 +14674,7 @@
; return 0; }
EOF
-if { (eval echo configure:14672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_cairo_xlib_surface_create_with_xrender_format=yes"
else
@@ -14696,6 +14702,65 @@
+ac_save_libs="$LIBS"
+ac_save_ldflags="$LDFLAGS"
+LIBS=" $CAIROLIB $LIBS"
+LDFLAGS=" $LDFLAGS"
+echo $ac_n "checking for cairo_xlib_surface_get_xrender_format""... $ac_c" 1>&6
+echo "configure:14711: checking for cairo_xlib_surface_get_xrender_format" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 14714 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char cairo_xlib_surface_get_xrender_format(); below. */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char cairo_xlib_surface_get_xrender_format();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_cairo_xlib_surface_get_xrender_format) || defined (__stub___cairo_xlib_surface_get_xrender_format)
+choke me
+#else
+cairo_xlib_surface_get_xrender_format();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:14737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_cairo_xlib_surface_get_xrender_format=yes"
+else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -rf conftest*
+ eval "ac_cv_func_cairo_xlib_surface_get_xrender_format=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'cairo_xlib_surface_get_xrender_format`\" = yes"; then
+ echo "$ac_t""yes" 1>&6
+
+CAIRO_HAS_XRENDER_SURFACE=1
+
+else
+ echo "$ac_t""no" 1>&6
+
+CAIRO_HAS_XRENDER_SURFACE=
+
+fi
+
+LIBS=${ac_save_libs}
+LDFLAGS=${ac_save_ldflags}
+
+
+
CAIROLIB="$CAIROLIB $CAIROLDFLAGS"
fi # $USE_CAIRO
@@ -14710,7 +14775,7 @@
echo $ac_n "checking whether to use GLw""... $ac_c" 1>&6
-echo "configure:14714: checking whether to use GLw" >&5
+echo "configure:14779: checking whether to use GLw" >&5
echo "$ac_t"""$with_glw"" 1>&6
case "$with_glw" in
"no") USE_GLW= ;;
@@ -14729,7 +14794,7 @@
echo $ac_n "checking for location of GLw includes""... $ac_c" 1>&6
-echo "configure:14733: checking for location of GLw includes" >&5
+echo "configure:14798: checking for location of GLw includes" >&5
case "$with_glw_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-glw-includes." 1>&2; exit 1; }
@@ -14755,15 +14820,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14759: checking for $ac_hdr" >&5
+echo "configure:14824: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14762 "configure"
+#line 14827 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14791,15 +14856,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:14795: checking for $ac_hdr" >&5
+echo "configure:14860: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 14798 "configure"
+#line 14863 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -14839,7 +14904,7 @@
echo $ac_n "checking for location of GLw library""... $ac_c" 1>&6
-echo "configure:14843: checking for location of GLw library" >&5
+echo "configure:14908: checking for location of GLw library" >&5
case "$with_glw_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-glw-libs." 1>&2; exit 1; }
@@ -14864,13 +14929,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14868: checking for GLwCreateMDrawingArea in -lGLw" >&5
+echo "configure:14933: checking for GLwCreateMDrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14874 "configure"
+#line 14939 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14881,7 +14946,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14906,13 +14971,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14910: checking for GLwCreateM1DrawingArea in -lGLw" >&5
+echo "configure:14975: checking for GLwCreateM1DrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14916 "configure"
+#line 14981 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14923,7 +14988,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14948,13 +15013,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLw""... $ac_c" 1>&6
-echo "configure:14952: checking for GLwCreateM2DrawingArea in -lGLw" >&5
+echo "configure:15017: checking for GLwCreateM2DrawingArea in -lGLw" >&5
ac_lib_var=`echo GLw'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 14958 "configure"
+#line 15023 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -14965,7 +15030,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:14969: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -14990,13 +15055,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:14994: checking for GLwCreateMDrawingArea in -lGLwM" >&5
+echo "configure:15059: checking for GLwCreateMDrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15000 "configure"
+#line 15065 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15007,7 +15072,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15032,13 +15097,13 @@
echo $ac_n "checking for GLwCreateM1DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:15036: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
+echo "configure:15101: checking for GLwCreateM1DrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateM1DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15042 "configure"
+#line 15107 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15049,7 +15114,7 @@
GLwCreateM1DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15074,13 +15139,13 @@
echo $ac_n "checking for GLwCreateM2DrawingArea in -lGLwM""... $ac_c" 1>&6
-echo "configure:15078: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
+echo "configure:15143: checking for GLwCreateM2DrawingArea in -lGLwM" >&5
ac_lib_var=`echo GLwM'_'GLwCreateM2DrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15084 "configure"
+#line 15149 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15091,7 +15156,7 @@
GLwCreateM2DrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15118,13 +15183,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:15122: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:15187: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15128 "configure"
+#line 15193 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15135,7 +15200,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15154,13 +15219,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLw""... $ac_c" 1>&6
-echo "configure:15158: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
+echo "configure:15223: checking for GLwCreateMDrawingArea in -lMesaGLw" >&5
ac_lib_var=`echo MesaGLw'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLw $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15164 "configure"
+#line 15229 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15171,7 +15236,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15198,13 +15263,13 @@
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:15202: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:15267: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15208 "configure"
+#line 15273 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15215,7 +15280,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15234,13 +15299,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for GLwCreateMDrawingArea in -lMesaGLwM""... $ac_c" 1>&6
-echo "configure:15238: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
+echo "configure:15303: checking for GLwCreateMDrawingArea in -lMesaGLwM" >&5
ac_lib_var=`echo MesaGLwM'_'GLwCreateMDrawingArea | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lMesaGLwM $X_LIBS $OPENGLLIB -lXm -lXt $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $MATHLIB $OPENGLULIB $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15244 "configure"
+#line 15309 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15251,7 +15316,7 @@
GLwCreateMDrawingArea()
; return 0; }
EOF
-if { (eval echo configure:15255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15364,7 +15429,7 @@
echo $ac_n "checking whether to use FreeType""... $ac_c" 1>&6
-echo "configure:15368: checking whether to use FreeType" >&5
+echo "configure:15433: checking whether to use FreeType" >&5
echo "$ac_t"""$with_freetype"" 1>&6
case "$with_freetype" in
"no") USE_FREETYPE= ;;
@@ -15383,7 +15448,7 @@
echo $ac_n "checking for location of FreeType includes""... $ac_c" 1>&6
-echo "configure:15387: checking for location of FreeType includes" >&5
+echo "configure:15452: checking for location of FreeType includes" >&5
case "$with_freetype_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-freetype-includes." 1>&2; exit 1; }
@@ -15409,15 +15474,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15413: checking for $ac_hdr" >&5
+echo "configure:15478: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15416 "configure"
+#line 15481 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15421: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -15451,7 +15516,7 @@
echo $ac_n "checking for location of FreeType library""... $ac_c" 1>&6
-echo "configure:15455: checking for location of FreeType library" >&5
+echo "configure:15520: checking for location of FreeType library" >&5
case "$with_freetype_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-freetype-libs." 1>&2; exit 1; }
@@ -15476,13 +15541,13 @@
echo $ac_n "checking for FT_Init_FreeType in -lfreetype""... $ac_c" 1>&6
-echo "configure:15480: checking for FT_Init_FreeType in -lfreetype" >&5
+echo "configure:15545: checking for FT_Init_FreeType in -lfreetype" >&5
ac_lib_var=`echo freetype'_'FT_Init_FreeType | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lfreetype $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15486 "configure"
+#line 15551 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15493,7 +15558,7 @@
FT_Init_FreeType()
; return 0; }
EOF
-if { (eval echo configure:15497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15534,7 +15599,7 @@
echo $ac_n "checking whether to use NLS""... $ac_c" 1>&6
-echo "configure:15538: checking whether to use NLS" >&5
+echo "configure:15603: checking whether to use NLS" >&5
echo "$ac_t"""$with_nls"" 1>&6
case "$with_nls" in
"no") USE_NLS= ;;
@@ -15554,10 +15619,10 @@
echo $ac_n "checking for gettext""... $ac_c" 1>&6
-echo "configure:15558: checking for gettext" >&5
+echo "configure:15623: checking for gettext" >&5
cat > conftest.$ac_ext <<EOF
-#line 15561 "configure"
+#line 15626 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char gettext(); below. */
@@ -15580,7 +15645,7 @@
; return 0; }
EOF
-if { (eval echo configure:15584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_func_gettext=yes"
else
@@ -15598,13 +15663,13 @@
echo "$ac_t""no" 1>&6
echo $ac_n "checking for gettext in -lintl""... $ac_c" 1>&6
-echo "configure:15602: checking for gettext in -lintl" >&5
+echo "configure:15667: checking for gettext in -lintl" >&5
ac_lib_var=`echo intl'_'gettext | sed 'y%./+-%__p_%'`
ac_save_LIBS="$LIBS"
LIBS="-lintl $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 15608 "configure"
+#line 15673 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
@@ -15615,7 +15680,7 @@
gettext()
; return 0; }
EOF
-if { (eval echo configure:15619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -15650,7 +15715,7 @@
echo $ac_n "checking whether to use C++""... $ac_c" 1>&6
-echo "configure:15654: checking whether to use C++" >&5
+echo "configure:15719: checking whether to use C++" >&5
echo "$ac_t"""$with_cxx"" 1>&6
case "$with_cxx" in
"no") USE_CXX= ;;
@@ -15666,7 +15731,7 @@
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:15670: checking for $ac_word" >&5
+echo "configure:15735: checking for $ac_word" >&5
if test -n "$CXX"; then
ac_cv_prog_CXX="$CXX" # Let the user override the test.
@@ -15695,7 +15760,7 @@
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:15699: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:15764: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
ac_ext=C
# CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -15706,12 +15771,12 @@
cat > conftest.$ac_ext << EOF
-#line 15710 "configure"
+#line 15775 "configure"
#include "confdefs.h"
int main(){return(0);}
EOF
-if { (eval echo configure:15715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
ac_cv_prog_cxx_works=yes
# If we can't run a trivial program, we are probably using a cross compiler.
if (./conftest; exit) 2>/dev/null; then
@@ -15737,19 +15802,19 @@
{ echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
fi
echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:15741: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:15806: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
cross_compiling=$ac_cv_prog_cxx_cross
echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:15746: checking whether we are using GNU C++" >&5
+echo "configure:15811: checking whether we are using GNU C++" >&5
cat > conftest.C <<EOF
#ifdef __GNUC__
yes;
#endif
EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:15753: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:15818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gxx=yes
else
ac_cv_prog_gxx=no
@@ -15767,7 +15832,7 @@
ac_save_CXXFLAGS="$CXXFLAGS"
CXXFLAGS=
echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:15771: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:15836: checking whether ${CXX-g++} accepts -g" >&5
echo 'void f(){}' > conftest.cc
if test -z "`${CXX-g++} -g -c conftest.cc 2>&1`"; then
@@ -15808,7 +15873,7 @@
echo $ac_n "checking whether to use openDWG""... $ac_c" 1>&6
-echo "configure:15812: checking whether to use openDWG" >&5
+echo "configure:15877: checking whether to use openDWG" >&5
echo "$ac_t"""$with_opendwg"" 1>&6
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
@@ -15828,7 +15893,7 @@
echo $ac_n "checking for location of openDGW includes""... $ac_c" 1>&6
-echo "configure:15832: checking for location of openDGW includes" >&5
+echo "configure:15897: checking for location of openDGW includes" >&5
case "$with_opendwg_includes" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opendwg-includes." 1>&2; exit 1; }
@@ -15854,15 +15919,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:15858: checking for $ac_hdr" >&5
+echo "configure:15923: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 15861 "configure"
+#line 15926 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:15866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:15931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -15896,7 +15961,7 @@
echo $ac_n "checking for location of openDWG library""... $ac_c" 1>&6
-echo "configure:15900: checking for location of openDWG library" >&5
+echo "configure:15965: checking for location of openDWG library" >&5
case "$with_opendwg_libs" in
y | ye | yes | n | no)
{ echo "configure: error: *** You must supply a directory to --with-opendwg-libs." 1>&2; exit 1; }
@@ -15943,7 +16008,7 @@
if test "$enable_largefile" = yes; then
echo $ac_n "checking for special C compiler options needed for large files""... $ac_c" 1>&6
-echo "configure:15947: checking for special C compiler options needed for large files" >&5
+echo "configure:16012: checking for special C compiler options needed for large files" >&5
ac_cv_sys_largefile_CC=no
largefile_cc_opt=""
@@ -15951,7 +16016,7 @@
# IRIX 6.2 and later do not support large files by default,
# so use the C compiler's -n32 option if that helps.
cat > conftest.$ac_ext <<EOF
-#line 15955 "configure"
+#line 16020 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15967,7 +16032,7 @@
; return 0; }
EOF
-if { (eval echo configure:15971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
@@ -15976,7 +16041,7 @@
ac_save_CC="${CC-cc}"
CC="$CC -n32"
cat > conftest.$ac_ext <<EOF
-#line 15980 "configure"
+#line 16045 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -15992,7 +16057,7 @@
; return 0; }
EOF
-if { (eval echo configure:15996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_CC=' -n32'
else
@@ -16012,11 +16077,11 @@
fi
echo $ac_n "checking for _FILE_OFFSET_BITS value needed for large files""... $ac_c" 1>&6
-echo "configure:16016: checking for _FILE_OFFSET_BITS value needed for large files" >&5
+echo "configure:16081: checking for _FILE_OFFSET_BITS value needed for large files" >&5
ac_cv_sys_file_offset_bits=no
cat > conftest.$ac_ext <<EOF
-#line 16020 "configure"
+#line 16085 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -16032,14 +16097,14 @@
; return 0; }
EOF
-if { (eval echo configure:16036: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16043 "configure"
+#line 16108 "configure"
#include "confdefs.h"
#define _FILE_OFFSET_BITS 64
#include <sys/types.h>
@@ -16057,7 +16122,7 @@
; return 0; }
EOF
-if { (eval echo configure:16061: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_file_offset_bits=64
else
@@ -16076,11 +16141,11 @@
fi
echo $ac_n "checking for _LARGE_FILES value needed for large files""... $ac_c" 1>&6
-echo "configure:16080: checking for _LARGE_FILES value needed for large files" >&5
+echo "configure:16145: checking for _LARGE_FILES value needed for large files" >&5
ac_cv_sys_large_files=no
cat > conftest.$ac_ext <<EOF
-#line 16084 "configure"
+#line 16149 "configure"
#include "confdefs.h"
#include <sys/types.h>
/* Check that off_t can represent 2**63 - 1 correctly.
@@ -16096,14 +16161,14 @@
; return 0; }
EOF
-if { (eval echo configure:16100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16107 "configure"
+#line 16172 "configure"
#include "confdefs.h"
#define _LARGE_FILES 1
#include <sys/types.h>
@@ -16121,7 +16186,7 @@
; return 0; }
EOF
-if { (eval echo configure:16125: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_large_files=1
else
@@ -16140,25 +16205,25 @@
fi
echo $ac_n "checking for _LARGEFILE_SOURCE value needed for large files""... $ac_c" 1>&6
-echo "configure:16144: checking for _LARGEFILE_SOURCE value needed for large files" >&5
+echo "configure:16209: checking for _LARGEFILE_SOURCE value needed for large files" >&5
ac_cv_sys_largefile_source=no
cat > conftest.$ac_ext <<EOF
-#line 16148 "configure"
+#line 16213 "configure"
#include "confdefs.h"
#include <stdio.h>
int main() {
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:16155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16220: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
:
else
echo "configure: failed program was:" >&5
cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
-#line 16162 "configure"
+#line 16227 "configure"
#include "confdefs.h"
#define _LARGEFILE_SOURCE 1
#include <stdio.h>
@@ -16167,7 +16232,7 @@
return !fseeko;
; return 0; }
EOF
-if { (eval echo configure:16171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16236: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_sys_largefile_source=1
else
@@ -16188,10 +16253,10 @@
fi
echo $ac_n "checking if system supports Large Files at all""... $ac_c" 1>&6
-echo "configure:16192: checking if system supports Large Files at all" >&5
+echo "configure:16257: checking if system supports Large Files at all" >&5
cat > conftest.$ac_ext <<EOF
-#line 16195 "configure"
+#line 16260 "configure"
#include "confdefs.h"
#include <stdio.h>
#include <sys/types.h>
@@ -16223,7 +16288,7 @@
#endif
; return 0; }
EOF
-if { (eval echo configure:16227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:16292: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_largefiles=yes
else
@@ -16252,7 +16317,7 @@
# Python check
echo $ac_n "checking whether to use Python""... $ac_c" 1>&6
-echo "configure:16256: checking whether to use Python" >&5
+echo "configure:16321: checking whether to use Python" >&5
PYTHONINC=
PYTHONCFLAGS=
@@ -16272,7 +16337,7 @@
# Extract the first word of "python-config", so it can be a program name with args.
set dummy python-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16276: checking for $ac_word" >&5
+echo "configure:16341: checking for $ac_word" >&5
case "$PY_CONFIG" in
/*)
@@ -16314,15 +16379,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16318: checking for $ac_hdr" >&5
+echo "configure:16383: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16321 "configure"
+#line 16386 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16326: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -16392,7 +16457,7 @@
# Enable wxWidgets support (for wxGUI)
echo $ac_n "checking whether to use wxWidgets""... $ac_c" 1>&6
-echo "configure:16396: checking whether to use wxWidgets" >&5
+echo "configure:16461: checking whether to use wxWidgets" >&5
WXVERSION=
WXWIDGETSCXXFLAGS=
@@ -16413,7 +16478,7 @@
# Extract the first word of "wx-config", so it can be a program name with args.
set dummy wx-config; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:16417: checking for $ac_word" >&5
+echo "configure:16482: checking for $ac_word" >&5
case "$WX_CONFIG" in
/*)
@@ -16461,7 +16526,7 @@
REQWX="2.8.1"
echo $ac_n "checking wxWidgets version""... $ac_c" 1>&6
-echo "configure:16465: checking wxWidgets version" >&5
+echo "configure:16530: checking wxWidgets version" >&5
if WXVERSION=`"$WX_CONFIG" --version`; then
echo "$ac_t""$WXVERSION" 1>&6
else
@@ -16484,15 +16549,15 @@
do
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:16488: checking for $ac_hdr" >&5
+echo "configure:16553: checking for $ac_hdr" >&5
cat > conftest.$ac_ext <<EOF
-#line 16491 "configure"
+#line 16556 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:16496: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:16561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -16819,6 +16884,7 @@
s%@XMINC@%$XMINC%g
s%@XMLIB@%$XMLIB%g
s%@CAIRO_HAS_XRENDER@%$CAIRO_HAS_XRENDER%g
+s%@CAIRO_HAS_XRENDER_SURFACE@%$CAIRO_HAS_XRENDER_SURFACE%g
s%@CAIROINC@%$CAIROINC%g
s%@CAIROLIB@%$CAIROLIB%g
s%@USE_CAIRO@%$USE_CAIRO%g
Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in 2011-08-11 22:01:16 UTC (rev 47580)
+++ grass/branches/develbranch_6/configure.in 2011-08-11 22:01:53 UTC (rev 47581)
@@ -1638,10 +1638,16 @@
if test -n "$USE_CAIRO"; then
-cairo="cairo cairo-ft"
+cairo="cairo"
+pkgs="cairo-ft cairo-fc"
if test -n "$USE_X11"; then
- cairo="$cairo cairo-xlib-xrender"
+ pkgs="$pkgs cairo-xlib-xrender"
fi
+for pkg in $pkgs ; do
+ if pkg-config --exists $pkg ; then
+ cairo="$cairo $pkg"
+ fi
+done
# With Cairo includes directory
#FIXME: somehow quote dirs with spaces in $cairo ?
@@ -1662,6 +1668,9 @@
LOC_CHECK_FUNC(cairo_xlib_surface_create_with_xrender_format,,,,,$CAIROLIB,
[CAIRO_HAS_XRENDER=1],[CAIRO_HAS_XRENDER=0])
AC_SUBST(CAIRO_HAS_XRENDER)
+LOC_CHECK_FUNC(cairo_xlib_surface_get_xrender_format,,,,,$CAIROLIB,
+[CAIRO_HAS_XRENDER_SURFACE=1],[CAIRO_HAS_XRENDER_SURFACE=])
+AC_SUBST(CAIRO_HAS_XRENDER_SURFACE)
CAIROLIB="$CAIROLIB $CAIROLDFLAGS"
Modified: grass/branches/develbranch_6/lib/cairodriver/Graph.c
===================================================================
--- grass/branches/develbranch_6/lib/cairodriver/Graph.c 2011-08-11 22:01:16 UTC (rev 47580)
+++ grass/branches/develbranch_6/lib/cairodriver/Graph.c 2011-08-11 22:01:53 UTC (rev 47581)
@@ -1,9 +1,31 @@
+/*!
+ \file lib/cairodriver/Graph.c
+
+ \brief GRASS cairo display driver - driver settings
+
+ (C) 2007-2008, 2011 by Lars Ahlzen and the GRASS Development Team
+
+ This program is free software under the GNU General Public License
+ (>=v2). Read the file COPYING that comes with GRASS for details.
+
+ \author Lars Ahlzen <lars ahlzen.com> (original contibutor)
+ \author Glynn Clements
+*/
+
#include "cairodriver.h"
+
+#if CAIRO_HAS_PS_SURFACE
#include <cairo-ps.h>
+#endif
+#if CAIRO_HAS_PDF_SURFACE
#include <cairo-pdf.h>
+#endif
+#if CAIRO_HAS_SVG_SURFACE
#include <cairo-svg.h>
-#if defined(USE_X11) && CAIRO_HAS_XLIB_SURFACE
+#endif
+#if CAIRO_HAS_XLIB_XRENDER_SURFACE
#include <cairo-xlib.h>
+#include <cairo-xlib-xrender.h>
#endif
#include <unistd.h>
More information about the grass-commit
mailing list