[cairo-commit] cairo-java ChangeLog, 1.75, 1.76 Makefile.am, 1.19, 1.20 configure.ac, 1.10, 1.11

[Igor Foox]

Committed by: ifoox

Update of /cvs/cairo/cairo-java
In directory gabe:/tmp/cvs-serv2999

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
2005-09-16  Igor Foox  <ifoox at redhat.com>

        * configure.ac: Added --enalbe-pdf option to configure script, off by
        default.
        * Makefile.am: Added check for CAIRO_HAS_PDF_SURFACE, compiling
        pdf-related files based on the --enable-pdf option to configure.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- ChangeLog	16 Sep 2005 19:01:17 -0000	1.75
+++ ChangeLog	24 Sep 2005 13:41:57 -0000	1.76
@@ -1,7 +1,14 @@
 2005-09-16  Igor Foox  <ifoox at redhat.com>
 
-        * cairo-java.pc.in: Fix pkg-config dependency by adding Requires clause
-        for glib-java and cairo .
+	* configure.ac: Added --enalbe-pdf option to configure script, off by 
+	default.
+	* Makefile.am: Added check for CAIRO_HAS_PDF_SURFACE, compiling 
+	pdf-related files based on the --enable-pdf option to configure.
+
+2005-09-16  Igor Foox  <ifoox at redhat.com>
+
+	* cairo-java.pc.in: Fix pkg-config dependency by adding Requires clause
+	for glib-java and cairo .
 
 2005-09-13  Andrew Cowie  <andrew at operationaldynamics.com>
 

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- Makefile.am	17 Aug 2005 00:23:44 -0000	1.19
+++ Makefile.am	24 Sep 2005 13:41:57 -0000	1.20
@@ -1,3 +1,10 @@
+if CAIRO_HAS_PDF_SURFACE
+java_cairo_pdf_source_files = 	\
+	src/java/org/freedesktop/cairo/PDFSurface.java 
+jni_cairo_pdf_source_files = 	\
+	src/jni/org_freedesktop_cairo_PDFSurface.c 
+endif
+
 AUTOMAKE_OPTIONS = subdir-objects
 
 if BUILD_GCJ
@@ -32,7 +39,6 @@
 	src/java/org/freedesktop/cairo/Matrix.java \
 	src/java/org/freedesktop/cairo/Operator.java \
 	src/java/org/freedesktop/cairo/Pattern.java \
-	src/java/org/freedesktop/cairo/PDFSurface.java \
 	src/java/org/freedesktop/cairo/Point.java \
 	src/java/org/freedesktop/cairo/RadialGradient.java \
 	src/java/org/freedesktop/cairo/Rectangle.java \
@@ -41,7 +47,8 @@
 	src/java/org/freedesktop/cairo/SubpixelOrder.java \
 	src/java/org/freedesktop/cairo/Surface.java \
 	src/java/org/freedesktop/cairo/SurfacePattern.java \
-	src/java/org/freedesktop/cairo/TextExtents.java
+	src/java/org/freedesktop/cairo/TextExtents.java \
+	$(java_cairo_pdf_source_files)
 
 jni_cairo_source_files = \
 	src/jni/org_freedesktop_cairo_Context.c \
@@ -52,11 +59,11 @@
 	src/jni/org_freedesktop_cairo_ImageSurface.c \
 	src/jni/org_freedesktop_cairo_Matrix.c \
 	src/jni/org_freedesktop_cairo_Pattern.c \
-	src/jni/org_freedesktop_cairo_PDFSurface.c \
 	src/jni/org_freedesktop_cairo_ScaledFont.c \
 	src/jni/org_freedesktop_cairo_Status.c \
 	src/jni/org_freedesktop_cairo_Surface.c \
-	src/jni/org_freedesktop_cairo_TextExtents.c
+	src/jni/org_freedesktop_cairo_TextExtents.c \
+	$(jni_cairo_pdf_source_files)
 
 examples =
 

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-java/configure.ac,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- configure.ac	13 Sep 2005 03:14:10 -0000	1.10
+++ configure.ac	24 Sep 2005 13:41:57 -0000	1.11
@@ -49,6 +49,20 @@
 AC_SUBST(CAIRO_CFLAGS)
 AC_SUBST(CAIRO_LIBS)
 
+dnl Check for pdf support: Remove this when the cairo pdf-backend becoms 
+dnl non-experimental
+dnl ===========================================================================
+
+AC_ARG_ENABLE(pdf,
+  [  --enable-pdf            Enable wrappings for cairo's PDF backend],
+  [use_pdf=$enableval], [use_pdf=no])
+
+
+AM_CONDITIONAL(CAIRO_HAS_PDF_SURFACE, test "x$use_pdf" = "xyes")
+
+dnl ===========================================================================
+
+
 PKG_CHECK_MODULES(FONTCONFIG, fontconfig >= 2.3.1)
 AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)