Merge branch 'master' into netgen-1.5

.gitignore

@@ -1,12 +1,9 @@
 netgen
 netgenexec
 defs.mak
-scripts/defs.mak
 config.cache
 config.log
-scripts/config.log
 config.status
-scripts/config.status
 *.o
 *.so
 *~

Makefile

@@ -9,7 +9,7 @@ MODULES = base
 MAKEFLAGS =
 INSTALL_CAD_DIRS = lib doc
 
--include defs.mak
+include defs.mak
 
 all:	$(ALL_TARGET)
 
@@ -51,8 +51,8 @@ depend:
 install: $(INSTALL_TARGET)
 
 install-netgen:
-	@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
-	@echo --- installing run-time files to $(DESTDIR)${INSTALL_LIBDIR}
+	@echo --- installing executable to $(DESTDIR)${BINDIR}
+	@echo --- installing run-time files to $(DESTDIR)${LIBDIR}
 	@${MAKE} install-real >> install.log
 
 install-real: install-dirs
@@ -60,15 +60,15 @@ install-real: install-dirs
 		(cd $$dir && ${MAKE} install); done
 
 install-tcl-dirs:
-	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
-		$(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_PYDIR}
+	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} \
+		$(DESTDIR)${TCLDIR} $(DESTDIR)${PYDIR}
 
 install-dirs:
-	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR}
+	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${BINDIR}
 
 install-tcl: install-dirs
-	@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
-	@echo --- installing run-time files to $(DESTDIR)${INSTALL_LIBDIR}
+	@echo --- installing executable to $(DESTDIR)${BINDIR}
+	@echo --- installing run-time files to $(DESTDIR)${LIBDIR}
 	@${MAKE} install-tcl-real 2>&1 >> install.log
 
 install-tcl-real: install-tcl-dirs

README

@@ -85,8 +85,6 @@ and IRSIM version 9.7:
    make
    make install
 
-Note: For FreeBSD, use 'gmake' instead.
-
 IN CASE OF FAILURE
 -------------------
 Please contact me ([email protected]) to report compile-time and

VERSION

@@ -1 +1 @@
-1.5.158
+1.5.120

base/flatten.c

@@ -259,7 +259,7 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
   struct  nlist *ChildCell;
   struct objlist *tmp, *ob2, *ob3;
   int	notdone, rnodenum;
-  char	tmpstr[1024];
+  char	tmpstr[200];
   int	nextnode, oldmax, numflat = 0;
 #if !OLDPREFIX
   int     prefixlength;
@@ -1166,7 +1166,7 @@ struct nlist *cleanuppins(struct hashlist *p, void *clientdata)
           while (ob && obt && (ob->type > FIRSTPIN || ob == firstpin) &&
 			ob->model.class != NULL) {
 	     nob = ob->next;
-	     if ((obt->type == PORT) && (obt->node == -2)) {
+	     if ((obt->type == PORT) && (obt->node == -1)) {
 
 	        /* Remove this pin */
 
@@ -1238,7 +1238,7 @@ int CleanupPins(char *name, int filenum)
 
    for (ob = ThisCell->cell; ob != NULL; ob = ob->next) {
       if (ob->type != PORT) break;
-      if (ob->node == -2) {
+      if (ob->node == -1) {
 	 needscleanup = 1;
 	 break;
       }
@@ -1265,7 +1265,7 @@ int CleanupPins(char *name, int filenum)
       }
       else if (ob->type != PORT) break;
       nob = ob->next;
-      if (ob->node == -2) {
+      if (ob->node == -1) {
 	 if (lob == NULL) {
 	    ThisCell->cell = ob->next;
 	 }
@@ -1539,7 +1539,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 	/* (it without regard to cell1) improves the matching.	*/
 
 	else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell2 != NULL) &&
-			(ecomp->num2 != 0) && (ecomp->cell2->class == CLASS_SUBCKT)) {
+			(ecomp->cell2->class == CLASS_SUBCKT)) {
 	    ecomp->add2 = -ecomp->num2;
 	    match = 1;
 	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
@@ -1597,7 +1597,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 	/* (it without regard to cell1) improves the matching.	*/
 
 	else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) &&
-			(ecomp->num1 != 0) && (ecomp->cell1->class == CLASS_SUBCKT)) {
+			(ecomp->cell1->class == CLASS_SUBCKT)) {
 	    ecomp->add1 = -ecomp->num1;
 	    match = 1;
 	    for (ob2 = ecomp->cell1->cell; ob2; ob2 = ob2->next) {

base/netcmp.h

@@ -7,10 +7,6 @@ extern struct nlist *Circuit1;
 extern struct nlist *Circuit2;
 
 extern int ExhaustiveSubdivision;
-extern int FastSymmetryBreaking;
-
-extern int left_col_end;
-extern int right_col_end;
 
 #ifdef TCL_NETGEN
 #include <tcl.h>

base/netfile.c

@@ -47,18 +47,6 @@ static FILE *outfile;
 static int Graph = 0;
 int File;
 
-/*------------------------------------------------------*/
-/* Structure for stacking nested `if[n]def in verilog	*/
-/*------------------------------------------------------*/
-
-struct ifstack {
-    int invert;
-    struct property *kl;
-    struct ifstack *next;
-};
-
-struct ifstack *condstack = NULL;
-
 extern char *SetExtension(char *buffer, char *path, char *extension)
 /* add 'extension' to 'path' (overwriting previous extension, if any),
    write it into buffer (if buffer is null, malloc a buffer).
@@ -203,14 +191,11 @@ struct filestack {
 
 static struct filestack *OpenFiles = NULL;
 
-struct hashdict *definitions = (struct hashdict *)NULL;
-
 #define WHITESPACE_DELIMITER " \t\n\r"
 
 /*----------------------------------------------------------------------*/
 /* TrimQuoted() ---							*/
 /* Remove spaces from inside single- or double-quoted strings.		*/
-/* Ignore verilog constant bits (e.g., "1'b0") when parsing.		*/
 /*----------------------------------------------------------------------*/
 
 void TrimQuoted(char *line)
@@ -226,13 +211,6 @@ void TrimQuoted(char *line)
     {
 	changed = FALSE;
 	qstart = strchr(lptr, '\'');
-	if (qstart && (qstart > lptr)) {
-	    if (isdigit(*(qstart - 1))) {
-		lptr = qstart + 1;
-		changed = TRUE;
-		continue;
-	    }
-	}
 	if (qstart)
 	{
 	    qend = strchr(qstart + 1, '\'');
@@ -273,6 +251,7 @@ void TrimQuoted(char *line)
 	    }
 	}
     }
+
 }
 
 /*----------------------------------------------------------------------*/
@@ -286,216 +265,39 @@ void TrimQuoted(char *line)
 
 int GetNextLineNoNewline(char *delimiter)
 {
-    char *newbuf;
-    int testc;
-    int nested = 0;
-    int llen;
+  char *newbuf;
+  int testc;
 
-    if (feof(infile)) return -1;
+  if (feof(infile)) return -1;
 
-    while (1) {	    /* May loop indefinitely in an `if[n]def conditional */
+  // This is more reliable than feof() ...
+  testc = getc(infile);
+  if (testc == -1) return -1;
+  ungetc(testc, infile); 
 
-	// This is more reliable than feof() ...
-	testc = getc(infile);
-	if (testc == -1) return -1;
-	ungetc(testc, infile); 
+  if (linesize == 0) {
+	/* Allocate memory for line */
+	linesize = 500;
+	line = (char *)MALLOC(linesize);
+	linetok = (char *)MALLOC(linesize);
+  }
+  fgets(line, linesize, infile);
+  while (strlen(line) == linesize - 1) {
+       newbuf = (char *)MALLOC(linesize + 500);
+       strcpy(newbuf, line);
+       FREE(line);
+       line = newbuf;
+       fgets(line + linesize - 1, 501, infile);
+       linesize += 500;
+       FREE(linetok);
+       linetok = (char *)MALLOC(linesize);
+  }
+  linenum++;
+  strcpy(linetok, line);
+  TrimQuoted(linetok);
 
-	if (linesize == 0) {
-	    /* Allocate memory for line */
-	    linesize = 2000;
-	    line = (char *)MALLOC(linesize + 1);
-	    linetok = (char *)MALLOC(linesize + 1);
-	}
-	fgets(line, linesize, infile);
-	/* Immediately resolve backslash-EOL */
-	llen = strlen(line);
-	while ((llen > 1) && (llen < linesize - 1) && *(line + llen - 2) == '\\') {
-	    *(line + llen - 2) = '\n';
-	    fgets(line + llen - 1, linesize - llen + 1, infile);
-	    llen = strlen(line);
-	}
-	while (llen == linesize - 1) {
-	    newbuf = (char *)MALLOC(linesize + 501);
-	    strcpy(newbuf, line);
-	    FREE(line);
-	    line = newbuf;
-	    fgets(line + linesize - 1, 501, infile);
-	    llen = strlen(line);
-	    while ((llen > 1) && (llen < linesize - 1) && *(line + llen - 2) == '\\') {
-		*(line + llen - 2) = '\n';
-		fgets(line + llen - 1, linesize - llen + 1, infile);
-		llen = strlen(line);
-	    }
-	    linesize += 500;
-	    FREE(linetok);
-	    linetok = (char *)MALLOC(linesize + 1);
-	}
-
-	/* Check for substitutions (verilog only).  Make sure linetok is    */
-	/* large enough to hold the entire line after substitutions.	    */
-
-	if (definitions != NULL) {
-	    char *s, *w, e;
-	    struct property *kl;
-	    int len, dlen, vlen, addin = 0;
-	    unsigned char found = FALSE;
-
-	    for (s = line; *s != '\0'; s++) {
-		if (*s == '`') {
-		    w = s + 1;
-		    while (isalnum(*w) || (*w == '_') || (*w == '$')) w++;
-		    e = *w;
-		    *w = '\0';
-		    kl = (struct property *)HashLookup(s + 1, definitions);
-		    if (kl != NULL) {
-			dlen = strlen(s);
-			if (kl->type == PROP_STRING) {
-			    vlen = strlen(kl->pdefault.string);
-			}
-			else vlen = 12;  /* Leave room for numeric conversion */
-			addin += vlen - dlen + 1;
-			found = TRUE;
-		    }
-		    *w = e;
-		}
-	    }
-	    if (found) {
-		len = strlen(line);
-		if (len + addin > linesize) {
-		    while (len + addin > linesize) linesize += 500;
-		    FREE(linetok);
-		    linetok = (char *)MALLOC(linesize);
-		}
-	    }
-	}
-
-	/* Make definition substitutions (verilog only) */
-
-	if (definitions != NULL) {
-	    char *s, *t, *w, e;
-	    struct property *kl;
-
-	    t = linetok;
-	    for (s = line; *s != '\0'; s++) {
-		if (*s == '`') {
-		    w = s + 1;
-		    while (isalnum(*w) || (*w == '_') || (*w == '$')) w++;
-		    e = *w;
-		    *w = '\0';
-		    kl = (struct property *)HashLookup(s + 1, definitions);
-		    if (kl != NULL) {
-			if (kl->type == PROP_STRING)
-			    strcpy(t, kl->pdefault.string);
-			else if (kl->type == PROP_INTEGER)
-			    sprintf(t, "%d", kl->pdefault.ival);
-			else if (kl->type == PROP_DOUBLE)
-			    sprintf(t, "%g", kl->pdefault.dval);
-			t += strlen(t);
-			s = w - 1;
-		    }
-		    else *t++ = *s;
-		    *w = e;
-		}
-		else *t++ = *s;
-	    }
-	    *t = '\0';
-	}
-	else
-	    strcpy(linetok, line);
-
-	TrimQuoted(linetok);
-	linenum++;
-
-	nexttok = strdtok(linetok, WHITESPACE_DELIMITER, delimiter);
-	if (nexttok == NULL) return 0;
-
-	/* Handle `ifdef, `ifndef, `elsif, `else, and `endif (verilog	*/
-	/* only, where indicated by a non-NULL "definitions")		*/
-
-	if (definitions == NULL) return 0;
-
-	/* If currently skipping through a section, handle conditionals differently */
-
-	if (condstack) {
-	    if (((condstack->invert == 0) && (condstack->kl == NULL))
-			|| ((condstack->invert == 1) && (condstack->kl != NULL))) {
-		if (match(nexttok, "`ifdef") || match(nexttok, "`ifndef")) {
-		    nested++;
-		    continue;
-		}
-		else if (nested > 0) {
-		    if (match(nexttok, "`endif")) nested--;
-		    continue;
-		}
-		else if (nexttok[0] != '`') continue; 
-	    }
-	}
-
-	/* Handle conditionals (that is not being skipped over) */
-
-	if (match(nexttok, "`endif")) {
-	    if (condstack == NULL) {
-		fprintf(stderr, "Error:  `endif without corresponding `if[n]def\n");
-	    }
-	    else {
-		struct ifstack *iftop = condstack;
-		condstack = condstack->next;
-		FREE(iftop);   
-	    }
-	}
-
-	/* Note that `if[n]def may be nested. */
-    
-	else if (match(nexttok, "`ifdef") || match(nexttok, "`ifndef") ||
-		    match(nexttok, "`elsif") || match(nexttok, "`else")) {
-
-	    /* Every `ifdef or `ifndef increases condstack by 1 */
-	    if (nexttok[1] == 'i') {
-		struct ifstack *newif = (struct ifstack *)MALLOC(sizeof(struct ifstack));
-		newif->next = condstack;
-		condstack = newif;
-	    }
-	    if (condstack == NULL) {
-		fprintf(stderr, "Error:  %s without `if[n]def\n", nexttok);
-		break;
-	    }
-	    else {
-		if (match(nexttok, "`else")) {
-		    /* Invert the sense of the if[n]def scope */
-		    condstack->invert = (condstack->invert == 1) ? 0 : 1;
-		}
-		else if (match(nexttok, "`elsif")) {
-		    nexttok = strdtok(NULL, WHITESPACE_DELIMITER, delimiter);
-		    if (nexttok == NULL) {
-			fprintf(stderr, "Error:  `elsif with no conditional.\n");
-			return 0;
-		    }
-		    /* Keep the same scope but redefine the parameter */
-		    condstack->invert = 0;
-		    condstack->kl = (struct property *)HashLookup(nexttok, definitions);
-		}
-		else {
-		    condstack->invert = (nexttok[3] == 'n') ? 1 : 0;
-		    nexttok = strdtok(NULL, WHITESPACE_DELIMITER, delimiter);
-		    if (nexttok == NULL) {
-			fprintf(stderr, "Error:  %s with no conditional.\n", nexttok);
-			return 0;
-		    }
-		    condstack->kl = (struct property *)HashLookup(nexttok, definitions);
-		}
-	    }
-	}
-	else if (condstack) {
-	    if (((condstack->invert == 0) && (condstack->kl == NULL))
-			|| ((condstack->invert == 1) && (condstack->kl != NULL)))
-		continue;
-	    else
-		break;
-	}
-	else
-	    break;
-    }
-    return 0;
+  nexttok = strdtok(linetok, WHITESPACE_DELIMITER, delimiter);
+  return 0;
 }
 
 /*----------------------------------------------------------------------*/
@@ -510,24 +312,6 @@ void GetNextLine(char *delimiter)
     } while (nexttok == NULL);
 }
 
-/*----------------------------------------------------------------------*/
-/* Return a pointer to the line at the position of nexttok		*/
-/* This is used only when returning the entire line, untokenized, and	*/
-/* is only called by the verilog read routine when reading the value of	*/
-/* a `define statement.							*/
-/*----------------------------------------------------------------------*/
-
-char *GetLineAtTok()
-{
-    char *lpos;
-
-    if (nexttok == NULL) return NULL;
-    if (line == NULL) return NULL;
-
-    lpos = strstr(line, nexttok);
-    return lpos;
-}
-
 /*----------------------------------------------------------------------*/
 /* if nexttok is already NULL, force scanner to read new line		*/
 /*----------------------------------------------------------------------*/
@@ -694,20 +478,9 @@ char *strdtok(char *pstring, char *delim1, char *delim2)
     /* space character becomes part of the verilog name.  The remainder of the  */
     /* name is parsed according to the rules of "delim2".                       */
 
-    /* Special verilog rule exception:  To handle the problems caused by	*/
-    /* translating verilog backslash-escaped names into other netlist formats	*/
-    /* like SPICE where the convention is strictly prohibited, I have used the	*/
-    /* convention in qflow scripts to replace the trailing space with another	*/
-    /* backslash, so the name is effectively delimited by a pair of back-	*/
-    /* slashes.  Therefore check for a space or another backslash, whichever	*/
-    /* comes first.  That will satisfy both methods.  Technically this routine	*/
-    /* should know whether it is parsing SPICE or verilog and handle the syntax	*/
-    /* accordingly (needs to be done).						*/
-
     if (*s == '\\') {
-        s++;
         while (*s != '\0') {
-	    if ((*s == ' ') || (*s == '\\')) {
+	    if (*s == ' ') {
 		s++;
 		break;
 	    }
@@ -798,7 +571,7 @@ int OpenParseFile(char *name, int fnum)
   FILE *locfile;
   struct filestack *newfile;
 
-  locfile = fopen(name, "r");
+  locfile = fopen(name,"r");
   linenum = 0;
   /* reset the token scanner */
   nexttok = NULL;  
@@ -883,12 +656,7 @@ char *ReadNetlist(char *fname, int *fnum)
       {SPICE_EXTENSION, ReadSpice},
       {SPICE_EXT2, ReadSpice},
       {SPICE_EXT3, ReadSpice},
-      {SPICE_EXT4, ReadSpice},
-      {SPICE_EXT5, ReadSpice},
-      {SPICE_EXT6, ReadSpice},
-      {SPICE_EXT7, ReadSpice},
       {VERILOG_EXTENSION, ReadVerilog},
-      {SYS_VERILOG_EXTENSION, ReadVerilog},
       {NETGEN_EXTENSION, ReadNetgenFile},
       {NULL, NULL}
     };

base/netfile.h

@@ -9,16 +9,11 @@
 #define SIM_EXTENSION ".sim"
 #define SPICE_EXTENSION ".spice"
 #define SPICE_EXT2 ".spc"
-#define SPICE_EXT3 ".sp"
-#define SPICE_EXT4 ".spi"
-#define SPICE_EXT5 ".fspc"
-#define SPICE_EXT6 ".cir"
-#define SPICE_EXT7 ".ckt"
+#define SPICE_EXT3 ".fspc"
 #define NETGEN_EXTENSION ".ntg"
 #define CCODE_EXTENSION ".c.code"
 #define ESACAP_EXTENSION ".esa"
 #define VERILOG_EXTENSION ".v"
-#define SYS_VERILOG_EXTENSION ".sv"
 
 #define LINELENGTH 80
 
@@ -29,17 +24,14 @@ extern void FlushString (char *format, ...);
 extern char *SetExtension(char *buffer, char *path, char *extension);
 
 extern int File;
-extern struct hashdict *definitions;
 
 /* input routines */
 
 extern char *nexttok;
 #define SKIPTO(a) do {SkipTok(NULL);} while (!match(nexttok,a))
 extern char *strdtok(char *pstring, char *delim1, char *delim2);
-extern char *GetLineAtTok();
 extern void SkipTok(char *delimiter);
 extern void SkipTokNoNewline(char *delimiter);
-extern void SkipTokComments(char *delimiter);
 extern void SkipNewLine(char *delimiter);
 extern void SpiceTokNoNewline(void);	/* handles SPICE "+" continuation line */
 extern void SpiceSkipNewLine(void);	/* handles SPICE "+" continuation line */

base/objlist.c

@@ -289,7 +289,7 @@ static struct hashdict cell_dict;
 void InitCellHashTable(void)
 {
     hashfunc = hash;
-    matchfunc = NULL;
+    matchfunc = match;
     matchintfunc = matchfile;
     InitializeHashTable(&cell_dict, CELLHASHSIZE);
 }
@@ -598,11 +598,7 @@ static int PrintCellHashTableElement(struct hashlist *p)
     if (Debug == 1)  Printf("Cell: %s (instanced %d times); Primitive\n",
 		       ptr->name, ptr->number);
     else if (Debug == 3) {	/* list */
-#ifdef TCL_NETGEN
        Tcl_AppendElement(netgeninterp, ptr->name);
-#else
-       Printf("%s ", ptr->name);
-#endif
     }
   }
   else if ((Debug == 2) || (Debug == 3)) {	/* list only */
@@ -1112,17 +1108,13 @@ void FreeObjectAndHash(struct objlist *ob, struct nlist *ptr)
 
 /***************  GENERAL UTILITIES ****************************/
 
-int NumberOfPorts(char *cellname, int file)
+int NumberOfPorts(char *cellname)
 {
   struct nlist *tp;
   struct objlist *ob;
   int ports;
 
-  if (file == -1)
-    tp = LookupCell(cellname);
-  else
-    tp = LookupCellFile(cellname, file);
-
+  tp = LookupCell(cellname);
   if (tp == NULL) return(0);
   ports = 0;
   for (ob = tp->cell; ob != NULL; ob = ob->next)

base/objlist.h

@@ -242,7 +242,7 @@ extern void FreeObjectAndHash(struct objlist *ob, struct nlist *ptr);
 extern void FreePorts(char *cellname);
 extern struct IgnoreList *ClassIgnore;
 
-extern int NumberOfPorts(char *cellname, int file);
+extern int NumberOfPorts(char *cellname);
 extern struct objlist *InstanceNumber(struct nlist *tp, int inst);
 
 extern struct objlist *List(char *list_template);

base/place.c

@@ -929,7 +929,7 @@ void ToggleDebug(void)
 void DescribeCell(char *name, int detail)
 {
   Printf("Cell: %s contains %d instances, %d nodes and %d ports\n", name, 
-	 NumberOfInstances(name),  RenumberNodes(name), NumberOfPorts(name, -1));
+	 NumberOfInstances(name),  RenumberNodes(name), NumberOfPorts(name));
   PrintEmbeddingTree(stdout,name,detail);
 }
 

base/query.c

@@ -801,16 +801,9 @@ void DescribeInstance(char *name, int file)
   {
     if (ob->node > nodemax) nodemax = ob->node;
     else if ((ob->node == -1) && (ob->model.port != PROXY)) {
-
-      /* All black-box modules and placeholders by definition have all	*/
-      /* disconnected pins, so don't report those.			*/
-
-      if (!(tp->flags & CELL_PLACEHOLDER) && (tp->class != CLASS_MODULE))
-      {
-	if (disconnectednodes == 0) Fprintf(stderr, "\n");
-        disconnectednodes++;
-        Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name);
-      }
+      if (disconnectednodes == 0) Fprintf(stderr, "\n");
+      disconnectednodes++;
+      Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name);
     }
   }
   instlist = (unsigned char *) CALLOC((nodemax + 1), sizeof(unsigned char));
@@ -907,7 +900,7 @@ void PrintLeavesInCell(char *cellname, int filenum)
   np->dumped = 1;
 
   if (np->class != CLASS_SUBCKT) {
-    Printf("%s; %d ports; Primitive.\n", cellname, NumberOfPorts(cellname, filenum));
+    Printf("%s; %d ports; Primitive.\n", cellname, NumberOfPorts(cellname));
     return;
   }
 
@@ -920,7 +913,7 @@ void PrintLeavesInCell(char *cellname, int filenum)
       am_a_leaf = 0;
     }
 
