From 53301e1bbac40b0801394ef935c61c024ac13d8d Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Fri, 15 Jun 2007 23:15:34 +0000 Subject: [PATCH] 2007-06-16 Matthew Allum * clutter/clutter-actor.c: Fix typo in x rotation transform (Thanks to Johan Billen #138) * configure.ac: * doc/manual/Makefile.am: Fix manual build and required program check. * tests/Makefile.am: Another typo fix. --- ChangeLog | 12 ++++++++++++ clutter/clutter-actor.c | 2 +- configure.ac | 13 +++++++++---- doc/manual/Makefile.am | 6 +++--- tests/Makefile.am | 2 +- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index dcd98694b..3c20dbe91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2007-06-16 Matthew Allum + + * clutter/clutter-actor.c: + Fix typo in x rotation transform (Thanks to Johan Billen #138) + + * configure.ac: + * doc/manual/Makefile.am: + Fix manual build and required program check. + + * tests/Makefile.am: + Another typo fix. + 2007-06-15 Tomas Frydrych * clutter/clutter-actor.c: diff --git a/clutter/clutter-actor.c b/clutter/clutter-actor.c index b668823d6..e6bbbbfa9 100644 --- a/clutter/clutter-actor.c +++ b/clutter/clutter-actor.c @@ -595,7 +595,7 @@ _clutter_actor_apply_modelview_transform (ClutterActor * self) if (priv->rxang) { cogl_translate (0, priv->rxy, priv->z + priv->rxz); - cogl_rotatex (priv->rxang, CFX_ONE, 0, CFX_ONE); + cogl_rotatex (priv->rxang, CFX_ONE, 0, 0); cogl_translate (0, -priv->rxy, -(priv->z - priv->rxz)); } diff --git a/configure.ac b/configure.ac index 35d88ffda..512be5aaa 100644 --- a/configure.ac +++ b/configure.ac @@ -263,10 +263,15 @@ AC_ARG_ENABLE(manual, enable_manual=$enableval, enable_manual=no) if "x$enable_manual" = "xyes"; then - AC_PATH_PROG(JW, jw) - AC_PATH_PROG(XMLTO, xmlto) - AC_SUBST(JW) - AC_SUBST(XMLTO) + AC_PATH_PROG(HAVE_JW, jw, no) + if test "x$HAVE_JW" = "xno"; then + AC_MSG_ERROR(['jw' program not found in path - required for building manual.]) + fi + + AC_PATH_PROG(HAVE_XMLTO, xmlto, no) + if test "x$HAVE_XMLTO" = "xno"; then + AC_MSG_ERROR(['xmlto' program not found in path - required for building manual.]) + fi fi AM_CONDITIONAL(ENABLE_MANUAL, test x$enable_manual != xno) diff --git a/doc/manual/Makefile.am b/doc/manual/Makefile.am index 06a40c92a..409fcda26 100644 --- a/doc/manual/Makefile.am +++ b/doc/manual/Makefile.am @@ -5,19 +5,19 @@ EXTRA_DIST = clutter-manual.xml.in manual.xsl style.css $(srcdir)/$(IMAGE_FILES CLEANFILES = pdf-build.stamp txt-build.stamp htmldoc-build.stamp clutter-manual.xml pdf-build.stamp: clutter-manual.xml - SP_ENCODING=XML SP_CHARSET_FIXED=YES $(JW) \ + SP_ENCODING=XML SP_CHARSET_FIXED=YES jw \ -b pdf $(srcdir)/clutter-manual.xml && \ mv $(srcdir)/clutter-manual.pdf clutter-manual-@CLUTTER_MAJORMINOR@.pdf && \ touch pdf-build.stamp txt-build.stamp: clutter-manual.xml - $(XMLTO) txt $(srcdir)/clutter-manual.xml && \ + xmlto txt $(srcdir)/clutter-manual.xml && \ mv $(srcdir)/clutter-manual.txt clutter-manual-@CLUTTER_MAJORMINOR@.txt && \ touch txt-build.stamp htmldoc-build.stamp: clutter-manual.xml $(mkinstalldirs) html && \ - $(XMLTO) -m manual.xsl -o html/ xhtml $(srcdir)/clutter-manual.xml && \ + xmlto -m manual.xsl -o html/ xhtml $(srcdir)/clutter-manual.xml && \ cp $(srcdir)/style.css html/ && \ touch htmldoc-build.stamp diff --git a/tests/Makefile.am b/tests/Makefile.am index 18ed66974..a7428d654 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -11,7 +11,7 @@ test_textures_SOURCES = test-textures.c test_events_SOURCES = test-events.c test_offscreen_SOURCES = test-offscreen.c test_scale_SOURCES = test-scale.c -test_actor_SOURCES = test-actors.c +test_actors_SOURCES = test-actors.c test_behave_SOURCES = test-behave.c test_text_SOURCES = test-text.c test_entry_SOURCES = test-entry.c