various minor Makefile fixes

diff --git a/configure.ac b/configure.ac
index 97cf464ca37c34787c2feca8fc0330d6444ee124..5aaf94bb3cfd32966c9ba5981bd29019254a23e1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -255,7 +255,6 @@ dnl -----------------------------------
 dnl INCLUDES and LIBS for GUILE
 
 AC_CHECK_PROG(GUILE,guile,guile)
-AM_CONDITIONAL(WITH_GUILE, [test "x$GUILE" != "x"])
 if test "x$GUILE" = "x"; then
   HAVE_GUILE=0
 else
@@ -263,6 +262,10 @@ else
   GUILE_INCLUDES=
   GUILE_LIBS=
 fi
+AC_CHECK_HEADER(libguile.h,,[
+  AC_MSG_WARN([Unable to find header libguile.h. The Guile packages will not be built])
+  HAVE_GUILE=0])
+AM_CONDITIONAL(WITH_GUILE, [test "x$HAVE_GUILE" = "x1"])
 AC_SUBST(HAVE_GUILE)
 AC_SUBST(GUILE_INCLUDES)
 AC_SUBST(GUILE_LIBS)
@@ -352,8 +355,10 @@ dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON
 
 AC_CHECK_PROG(PYTHON,python,python)
-HAVE_PYTHON=1
-if test "x$PYTHON" != "x"; then
+if test "x$PYTHON" = "x"; then
+  HAVE_PYTHON=0
+else
+  HAVE_PYTHON=1
   PYTHON_VERSION=`python -V 2>&1 | grep Python | cut -d ' ' -f 2`
   if test "x$PYTHON_VERSION" = "x"; then
     HAVE_PYTHON=0

diff --git a/graphs/directed/Makefile.am b/graphs/directed/Makefile.am
index 26baa05fb56964e1732a3f21c903cee94e0a3ce6..59d482bc254c3ee7bbf95c1f20972f2d68b2024d 100644 (file)
--- a/graphs/directed/Makefile.am
+++ b/graphs/directed/Makefile.am
@@ -133,6 +133,10 @@ png:
        for i in $(GRAPHS); do echo "dot $$i"; \
                $(top_builddir)/cmd/dot/dot -Tpng -o$$i.png $(top_srcdir)/graphs/directed/$$i; done
 
+png_cg:
+       for i in $(GRAPHS); do echo "dot $$i"; \
+               $(top_builddir)/cmd/dot/dot -Tpng:cg -o$$i.png_cg $(top_srcdir)/graphs/directed/$$i; done
+
 ps:
        for i in $(GRAPHS); do echo "dot $$i"; \
                $(top_builddir)/cmd/dot/dot -Tps -o$$i.ps $(top_srcdir)/graphs/directed/$$i; done

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index ca7237df2e4c62603ad8af0963b3b397c4336ffc..aa6215e7480b1fe8c7d66af99ad38b4dd9b592c4 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -215,7 +215,7 @@ EXTRA_DIST = gv.i \
 CLEANFILES = csharp/SWIG*.cs csharp/gv*.cs csharp/*.dot csharp/*.png csharp/*.so \
        java/*.dot java/*.png java/SWIG*.java java/gv*.java java/*.class java/*.so \
        perl/gv.pm perl/*.so perl/*.dot perl/*.png \
-       php/gv.php php/php_gv.h php/*.so
+       php/gv.php php/php_gv.h php/*.so \
        python/gv.py python/gv.pyc python/*.so python/*.dot python/*.png \
        ruby/*.so ruby/*.dot ruby/*.png \
        tcl/*.so tcl/*.dot tcl/*.png pkgIndex.tcl