From: ellson <devnull@localhost>
Date: Fri, 30 Jul 2010 01:54:10 +0000 (+0000)
Subject: try to fix build breakages
X-Git-Tag: LAST_LIBGRAPH~32^2~1239
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=78bbcc7ad78b254bce340c723bd0b817ac590d4c;p=graphviz

try to fix build breakages
---

diff --git a/configure.ac b/configure.ac
index d3549ef7f..63c35b2f0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3064,6 +3064,7 @@ AC_CONFIG_FILES(Makefile
 	lib/sfio/Sfio_f/Makefile
 	lib/vmalloc/Makefile
 	lib/dotgen/Makefile
+	lib/dotgen2/Makefile
 	lib/neatogen/Makefile
 	lib/fdpgen/Makefile
 	lib/sparse/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 57e2861c2..9745352f0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,16 +2,9 @@
 ## Process this file with automake to produce Makefile.in
 
 
-if WITH_CGRAPH
 SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast \
 	vpsc rbtree ortho sparse patchwork expr common \
 	pack xdot gvc ingraphs topfish glcomp \
-	circogen dotgen2 fdpgen neatogen twopigen sfdpgen osage gvpr
-else
-SUBDIRS = cdt graph cgraph gd pathplan sfio vmalloc ast \
-	vpsc rbtree ortho sparse patchwork expr common \
-	pack xdot gvc ingraphs topfish glcomp \
-	circogen dotgen fdpgen neatogen twopigen sfdpgen osage gvpr
-endif
+	circogen dotgen dotgen2 fdpgen neatogen twopigen sfdpgen osage gvpr
 
 EXTRA_DIST = Makefile.old gvc.vcproj gvc.def
diff --git a/lib/dotgen/Makefile.am b/lib/dotgen/Makefile.am
index ed8fe6996..ec0669955 100644
--- a/lib/dotgen/Makefile.am
+++ b/lib/dotgen/Makefile.am
@@ -16,8 +16,11 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/cdt \
 	-I$(top_srcdir)/lib/pathplan
 
+if WITH_CGRAPH
+else
 noinst_HEADERS = dot.h dotprocs.h aspect.h
 noinst_LTLIBRARIES = libdotgen_C.la
+endif
 
 libdotgen_C_la_LDFLAGS = -no-undefined
 libdotgen_C_la_SOURCES = acyclic.c class1.c class2.c cluster.c compound.c \
diff --git a/lib/dotgen2/Makefile.am b/lib/dotgen2/Makefile.am
index bef2a9c52..b27dac200 100644
--- a/lib/dotgen2/Makefile.am
+++ b/lib/dotgen2/Makefile.am
@@ -16,10 +16,12 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/lib/cdt \
 	-I$(top_srcdir)/lib/pathplan
 
+if WITH_CGRAPH
 noinst_HEADERS = dot2.h dot2procs.h groups.h minc.h
 noinst_LTLIBRARIES = libdotgen2_C.la
+endif
 
 libdotgen2_C_la_LDFLAGS = -no-undefined
 libdotgen2_C_la_SOURCES = dotinit.c level.c minc2.c ns.c groups.c minc_utils.c decomp.c
 
-EXTRA_DIST = dotgen2.vcproj
+# EXTRA_DIST = dotgen2.vcproj