[cairo-commit] cairo-java ChangeLog, 1.26, 1.27 Makefile.am, 1.3, 1.4 configure.ac, 1.4, 1.5

[Jeffrey Morgan]

Committed by: kuzman

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

Modified Files:
	ChangeLog Makefile.am configure.ac 
Log Message:
setting glib cflags and classpath for javadoc

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo-java/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- ChangeLog	24 Mar 2005 18:11:40 -0000	1.26
+++ ChangeLog	25 Mar 2005 16:18:03 -0000	1.27
@@ -1,3 +1,9 @@
+2005-03-25  Jeffrey Morgan  <kuzman at gmail.com>
+
+	* configure.ac: added check for glib and set cflags
+	* Makefile.am:  seting glib cflags in compilation and set
+	classpath for javadocs
+
 2005-03-24  Jeffrey Morgan  <kuzman at gmail.com>
 
 	* Makefile.am:

Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-java/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	24 Mar 2005 18:11:40 -0000	1.3
+++ Makefile.am	25 Mar 2005 16:18:03 -0000	1.4
@@ -66,7 +66,7 @@
 endif
 
 libcairojni_la_SOURCES = $(jni_cairo_source_files)
-libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir)
+libcairojni_la_CFLAGS = $(CAIRO_CFLAGS) $(FONTCONFIG_CFLAGS) $(GLIB_CFLAGS) $(JGJAVA_CFLAGS) -I$(includedir)
 libcairojni_la_LDFLAGS = $(CAIRO_LIBS) $(FONTCONFIG_LIBS) $(JGJNI_LIBS) -release $(apiversion)
 
 # automake should support generating versioned jars
@@ -110,6 +110,8 @@
 		-windowtitle "Cairo-Java $(VERSION) API Reference" \
 		-doctitle "Cairo-Java $(VERSION) API Reference" \
 		-footer "$(JAVADOC_FOOTER)" \
+		-public \
+		-classpath $(JGJAR):$(srcdir)/src/java:src/java \
 		org.freedesktop.cairo
 	touch doc-stamp
 endif

Index: configure.ac
===================================================================
RCS file: /cvs/cairo/cairo-java/configure.ac,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.ac	24 Mar 2005 18:11:40 -0000	1.4
+++ configure.ac	25 Mar 2005 16:18:03 -0000	1.5
@@ -54,6 +54,10 @@
 AC_SUBST(FONTCONFIG_CFLAGS)
 AC_SUBST(FONTCONFIG_LIBS)
 
+PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.6.0)
+AC_SUBST(GLIB_CFLAGS)
+AC_SUBST(GLIB_LIBS)
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([cairo-java.pc])
 AC_CONFIG_FILES([src/java/org/freedesktop/cairo/Config.java])