Fix typo in Config.mk;

put back assert for mem test in dot.c;
change old makefile for tools to use new LTDL variable;
fix gvpack build files for windows;
be irritated at not-ready-for-prime-time interface of cogito which
forces me to do a single log message for these very unrelated changes.

diff --git a/Config.mk b/Config.mk
index 1db3aa47bcda10332babdb0c780d421ef364d6a2..addb5ae6b7b5466028b46f87a7f4f5d622ef2763 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -23,7 +23,7 @@ EXTLIB_INC=-I/usr/include/freetype2
 EXTLIB_LIB=-ljpeg -lpng -lfontconfig -lfreetype -lz
 
 # library for libtool dynamic loading
-# to enable, uncoment this, and comment out "DISABLE_LTDL" in config.h.old
+# to enable, uncomment this, and comment out "DISABLE_LTDL" in config.h.old
 #LTDL_LIB=-lltdl
 
 ###################################################

diff --git a/cmd/dot/dot.c b/cmd/dot/dot.c
index 32e53890399478f4a994cea90c314720448a6abd..50abf6093192ceefb4bab4fdaa3e6e16f0e2202a 100644 (file)
--- a/cmd/dot/dot.c
+++ b/cmd/dot/dot.c
@@ -155,9 +155,7 @@ int main(int argc, char **argv)
            /* Delete graph */
            agclose(G);
        }
-#if 0
        assert(0);              /* should never exit loop */
-#endif
     } else {
        while ((G = next_input_graph())) {
            if (prev) {

diff --git a/cmd/tools/Makefile.old b/cmd/tools/Makefile.old
index c0edf42d207ecf66c9473b6bbfc333392c87705f..aabac880c31f6a4275da8af795e47d9187cd88a8 100644 (file)
--- a/cmd/tools/Makefile.old
+++ b/cmd/tools/Makefile.old
@@ -37,7 +37,7 @@ DNLIBS = -L$(LOC_LIB)/gvc -lgvc $(PLUGS) \
         -L$(LOC_LIB)/pathplan -lpathplan \
         -L$(LOC_LIB)/gd -lgd \
          $(LIBS) \
-         $(EXTLIB_LIB) $(EXPAT_LIB) -lltdl -lm
+         $(EXTLIB_LIB) $(EXPAT_LIB) $(LTDL_LIB) -lm
 INGLIB = -L$(LOC_LIB)/ingraphs -lingraphs
 
 ALIBS = -L$(LOC_LIB)/agraph -lagraph -L$(LOC_LIB)/cdt -lcdt