[cairo-commit] configure.in src/check-def.sh

[Behdad Esfahbod]

 configure.in     |    8 ++++++--
 src/check-def.sh |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
diff-tree 7c3062240ac036c8091ee9f0acce0aa3ea9df8ea (from 191e108b93ef6d39832e78323a18cc4c795c7ca3)
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Tue Sep 26 13:54:03 2006 -0400

    [configure] Print out whether SVG and PDF surfaces can be tested

diff --git a/configure.in b/configure.in
index edffd4f..6cc91bf 100644
--- a/configure.in
+++ b/configure.in
@@ -508,7 +508,8 @@ CAIRO_BACKEND_ENABLE(pdf, PDF, pdf, PDF_
 POPPLER_VERSION_REQUIRED=0.4.1
 test_pdf=no
 if test "x$use_pdf" = "xyes"; then
-  PKG_CHECK_MODULES(POPPLER, poppler-glib >= $POPPLER_VERSION_REQUIRED pango gtk+-2.0, [test_pdf=yes], [test_pdf=no])
+  poppler_DEPENDENCY="poppler-glib >= $POPPLER_VERSION_REQUIRED"
+  PKG_CHECK_MODULES(POPPLER, $poppler_DEPENDENCY pango gtk+-2.0, [test_pdf=yes], [test_pdf="no (requires $poppler_DEPENDENCY)"])
   if test "x$test_pdf" = "xyes"; then
     AC_DEFINE([CAIRO_CAN_TEST_PDF_SURFACE], 1, [Define to 1 if the PDF backend can be tested (need poppler and other dependencies for pdf2png)])
   else
@@ -532,7 +533,8 @@ CAIRO_BACKEND_ENABLE(svg, SVG, svg, SVG_
 
 LIBRSVG_VERSION_REQUIRED=2.14.0
 if test "x$use_svg" = "xyes"; then
-  PKG_CHECK_MODULES(LIBRSVG, librsvg-2.0 >= $LIBRSVG_VERSION_REQUIRED gdk-2.0, [test_svg=yes], [test_svg=no])
+  librsvg_DEPENDENCY="librsvg-2.0 >= $LIBRSVG_VERSION_REQUIRED"
+  PKG_CHECK_MODULES(LIBRSVG, $librsvg_DEPENDENCY gdk-2.0, [test_svg=yes], [test_svg="no (requires $librsvg_DEPENDENCY)"])
   if test "x$test_svg" = "xyes"; then
     AC_DEFINE([CAIRO_CAN_TEST_SVG_SURFACE], 1, [Define to 1 if the SVG backend can be tested])
   else
@@ -858,6 +860,8 @@ echo ""
 echo "and the following debug options:"
 echo "  gcov support:  $use_gcov"
 echo "  test surfaces: $use_test_surfaces"
+echo "  pdf testing:   $test_pdf"
+echo "  svg testing:   $test_svg"
 echo ""
 echo "using CFLAGS:"
 echo $CAIRO_CFLAGS
diff --git a/src/check-def.sh b/src/check-def.sh
index 3545851..aae3fc6 100755
--- a/src/check-def.sh
+++ b/src/check-def.sh
@@ -22,7 +22,7 @@ for def in $defs; do
 
 	{
 		echo EXPORTS
-		nm $so | grep ' T ' | cut -d' ' -f3 | grep -v '^_cairo.*_test_\|^_fini\|^_init' | sort -u
+		nm $so | grep ' T ' | cut -d' ' -f3 | grep -v '^_cairo_.*_test_\|^_fini\|^_init' | sort -u
 		# cheat: copy the last line from the def file!
 		tail -n1 $def
 	} | diff $def - || status=1