have mingle's Makefile.am respect configure's WITH_ANN

diff --git a/.gitignore b/.gitignore
index 1769c71177b2abc00a3a17d7b8a35c677e73e37d..cffcfc37bb3a2063f9edcb26c9fe0f2bd56c4828 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -69,8 +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/mingle/mingle
+cmd/mingle/mingle.1.pdf
 cmd/smyrna/smyrna
 cmd/smyrna/smyrna.1.pdf
 cmd/tools/acyclic

diff --git a/cmd/mingle/Makefile.am b/cmd/mingle/Makefile.am
index 2ffa7cf8ec5999f16b4a8617ae41172c7fc80741..4d1c15640ac2988b64887517d009e446aa14622b 100644 (file)
--- a/cmd/mingle/Makefile.am
+++ b/cmd/mingle/Makefile.am
@@ -12,12 +12,14 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/cgraph \
        -I$(top_srcdir)/lib/cdt
 
+if WITH_ANN
 bin_PROGRAMS = mingle
 
 #man_MANS = mingle.1
 #pdf_DATA = mingle.1.pdf
 man_MANS =
 pdf_DATA = 
+endif
 
 mingle_SOURCES = minglemain.c
 mingle_CPPFLAGS = $(AM_CPPFLAGS)

diff --git a/lib/mingle/Makefile.am b/lib/mingle/Makefile.am
index a92a4a57dcb767e5ad1421b14986ce6915bd941b..d331c446e001b96eaca2c58d551091e820f4d2cb 100644 (file)
--- a/lib/mingle/Makefile.am
+++ b/lib/mingle/Makefile.am
@@ -13,7 +13,9 @@ AM_CPPFLAGS = \
 
 noinst_HEADERS =  edge_bundling.h ink.h agglomerative_bundling.h nearest_neighbor_graph.h nearest_neighbor_graph_ann.h
 
+if WITH_ANN
 noinst_LTLIBRARIES = libmingle_C.la
+endif
 
 libmingle_C_la_SOURCES = edge_bundling.c ink.c agglomerative_bundling.c nearest_neighbor_graph.c nearest_neighbor_graph_ann.cpp