summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-09-14 16:47:54 +0000
committerHezekiah M. Carty <hcarty@atmos.umd.edu>2009-06-18 13:59:31 -0400
commita18e49881534d107bd012aea54448e871006657a (patch)
tree50c156f3b478e35167d3b47aca7b10cee966fcdd
parent62b8f56570d9d511439e95c650f8be297923d8cb (diff)
Add check from freetype2
* configure.ac: Add freetype2 to PKG_CHECK_MODULES call in addition to cairo. * src/Makefile: Remove .depend as part of make clean.
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac2
-rw-r--r--src/Makefile2
3 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1155c0f..d62cbb6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-14 Carl Worth <cworth@cworth.org>
+
+ * configure.ac: Add freetype2 to PKG_CHECK_MODULES call in
+ addition to cairo.
+
+ * src/Makefile: Remove .depend as part of make clean.
+
2005-08-11 Olivier Andrieu <oliv__a@users.sourceforge.net>
* src/* : adapt to cairo-0.9.0
diff --git a/configure.ac b/configure.ac
index 69dc4f7..b195571 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CONFIG_AUX_DIR(support)
AC_PROG_OCAML()
# Check for cairo
-PKG_CHECK_MODULES(CAIRO, cairo >= 0.6.0)
+PKG_CHECK_MODULES(CAIRO, cairo >= 0.6.0 freetype2)
# Optional GTK support (for the X11 backend)
AC_ARG_WITH(gtk,
diff --git a/src/Makefile b/src/Makefile
index edc5317..45b661e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -108,7 +108,7 @@ doc: $(DOCFILES:%.mli=%.cmi)
ocamldoc -v -html -d ../doc/html -t Cairo-ocaml $(if $(LABLGTKDIR),-I $(LABLGTKDIR)) $(DOCFILES)
clean :
- rm -f *.cm* *.o *.a *.so
+ rm -f *.cm* *.o *.a *.so .depend
.depend : $(wildcard *.ml *.mli)
@echo "making deps"