gegl r2010 - in trunk: . docs docs/gallery operations/io
- From: kcozens svn gnome org
- To: svn-commits-list gnome org
- Subject: gegl r2010 - in trunk: . docs docs/gallery operations/io
- Date: Tue, 12 Feb 2008 19:14:18 +0000 (GMT)
Author: kcozens
Date: Tue Feb 12 19:14:18 2008
New Revision: 2010
URL: http://svn.gnome.org/viewvc/gegl?rev=2010&view=rev
Log:
* operations/io/Makefile.am: Echo ff-load.so when building the op.
* docs/gallery/Makefile.am: Use graphviz executable found when
configure was run.
* docs/Makefile.am: Use enscript executable found when configure was
run. Don't install files generated by enscript if enscript was not
found when configure was run. Install gegl-plugin.h.html if built.
* configure.ac: No need to AC_SUBST items set in AM_CONDITIONAL.
Fixed up detection of enscript and graphviz. Added asciidoc and
graphviz to summary of optional dependencies.
Modified:
trunk/ChangeLog
trunk/configure.ac
trunk/docs/Makefile.am
trunk/docs/gallery/Makefile.am
trunk/operations/io/Makefile.am
Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Feb 12 19:14:18 2008
@@ -91,7 +91,6 @@
[Define to 1 if this is an unstable version of GEGL])
fi
AM_CONDITIONAL(GEGL_UNSTABLE, test "x$GEGL_UNSTABLE" = "xyes")
-AC_SUBST(GEGL_UNSTABLE)
dnl libtool versioning
@@ -324,7 +323,6 @@
have_gtk="no (gtk+ not found)")
AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes")
-AC_SUBST(HAVE_GTK)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
@@ -372,7 +370,6 @@
have_lua="no (usable lua not found)")])])
AM_CONDITIONAL(HAVE_LUA, test "x$have_lua" = "xyes")
-AC_SUBST(HAVE_LUA)
AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LIBS)
@@ -394,7 +391,6 @@
fi
AM_CONDITIONAL(HAVE_RUBY, test "x$have_ruby" = "xyes")
-AC_SUBST(HAVE_RUBY)
AC_SUBST(RUBY_BIN)
@@ -407,7 +403,6 @@
have_cairo="no (usable cairo not found)")
AM_CONDITIONAL(HAVE_CAIRO, test "x$have_cairo" = "xyes")
-AC_SUBST(HAVE_CAIRO)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(CAIRO_LIBS)
@@ -426,8 +421,6 @@
have_pangocairo="no (usable pangocairo not found)")
AM_CONDITIONAL(HAVE_PANGOCAIRO, test "x$have_pangocairo" = "xyes")
-AC_SUBST(HAVE_PANGO)
-AC_SUBST(HAVE_PANGOCAIRO)
AC_SUBST(PANGO_CFLAGS)
AC_SUBST(PANGO_LIBS)
AC_SUBST(PANGOCAIRO_CFLAGS)
@@ -470,7 +463,6 @@
fi
AM_CONDITIONAL(HAVE_JPEG, test "x$jpeg_ok" = "xyes")
-AC_SUBST(HAVE_JPEG)
AC_SUBST(LIBJPEG)
@@ -483,7 +475,6 @@
have_libpng="no (usable libpng not found)")
AM_CONDITIONAL(HAVE_PNG, test "x$have_libpng" = "xyes")
-AC_SUBST(HAVE_PNG)
AC_SUBST(PNG_CFLAGS)
AC_SUBST(PNG_LIBS)
@@ -497,7 +488,6 @@
have_librsvg="no (usable librsvg not found)")
AM_CONDITIONAL(HAVE_RSVG, test "x$have_librsvg" = "xyes")
-AC_SUBST(HAVE_RSVG)
AC_SUBST(RSVG_CFLAGS)
AC_SUBST(RSVG_LIBS)
@@ -511,7 +501,6 @@
have_openexr="no (usable OpenEXR not found)")
AM_CONDITIONAL(HAVE_OPENEXR, test "x$have_openexr" = "xyes")
-AC_SUBST(HAVE_OPENEXR)
AC_SUBST(OPENEXR_CFLAGS)
AC_SUBST(OPENEXR_LIBS)
@@ -532,7 +521,6 @@
fi
AM_CONDITIONAL(HAVE_SDL, test "x$SDL_CONFIG" = "xyes")
-AC_SUBST(HAVE_SDL)
AC_SUBST(SDL_CFLAGS)
AC_SUBST(SDL_LIBS)
@@ -541,8 +529,8 @@
# Check for graphviz
####################
-AC_PATH_PROG(HAVE_GRAPHVIZ, dot, no)
-if test "$HAVE_GRAPHVIZ" = "no"; then
+AC_PATH_PROG(GRAPHVIZ, dot, no)
+if test "$GRAPHVIZ" = "no"; then
have_graphviz="no (graphviz not found)"
AC_MSG_RESULT([*** Check for dot command from graphviz failed.])
else
@@ -550,15 +538,13 @@
fi
AM_CONDITIONAL(HAVE_GRAPHVIZ, test "x$have_graphviz" = "xyes")
-AC_SUBST(HAVE_GRAPHVIZ)
-
####################
# Check for enscript
####################
-AC_PATH_PROG(HAVE_ENSCRIPT, enscript, no)
-if test "$HAVE_ENSCRIPT" = "no"; then
+AC_PATH_PROG(ENSCRIPT, enscript, no)
+if test "$ENSCRIPT" = "no"; then
have_enscript="no (enscript not found)"
AC_MSG_RESULT([*** Check for enscript command failed.])
else
@@ -566,8 +552,6 @@
fi
AM_CONDITIONAL(HAVE_ENSCRIPT, test "x$have_enscript" = "xyes")
-AC_SUBST(HAVE_ENSCRIPT)
-
####################
# Check for asciidoc
@@ -597,8 +581,6 @@
have_libavformat="no (usable libavformat not found)")
AM_CONDITIONAL(HAVE_AVFORMAT, test "x$have_libavformat" = "xyes")
-AC_SUBST(HAVE_AVCODEC)
-AC_SUBST(HAVE_AVFORMAT)
AC_SUBST(AVCODEC_CFLAGS)
AC_SUBST(AVCODEC_LIBS)
AC_SUBST(AVFORMAT_CFLAGS)
@@ -697,6 +679,8 @@
OpenEXR: $have_openexr
rsvg: $have_librsvg
SDL: $have_sdl
+ asciidoc: $have_asciidoc
+ enscript: $have_enscript
graphviz: $have_graphviz
avcodec: $have_libavcodec
avformat: $have_libavformat
Modified: trunk/docs/Makefile.am
==============================================================================
--- trunk/docs/Makefile.am (original)
+++ trunk/docs/Makefile.am Tue Feb 12 19:14:18 2008
@@ -49,22 +49,22 @@
gegl.h.html: $(top_srcdir)/gegl/gegl.h
if HAVE_ENSCRIPT
- enscript -E --color --language=html -p$@ $<
+ $(ENSCRIPT) -E --color --language=html -p$@ $<
endif
gegl-operation.h.html: $(top_srcdir)/gegl/operation/gegl-operation.h
if HAVE_ENSCRIPT
- enscript -E --color --language=html -p$@ $<
+ $(ENSCRIPT) -E --color --language=html -p$@ $<
endif
gegl-plugin.h.html: $(top_srcdir)/gegl/gegl-plugin.h
if HAVE_ENSCRIPT
- enscript -E --color --language=html -p$@ $<
+ $(ENSCRIPT) -E --color --language=html -p$@ $<
endif
brightness-contrast.c.html: $(top_srcdir)/operations/color/brightness-contrast.c
if HAVE_ENSCRIPT
- enscript -E --color --language=html -p$@ $<
+ $(ENSCRIPT) -E --color --language=html -p$@ $<
endif
api.html: ../gegl/gegl.h ../gegl/buffer/gegl-buffer.h ../gegl/operation/gegl-operation.h ../tools/create-reference.rb
@@ -96,10 +96,13 @@
install-exec-local: all-local
$(INSTALL) -d $(help_dir)
+if HAVE_ENSCRIPT
$(INSTALL) $(srcdir)/brightness-contrast.c.html \
$(srcdir)/gegl.h.html \
$(srcdir)/gegl-operation.h.html \
- $(srcdir)/api.html $(srcdir)/gegl.devhelp $(help_dir)
+ $(srcdir)/gegl-plugin.h.html $(help_dir)
+endif
+ $(INSTALL) $(srcdir)/api.html $(srcdir)/gegl.devhelp $(help_dir)
$(INSTALL) -T $(srcdir)/devhelp.css $(help_dir)/gegl.css
uninstall-local:
Modified: trunk/docs/gallery/Makefile.am
==============================================================================
--- trunk/docs/gallery/Makefile.am (original)
+++ trunk/docs/gallery/Makefile.am Tue Feb 12 19:14:18 2008
@@ -43,7 +43,7 @@
$(top_builddir)/bin/gegl $< -o `echo $@ | sed s?$(srcdir)/??` > `echo $@ | sed s?$(srcdir)/?? | sed -e s/png/txt/`;
if HAVE_GRAPHVIZ
@GEGL_PATH=$(top_builddir)/operations \
- $(top_builddir)/bin/gegl --dot $< | dot -Tpng -o `echo $@ | sed s?$(srcdir)/?? | sed s/.png/-graph.png/` >/dev/null
+ $(top_builddir)/bin/gegl --dot $< | $(GRAPHVIZ) -Tpng -o `echo $@ | sed s?$(srcdir)/?? | sed s/.png/-graph.png/` >/dev/null
endif
clean-local:
Modified: trunk/operations/io/Makefile.am
==============================================================================
--- trunk/operations/io/Makefile.am (original)
+++ trunk/operations/io/Makefile.am Tue Feb 12 19:14:18 2008
@@ -9,6 +9,7 @@
ff-load$(SHREXT): ff-load.c $(GEGLHEADERS)
@if [ ! -z "$(AVCODEC_LIBS)" ]; then \
+ echo $@;\
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LDADD) \
$(AVCODEC_CFLAGS) $(AVCODEC_LIBS) \
$(AVFORMAT_CFLAGS) $(AVFORMAT_LIBS);\
@@ -57,4 +58,4 @@
|| true
convert-format$(SHRECT): convert-format.c $(GEGLHEADERS)
- @(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $a $< $(LDADD))
\ No newline at end of file
+ @(echo $@;$(CC) $(CFLAGS) $(LDFLAGS) -o $a $< $(LDADD))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]