[cairo-commit] cairo-java ChangeLog, 1.83, 1.84 Makefile.am, 1.23, 1.24

[Andrew Frederick Cowie]

Committed by: afcowie

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

Modified Files:
	ChangeLog Makefile.am 
Log Message:
Add JNI_INCLUDES to CFLAGS so that cairo-java can build on machines
that don't have GCJ installed. This is a fix that was done to the
others java-gnome libraries but evidently missed when cairo-java was
orginally cloned. Patch from Saleem Abdulrasool <compnerd at gentoo.org>


Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- ChangeLog	28 Oct 2005 23:04:46 -0000	1.83
+++ ChangeLog	28 Nov 2005 17:56:00 -0000	1.84
@@ -1,3 +1,11 @@
+2005-11-28  Andrew Cowie  <andrew at operationaldynamics.com>
+
+	* Makefile.am:
+	Add JNI_INCLUDES to CFLAGS so that cairo-java can build on machines
+	that don't have GCJ installed. This is a fix that was done to the
+	others java-gnome libraries but evidently missed when cairo-java was
+	orginally cloned. Patch from Saleem Abdulrasool <compnerd at gentoo.org>
+
 2005-10-28  Jeffrey Morgan  <kuzman at gmail.com>
 
 	* src/java/org/freedesktop/cairo/Extend.java: (Extend): added

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- Makefile.am	11 Oct 2005 14:30:23 -0000	1.23
+++ Makefile.am	28 Nov 2005 17:56:02 -0000	1.24
@@ -74,11 +74,11 @@
 libcairojava_la_SOURCES = $(java_cairo_source_files)
 libcairojava_la_GCJFLAGS = -fjni -I$(srcdir)/src/java -Isrc/java --classpath=$(JGJAR):$(srcdir)/src/java
 libcairojava_la_LDFLAGS = $(JGJAVA_LIBS) -release $(apiversion)
-endif
-
+else
 libcairojni_la_SOURCES = $(jni_cairo_source_files)
-libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir)
+libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir) $(JNI_INCLUDES)
 libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
+endif
 
 # automake should support generating versioned jars
 cairo_jardir = $(jardir)