-  if (am_a_leaf) Printf("%s; %d ports\n", cellname, NumberOfPorts(cellname, filenum));
+  if (am_a_leaf) Printf("%s; %d ports\n", cellname, NumberOfPorts(cellname));
   return;
 }
 
@@ -1070,7 +1063,7 @@ void Query(void)
       ActelLib();
       break;
     case 'S':
-      promptstring("Read SPICE (.spice) file? ", repstr);
+      promptstring("Read SPICE (.ckt) file? ", repstr);
       ReadSpice(repstr, &filenum);
       break;
     case 'V':

base/spice.c

@@ -1883,36 +1883,20 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
   CurrentCell = NULL;
 
   if ((filenum = OpenParseFile(fname, *fnum)) < 0) {
+    char name[100];
 
-    if (strrchr(fname, '.') == NULL) {
-      char name[1024];
-      SetExtension(name, fname, SPICE_EXTENSION);
-      if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-        Fprintf(stderr, "Error in SPICE file read: No file %s\n", name);
-        *fnum = filenum;
-        return NULL;
-      }
-    }    
-    else {
-      Fprintf(stderr, "Error in SPICE file read: No file %s\n", fname);
+    SetExtension(name, fname, SPICE_EXTENSION);
+    if ((filenum = OpenParseFile(name, *fnum)) < 0) {
+      Fprintf(stderr,"Error in SPICE file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
-    }
+    }    
   }
 
-  /* Make sure all SPICE file reading is case insensitive   */
-  /* BUT if a verilog file was read before it, then it will */
-  /* be forced to be case sensitive, caveat end-user.	    */
-
-  if (matchfunc == match) {
-      Printf("Warning:  A case-sensitive file has been read and so the "
-                "SPICE netlist must be treated case-sensitive to match.\n");
-  }
-  else {
-      matchfunc = matchnocase;
-      matchintfunc = matchfilenocase;
-      hashfunc = hashnocase;
-  }
+  /* Make sure all SPICE file reading is case insensitive */
+  matchfunc = matchnocase;
+  matchintfunc = matchfilenocase;
+  hashfunc = hashnocase;
 
   InitializeHashTable(&spiceparams, OBJHASHSIZE);
 
@@ -1996,18 +1980,14 @@ void IncludeSpice(char *fname, int parent, struct cellstack **CellStackPtr,
 	/* helps, if the file didn't have an extension.  But	*/
 	/* really, we're getting desperate at this point.	*/
 
-	if (strrchr(fname, '.') == NULL) {
+	if (strchr(fname, '.') == NULL) {
            SetExtension(name, fname, SPICE_EXTENSION);
            filenum = OpenParseFile(name, parent);
-	   if (filenum < 0) {
-             Fprintf(stderr, "Error in SPICE file include: No file %s\n", name);
-             return;
-	   }
-        }    
-        else {
-          Fprintf(stderr, "Error in SPICE file include: No file %s\n", fname);
-          return;
 	}
+        if (filenum < 0) {
+           Fprintf(stderr,"Error in SPICE file include: No file %s\n",name);
+           return;
+        }    
      }
   }
   ReadSpiceFile(fname, parent, CellStackPtr, blackbox);

configure

@@ -4,6 +4,4 @@
 # all of its config scripts in a different directory than the configure
 # script itself.
 
-export CFLAGS="$CFLAGS -g"
-cd scripts
-exec ./configure "$@"
+( CFLAGS="-g" ; export CFLAGS ; cd scripts ; ./configure $* )

defs.mak

@@ -0,0 +1,85 @@
+# defs.mak.in --
+# source file for autoconf-generated "defs.mak" for netgen
+
+# defs.mak.  Generated from defs.mak.in by configure.
+# Feel free to change the values in here to suit your needs.
+# Be aware that running scripts/configure again will overwrite
+# any changes!
+
+SHELL                  = /bin/sh
+
+prefix = ${BUILDROOT}/usr/local
+exec_prefix = ${prefix}
+bindir = ${exec_prefix}/bin
+libdir = ${exec_prefix}/lib
+mandir = ${prefix}/share/man
+
+VERSION                = 
+
+SCRIPTS                = ${NETGENDIR}/scripts
+
+INSTALL = /bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL}
+
+# Override standard "make" target when compiling under TCL
+ALL_TARGET = tcl
+INSTALL_TARGET = install-tcl
+
+# Change CADDIR to install in a different place
+BINDIR                 = ${bindir}
+MANDIR                 = ${mandir}
+LIBDIR                 = ${libdir}
+DOCDIR                 = ${libdir}/netgen/doc
+TCLDIR                 = ${libdir}/netgen/tcl
+PYDIR		       = ${libdir}/netgen/python
+
+MAIN_EXTRA_LIBS        =  ${NETGENDIR}/tcltk/libtcltk.o
+LD_EXTRA_LIBS          = 
+LD_SHARED              = 
+TOP_EXTRA_LIBS         = 
+SUB_EXTRA_LIBS         = 
+
+MODULES               +=  tcltk
+UNUSED_MODULES        += 
+PROGRAMS              +=  tcltk
+INSTALL_CAD_DIRS      +=  tcltk
+
+RM                     = rm -f
+CP                     = cp
+AR                     = @AR@
+ARFLAGS                = crv
+LINK		       = /bin/ld -r
+LD                     = /bin/ld
+M4		       = /bin/m4
+RANLIB                 = ranlib
+SHDLIB_EXT	       = .so
+LDDL_FLAGS             =  -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
+LD_RUN_PATH            = 
+LIB_SPECS              =  -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6
+LIB_SPECS_NOSTUB       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+WISH_EXE	       = /usr/bin/wish
+TCL_LIB_DIR	       = /usr/lib
+
+CC                     = gcc
+CPP                    = gcc -E -x c
+CXX                    = @CXX@
+
+CPPFLAGS               = -I. -I${NETGENDIR} 
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"112\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"112\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+CFLAGS                 = -g -m64 -fPIC -fPIC 
+
+DEPEND_FILE            = Depend
+DEPEND_FLAG            = -MM
+EXEEXT		       = 
+
+GR_CFLAGS              =  
+GR_DFLAGS              =  -DX11 -DXLIB -DNDEBUG
+GR_LIBS                =  -lX11 
+GR_SRCS                =  ${TK_SRCS}
+
+OBJS      = ${SRCS:.c=.o}
+LIB_OBJS  = ${LIB_SRCS:.c=.o}
+CLEANS    = ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}

doc/Makefile

@@ -2,11 +2,11 @@ NETGENDIR = ..
 
 include ${NETGENDIR}/defs.mak
 
-MANDIRS = $(DESTDIR)${INSTALL_MANDIR} $(DESTDIR)${INSTALL_MANDIR}/man1
-DOCDIRS = $(DESTDIR)${INSTALL_DOCDIR}
+MANDIRS = $(DESTDIR)${MANDIR} $(DESTDIR)${MANDIR}/man1
+DOCDIRS = $(DESTDIR)${DOCDIR}
 
 MANFILES = 
-DOCFILES = $(DESTDIR)${INSTALL_DOCDIR}/netgen.doc
+DOCFILES = $(DESTDIR)${DOCDIR}/netgen.doc
 
 install-tcl: ${DOCDIRS} ${DOCFILES}
 
@@ -23,8 +23,8 @@ make-doc-dirs:
 	${SCRIPTS}/mkdirs ${DOCDIRS}
 
 # This file does not actually exist. . .
-$(DESTDIR)${INSTALL_MANDIR}/man1/netgen.1: netgen.1 ${MANDIRS}
-	${CP} netgen.1 $(DESTDIR)${INSTALL_MANDIR}/man1/netgen.1
+$(DESTDIR)${MANDIR}/man1/netgen.1: netgen.1 ${MANDIRS}
+	${CP} netgen.1 $(DESTDIR)${MANDIR}/man1/netgen.1
 
-$(DESTDIR)${INSTALL_DOCDIR}/netgen.doc: netgen.doc ${DOCDIRS}
-	${CP} netgen.doc $(DESTDIR)${INSTALL_DOCDIR}/netgen.doc
+$(DESTDIR)${DOCDIR}/netgen.doc: netgen.doc ${DOCDIRS}
+	${CP} netgen.doc $(DESTDIR)${DOCDIR}/netgen.doc

lib/Makefile

@@ -4,14 +4,14 @@ include ${NETGENDIR}/defs.mak
 
 LIB_FILES = ntk2adl.sh spice spice.bot spice.top
 
-LIB_INST_FILES= $(LIB_FILES:%=$(DESTDIR)${INSTALL_LIBDIR}/netgen/%)
-BIN_INST_FILES= $(BIN_FILES:%=$(DESTDIR)${INSTALL_BINDIR}/%)
+LIB_INST_FILES= $(LIB_FILES:%=$(DESTDIR)${LIBDIR}/netgen/%)
+BIN_INST_FILES= $(BIN_FILES:%=$(DESTDIR)${BINDIR}/%)
 
 install-tcl: ${LIB_INST_FILES}
 
 install: ${LIB_INST_FILES}
 
