various mingle fixes for rpm builds

diff --git a/.gitignore b/.gitignore
index 76e994d31021cebdb6513c5f1b77705f5ab86134..1769c71177b2abc00a3a17d7b8a35c677e73e37d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,8 @@ cmd/lefty/lefty
 cmd/lefty/lefty.1.pdf
 cmd/lneato/lneato
 cmd/lneato/lneato.1.pdf
+cmd/lneato/mingle
+cmd/lneato/mingle.1.pdf
 cmd/smyrna/smyrna
 cmd/smyrna/smyrna.1.pdf
 cmd/tools/acyclic

diff --git a/configure.ac b/configure.ac
index d5b13185eff5ada8ab18bc9a0db78eacb034c5cf..ae3e556485d40c69ef81e2c532d0c2d0edd834eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2491,7 +2491,16 @@ else
     AC_SUBST([ANN_CFLAGS])
     AC_SUBST([ANN_LIBS])
   ],[
-    use_ann="No (ANN library not available)"
+    AC_CHECK_PROGS(ANN2FIG,ann2fig,false)
+    if test "$ANN2FIG" != "false"; then
+      AC_DEFINE_UNQUOTED(HAVE_ANN,1,
+        [Define if you have the ann library])
+      ANN_LIBS=-lANN
+      AC_SUBST([ANN_LIBS])
+      use_ann="Yes (but no ann.pc found)"
+    else
+      use_ann="No (ANN library not available)"
+    fi
   ])
 fi
 AM_CONDITIONAL(WITH_ANN, [test "x$use_ann" == "xYes"])

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 5873e8f745601b3feddb57481a81f7c6d40e3739..8c970f0cbb254aeffd28cda7e5677ee0c7524bb0 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -38,7 +38,7 @@ Prefix: /usr
 
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires: zlib-devel expat-devel
+BuildRequires: zlib-devel expat-devel ann-devel
 BuildRequires: /bin/ksh bison m4 flex swig tk tcl >= 8.3 freetype-devel >= 2
 
 #-- All platforms
@@ -225,6 +225,7 @@ fi
 %{_bindir}/gvpr
 %{_bindir}/gxl2dot
 %{_bindir}/gxl2gv
+%{_bindir}/mingle
 %{_bindir}/mm2gv
 %{_bindir}/neato
 %{_bindir}/nop