-$(DESTDIR)${INSTALL_LIBDIR}/netgen/%: %
-	../scripts/mkdirs $(DESTDIR)${INSTALL_LIBDIR}/netgen
-	${RM} $(DESTDIR)${INSTALL_LIBDIR}/netgen/$*
-	${CP} $* $(DESTDIR)${INSTALL_LIBDIR}/netgen/$*
+$(DESTDIR)${LIBDIR}/netgen/%: %
+	../scripts/mkdirs $(DESTDIR)${LIBDIR}/netgen
+	${RM} $(DESTDIR)${LIBDIR}/netgen/$*
+	${CP} $* $(DESTDIR)${LIBDIR}/netgen/$*

netgen/Makefile

@@ -25,23 +25,23 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS}
 		${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \
 		-lc ${LIBS} ${LIB_SPECS} ${LDFLAGS}
 
-$(DESTDIR)${INSTALL_BINDIR}/netgen:
+$(DESTDIR)${BINDIR}/netgen:
 	${RM} $@
 	${CP} netgen $@
 
-$(DESTDIR)${INSTALL_BINDIR}/ntk2adl:
+$(DESTDIR)${BINDIR}/ntk2adl:
 	${RM} $@
 	${CP} ntk2adl $@
 
-$(DESTDIR)${INSTALL_BINDIR}/ntk2xnf:
+$(DESTDIR)${BINDIR}/ntk2xnf:
 	${RM} $@
 	${CP} ntk2xnf $@
 
-$(DESTDIR)${INSTALL_BINDIR}/netcomp:
+$(DESTDIR)${BINDIR}/netcomp:
 	${RM} $@
 	${CP} netcomp $@
 
-$(DESTDIR)${INSTALL_BINDIR}/inetcomp:
+$(DESTDIR)${BINDIR}/inetcomp:
 	${RM} $@
 	${CP} inetcomp $@
 
@@ -61,14 +61,14 @@ ntk2xnf: ntk2xnf.c
 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ntk2xnf.c -o $@ ${EXTRA_LIBS} \
 		${LIBS} ${LDFLAGS}
 
-install: $(DESTDIR)${INSTALL_BINDIR}/netgen $(DESTDIR)${INSTALL_BINDIR}/netcomp \
-		$(DESTDIR)${INSTALL_BINDIR}/inetcomp $(DESTDIR)${INSTALL_BINDIR}/ntk2adl \
-		$(DESTDIR)${INSTALL_BINDIR}/ntk2xnf
+install: $(DESTDIR)${BINDIR}/netgen $(DESTDIR)${BINDIR}/netcomp \
+		$(DESTDIR)${BINDIR}/inetcomp $(DESTDIR)${BINDIR}/ntk2adl \
+		$(DESTDIR)${BINDIR}/ntk2xnf
 
-install-tcl: $(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}
+install-tcl: $(DESTDIR)${TCLDIR} $(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}
 
-$(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}: tclnetgen${SHDLIB_EXT}
-	${RM} $(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}
-	${CP} tclnetgen${SHDLIB_EXT} $(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}
+$(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}: tclnetgen${SHDLIB_EXT}
+	${RM} $(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}
+	${CP} tclnetgen${SHDLIB_EXT} $(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}
 
 include ${NETGENDIR}/rules.mak

python/Makefile

@@ -4,7 +4,7 @@ SRCS =
 SCRIPTS = consoletext.py helpwindow.py lvs_manager.py treeviewsplit.py
 SCRIPTS += tksimpledialog.py tooltip.py lvs_help.txt
 
-SCRIPTINSTALL = $(DESTDIR)${INSTALL_PYDIR}
+SCRIPTINSTALL = $(DESTDIR)${PYDIR}
 
 include ${NETGENDIR}/defs.mak
 
@@ -12,11 +12,11 @@ main: lvs_manager.py
 
 tcl-main: lvs_manager.py
 
-$(DESTDIR)${INSTALL_PYDIR}/consoletext.py:
+$(DESTDIR)${PYDIR}/consoletext.py:
 	${RM} $@
 	${CP} consoletext.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/helpwindow.py:
+$(DESTDIR)${PYDIR}/helpwindow.py:
 	${RM} $@
 	${CP} helpwindow.py $@
 
@@ -24,31 +24,31 @@ lvs_manager.py: lvs_manager.py.in
 	sed -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
 		lvs_manager.py.in > lvs_manager.py
 
-$(DESTDIR)${INSTALL_PYDIR}/lvs_manager.py: lvs_manager.py
+$(DESTDIR)${PYDIR}/lvs_manager.py: lvs_manager.py
 	${RM} $@
 	${CP} lvs_manager.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/treeviewsplit.py: treeviewsplit.py
+$(DESTDIR)${PYDIR}/treeviewsplit.py: treeviewsplit.py
 	${RM} $@
 	${CP} treeviewsplit.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/tksimpledialog.py: tksimpledialog.py
+$(DESTDIR)${PYDIR}/tksimpledialog.py: tksimpledialog.py
 	${RM} $@
 	${CP} tksimpledialog.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/tooltip.py: tooltip.py
+$(DESTDIR)${PYDIR}/tooltip.py: tooltip.py
 	${RM} $@
 	${CP} tooltip.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/lvs_help.txt: lvs_help.txt
+$(DESTDIR)${PYDIR}/lvs_help.txt: lvs_help.txt
 	${RM} $@
 	${CP} lvs_help.txt $@
 
 install: install-tcl
 
-install-tcl: $(DESTDIR)${INSTALL_PYDIR} $(DESTDIR)${INSTALL_PYDIR}/consoletext.py \
-	$(DESTDIR)${INSTALL_PYDIR}/helpwindow.py $(DESTDIR)${INSTALL_PYDIR}/lvs_manager.py \
-	$(DESTDIR)${INSTALL_PYDIR}/treeviewsplit.py $(DESTDIR)${INSTALL_PYDIR}/tksimpledialog.py \
-	$(DESTDIR)${INSTALL_PYDIR}/tooltip.py $(DESTDIR)${INSTALL_PYDIR}/lvs_help.txt
+install-tcl: $(DESTDIR)${PYDIR} $(DESTDIR)${PYDIR}/consoletext.py \
+	$(DESTDIR)${PYDIR}/helpwindow.py $(DESTDIR)${PYDIR}/lvs_manager.py \
+	$(DESTDIR)${PYDIR}/treeviewsplit.py $(DESTDIR)${PYDIR}/tksimpledialog.py \
+	$(DESTDIR)${PYDIR}/tooltip.py $(DESTDIR)${PYDIR}/lvs_help.txt
 
 include ${NETGENDIR}/rules.mak

scripts/config.log

@@ -0,0 +1,772 @@
+This file contains any messages produced by compilers while
+running configure, to aid debugging if configure makes a mistake.
+
+It was created by netgen configure 1.3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  $ ./configure 
+
+## --------- ##
+## Platform. ##
+## --------- ##
+
+hostname = stravinsky
+uname -m = x86_64
+uname -r = 4.1.13-100.fc21.x86_64
+uname -s = Linux
+uname -v = #1 SMP Tue Nov 10 13:13:20 UTC 2015
+
+/usr/bin/uname -p = x86_64
+/bin/uname -X     = unknown
+
+/bin/arch              = x86_64
+/usr/bin/arch -k       = unknown
+/usr/convex/getsysinfo = unknown
+/usr/bin/hostinfo      = unknown
+/bin/machine           = unknown
+/usr/bin/oslevel       = unknown
+/bin/universe          = unknown
+
+PATH: .
+PATH: /bin
+PATH: /sbin
+PATH: /usr/bin
+PATH: /usr/sbin
+PATH: /usr/local/bin
+
+
+## ----------- ##
+## Core tests. ##
+## ----------- ##
+
+configure:2398: checking build system type
+configure:2412: result: x86_64-unknown-linux-gnu
+configure:2432: checking host system type
+configure:2445: result: x86_64-unknown-linux-gnu
+configure:2465: checking target system type
+configure:2478: result: x86_64-unknown-linux-gnu
+configure:2569: checking for gcc
+configure:2585: found /bin/gcc
+configure:2596: result: gcc
+configure:2825: checking for C compiler version
+configure:2834: gcc --version >&5
+gcc (GCC) 4.9.2 20150212 (Red Hat 4.9.2-6)
+Copyright (C) 2014 Free Software Foundation, Inc.
+This is free software; see the source for copying conditions.  There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+configure:2845: $? = 0
+configure:2834: gcc -v >&5
+Using built-in specs.
+COLLECT_GCC=gcc
+COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
+Target: x86_64-redhat-linux
+Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20150212/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
+Thread model: posix
+gcc version 4.9.2 20150212 (Red Hat 4.9.2-6) (GCC) 
+configure:2845: $? = 0
+configure:2834: gcc -V >&5
+gcc: error: unrecognized command line option '-V'
+gcc: fatal error: no input files
+compilation terminated.
+configure:2845: $? = 4
+configure:2834: gcc -qversion >&5
+gcc: error: unrecognized command line option '-qversion'
+gcc: fatal error: no input files
+compilation terminated.
+configure:2845: $? = 4
+configure:2865: checking whether the C compiler works
+configure:2887: gcc -g   conftest.c  >&5
+configure:2891: $? = 0
+configure:2939: result: yes
+configure:2942: checking for C compiler default output file name
+configure:2944: result: a.out
+configure:2950: checking for suffix of executables
+configure:2957: gcc -o conftest -g   conftest.c  >&5
+configure:2961: $? = 0
+configure:2983: result: 
+configure:3005: checking whether we are cross compiling
+configure:3013: gcc -o conftest -g   conftest.c  >&5
+configure:3017: $? = 0
+configure:3024: ./conftest
+configure:3028: $? = 0
+configure:3043: result: no
+configure:3048: checking for suffix of object files
+configure:3070: gcc -c -g  conftest.c >&5
+configure:3074: $? = 0
+configure:3095: result: o
+configure:3099: checking whether we are using the GNU C compiler
+configure:3118: gcc -c -g  conftest.c >&5
+configure:3118: $? = 0
+configure:3127: result: yes
+configure:3136: checking whether gcc accepts -g
+configure:3156: gcc -c -g  conftest.c >&5
+configure:3156: $? = 0
+configure:3197: result: yes
+configure:3214: checking for gcc option to accept ISO C89
+configure:3277: gcc  -c -g  conftest.c >&5
+configure:3277: $? = 0
+configure:3290: result: none needed
+configure:3315: checking how to run the C preprocessor
+configure:3346: gcc -E  conftest.c
+configure:3346: $? = 0
+configure:3360: gcc -E  conftest.c
+conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
+ #include <ac_nonexistent.h>
+                            ^
+compilation terminated.
+configure:3360: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME "netgen"
+| #define PACKAGE_TARNAME "netgen"
+| #define PACKAGE_VERSION "1.3"
+| #define PACKAGE_STRING "netgen 1.3"
+| #define PACKAGE_BUGREPORT "[email protected]"
+| #define PACKAGE_URL ""
+| #define NETGEN_VERSION "1.5"
+| #define NETGEN_REVISION "112"
+| /* end confdefs.h.  */
+| #include <ac_nonexistent.h>
+configure:3385: result: gcc -E
+configure:3405: gcc -E  conftest.c
+configure:3405: $? = 0
+configure:3419: gcc -E  conftest.c
+conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
+ #include <ac_nonexistent.h>
+                            ^
+compilation terminated.
+configure:3419: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME "netgen"
+| #define PACKAGE_TARNAME "netgen"
+| #define PACKAGE_VERSION "1.3"
+| #define PACKAGE_STRING "netgen 1.3"
+| #define PACKAGE_BUGREPORT "[email protected]"
+| #define PACKAGE_URL ""
+| #define NETGEN_VERSION "1.5"
+| #define NETGEN_REVISION "112"
+| /* end confdefs.h.  */
+| #include <ac_nonexistent.h>
+configure:3448: checking for library containing strerror
+configure:3479: gcc -o conftest -g   conftest.c  >&5
+configure:3479: $? = 0
+configure:3496: result: none required
+configure:3518: checking for a BSD-compatible install
+configure:3586: result: /bin/install -c
+configure:3640: checking for ranlib
+configure:3656: found /bin/ranlib
+configure:3667: result: ranlib
+configure:3694: checking for gm4
+configure:3727: result: no
+configure:3694: checking for gnum4
+configure:3727: result: no
+configure:3694: checking for m4
+configure:3712: found /bin/m4
+configure:3724: result: /bin/m4
+configure:3765: checking for ld used by GCC
+configure:3828: result: /bin/ld
+configure:3835: checking if the linker (/bin/ld) is GNU ld
+GNU ld version 2.24
+configure:3847: result: yes
+configure:3854: checking for grep that handles long lines and -e
+configure:3912: result: /bin/grep
+configure:3917: checking for egrep
+configure:3979: result: /bin/grep -E
+configure:3984: checking for ANSI C header files
+configure:4004: gcc -c -g  conftest.c >&5
+configure:4004: $? = 0
+configure:4077: gcc -o conftest -g   conftest.c  >&5
+configure:4077: $? = 0
+configure:4077: ./conftest
+configure:4077: $? = 0
+configure:4088: result: yes
+configure:4101: checking for sys/types.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for sys/stat.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for stdlib.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for string.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for memory.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for strings.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for inttypes.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for stdint.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4101: checking for unistd.h
+configure:4101: gcc -c -g  conftest.c >&5
+configure:4101: $? = 0
+configure:4101: result: yes
+configure:4117: checking size of void *
+configure:4122: gcc -o conftest -g   conftest.c  >&5
+configure:4122: $? = 0
+configure:4122: ./conftest
+configure:4122: $? = 0
+configure:4136: result: 8
+configure:4150: checking size of unsigned int
+configure:4155: gcc -o conftest -g   conftest.c  >&5
+configure:4155: $? = 0
+configure:4155: ./conftest
+configure:4155: $? = 0
+configure:4169: result: 4
+configure:4183: checking size of unsigned long
+configure:4188: gcc -o conftest -g   conftest.c  >&5
+configure:4188: $? = 0
+configure:4188: ./conftest
+configure:4188: $? = 0
+configure:4202: result: 8
+configure:4216: checking size of unsigned long long
+configure:4221: gcc -o conftest -g   conftest.c  >&5
+configure:4221: $? = 0
+configure:4221: ./conftest
+configure:4221: $? = 0
+configure:4235: result: 8
+configure:4246: checking whether byte ordering is bigendian
+configure:4261: gcc -c -g  conftest.c >&5
+conftest.c:26:9: error: unknown type name 'not'
+         not a universal capable compiler
+         ^
+conftest.c:26:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'universal'
+         not a universal capable compiler
+               ^
+conftest.c:26:15: error: unknown type name 'universal'
+configure:4261: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME "netgen"
+| #define PACKAGE_TARNAME "netgen"
+| #define PACKAGE_VERSION "1.3"
+| #define PACKAGE_STRING "netgen 1.3"
+| #define PACKAGE_BUGREPORT "[email protected]"
+| #define PACKAGE_URL ""
+| #define NETGEN_VERSION "1.5"
+| #define NETGEN_REVISION "112"
+| #define STDC_HEADERS 1
+| #define HAVE_SYS_TYPES_H 1
+| #define HAVE_SYS_STAT_H 1
+| #define HAVE_STDLIB_H 1
+| #define HAVE_STRING_H 1
+| #define HAVE_MEMORY_H 1
+| #define HAVE_STRINGS_H 1
+| #define HAVE_INTTYPES_H 1
+| #define HAVE_STDINT_H 1
+| #define HAVE_UNISTD_H 1
+| #define SIZEOF_VOID_P 8
+| #define SIZEOF_UNSIGNED_INT 4
+| #define SIZEOF_UNSIGNED_LONG 8
+| #define SIZEOF_UNSIGNED_LONG_LONG 8
+| /* end confdefs.h.  */
+| #ifndef __APPLE_CC__
+| 	       not a universal capable compiler
+| 	     #endif
+| 	     typedef int dummy;
+| 
+configure:4306: gcc -c -g  conftest.c >&5
+configure:4306: $? = 0
+configure:4324: gcc -c -g  conftest.c >&5
+conftest.c: In function 'main':
+conftest.c:32:4: error: unknown type name 'not'
+    not big endian
+    ^
+conftest.c:32:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian'
+    not big endian
+            ^
+configure:4324: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME "netgen"
+| #define PACKAGE_TARNAME "netgen"
+| #define PACKAGE_VERSION "1.3"
+| #define PACKAGE_STRING "netgen 1.3"
+| #define PACKAGE_BUGREPORT "[email protected]"
+| #define PACKAGE_URL ""
+| #define NETGEN_VERSION "1.5"
+| #define NETGEN_REVISION "112"
+| #define STDC_HEADERS 1
+| #define HAVE_SYS_TYPES_H 1
+| #define HAVE_SYS_STAT_H 1
+| #define HAVE_STDLIB_H 1
+| #define HAVE_STRING_H 1
+| #define HAVE_MEMORY_H 1
+| #define HAVE_STRINGS_H 1
+| #define HAVE_INTTYPES_H 1
+| #define HAVE_STDINT_H 1
+| #define HAVE_UNISTD_H 1
+| #define SIZEOF_VOID_P 8
+| #define SIZEOF_UNSIGNED_INT 4
+| #define SIZEOF_UNSIGNED_LONG 8
+| #define SIZEOF_UNSIGNED_LONG_LONG 8
+| /* end confdefs.h.  */
+| #include <sys/types.h>
+| 		#include <sys/param.h>
+| 
+| int
+| main ()
+| {
+| #if BYTE_ORDER != BIG_ENDIAN
+| 		 not big endian
+| 		#endif
+| 
+|   ;
+|   return 0;
+| }
+configure:4452: result: no
+configure:4471: checking for ANSI C header files
+configure:4575: result: yes
+configure:4587: checking for setenv
+configure:4587: gcc -o conftest -g   conftest.c  >&5
+configure:4587: $? = 0
+configure:4587: result: yes
+configure:4587: checking for putenv
+configure:4587: gcc -o conftest -g   conftest.c  >&5
+configure:4587: $? = 0
+configure:4587: result: yes
+configure:4597: checking for vfork
+configure:4597: gcc -o conftest -g   conftest.c  >&5
+configure:4597: $? = 0
+configure:4597: result: yes
+configure:4605: checking dirent.h usability
+configure:4605: gcc -c -g  conftest.c >&5
+configure:4605: $? = 0
+configure:4605: result: yes
+configure:4605: checking dirent.h presence
+configure:4605: gcc -E -x c  conftest.c
+configure:4605: $? = 0
+configure:4605: result: yes
+configure:4605: checking for dirent.h
+configure:4605: result: yes
+configure:4618: checking limits.h usability
+configure:4618: gcc -c -g  conftest.c >&5
+configure:4618: $? = 0
+configure:4618: result: yes
+configure:4618: checking limits.h presence
+configure:4618: gcc -E -x c  conftest.c
+configure:4618: $? = 0
+configure:4618: result: yes
+configure:4618: checking for limits.h
+configure:4618: result: yes
+configure:4631: checking param.h usability
+configure:4631: gcc -c -g  conftest.c >&5
+conftest.c:63:19: fatal error: param.h: No such file or directory
+ #include <param.h>
+                   ^
+compilation terminated.
+configure:4631: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME "netgen"
+| #define PACKAGE_TARNAME "netgen"
+| #define PACKAGE_VERSION "1.3"
+| #define PACKAGE_STRING "netgen 1.3"
+| #define PACKAGE_BUGREPORT "[email protected]"
+| #define PACKAGE_URL ""
+| #define NETGEN_VERSION "1.5"
+| #define NETGEN_REVISION "112"
+| #define STDC_HEADERS 1
+| #define HAVE_SYS_TYPES_H 1
+| #define HAVE_SYS_STAT_H 1
+| #define HAVE_STDLIB_H 1
+| #define HAVE_STRING_H 1
+| #define HAVE_MEMORY_H 1
+| #define HAVE_STRINGS_H 1
+| #define HAVE_INTTYPES_H 1
+| #define HAVE_STDINT_H 1
+| #define HAVE_UNISTD_H 1
+| #define SIZEOF_VOID_P 8
+| #define SIZEOF_UNSIGNED_INT 4
+| #define SIZEOF_UNSIGNED_LONG 8
+| #define SIZEOF_UNSIGNED_LONG_LONG 8
+| #define STDC_HEADERS 1
+| #define HAVE_SETENV 1
+| #define HAVE_PUTENV 1
+| #define HAVE_DIRENT_H 1
+| #define HAVE_LIMITS_H 1
+| /* end confdefs.h.  */
+| #include <stdio.h>
+| #ifdef HAVE_SYS_TYPES_H
+| # include <sys/types.h>
+| #endif
+| #ifdef HAVE_SYS_STAT_H
+| # include <sys/stat.h>
+| #endif
+| #ifdef STDC_HEADERS
+| # include <stdlib.h>
+| # include <stddef.h>
+| #else
+| # ifdef HAVE_STDLIB_H
+| #  include <stdlib.h>
+| # endif
+| #endif
+| #ifdef HAVE_STRING_H
+| # if !defined STDC_HEADERS && defined HAVE_MEMORY_H
+| #  include <memory.h>
+| # endif
+| # include <string.h>
+| #endif
+| #ifdef HAVE_STRINGS_H
+| # include <strings.h>
+| #endif
+| #ifdef HAVE_INTTYPES_H
+| # include <inttypes.h>
+| #endif
+| #ifdef HAVE_STDINT_H
+| # include <stdint.h>
+| #endif
+| #ifdef HAVE_UNISTD_H
+| # include <unistd.h>
+| #endif
+| #include <param.h>
+configure:4631: result: no
+configure:4631: checking param.h presence
+configure:4631: gcc -E -x c  conftest.c
+conftest.c:30:19: fatal error: param.h: No such file or directory
+ #include <param.h>
+                   ^
+compilation terminated.
+configure:4631: $? = 1
+configure: failed program was:
+| /* confdefs.h */
+| #define PACKAGE_NAME "netgen"
+| #define PACKAGE_TARNAME "netgen"
+| #define PACKAGE_VERSION "1.3"
+| #define PACKAGE_STRING "netgen 1.3"
+| #define PACKAGE_BUGREPORT "[email protected]"
+| #define PACKAGE_URL ""
+| #define NETGEN_VERSION "1.5"
+| #define NETGEN_REVISION "112"
+| #define STDC_HEADERS 1
+| #define HAVE_SYS_TYPES_H 1
+| #define HAVE_SYS_STAT_H 1
+| #define HAVE_STDLIB_H 1
+| #define HAVE_STRING_H 1
+| #define HAVE_MEMORY_H 1
+| #define HAVE_STRINGS_H 1
+| #define HAVE_INTTYPES_H 1
+| #define HAVE_STDINT_H 1
+| #define HAVE_UNISTD_H 1
+| #define SIZEOF_VOID_P 8
+| #define SIZEOF_UNSIGNED_INT 4
+| #define SIZEOF_UNSIGNED_LONG 8
+| #define SIZEOF_UNSIGNED_LONG_LONG 8
+| #define STDC_HEADERS 1
+| #define HAVE_SETENV 1
+| #define HAVE_PUTENV 1
+| #define HAVE_DIRENT_H 1
+| #define HAVE_LIMITS_H 1
+| /* end confdefs.h.  */
+| #include <param.h>
+configure:4631: result: no
+configure:4631: checking for param.h
+configure:4631: result: no
+configure:4644: checking for python3
+configure:4660: found /bin/python3
+configure:4672: result: yes
+configure:4681: checking for va_copy
+configure:4699: gcc -o conftest -g   conftest.c  >&5
+configure:4699: $? = 0
+configure:4708: result: yes
+configure:4716: checking for __va_copy
+configure:4734: gcc -o conftest -g   conftest.c  >&5
+configure:4734: $? = 0
+configure:4743: result: yes
+configure:4874: checking for tclConfig.sh
+configure:4946: result: /usr/lib64/tclConfig.sh
+configure:4962: checking for tkConfig.sh
+configure:5035: result: /usr/lib64/tkConfig.sh
+configure:5168: checking for wish executable
+configure:5195: result: /usr/bin/wish
+configure:5201: checking for tclsh executable
+configure:5227: result: /usr/bin/tclsh
+configure:5350: checking for X
+configure:5489: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5489: $? = 0
+configure:5539: result: libraries , headers 
+configure:5638: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5638: $? = 0
+configure:5736: checking for gethostbyname
+configure:5736: gcc -o conftest -g   conftest.c  >&5
+configure:5736: $? = 0
+configure:5736: result: yes
+configure:5833: checking for connect
+configure:5833: gcc -o conftest -g   conftest.c  >&5
+configure:5833: $? = 0
+configure:5833: result: yes
+configure:5882: checking for remove
+configure:5882: gcc -o conftest -g   conftest.c  >&5
+configure:5882: $? = 0
+configure:5882: result: yes
+configure:5931: checking for shmat
+configure:5931: gcc -o conftest -g   conftest.c  >&5
+configure:5931: $? = 0
+configure:5931: result: yes
+configure:5989: checking for IceConnectionNumber in -lICE
+configure:6014: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:6014: $? = 0
+configure:6023: result: yes
+configure:6745: creating ./config.status
+
+## ---------------------- ##
+## Running config.status. ##
+## ---------------------- ##
+
+This file was extended by netgen config.status 1.3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = 
+  CONFIG_HEADERS  = 
+  CONFIG_LINKS    = 
+  CONFIG_COMMANDS = 
+  $ ./config.status 
+
+on stravinsky
+
+config.status:784: creating defs.mak
+config.status:887: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
+
+## ---------------- ##
+## Cache variables. ##
+## ---------------- ##
+
+ac_cv_build=x86_64-unknown-linux-gnu
+ac_cv_c___va_copy=yes
+ac_cv_c_bigendian=no
+ac_cv_c_compiler_gnu=yes
+ac_cv_c_va_copy=yes
+ac_cv_env_CC_set=
+ac_cv_env_CC_value=
+ac_cv_env_CFLAGS_set=set
+ac_cv_env_CFLAGS_value=-g
+ac_cv_env_CPPFLAGS_set=
+ac_cv_env_CPPFLAGS_value=
+ac_cv_env_CPP_set=
+ac_cv_env_CPP_value=
+ac_cv_env_LDFLAGS_set=
+ac_cv_env_LDFLAGS_value=
+ac_cv_env_LIBS_set=
+ac_cv_env_LIBS_value=
+ac_cv_env_XMKMF_set=
+ac_cv_env_XMKMF_value=
+ac_cv_env_build_alias_set=
+ac_cv_env_build_alias_value=
+ac_cv_env_host_alias_set=
+ac_cv_env_host_alias_value=
+ac_cv_env_target_alias_set=
+ac_cv_env_target_alias_value=
+ac_cv_func_connect=yes
+ac_cv_func_gethostbyname=yes
+ac_cv_func_putenv=yes
+ac_cv_func_remove=yes
+ac_cv_func_setenv=yes
+ac_cv_func_shmat=yes
+ac_cv_func_vfork=yes
+ac_cv_have_x='have_x=yes	ac_x_includes='\'''\''	ac_x_libraries='\'''\'''
+ac_cv_header_dirent_h=yes
+ac_cv_header_inttypes_h=yes
+ac_cv_header_limits_h=yes
+ac_cv_header_memory_h=yes
+ac_cv_header_param_h=no
+ac_cv_header_stdc=yes
+ac_cv_header_stdint_h=yes
+ac_cv_header_stdlib_h=yes
+ac_cv_header_string_h=yes
+ac_cv_header_strings_h=yes
+ac_cv_header_sys_stat_h=yes
+ac_cv_header_sys_types_h=yes
+ac_cv_header_unistd_h=yes
+ac_cv_host=x86_64-unknown-linux-gnu
+ac_cv_lib_ICE_IceConnectionNumber=yes
+ac_cv_objext=o
+ac_cv_path_EGREP='/bin/grep -E'
+ac_cv_path_GREP=/bin/grep
+ac_cv_path_LD=/bin/ld
+ac_cv_path_M4=/bin/m4
+ac_cv_path_install='/bin/install -c'
+ac_cv_prog_CPP='gcc -E'
+ac_cv_prog_HAVE_PYTHON3=yes
+ac_cv_prog_ac_ct_CC=gcc
+ac_cv_prog_ac_ct_RANLIB=ranlib
+ac_cv_prog_cc_c89=
+ac_cv_prog_cc_g=yes
+ac_cv_prog_gnu_ld=yes
+ac_cv_search_strerror='none required'
+ac_cv_sizeof_unsigned_int=4
+ac_cv_sizeof_unsigned_long=8
+ac_cv_sizeof_unsigned_long_long=8
+ac_cv_sizeof_void_p=8
+ac_cv_target=x86_64-unknown-linux-gnu
+
+## ----------------- ##
+## Output variables. ##
+## ----------------- ##
+
+ALL_TARGET='tcl'
+CC='gcc'
+CFLAGS='-g -m64 -fPIC'
+CPP='gcc -E -x c'
+CPPFLAGS=''
+DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"112\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEPEND_FLAG='-MM'
+ECHO_C=''
+ECHO_N='printf'
+ECHO_T=''
+EGREP='/bin/grep -E'
+EXEEXT=''
+EXTRA_LIB_SPECS='-ldl'
+GREP='/bin/grep'
+HAVE_PYTHON3='yes'
+INC_SPECS=''
+INSTALL_DATA='${INSTALL} -m 644'
+INSTALL_PROGRAM='${INSTALL}'
+INSTALL_SCRIPT='${INSTALL}'
+INSTALL_TARGET='install-tcl'
+LD='/bin/ld'
+LDDL_FLAGS=' -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map'
+LDFLAGS=''
+LD_RUN_PATH=''
+LIBOBJS=''
+LIBS=''
+LIB_SPECS=' -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6'
+LIB_SPECS_NOSTUB=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
+LTLIBOBJS=''
+M4='/bin/m4'
+OBJEXT='o'
+PACKAGE='netgen'
+PACKAGE_BUGREPORT='[email protected]'
+PACKAGE_NAME='netgen'
+PACKAGE_STRING='netgen 1.3'
+PACKAGE_TARNAME='netgen'
+PACKAGE_URL=''
+PACKAGE_VERSION='1.3'
+PATH_SEPARATOR=':'
+RANLIB='ranlib'
+SCRIPTS=''
+SHDLIB_EXT='.so'
+SHELL='/bin/sh'
+SHLIB_CFLAGS='-fPIC'
+SHLIB_LD=''
+SHLIB_LIB_SPECS=''
+TCLSH_EXE='/usr/bin/tclsh'
+TCL_LIB_DIR='/usr/lib'
+VERSION=''
+WISH_EXE='/usr/bin/wish'
+XMKMF=''
+X_CFLAGS=''
+X_EXTRA_LIBS=''
+X_LIBS=''
+X_PRE_LIBS=' -lSM -lICE'
+ac_ct_CC='gcc'
+bindir='${exec_prefix}/bin'
+build='x86_64-unknown-linux-gnu'
+build_alias=''
+build_cpu='x86_64'
+build_os='linux-gnu'
+build_vendor='unknown'
+cadinstall=' tcltk'
+datadir='${datarootdir}'
+datarootdir='${prefix}/share'
+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+dvidir='${docdir}'
+exec_prefix='${prefix}'
+extra_defs=' -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"'
+extra_libs=' ${NETGENDIR}/tcltk/libtcltk.o'
+gr_cflags=''
+gr_dflags=' -DX11 -DXLIB'
+gr_libs=' -lX11'
+gr_srcs=' ${TK_SRCS}'
+host='x86_64-unknown-linux-gnu'
+host_alias=''
+host_cpu='x86_64'
+host_os='linux-gnu'
+host_vendor='unknown'
+htmldir='${docdir}'
+includedir='${prefix}/include'
+infodir='${datarootdir}/info'
+ld_extra_libs=''
+ld_extra_objs=''
+libdir='${exec_prefix}/lib'
+libexecdir='${exec_prefix}/libexec'
+localedir='${datarootdir}/locale'
+localstatedir='${prefix}/var'
+mandir='${datarootdir}/man'
+modules=' tcltk'
+oldincludedir='/usr/include'
+pdfdir='${docdir}'
+prefix='/usr/local'
+program_transform_name='s,x,x,'
+programs=' tcltk'
+psdir='${docdir}'
+sbindir='${exec_prefix}/sbin'
+sharedstatedir='${prefix}/com'
+stub_defs=' -DUSE_TCL_STUBS -DUSE_TK_STUBS'
+sub_extra_libs=''
+sysconfdir='${prefix}/etc'
+target='x86_64-unknown-linux-gnu'
+target_alias=''
+target_cpu='x86_64'
+target_os='linux-gnu'
+target_vendor='unknown'
+top_extra_libs=''
+unused=''
+
+## ----------- ##
+## confdefs.h. ##
+## ----------- ##
+
+/* confdefs.h */
+#define PACKAGE_NAME "netgen"
+#define PACKAGE_TARNAME "netgen"
+#define PACKAGE_VERSION "1.3"
+#define PACKAGE_STRING "netgen 1.3"
+#define PACKAGE_BUGREPORT "[email protected]"
+#define PACKAGE_URL ""
+#define NETGEN_VERSION "1.5"
+#define NETGEN_REVISION "112"
+#define STDC_HEADERS 1
+#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_STDLIB_H 1
+#define HAVE_STRING_H 1
+#define HAVE_MEMORY_H 1
+#define HAVE_STRINGS_H 1
+#define HAVE_INTTYPES_H 1
+#define HAVE_STDINT_H 1
+#define HAVE_UNISTD_H 1
+#define SIZEOF_VOID_P 8
+#define SIZEOF_UNSIGNED_INT 4
+#define SIZEOF_UNSIGNED_LONG 8
+#define SIZEOF_UNSIGNED_LONG_LONG 8
+#define STDC_HEADERS 1
+#define HAVE_SETENV 1
+#define HAVE_PUTENV 1
+#define HAVE_DIRENT_H 1
+#define HAVE_LIMITS_H 1
+#define HAVE_VA_COPY 1
+#define HAVE___VA_COPY 1
+#define DBUG_OFF 1
+#define TCL_NETGEN 1
+#define linux 1
+#define SYSV 1
+#define ISC 1
+
+configure: exit 0

scripts/config.status

@@ -0,0 +1,941 @@
+#! /bin/sh
+# Generated by configure.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by netgen $as_me 1.3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+# Files that config.status was made for.
+config_files=" defs.mak"
+
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to <[email protected]>."
+
+ac_cs_config="'CFLAGS=-g'"
+ac_cs_version="\
+netgen config.status 1.3
+configured by ./configure, generated by GNU Autoconf 2.69,
+  with options \"$ac_cs_config\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='/home/tim/gitsrc/netgen-1.5/scripts'
+srcdir='..'
+INSTALL='/bin/install -c'
+test -n "$AWK" || AWK=awk
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+if $ac_cs_recheck; then
+  set X /bin/sh './configure'  'CFLAGS=-g' $ac_configure_extra_args --no-create --no-recursion
+  shift
+  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
+  CONFIG_SHELL='/bin/sh'
+  export CONFIG_SHELL
+  exec "$@"
+fi
+
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "defs.mak") CONFIG_FILES="$CONFIG_FILES defs.mak" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
+S["LTLIBOBJS"]=""
+S["LIBOBJS"]=""
+S["INSTALL_TARGET"]="install-tcl"
+S["ALL_TARGET"]="tcl"
+S["LD_RUN_PATH"]=""
+S["SHLIB_CFLAGS"]="-fPIC"
+S["DEPEND_FLAG"]="-MM"
+S["gr_srcs"]=" ${TK_SRCS}"
+S["gr_libs"]=" -lX11"
+S["gr_dflags"]=" -DX11 -DXLIB"
+S["gr_cflags"]=""
+S["cadinstall"]=" tcltk"
+S["programs"]=" tcltk"
+S["unused"]=""
+S["modules"]=" tcltk"
+S["sub_extra_libs"]=""
+S["top_extra_libs"]=""
+S["ld_extra_objs"]=""
+S["ld_extra_libs"]=""
+S["stub_defs"]=" -DUSE_TCL_STUBS -DUSE_TK_STUBS"
+S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\" -DTCL_DIR=\\\"${TCLDIR}\\\""
+S["extra_libs"]=" ${NETGENDIR}/tcltk/libtcltk.o"
+S["SCRIPTS"]=""
+S["PACKAGE"]="netgen"
+S["VERSION"]=""
+S["TCL_LIB_DIR"]="/usr/lib"
+S["TCLSH_EXE"]="/usr/bin/tclsh"
+S["WISH_EXE"]="/usr/bin/wish"
+S["LIB_SPECS_NOSTUB"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
+S["LIB_SPECS"]=" -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6"
+S["INC_SPECS"]=""
+S["EXTRA_LIB_SPECS"]="-ldl"
+S["SHLIB_LIB_SPECS"]=""
+S["LDDL_FLAGS"]=" -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map"
+S["LD"]="/bin/ld"
+S["SHLIB_LD"]=""
+S["SHDLIB_EXT"]=".so"
+S["X_EXTRA_LIBS"]=""
+S["X_LIBS"]=""
+S["X_PRE_LIBS"]=" -lSM -lICE"
+S["X_CFLAGS"]=""
+S["XMKMF"]=""
+S["HAVE_PYTHON3"]="yes"
+S["EGREP"]="/bin/grep -E"
+S["GREP"]="/bin/grep"
+S["M4"]="/bin/m4"
+S["RANLIB"]="ranlib"
+S["INSTALL_DATA"]="${INSTALL} -m 644"
+S["INSTALL_SCRIPT"]="${INSTALL}"
+S["INSTALL_PROGRAM"]="${INSTALL}"
+S["CPP"]="gcc -E -x c"
+S["OBJEXT"]="o"
+S["EXEEXT"]=""
+S["ac_ct_CC"]="gcc"
+S["CPPFLAGS"]=""
+S["LDFLAGS"]=""
+S["CFLAGS"]="-g -m64 -fPIC"
+S["CC"]="gcc"
+S["target_os"]="linux-gnu"
+S["target_vendor"]="unknown"
+S["target_cpu"]="x86_64"
+S["target"]="x86_64-unknown-linux-gnu"
+S["host_os"]="linux-gnu"
+S["host_vendor"]="unknown"
+S["host_cpu"]="x86_64"
+S["host"]="x86_64-unknown-linux-gnu"
+S["build_os"]="linux-gnu"
+S["build_vendor"]="unknown"
+S["build_cpu"]="x86_64"
+S["build"]="x86_64-unknown-linux-gnu"
+S["target_alias"]=""
+S["host_alias"]=""
+S["build_alias"]=""
+S["LIBS"]=""
+S["ECHO_T"]=""
+S["ECHO_N"]="-n"
+S["ECHO_C"]=""
+S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\
+"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"112\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 "\
+"-DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -"\
+"DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DH"\
+"AVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"
+S["mandir"]="${datarootdir}/man"
+S["localedir"]="${datarootdir}/locale"
+S["libdir"]="${exec_prefix}/lib"
+S["psdir"]="${docdir}"
+S["pdfdir"]="${docdir}"
+S["dvidir"]="${docdir}"
+S["htmldir"]="${docdir}"
+S["infodir"]="${datarootdir}/info"
+S["docdir"]="${datarootdir}/doc/${PACKAGE_TARNAME}"
+S["oldincludedir"]="/usr/include"
+S["includedir"]="${prefix}/include"
+S["localstatedir"]="${prefix}/var"
+S["sharedstatedir"]="${prefix}/com"
+S["sysconfdir"]="${prefix}/etc"
+S["datadir"]="${datarootdir}"
+S["datarootdir"]="${prefix}/share"
+S["libexecdir"]="${exec_prefix}/libexec"
+S["sbindir"]="${exec_prefix}/sbin"
+S["bindir"]="${exec_prefix}/bin"
+S["program_transform_name"]="s,x,x,"
+S["prefix"]="/usr/local"
+S["exec_prefix"]="${prefix}"
+S["PACKAGE_URL"]=""
+S["PACKAGE_BUGREPORT"]="[email protected]"
+S["PACKAGE_STRING"]="netgen 1.3"
+S["PACKAGE_VERSION"]="1.3"
+S["PACKAGE_TARNAME"]="netgen"
+S["PACKAGE_NAME"]="netgen"
+S["PATH_SEPARATOR"]=":"
+S["SHELL"]="/bin/sh"
+_ACAWK
+cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+  case $INSTALL in
+  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
+  *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
+  esac
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  ac_datarootdir_hack='
+  s&@datadir@&${datarootdir}&g
+  s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g
+  s&@infodir@&${datarootdir}/info&g
+  s&@localedir@&${datarootdir}/locale&g
+  s&@mandir@&${datarootdir}/man&g
+  s&\${datarootdir}&${prefix}/share&g' ;;
+esac
+ac_sed_extra="
+
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+s&@INSTALL@&$ac_INSTALL&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+as_fn_exit 0

scripts/configure

@@ -633,7 +633,6 @@ gr_srcs
 gr_libs
 gr_dflags
 gr_cflags
-DIST_DIR
 cadinstall
 programs
 unused
@@ -735,7 +734,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 with_gnu_ld
-with_distdir
 with_interpreter
 with_tcl
 with_tk
@@ -1374,7 +1372,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-distdir=DIR       install into location DIR for distribution
   --with-interpreter=arg	enable interpreter
   --with-tcl=DIR          Find tclConfig.sh in DIR
   --with-tk=DIR           Find tkConfig.sh in DIR
@@ -4801,24 +4798,6 @@ usingTcl=1
 usingX11=
 
 
-# For distributed installs, where the run-time files are installed in a
-# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
-# the prefix is replaced by the destination directory, rather than appended
-# to it.
-DIST_DIR="\${exec_prefix}"
-
-# Check whether --with-distdir was given.
-if test "${with_distdir+set}" = set; then :
-  withval=$with_distdir;
-  if test "$withval" = "no" -o "$withval" = "NO" ; then
-     DIST_DIR="\${exec_prefix}"
-  else
-     DIST_DIR=${withval}
-  fi
-
-fi
-
-
 
 # Check whether --with-interpreter was given.
 if test "${with_interpreter+set}" = set; then :
@@ -6434,7 +6413,7 @@ fi
       # Not available on all versions:  check for include file.
       SHLIB_CFLAGS="-fpic"
       LDDL_FLAGS="-shared ${LIB_SPECS}"
-      CFLAGS="${CFLAGS} -L/usr/X11R6/include"
+      CFLAGS="${CFLAGS} -l/usr/X11R6/include"
       ;;
 
     *-netbsd*|*-openbsd*)
@@ -6608,7 +6587,6 @@ fi
 
 
 
-
 
 
 ac_config_files="$ac_config_files defs.mak"

scripts/configure.in

@@ -249,20 +249,6 @@ usingX11=
 
 dnl Compile-time options below. . .
 
-# For distributed installs, where the run-time files are installed in a
-# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
-# the prefix is replaced by the destination directory, rather than appended
-# to it.
-DIST_DIR="\${exec_prefix}"
-AC_ARG_WITH(distdir,
-[  --with-distdir=DIR       install into location DIR for distribution], [
-  if test "$withval" = "no" -o "$withval" = "NO" ; then
-     DIST_DIR="\${exec_prefix}"
-  else
-     DIST_DIR=${withval}
-  fi
-], )
-
 AC_ARG_WITH(interpreter,
 [  --with-interpreter=[arg]	enable interpreter], [
   if test "$withval" = "no" -o "$withval" = "NO"; then
@@ -1134,7 +1120,7 @@ if test $usingTcl ; then
       # Not available on all versions:  check for include file.
       SHLIB_CFLAGS="-fpic"
       LDDL_FLAGS="-shared ${LIB_SPECS}"
-      CFLAGS="${CFLAGS} -L/usr/X11R6/include"
+      CFLAGS="${CFLAGS} -l/usr/X11R6/include"
       ;;
 
     *-netbsd*|*-openbsd*)
@@ -1286,7 +1272,6 @@ AC_SUBST(modules)
 AC_SUBST(unused)
 AC_SUBST(programs)
 AC_SUBST(cadinstall)
-AC_SUBST(DIST_DIR)
 
 AC_SUBST(gr_cflags)
 AC_SUBST(gr_dflags)

scripts/defs.mak

@@ -0,0 +1,85 @@
+# defs.mak.in --
+# source file for autoconf-generated "defs.mak" for netgen
+
+# defs.mak.  Generated from defs.mak.in by configure.
+# Feel free to change the values in here to suit your needs.
+# Be aware that running scripts/configure again will overwrite
+# any changes!
+
+SHELL                  = /bin/sh
+
+prefix = ${BUILDROOT}/usr/local
+exec_prefix = ${prefix}
+bindir = ${exec_prefix}/bin
+libdir = ${exec_prefix}/lib
+mandir = ${prefix}/share/man
+
+VERSION                = 
+
+SCRIPTS                = ${NETGENDIR}/scripts
+
+INSTALL = /bin/install -c
+INSTALL_PROGRAM = ${INSTALL}
+INSTALL_DATA = ${INSTALL} -m 644
+INSTALL_SCRIPT = ${INSTALL}
+
+# Override standard "make" target when compiling under TCL
+ALL_TARGET = tcl
+INSTALL_TARGET = install-tcl
+
+# Change CADDIR to install in a different place
+BINDIR                 = ${bindir}
+MANDIR                 = ${mandir}
+LIBDIR                 = ${libdir}
+DOCDIR                 = ${libdir}/netgen/doc
+TCLDIR                 = ${libdir}/netgen/tcl
+PYDIR		       = ${libdir}/netgen/python
+
+MAIN_EXTRA_LIBS        =  ${NETGENDIR}/tcltk/libtcltk.o
+LD_EXTRA_LIBS          = 
+LD_SHARED              = 
+TOP_EXTRA_LIBS         = 
+SUB_EXTRA_LIBS         = 
+
+MODULES               +=  tcltk
+UNUSED_MODULES        += 
+PROGRAMS              +=  tcltk
+INSTALL_CAD_DIRS      +=  tcltk
+
+RM                     = rm -f
+CP                     = cp
+AR                     = @AR@
+ARFLAGS                = crv
+LINK		       = /bin/ld -r
+LD                     = /bin/ld
+M4		       = /bin/m4
+RANLIB                 = ranlib
+SHDLIB_EXT	       = .so
+LDDL_FLAGS             =  -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
+LD_RUN_PATH            = 
+LIB_SPECS              =  -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6
+LIB_SPECS_NOSTUB       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+WISH_EXE	       = /usr/bin/wish
+TCL_LIB_DIR	       = /usr/lib
+
+CC                     = gcc
+CPP                    = gcc -E -x c
+CXX                    = @CXX@
+
+CPPFLAGS               = -I. -I${NETGENDIR} 
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"112\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"112\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+CFLAGS                 = -g -m64 -fPIC -fPIC 
+
+DEPEND_FILE            = Depend
+DEPEND_FLAG            = -MM
+EXEEXT		       = 
+
+GR_CFLAGS              =  
+GR_DFLAGS              =  -DX11 -DXLIB -DNDEBUG
+GR_LIBS                =  -lX11 
+GR_SRCS                =  ${TK_SRCS}
+
+OBJS      = ${SRCS:.c=.o}
+LIB_OBJS  = ${LIB_SRCS:.c=.o}
+CLEANS    = ${OBJS} ${LIB_OBJS} lib${MODULE}.a lib${MODULE}.o ${MODULE}

scripts/defs.mak.in

@@ -35,13 +35,6 @@ DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
 PYDIR		       = ${libdir}/netgen/python
 
-INSTALL_BINDIR                 = @DIST_DIR@/bin
-INSTALL_MANDIR                 = @DIST_DIR@/share/man
-INSTALL_LIBDIR                 = @DIST_DIR@/lib
-INSTALL_DOCDIR                 = ${INSTALL_LIBDIR}/netgen/doc
-INSTALL_TCLDIR                 = ${INSTALL_LIBDIR}/netgen/tcl
-INSTALL_PYDIR		       = ${INSTALL_LIBDIR}/netgen/python
-
 MAIN_EXTRA_LIBS        = @extra_libs@
 LD_EXTRA_LIBS          = @ld_extra_libs@
 LD_SHARED              = @ld_extra_objs@

scripts/makedbh

@@ -0,0 +1,187 @@
+#!/bin/csh -f
+#
+# makes the "database.h" (1st argument, $1) file from "database.h.in"
+# (2nd argument, $2), setting various mask operation definitions
+# according to the number of words implied by the value of TT_MAXTYPES
+
+# The following mess grabs the value of TT_MAXTYPES from database.h.in
+#
+set maxtypes=`sed -n -e '/^#define[[:space:]]*TT_MAXTYPES/s/#define[[:space:]]*TT_MAXTYPES[[:space:]]*//p' < $1 | sed -e 's/\/\*[[:print:]]*\*\/[[:space:]]*//g' `
+#
+# Alternative method works with outdated versions of sed/ed.
+#
+if ($maxtypes == "") then
+   set maxtypes=`sed -n -e '/^#define[ 	]*TT_MAXTYPES/s/#define[ 	]*TT_MAXTYPES[ 	]*//p' < $1 | sed -e 's/\/\*.*\*\/[ 	]*//g' `
+endif
+#
+# If we can't generate database.h correctly, nothing is going to compile.
+#
+if ($maxtypes == "") then
+   echo "Bad sed script in scripts/makedbh:  Cannot generate database/database.h!"
+   exit
+endif
+
+# Find derived values from bits per word
+# Note that bits-per-word should be determined from the compiler, but
+# 32 bits per word has always been hardwired into magic.
+#
+set bpw = 32
+
+# @ wordmask=$bpw - 1
+# set wordshift=`echo "c=l($bpw); d=l(2); scale=0; c/d" | bc -l`
+# @ maskwords=$maxtypes + $bpw - 1
+# @ maskwords/=$bpw
+
+@ maskwords=$maxtypes + $bpw - 1
+@ maskwords/=$bpw
+
+
+# Generate the main part of the database.h file from database.h.in
+cat $1 > $2
+
+# Generate a list of integers from 0 to the value of "maskwords" - 1
+set count=""
+@ maskwords--
+while (${maskwords} >= 0)
+   set count=`echo ${count} ${maskwords}`
+   @ maskwords--
+end
+
+# Definitions
+
+echo "#define TTMaskZero(m) ( \" >> $2
+foreach i (${count})
+   echo -n "	(m)->tt_words[$i] = 0" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskIsZero(m) ( \" >> $2
+foreach i (${count})
+   echo -n "	(m)->tt_words[$i] == 0" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo " && \" >> $2
+   endif
+end
+
+echo "#define TTMaskEqual(m, n) ( \" >> $2
+foreach i (${count})
+   echo -n "	(m)->tt_words[$i] == (n)->tt_words[$i]" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo " && \" >> $2
+   endif
+end
+
+echo "#define TTMaskIntersect(m, n) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] & (n)->tt_words[$i])" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo " || \" >> $2
+   endif
+end
+
+echo "#define TTMaskCom(m) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] = ~(m)->tt_words[$i])" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskCom2(m, n) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] = ~(n)->tt_words[$i])" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskSetMask(m, n) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] |= (n)->tt_words[$i])" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskSetMask3(m, n, o) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] |= (n)->tt_words[$i] | (o)->tt_words[$i])" \
+	>> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskAndMask(m, n) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] &= (n)->tt_words[$i])" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskAndMask3(m, n, o) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] = (n)->tt_words[$i] & (o)->tt_words[$i])" \
+	>> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskClearMask(m, n) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] &= ~(n)->tt_words[$i])" >> $2
+   if ($i == 0) then
+      echo ")" >> $2
+      echo "" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "#define TTMaskClearMask3(m, n, o) ( \" >> $2
+foreach i (${count})
+   echo -n "	((m)->tt_words[$i] = (n)->tt_words[$i] & ~(o)->tt_words[$i])" \
+	>> $2
+   if ($i == 0) then
+      echo ")" >> $2
+   else
+      echo ", \" >> $2
+   endif
+end
+
+echo "" >> $2
+echo "#endif /* _DATABASE_H */" >> $2

tcltk/Makefile

@@ -12,20 +12,20 @@ CLEANS += netgen.sh netgen.tcl netgenexec${EXEEXT}
 CFLAGS += -I${NETGENDIR}/base
 
 TCL_FILES = \
-	$(DESTDIR)${INSTALL_TCLDIR}/tkcon.tcl \
-	$(DESTDIR)${INSTALL_TCLDIR}/console.tcl \
-	$(DESTDIR)${INSTALL_TCLDIR}/netgen.tcl
+	$(DESTDIR)${TCLDIR}/tkcon.tcl \
+	$(DESTDIR)${TCLDIR}/console.tcl \
+	$(DESTDIR)${TCLDIR}/netgen.tcl
 
 tcl-main: netgenexec${EXEEXT} netgen.tcl netgen.sh
 
-install-tcl: netgenexec${EXEEXT} $(DESTDIR)${INSTALL_BINDIR}/netgen.sh ${TCL_FILES}
-	${RM} $(DESTDIR)${INSTALL_TCLDIR}/netgenexec${EXEEXT}
-	${CP} netgenexec${EXEEXT} $(DESTDIR)${INSTALL_TCLDIR}/netgenexec${EXEEXT}
+install-tcl: netgenexec${EXEEXT} $(DESTDIR)${BINDIR}/netgen.sh ${TCL_FILES}
+	${RM} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT}
+	${CP} netgenexec${EXEEXT} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT}
 
 netgenexec${EXEEXT}: netgenexec.c
 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} netgenexec.c \
 		-o netgenexec${EXEEXT} \
-		${LIB_SPECS_NOSTUB} ${LDFLAGS} ${LIBS} ${GR_LIBS}
+		${LDFLAGS} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 netgen.tcl: netgen.tcl.in
 	sed -e 's%TCL_DIR%${TCLDIR}%g' \
@@ -39,13 +39,13 @@ netgen.sh: netgen.sh.in
 	    -e 's%WISH_EXE%${WISH_EXE}%g' \
 	    netgen.sh.in > netgen.sh
 
-$(DESTDIR)${INSTALL_TCLDIR}/%: %
-	${RM} $(DESTDIR)${INSTALL_TCLDIR}/$*
-	${CP} $* $(DESTDIR)${INSTALL_TCLDIR}/$*
+$(DESTDIR)${TCLDIR}/%: %
+	${RM} $(DESTDIR)${TCLDIR}/$*
+	${CP} $* $(DESTDIR)${TCLDIR}/$*
 
-$(DESTDIR)${INSTALL_BINDIR}/netgen.sh: netgen.sh
-	${RM} $(DESTDIR)${INSTALL_BINDIR}/netgen.sh $(DESTDIR)${INSTALL_BINDIR}/netgen
-	${CP} netgen.sh $(DESTDIR)${INSTALL_BINDIR}/netgen
-	(cd $(DESTDIR)${INSTALL_BINDIR}; chmod 0755 netgen)
+$(DESTDIR)${BINDIR}/netgen.sh: netgen.sh
+	${RM} $(DESTDIR)${BINDIR}/netgen.sh $(DESTDIR)${BINDIR}/netgen
+	${CP} netgen.sh $(DESTDIR)${BINDIR}/netgen
+	(cd $(DESTDIR)${BINDIR}; chmod 0755 netgen)
 
 include ${NETGENDIR}/rules.mak

tcltk/netgen.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-#
-# For installation, put this file (netgen.sh) in a standard executable path.
-# Put startup script "netgen.tcl" and shared library "tclnetgen.so"
-# in ${CAD_ROOT}/netgen/tcl/, with a symbolic link from file
-# ".wishrc" to "netgen.tcl".
-#
-# This script starts irsim under the Tcl interpreter,
-# reading commands from a special .wishrc script which
-# launches irsim and retains the Tcl interactive interpreter.
-
-# Parse for the argument "-c[onsole]".  If it exists, run netgen
-# with the TkCon console.  Strip this argument from the argument list.
-
-TKCON=true
-BATCH=
-GUI=
-NETGEN_WISH=/usr/bin/wish
-export NETGEN_WISH
-
-# Hacks for Cygwin
-if [ ${TERM:=""} = "cygwin" ]; then
-   export PATH="$PATH:/usr/lib"
-   export DISPLAY=${DISPLAY:=":0"}
-fi
-
-# Preserve quotes in arguments (thanks, Stackoverflow!)
-arglist=''
-for i in "$@" ; do
-   case $i in
-      -noc*) TKCON=;;
-      -bat*) BATCH=true; TKCON=;;
-      -gui) GUI=true; TKCON=;;
-      *) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";;
-   esac
-done 
-
-if [ $TKCON ]; then
-
-   exec /usr/local/lib/netgen/tcl/tkcon.tcl \
-	-eval "source /usr/local/lib/netgen/tcl/console.tcl" \
-	-slave "package require Tk; set argc $#; set argv [list $arglist]; \
-	source /usr/local/lib/netgen/tcl/netgen.tcl"
-
-# Run the Python LVS manager GUI
-
-elif [ $GUI ]; then
-    exec /usr/local/lib/netgen/python/lvs_manager.py $@
-
-#
-# Run the stand-in for wish (netgenexec), which acts exactly like "wish"
-# except that it replaces ~/.wishrc with netgen.tcl.  This executable is
-# *only* needed when running without the console; the console itself is
-# capable of sourcing the startup script.
-#
-
-else
-   exec /usr/local/lib/netgen/tcl/netgenexec -- "$@"
-
-fi

tcltk/netgen.tcl

@@ -1,753 +0,0 @@
-# Wishrc startup for ToolScript (netgen)
-#
-# For installation:  Put this file and also tclnetgen.so into
-# directory ${CAD_ROOT}/netgen/tcl/, and set the "load" line below
-# to point to the location of tclnetgen.so.  Also see comments
-# in shell script "netgen.sh".
-#
-
-# Check namespaces for existence of other applications
-set UsingMagic 0
-set UsingXCircuit 0
-set UsingIRSIM 0
-set batchmode 0
-set nlist [namespace children]
-foreach i $nlist {
-   switch $i {
-      ::magic { set UsingMagic 1 }
-      ::xcircuit { set UsingXCircuit 1 }
-      ::irsim { set UsingIRSIM 1 }
-   }
-}
-
-# -lazy option not needed if stubs libraries are handled correctly
-# load -lazy /usr/local/lib/netgen/tcl/tclnetgen.so
-
-load /usr/local/lib/netgen/tcl/tclnetgen.so
-
-#----------------------------------------------------------------
-# Convert LVS list result into a JSON file 
-#----------------------------------------------------------------
-
-proc netgen::convert_to_json {filename lvs_final} {
-   set pidx [string last . $filename]
-   set jsonname [string replace $filename $pidx end ".json"]
-   if {![catch {open $jsonname w} fjson]} {
-      puts $fjson "\["
-      # Outer list is of each cell compared
-      set clen [llength $lvs_final]
-      set cidx 0
-      foreach circuit $lvs_final {
-         incr cidx
-         puts $fjson "  \{"
-         set nkeys [llength $circuit]
-         set kidx 0
-	 foreach {key value} $circuit {
-            incr kidx 2
-	    switch $key {
-	       name {
-	          puts $fjson "   \"${key}\": \["
-		  set cktval [lindex $value 0]
-		  puts $fjson "      \"${cktval}\","
-		  set cktval [lindex $value 1]
-		  puts $fjson "      \"${cktval}\""
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       pins {
-	          puts $fjson "   \"${key}\": \["
-	          puts $fjson "      \["
-		  set cktval [lindex $value 0]
-		  foreach pin [lrange $cktval 0 end-1] {
-		     puts $fjson "        \"$pin\","
-		  }
-		  set pin [lindex $cktval end]
-		  puts $fjson "        \"$pin\""
-	          puts $fjson "      \], \["
-		  set cktval [lindex $value 1]
-		  foreach pin [lrange $cktval 0 end-1] {
-		     puts $fjson "        \"$pin\","
-		  }
-		  set pin [lindex $cktval end]
-		  puts $fjson "        \"$pin\""
-	          puts $fjson "      \]"
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-               nets {
-	          puts $fjson "   \"${key}\": \["
-		  set cktval [lindex $value 0]
-		  puts $fjson "    $cktval,"
-		  set cktval [lindex $value 1]
-		  puts $fjson "    $cktval"
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-               }
-	       devices {
-	          puts $fjson "   \"${key}\": \["
-	          puts $fjson "       \["
-		  set cktval [lindex $value 0]
-		  foreach dev [lrange $cktval 0 end-1] {
-		     set devname [lindex $dev 0]
-		     set devnum  [lindex $dev 1]
-		     puts $fjson "         \[\"${devname}\", ${devnum}\],"
-		  }
-		  set dev [lindex $cktval end]
-		  set devname [lindex $dev 0]
-		  set devnum  [lindex $dev 1]
-		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
-	          puts $fjson "       \], \["
-		  set cktval [lindex $value 1]
-		  foreach dev [lrange $cktval 0 end-1] {
-		     set devname [lindex $dev 0]
-		     set devnum  [lindex $dev 1]
-		     puts $fjson "         \[\"${devname}\", ${devnum} \],"
-		  }
-		  set dev [lindex $cktval end]
-		  set devname [lindex $dev 0]
-		  set devnum  [lindex $dev 1]
-		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
-	          puts $fjson "       \]"
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       goodnets -
-	       badnets {
-	          puts $fjson "   \"${key}\": \["
-		  set glen [llength $value]
-		  set gidx 0
-		  foreach group $value {
-		     incr gidx
-	             puts $fjson "      \["
-	             puts $fjson "        \["
-		     set cktval [lindex $group 0]
-		     set nlen [llength $cktval]
-		     set nidx 0
-		     foreach net $cktval {
-			incr nidx
-	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
-		        puts $fjson "            \"$netname\","
-		        puts $fjson "            \["
-			set netconn [lindex $net 1]
-			foreach fanout [lrange $netconn 0 end-1] {
-			   set devname [lindex $fanout 0]
-			   set pinname [lindex $fanout 1]
-			   set count [lindex $fanout 2]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
-			}
-			set fanout [lindex $netconn end]
-			set devname [lindex $fanout 0]
-			set pinname [lindex $fanout 1]
-			set count [lindex $fanout 2]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$nidx == $nlen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \], \["
-		     set cktval [lindex $group 1]
-		     set nlen [llength $cktval]
-		     set nidx 0
-		     foreach net $cktval {
-			incr nidx
-	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
-		        puts $fjson "            \"$netname\","
-		        puts $fjson "            \["
-			set netconn [lindex $net 1]
-			foreach fanout [lrange $netconn 0 end-1] {
-			   set devname [lindex $fanout 0]
-			   set pinname [lindex $fanout 1]
-			   set count [lindex $fanout 2]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
-			}
-			set fanout [lindex $netconn end]
-			set devname [lindex $fanout 0]
-			set pinname [lindex $fanout 1]
-			set count [lindex $fanout 2]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$nidx == $nlen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \]"
-		     if {$gidx == $glen} {
-	                puts $fjson "      \]"
-		     } else {
-	                puts $fjson "      \],"
-		     }
-		  }
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       goodelements -
-	       badelements {
-	          puts $fjson "   \"${key}\": \["
-		  set glen [llength $value]
-		  set gidx 0
-		  foreach group $value {
-		     incr gidx
-	             puts $fjson "      \["
-	             puts $fjson "        \["
-		     set cktval [lindex $group 0]
-		     set ilen [llength $cktval]
-		     set iidx 0
-		     foreach inst $cktval {
-			incr iidx
-	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
-		        puts $fjson "            \"$instname\","
-		        puts $fjson "            \["
-			set instpins [lindex $inst 1]
-			foreach fanout [lrange $instpins 0 end-1] {
-			   set pinname [lindex $fanout 0]
-			   set count [lindex $fanout 1]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$pinname\", $count \],"
-			}
-			set fanout [lindex $instpins end]
-			set pinname [lindex $fanout 0]
-			set count [lindex $fanout 1]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$iidx == $ilen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \], \["
-		     set cktval [lindex $group 1]
-		     set ilen [llength $cktval]
-		     set iidx 0
-		     foreach inst $cktval {
-			incr iidx
-	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
-		        puts $fjson "            \"$instname\","
-		        puts $fjson "            \["
-			set instpins [lindex $inst 1]
-			foreach fanout [lrange $instpins 0 end-1] {
-			   set pinname [lindex $fanout 0]
-			   set count [lindex $fanout 1]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$pinname\", $count \],"
-			}
-			set fanout [lindex $instpins end]
-			set pinname [lindex $fanout 0]
-			set count [lindex $fanout 1]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$iidx == $ilen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \]"
-		     if {$gidx == $glen} {
-	                puts $fjson "      \]"
-		     } else {
-	                puts $fjson "      \],"
-		     }
-		  }
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       properties {
-	          puts $fjson "   \"${key}\": \["
-		  set plen [llength $value]
-                  set pidx 0
-		  foreach instance $value {
-		     incr pidx
-	             puts $fjson "      \["
-		     set instnames [string map {"\\" "\\\\"} [lindex $instance 0]]
-		     set instname0 [string map {"\\" "\\\\"} [lindex $instnames 0]]
-	             puts $fjson "         \["
-		     puts $fjson "           \"${instname0}\","
-	             puts $fjson "           \["
-		     foreach property [lrange $instance 1 end-1] {
-		        set prop0 [lindex $property 0]
-			set propname [lindex $prop0 0]
-			set propval [lindex $prop0 1]
-		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
-		     }
-		     set property [lindex $instance end]
-		     set prop0 [lindex $property 0]
-		     set propname [lindex $prop0 0]
-		     set propval [lindex $prop0 1]
-		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
-	             puts $fjson "           \]"
-	             puts $fjson "         \],"
-		     set instname1 [string map {"\\" "\\\\"} [lindex $instnames 1]]
-	             puts $fjson "         \["
-		     puts $fjson "           \"${instname1}\","
-	             puts $fjson "           \["
-		     foreach property [lrange $instance 1 end-1] {
-		        set prop1 [lindex $property 1]
-			set propname [lindex $prop1 0]
-			set propval [lindex $prop1 1]
-		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
-		     }
-		     set property [lindex $instance end]
-		     set prop1 [lindex $property 1]
-		     set propname [lindex $prop1 0]
-		     set propval [lindex $prop1 1]
-		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
-	             puts $fjson "           \]"
-	             puts $fjson "         \]"
-		     if {$pidx == $plen} {
-	                puts $fjson "      \]"
-		     } else {
-	                puts $fjson "      \],"
-		     }
-		  }
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	    }
-	 }
-         if {$cidx == $clen} {
-            puts $fjson "  \}"
-	 } else {
-            puts $fjson "  \},"
-	 }
-      }
-      puts $fjson "\]"
-   }
-   close $fjson
-}
-
-#----------------------------------------------------------------
-# Define the "lvs" command as a way of calling the netgen options
-# for standard compare, essentially the same as the old "netcomp"
-# standalone program.
-#
-# Use the "canonical" command to parse the file and cell names,
-# although if the cells have not been read in yet, then the
-# original syntax of filename or {filename cellname} is required.
-#
-# "args" is passed to verify and may therefore contain only the
-# value "-list" or nothing.  If "-list", then output is returned
-# as a nested list.
-#----------------------------------------------------------------
-
-proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
-   set dolist 0
-   set dojson 0
-   foreach arg $args {
-      if {$arg == "-list"} {
-	 puts stdout "Generating list result"
-	 set dolist 1
-	 set lvs_final {}
-      } elseif {$arg == "-json"} {
-	 puts stdout "Generating JSON file result"
-	 set dolist 1
-	 set dojson 1
-	 set lvs_final {}
-      } elseif {$arg == "-blackbox"} {
-	 puts stdout "Treating empty subcircuits as black-box cells"
-	 netgen::model blackbox on
-      } elseif {$arg == "-full"} {
-	 puts stdout "Using full symmetry breaking method"
-	 netgen::symmetry full
-      }
-   }
-
-   # Allow name1 or name2 to be a list of {filename cellname},
-   # A single <filename>, or any valid_cellname form if the
-   # file has already been read.
-
-   if {[catch {set flist1 [canonical $name1]}]} {
-      if {[llength $name1] == 2} {
-         set file1 [lindex $name1 0]
-         set cell1 [lindex $name1 1]
-      } else {
-         set file1 $name1
-         set cell1 $name1
-      }
-      puts stdout "Reading netlist file $file1"
-      set fnum1 [netgen::readnet $file1]
-   } else {
-      set cell1 [lindex $flist1 0]
-      set fnum1 [lindex $flist1 1]
-      set flist1 [canonical $fnum1]
-      set file1 [lindex $flist1 0]
-   }
-
-   if {[catch {set flist2 [canonical $name2]}]} {
-      if {[llength $name2] == 2} {
-         set file2 [lindex $name2 0]
-         set cell2 [lindex $name2 1]
-      } else {
-         set file2 $name2
-         set cell2 $name2
-      }
-      puts stdout "Reading netlist file $file2"
-      set fnum2 [netgen::readnet $file2]
-   } else {
-      set cell2 [lindex $flist2 0]
-      set fnum2 [lindex $flist2 1]
-      set flist2 [canonical $fnum2]
-      set file2 [lindex $flist2 0]
-   }
-
-   if {$fnum1 == $fnum2} {
-      puts stderr "Both cells are in the same netlist:  Cannot compare!"
-      return
-   }
-
-   set clist1 [cells list $fnum1]
-   set cidx [lsearch -regexp $clist1 ^$cell1$]
-   if {$cidx < 0} {
-      puts stderr "Cannot find cell $cell1 in file $file1"
-      return
-   } else {
-      set cell1 [lindex $clist1 $cidx]
-   }
-   set clist2 [cells list $fnum2]
-   set cidx [lsearch -regexp $clist2 ^$cell2$]
-   if {$cidx < 0} {
-      puts stderr "Cannot find cell $cell2 in file $file2"
-      return
-   } else {
-      set cell2 [lindex $clist2 $cidx]
-   }
-
-   netgen::compare assign "$fnum1 $cell1" "$fnum2 $cell2"
-
-   if {[file exists $setupfile]} {
-      puts stdout "Reading setup file $setupfile"
-      # Instead of sourcing the setup file, run each line so we can
-      # catch individual errors and not let them halt the LVS process
-      set perrors 0
-      if {![catch {open $setupfile r} fsetup]} {
-	 set sline 0
-	 set command {}
-	 while {[gets $fsetup line] >= 0} {
-	    incr sline
-	    append command $line "\n"
-	    if {[info complete $command]} {
-	       if {[catch {uplevel 1 [list namespace eval netgen $command]} msg]} {
-		  set msg [string trimright $msg "\n"]
-		  puts stderr "Error $setupfile:$sline (ignoring), $msg"
-		  incr perrors
-	       }
-	       set command {}
-	    }
-	 }
-	 close $fsetup
-      } else {
-	 puts stdout "Error:  Cannot read the setup file $setupfile"
-      }
-	
-      if {$perrors > 0} {
-	 puts stdout "Warning:  There were errors reading the setup file"
-      }
-   } elseif {[string first nosetup $setupfile] < 0} {
-      netgen::permute default	;# transistors and resistors
-      netgen::property default
-   }
-
-   if {[string first nolog $logfile] < 0} {
-      puts stdout "Comparison output logged to file $logfile"
-      netgen::log file $logfile
-
-      netgen::log start
-      netgen::log echo off
-      set dolog true
-   } else {
-      set dolog false
-   }
-
-   if {$dolist == 1} {
-      set endval [netgen::compare -list hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
-   } else {
-      set endval [netgen::compare hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
-   }
-   if {$endval == {}} {
-      netgen::log put "No cells in queue!\n"
-      return
-   }
-   set properr {}
-   set pinsgood 0
-   while {$endval != {}} {
-      if {$dolist == 1} {
-         netgen::run -list converge
-      } else {
-         netgen::run converge
-      }
-      netgen::log echo on
-      if {[verify equivalent]} {
-	 # Resolve automorphisms by pin and property
-	 if {$dolist == 1} {
-            netgen::run -list resolve
-	 } else {
-            netgen::run resolve
-	 }
-	 set uresult [verify unique]
-         if {$uresult == 0} {
-	    netgen::log put "   Networks match locally but not globally.\n"
-	    netgen::log put "   Probably connections are swapped.\n"
-	    netgen::log put "   Check the end of logfile ${logfile} for implicated nodes.\n"
-	    if {$dolist == 1} {
-	       verify -list nodes
-	    } else {
-	       verify nodes
-	    }
-
-	    # Flatten the non-matching subcircuit (but not the top-level cells)
-            if {[netgen::print queue] != {}} {
-	       netgen::log put "  Flattening non-matched subcircuits $endval"
-	       netgen::flatten class "[lindex $endval 0] $fnum1"
-	       netgen::flatten class "[lindex $endval 1] $fnum2"
-	    }
-	 } else {
-	    # Match pins
-            netgen::log echo off
-	    if {$dolist == 1} {
-		set result [equate -list pins "$fnum1 [lindex $endval 0]" \
-				"$fnum2 [lindex $endval 1]"]
-	    } else {
-		set result [equate pins "$fnum1 [lindex $endval 0]" \
-				"$fnum2 [lindex $endval 1]"]
-	    }
-	    if {$result != 0} {
-		equate classes "$fnum1 [lindex $endval 0]" \
-			 "$fnum2 [lindex $endval 1]"
-	    }
-	    set pinsgood $result
-            netgen::log echo on
-	 }
-	 if {$uresult == 2} {lappend properr [lindex $endval 0]}
-      } else {
-	 # Flatten the non-matching subcircuit (but not the top-level cells)
-         if {[netgen::print queue] != {}} {
-	    netgen::log put "  Flattening non-matched subcircuits $endval"
-	    netgen::flatten class "[lindex $endval 0] $fnum1"
-	    netgen::flatten class "[lindex $endval 1] $fnum2"
-	 }
-      }
-      netgen::log echo off
-      if {$dolist == 1} {
-         catch {lappend lvs_final $lvs_out}
-         set lvs_out {}
-         set endval [netgen::compare -list hierarchical]
-      } else {
-         set endval [netgen::compare hierarchical]
-      }
-   }
-   netgen::log echo off
-   puts stdout "Result: " nonewline
-   netgen::log echo on
-   if {$pinsgood == 0} {
-      netgen::log put "The top level cell failed pin matching.\n"
-   } else {
-      verify only
-   }
-   if {$properr != {}} {
-      netgen::log put "The following cells had property errors: $properr\n"
-   }
-   if {$dolog} {
-      netgen::log end
-   }
-   puts stdout "LVS Done."
-   if {$dojson == 1} {
-      netgen::convert_to_json $logfile $lvs_final
-   } elseif {$dolist == 1} {
-      return $lvs_final
-   }
-}
-
-# It is important to make sure no netgen commands overlap with Tcl built-in
-# commands, because otherwise the namespace import will fail.
-
-proc pushnamespace { name } {
-
-   set y [namespace eval ${name} info commands ::${name}::*]
-   set z [info commands]
-
-   foreach v $y {
-      regsub -all {\*} $v {\\*} i
-      set x [namespace tail $i]
-      if {[lsearch $z $x] < 0} {
-         namespace import $i
-      } else {
-            puts "Warning: ${name} command '$x' use fully-qualified name '$v'"
-      }
-   }
-}
-
-proc popnamespace { name } {
-   set z [info commands]
-   set l [expr [string length ${name}] + 5]
-
-   while {[set v [lsearch $z ${name}_tcl_*]] >= 0} {
-      set y [lindex $z $v]
-      set w [string range $y $l end]
-      interp alias {} ::$w {}
-      rename ::$y ::$w
-      puts "Info: replacing ::$w with ::$y"
-   }
-   namespace forget ::${name}::*
-}
-
-set auto_noexec 1       ;# don't EVER call UNIX commands w/o "shell" in front
-
-#----------------------------------------------------------------------
-# Cross-Application section
-#----------------------------------------------------------------------
-
-# Setup IRSIM assuming that the Tcl version is installed.
-# We do not need to rename procedure irsim to NULL because it is
-# redefined in a script, which simply overwrites the original.
-
-proc irsim { args } {
-   global CAD_ROOT
-   set irsimscript [glob -nocomplain ${CAD_ROOT}/irsim/tcl/irsim.tcl]
-   if { ${irsimscript} == {} } {
-      puts stderr "\"irsim\" requires Tcl-based IRSIM version 9.6 or newer."
-      puts stderr "Could not find script \"irsim.tcl\".  If IRSIM is installed in a"
-      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
-      puts stderr "\"source <path>/irsim.tcl\" before doing \"irsim\"."
-   } else {
-      source $irsimscript
-      eval {irsim} $args
-   }
-}
-
-# Setup Xcircuit assuming that the Tcl version is installed.
-
-proc xcircuit { args } {
-   global CAD_ROOT
-   global argc
-   global argv
-   set xcircscript [glob -nocomplain ${CAD_ROOT}/xcircuit*/xcircuit.tcl]
-   if { ${xcircscript} == {} } {
-      puts stderr "\"xcircuit\" requires Tcl-based XCircuit version 3.1 or newer."
-      puts stderr "Could not find script \"xcircuit.tcl\".  If XCircuit is installed in a"
-      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
-      puts stderr "\"source <path>/xcircuit.tcl\"."
-   } else {
-      # if there are multiple installed versions, choose the highest version.
-      if {[llength $xcircscript] > 1} {
-        set xcircscript [lindex [lsort -decreasing -dictionary $xcircscript] 0]
-      }
-      set argv $args
-      set argc [llength $args]
-      uplevel #0 source $xcircscript
-   }
-}
-
-# Setup Magic assuming that the Tcl version is installed.
-
-proc magic { args } {
-   global CAD_ROOT
-   global argc
-   global argv
-   set magicscript [glob -nocomplain ${CAD_ROOT}/magic/tcl/magic.tcl]
-   if { ${magicscript} == {} } {
-      puts stderr "\"magic\" requires Tcl-based Magic version 7.2 or newer."
-      puts stderr "Could not find script \"magic.tcl\".  If Magic is installed in a"
-      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
-      puts stderr "\"source <path>/magic.tcl\"."
-   } else {
-      set argv $args
-      set argc [llength $args]
-      uplevel #0 source $magicscript
-   }
-}
-
-#----------------------------------------------------------------------------
-# Have we called netgen from tkcon or a clone thereof?  If so, set NetgenConsole
-#----------------------------------------------------------------------------
-
-if {! $UsingMagic } {
-   if {[lsearch [interp aliases] tkcon] != -1} {
-      set NetgenConsole tkcon
-      wm withdraw .
-   }
-}
-
-pushnamespace netgen
-
-#----------------------------------------------------------------------------
-# For now, if we are standalone, pop down the default Tk window.
-# Sometime later we may wish to provide a standalone GUI frontend in Tk
-# to improve upon the original X11 "xnetgen" frontend.  If so, its
-# definitions would go below.
-
-if {! $UsingMagic } {
-   if {[lsearch [interp aliases] tkcon] != -1} {
-      if {[string range [wm title .] 0 3] == "wish"} {
-	 wm withdraw .
-      }
-   }
-}
-
-#----------------------------------------------------------------------------
-# No-console mode drops "--" in front of the argument list and "-noc"
-# is retained, so remove them.  Internally, the console will be determined
-# by checking for a slave interpreter, so there is no need for any
-# action here other than removing the argument.
-
-if {[lindex $argv 0] == "--"} {
-   incr argc -1
-   set argv [lrange $argv 1 end]
-}
-
-if {[string range [lindex $argv 0] 0 3] == "-noc"} {
-   incr argc -1
-   set argv [lrange $argv 1 end]
-}
-
-if {[string range [lindex $argv 0] 0 3] == "-bat"} {
-   incr argc -1
-   set argv [lrange $argv 1 end]
-   set batchmode 1
-}
-
-#----------------------------------------------------------------------------
-# Anything on the command line is assumed to be a netgen command to evaluate
-
-if {[catch {eval $argv}]} {
-   puts stdout "$errorInfo"
-}
-if {$batchmode == 1} {quit}
-
-#----------------------------------------------------------------------------
-# Netgen start function drops back to interpreter after initialization & setup

tcltk/netgen.tcl.in

@@ -138,7 +138,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach net $cktval {
 			incr nidx
 	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
+			set netname [string map {"\\" ""} [lindex $net 0]]
 		        puts $fjson "            \"$netname\","
 		        puts $fjson "            \["
 			set netconn [lindex $net 1]
@@ -169,7 +169,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach net $cktval {
 			incr nidx
 	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
+			set netname [string map {"\\" ""} [lindex $net 0]]
 		        puts $fjson "            \"$netname\","
 		        puts $fjson "            \["
 			set netconn [lindex $net 1]
@@ -221,7 +221,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach inst $cktval {
 			incr iidx
 	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
+			set instname [lindex $inst 0]
 		        puts $fjson "            \"$instname\","
 		        puts $fjson "            \["
 			set instpins [lindex $inst 1]
@@ -250,7 +250,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach inst $cktval {
 			incr iidx
 	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
+			set instname [lindex $inst 0]
 		        puts $fjson "            \"$instname\","
 		        puts $fjson "            \["
 			set instpins [lindex $inst 1]
@@ -292,8 +292,8 @@ proc netgen::convert_to_json {filename lvs_final} {
 		  foreach instance $value {
 		     incr pidx
 	             puts $fjson "      \["
-		     set instnames [string map {"\\" "\\\\"} [lindex $instance 0]]
-		     set instname0 [string map {"\\" "\\\\"} [lindex $instnames 0]]
+		     set instnames [lindex $instance 0]
+		     set instname0 [lindex $instnames 0]
 	             puts $fjson "         \["
 		     puts $fjson "           \"${instname0}\","
 	             puts $fjson "           \["
@@ -310,7 +310,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
 	             puts $fjson "           \]"
 	             puts $fjson "         \],"
-		     set instname1 [string map {"\\" "\\\\"} [lindex $instnames 1]]
+		     set instname1 [lindex $instnames 1]
 	             puts $fjson "         \["
 		     puts $fjson "           \"${instname1}\","
 	             puts $fjson "           \["
@@ -382,9 +382,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       } elseif {$arg == "-blackbox"} {
 	 puts stdout "Treating empty subcircuits as black-box cells"
 	 netgen::model blackbox on
-      } elseif {$arg == "-full"} {
-	 puts stdout "Using full symmetry breaking method"
-	 netgen::symmetry full
       }
    }
 
@@ -504,7 +501,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       return
    }
    set properr {}
-   set pinsgood 0
    while {$endval != {}} {
       if {$dolist == 1} {
          netgen::run -list converge
@@ -550,7 +546,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
 		equate classes "$fnum1 [lindex $endval 0]" \
 			 "$fnum2 [lindex $endval 1]"
 	    }
-	    set pinsgood $result
             netgen::log echo on
 	 }
 	 if {$uresult == 2} {lappend properr [lindex $endval 0]}
@@ -574,11 +569,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
    netgen::log echo off
    puts stdout "Result: " nonewline
    netgen::log echo on
-   if {$pinsgood == 0} {
-      netgen::log put "The top level cell failed pin matching.\n"
-   } else {
-      verify only
-   }
+   verify only
    if {$properr != {}} {
       netgen::log put "The following cells had property errors: $properr\n"
    }

tcltk/tclnetgen.c

@@ -85,7 +85,6 @@ int _netcmp_compare(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_iterate(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_summary(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_print(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netcmp_format(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_run(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_verify(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_automorphs(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
@@ -94,7 +93,6 @@ int _netcmp_ignore(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_permute(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_property(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_exhaustive(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netcmp_symmetry(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_restart(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_global(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_convert(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
@@ -201,9 +199,6 @@ Command netcmp_cmds[] = {
 	{"print",		_netcmp_print,
 		"\n   "
 		"print netcomp internal data structure"},
-	{"format",		_netcmp_format,
-		"<col1_width> <col2_width>\n   "
-		"set width of formatted output"},
 	{"run",			_netcmp_run,
 		"[converge|resolve]\n   "
 		"converge: run netcomp to completion (convergence)\n   "
@@ -245,9 +240,6 @@ Command netcmp_cmds[] = {
 	{"exhaustive",		_netcmp_exhaustive,
 		"\n   "
 		"toggle exhaustive subdivision"},
-	{"symmetry",		_netcmp_symmetry,
-		"[fast|full]\n   "
-		"apply method for symmetry breaking"},
 	{"restart",		_netcmp_restart,
 		"\n   "
 		"start over (reset data structures)"},
@@ -1536,24 +1528,23 @@ int
 _netgen_model(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-   struct nlist *tp, *tp2;
+   struct nlist *tp;
    char *model, *retclass;
    unsigned char class;
    int fnum = -1;
-   int result, index, nports, nports2;
+   int result, index, nports;
 
    char *modelclasses[] = {
       "undefined", "nmos", "pmos", "pnp", "npn",
       "resistor", "capacitor", "diode",
       "inductor", "module", "blackbox", "xline",
-      "moscap", "mosfet", "bjt", "subcircuit", "copy",
-      NULL
+      "moscap", "mosfet", "bjt", "subcircuit", NULL
    };
    enum OptionIdx {
       UNDEF_IDX,  NMOS_IDX, PMOS_IDX, PNP_IDX, NPN_IDX,
       RES_IDX, CAP_IDX, DIODE_IDX, INDUCT_IDX,
       MODULE_IDX, BLACKBOX_IDX, XLINE_IDX, MOSCAP_IDX,
-      MOSFET_IDX, BJT_IDX, SUBCKT_IDX, COPY_IDX
+      MOSFET_IDX, BJT_IDX, SUBCKT_IDX
    };
 
    if (objc != 3 && objc != 2) {
@@ -1585,7 +1576,7 @@ _netgen_model(ClientData clientData,
 
    if (objc == 3) {
       model = Tcl_GetString(objv[2]);
-      nports = NumberOfPorts(model, fnum);
+      nports = NumberOfPorts(model);
 
       if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)modelclasses,
 		"class", 0, &index) != TCL_OK) {
@@ -1649,40 +1640,6 @@ _netgen_model(ClientData clientData,
 	    break;
 	 case SUBCKT_IDX:
 	    class = CLASS_SUBCKT;
-	    break;
-	 case COPY_IDX:
-	    /* "copy" is not a class, but indicates that the cell,  */
-	    /* if undefined or a module, should have its class	    */
-	    /* taken from the other circuit, if that circuit has a  */
-	    /* cell of the same name.				    */
-	    if (Circuit1 == NULL || Circuit2 == NULL) {
-		Tcl_SetResult(interp, "Circuits have not been queued for comparison.",
-			NULL);
-		return TCL_ERROR;
-	    }
-	    if (tp == Circuit1) {
-		tp2 = LookupCellFile(tp->name, Circuit2->file);
-		nports2 = NumberOfPorts(tp2->name, Circuit2->file);
-	    }
-	    else if (tp == Circuit2) {
-		tp2 = LookupCellFile(tp->name, Circuit1->file);
-		nports2 = NumberOfPorts(tp2->name, Circuit1->file);
-	    }
-	    else {
-		Tcl_SetResult(interp, "The referenced netlist is not being compared.",
-			NULL);
-		return TCL_ERROR;
-	    }
-	    /* Should a non-matching number of ports be considered a fatal error? */
-	    // if (nports2 != nports) {
-	    //	Tcl_SetResult(interp, "The number of ports for this cell does not "
-	    //		"match between netlists.", NULL);
-	    //	return TCL_ERROR;
-	    // }
-
-	    class = tp2->class;
-	    /* To do (maybe): Rename tp ports to match tp2? */
-
 	    break;
       }
       tp->class = class;
@@ -2014,61 +1971,6 @@ _netgen_printmem(ClientData clientData,
 }
 #endif
 
-/*------------------------------------------------------*/
-/* Function name: _netcmp_format			*/
-/* Syntax:						*/
-/*    netgen::format [col1_width [col2_width]]		*/
-/* Formerly: (none)					*/
-/* Results:						*/
-/* Side Effects:					*/
-/*------------------------------------------------------*/
-
-int
-_netcmp_format(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-    int col1_width = 41, col2_width = 41;
-
-    if (objc > 1) {
-	if (Tcl_GetIntFromObj(interp, objv[1], &col1_width) != TCL_OK)
-	    return TCL_ERROR;
-	if (objc > 2) {
-	    if (Tcl_GetIntFromObj(interp, objv[2], &col2_width) != TCL_OK)
-		return TCL_ERROR;
-	} else {
-	    /* If only one argument is given, then apply it to both columns */
-	    col2_width = col1_width;
-	}
-
-	if (col1_width <= 0 || col2_width <= 0) {
-	    Tcl_SetResult(interp, "Column width cannot be zero or less\n", NULL);
-	}
-
-	// Default values for left and right columns are 43 and 87
-	left_col_end = col1_width + 2;
-	right_col_end = left_col_end + col2_width + 3;
-    }
-    else if (objc == 1) {
-	Tcl_Obj *lobj, *tobj;
-
-	col1_width = left_col_end - 2;
-	col2_width = right_col_end - col1_width - 5;
-
-	lobj = Tcl_NewListObj(0, NULL);
-
-	tobj = Tcl_NewIntObj(col1_width);
-        Tcl_ListObjAppendElement(interp, lobj, Tcl_NewIntObj(col1_width));
-        Tcl_ListObjAppendElement(interp, lobj, Tcl_NewIntObj(col2_width));
-
-	Tcl_SetObjResult(interp, lobj);
-	return TCL_OK;
-    }
-    else {
-	Tcl_WrongNumArgs(interp, 1, objv, "[col1_width [col2_width]]");
-	return TCL_ERROR;
-    }
-}
-
 /*------------------------------------------------------*/
 /* The following code breaks up the NETCOMP() command	*/
 /* from netcmp.c into individual functions w/arguments	*/
@@ -2998,34 +2900,15 @@ _netcmp_equate(ClientData clientData,
 
       case PINS_IDX:
 	 if ((ElementClasses == NULL) && (auto_blackbox == FALSE)) {
-	    if (CurrentCell == NULL) {
+	    if (CurrentCell == NULL)
 		Fprintf(stderr, "Equate elements:  no current cell.\n");
-		Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-		return TCL_OK;
-	    }
-	    else if ((tp1->flags & CELL_PLACEHOLDER) ||
-			(tp2->flags & CELL_PLACEHOLDER)) {
-		if (tp1->flags & CELL_PLACEHOLDER) {
-		    Fprintf(stdout, "Warning: Equate pins:  cell %s "
-			"has no definition, treated as a black box.\n", name1);
-		}
-		if (tp2->flags & CELL_PLACEHOLDER) {
-		    Fprintf(stdout, "Warning: Equate pins:  cell %s "
-			"has no definition, treated as a black box.\n", name2);
-		}
-		// If a cell in either circuit is marked as a black box, then
-		// the cells in both circuits should be marked as a black box.
-		tp1->flags |= CELL_PLACEHOLDER;
-		tp2->flags |= CELL_PLACEHOLDER;
-	    }
-	    else {
-		Fprintf(stdout, "Equate pins:  cell %s and/or %s "
-			"has no elements.\n", name1, name2);
-		/* This is not necessarily an error, so go ahead and match pins. */
-	    }
+	    Fprintf(stderr, "Equate pins:  cell %s and/or %s has no elements.\n",
+			name1, name2);
+	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
+	    return TCL_OK;
 	 }
-	 if (ElementClasses == NULL) {
-	    /* This may have been called outside of a netlist compare,	*/
+	 else if (ElementClasses == NULL) {
+	    /* This has been called outside of a netlist compare,	*/
 	    /* probably to force name matching of pins on black-box	*/
 	    /* devices.  But MatchPins only works if tp1 == Circuit1	*/
 	    /* and tp2 == Circuit2, so preserve these values and 	*/
@@ -3928,8 +3811,8 @@ _netcmp_permute(ClientData clientData,
 	       if (PermuteForget(tp->name, fnum, NULL, NULL))
 	          Fprintf(stdout, "No permutations on circuit %s\n", tp->name);
 	       else
-	          Fprintf(stderr, "Unable to reset model %s pin permutations.\n",
-			tp->name);
+	          Fprintf(stderr, "Unable to reset model %s pin permutation %s, %s.\n",
+			tp->name, pin1, pin2);
 	    }
 	    return TCL_OK;
 	 }
@@ -3976,48 +3859,6 @@ _netcmp_permute(ClientData clientData,
    return TCL_OK;
 }
 
-/*------------------------------------------------------*/
-/* Function name: _netcmp_symmetry			*/
-/* Syntax: netgen::symmetry [fast|full]			*/
-/* Formerly: x						*/
-/* Results:						*/
-/* Side Effects:					*/
-/*------------------------------------------------------*/
-
-int
-_netcmp_symmetry(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-   char *fastfull[] = {
-      "fast", "full", NULL
-   };
-   enum OptionIdx {
-      FAST_IDX, FULL_IDX
-   };
-   int result, index;
-
-   if (objc == 1)
-      index = -1;
-   else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)fastfull,
-		"option", 0, &index) != TCL_OK)
-         return TCL_ERROR;
-   }
-
-   switch(index) {
-      case FAST_IDX:
-	 FastSymmetryBreaking = TRUE;
-	 break;
-      case FULL_IDX:
-	 FastSymmetryBreaking = FALSE;
-	 break;
-   }
-   Printf("Symmetry breaking method: %s.\n", 
-	     FastSymmetryBreaking ? "FAST" : "FULL");
-
-   return TCL_OK;
-}
-
 /*------------------------------------------------------*/
 /* Function name: _netcmp_exhaustive			*/
 /* Syntax: netgen::exhaustive [on|off]			*/
@@ -4039,7 +3880,7 @@ _netcmp_exhaustive(ClientData clientData,
    int result, index;
 
    if (objc == 1)
-      index = -1;
+      index = YES_IDX;
    else {
       if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
 		"option", 0, &index) != TCL_OK)

tcltk/tkcon.tcl

@@ -741,9 +741,9 @@ proc ::tkcon::EvalCmd {w cmd} {
 		    set tag [UniqueTag $w]
 		    $w insert output $res [list stderr $tag] \n stderr
 		    $w tag bind $tag <Enter> \
-			    [list $w tag configure $tag -underline 1]
+			    [list $w tag configure $tag -under 1]
 		    $w tag bind $tag <Leave> \
-			    [list $w tag configure $tag -underline 0]
+			    [list $w tag configure $tag -under 0]
 		    $w tag bind $tag <ButtonRelease-1> \
 			    "if {!\[info exists tkPriv(mouseMoved)\] || !\$tkPriv(mouseMoved)} \
 			    {[list edit -attach [Attach] -type error -- $PRIV(errorInfo)]}"
@@ -2472,8 +2472,8 @@ proc ::tkcon::ErrorHighlight w {
 	    set tag [UniqueTag $w]
 	    $w tag add $tag $start+${c0}c $start+1c+${c1}c
 	    $w tag configure $tag -foreground $COLOR(stdout)
-	    $w tag bind $tag <Enter> [list $w tag configure $tag -underline 1]
-	    $w tag bind $tag <Leave> [list $w tag configure $tag -underline 0]
+	    $w tag bind $tag <Enter> [list $w tag configure $tag -under 1]
+	    $w tag bind $tag <Leave> [list $w tag configure $tag -under 0]
 	    $w tag bind $tag <ButtonRelease-1> "if {!\$tkPriv(mouseMoved)} \
 		    {[list edit -attach $app -type proc -find $what -- $cmd]}"
 	}
@@ -2501,8 +2501,8 @@ proc ::tkcon::ErrorHighlight w {
 	    set tag [UniqueTag $w]
 	    $w tag add $tag $ix+1c $start
 	    $w tag configure $tag -foreground $COLOR(proc)
-	    $w tag bind $tag <Enter> [list $w tag configure $tag -underline 1]
-	    $w tag bind $tag <Leave> [list $w tag configure $tag -underline 0]
+	    $w tag bind $tag <Enter> [list $w tag configure $tag -under 1]
+	    $w tag bind $tag <Leave> [list $w tag configure $tag -under 0]
 	    $w tag bind $tag <ButtonRelease-1> "if {!\$tkPriv(mouseMoved)} \
 		    {[list edit -attach $app -type proc -- $cmd]}"
 	}
@@ -2954,14 +2954,14 @@ proc edit {args} {
 	##
 	set text $w.text
 	set m [menu [::tkcon::MenuButton $menu Edit edit]]
-	$m add command -label "Cut"   -underline 2 \
+	$m add command -label "Cut"   -under 2 \
 		-command [list tk_textCut $text]
-	$m add command -label "Copy"  -underline 0 \
+	$m add command -label "Copy"  -under 0 \
 		-command [list tk_textCopy $text]
-	$m add command -label "Paste" -underline 0 \
+	$m add command -label "Paste" -under 0 \
 		-command [list tk_textPaste $text]
 	$m add separator
-	$m add command -label "Find" -underline 0 \
+	$m add command -label "Find" -under 0 \
 		-command [list ::tkcon::FindBox $text]
 
 	## Send To Menu