Implemented command option 'ignore shorted', same syntax as

'ignore class', but removes instances of the specified class whose
pins are shorted together.  Currently requires that all pins must
be shorted together.

VERSION

@@ -1 +1 @@
-1.5.57
+1.5.63

base/netcmp.c

@@ -618,7 +618,10 @@ struct FormattedList *FormatBadElementFragment(struct Element *E)
 	    count++;
 
          elemlist->flist[k].count = count;
-         elemlist->flist[k].name = ob->name + strlen(ob->instance.name) + 1;
+	 if (*ob->name != *ob->instance.name)	// e.g., "port_match_error"
+            elemlist->flist[k].name = ob->name;
+	 else
+            elemlist->flist[k].name = ob->name + strlen(ob->instance.name) + 1;
          elemlist->flist[k].permute = (char)1;
          k++;
       }
@@ -632,7 +635,10 @@ struct FormattedList *FormatBadElementFragment(struct Element *E)
       m = k;
       for (j = i; j < fanout; j++) {
 	if (nodes[j] != NULL && nodes[i]->pin_magic == nodes[j]->pin_magic) {
-          elemlist->flist[k].name = ob2->name + strlen(ob2->instance.name) + 1;
+	  if (*ob2->name != *ob2->instance.name)  // e.g., "port_match_error"
+            elemlist->flist[k].name = ob2->name;
+	  else
+            elemlist->flist[k].name = ob2->name + strlen(ob2->instance.name) + 1;
           elemlist->flist[k].permute = (char)0;
           elemlist->flist[k].count = -1;	// Put total count at end
 	  k++;
@@ -3331,18 +3337,11 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
    vlist = (struct valuelist ***)CALLOC(pcount, sizeof(struct valuelist **));
    if (m_rec == NULL)
       vlist[0] = (struct valuelist **)CALLOC(icount, sizeof(struct valuelist *));
-   pcount = 1;
+
    while (ptop != NULL) {
-      if (ptop->prop == m_rec) {
-	 plist[0] = m_rec;
-	 vlist[0] = (struct valuelist **)CALLOC(icount,
+      plist[ptop->prop->idx] = ptop->prop;
+      vlist[ptop->prop->idx] = (struct valuelist **)CALLOC(icount,
 		sizeof(struct valuelist *));
-      }
-      else {
-	 plist[pcount] = ptop->prop;
-	 vlist[pcount++] = (struct valuelist **)CALLOC(icount,
-		sizeof(struct valuelist *));
-      }
       plink = ptop;
       FREE(ptop);
       ptop = plink->next;
@@ -3371,6 +3370,17 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
       i++;
    }
 
+   // Check for "M" records with type double and promote them to integer
+   for (i = 0; i < icount; i++) {
+      vl = vlist[0][i];
+      if (vl != NULL) {
+         if (vl->type == PROP_DOUBLE) {
+            vl->type = PROP_INTEGER;
+	    vl->value.ival = (int)(vl->value.dval + 0.5);
+         }
+      }
+   }
+
    // Now combine records with same properties by summing M.
    for (i = 0; i < icount - 1; i++) {
       for (j = 1; j < icount; j++) {
@@ -3476,13 +3486,13 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
 	       vlist[0][j] = &nullvl;	// Mark this position
 	       if (crit >= 0) {
 		  vl = vlist[crit][i];
-		  if (ctype == MERGE_ADD_CRIT) {
+		  if ((vl != NULL) && (ctype == MERGE_ADD_CRIT)) {
 		     if (vl->type == PROP_INTEGER)
 		        vl->value.ival += vlist[crit][j]->value.ival;
 		     else if (vl->type == PROP_DOUBLE)
 		        vl->value.dval += vlist[crit][j]->value.dval;
 		  }
-		  else {	/* MERGE_PAR_CRIT */
+		  else if (vl != NULL) {	/* MERGE_PAR_CRIT */
 		     if (vl->type == PROP_INTEGER) {
 			double di = vl->value.ival;
 			double dj = vlist[crit][j]->value.ival;
@@ -3502,7 +3512,7 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
 	    else if (vlist[0][i]->value.ival > 0) {
 	       if (crit >= 0) {
 		  vl = vlist[crit][i];
-		  if (ctype == MERGE_ADD_CRIT) {
+		  if ((vl != NULL) && (ctype == MERGE_ADD_CRIT)) {
 		     if (vl->type == PROP_INTEGER)
 		        vl->value.ival += vlist[0][j]->value.ival *
 				vlist[crit][j]->value.ival;
@@ -3510,7 +3520,7 @@ void PropertyOptimize(struct objlist *ob, struct nlist *tp)
 		        vl->value.dval += (double)vlist[0][j]->value.ival *
 				vlist[crit][j]->value.dval;
 		  }
-		  else {	/* MERGE_PAR_CRIT */
+		  else if (vl != NULL) {	/* MERGE_PAR_CRIT */
 		     if (vl->type == PROP_INTEGER) {
 			double d = (double)vlist[crit][j]->value.ival /
 					(double)vlist[0][j]->value.ival;
@@ -4541,13 +4551,13 @@ int EquivalenceNodes(char *name1, int file1, char *name2, int file2)
 /* database.						*/
 /*------------------------------------------------------*/
 
-int IgnoreClass(char *name, int file)
+int IgnoreClass(char *name, int file, unsigned char type)
 {
    struct IgnoreList *newIgnore;
 
    if ((file == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
-      IgnoreClass(name, Circuit1->file);
-      IgnoreClass(name, Circuit2->file);
+      IgnoreClass(name, Circuit1->file, type);
+      IgnoreClass(name, Circuit2->file, type);
       return;
    }
 
@@ -4557,9 +4567,13 @@ int IgnoreClass(char *name, int file)
    newIgnore->class = (char *)MALLOC(1 + strlen(name));
    strcpy(newIgnore->class, name);
    newIgnore->file = file;
+   newIgnore->type = type;
 
    /* Remove existing classes from database */
-   ClassDelete(name, file);
+   if (type == IGNORE_CLASS)
+      ClassDelete(name, file);
+   else
+      RemoveShorted(name, file);
 
    return 0;
 }
@@ -4798,7 +4812,7 @@ struct nlist *addproxies(struct hashlist *p, void *clientdata)
        tob = tc->cell;
        i = FIRSTPIN;
        firstpin = ob;
-       while (ob && (tob->type == PORT || tob->type == UNKNOWN)) {
+       while (tob && (tob->type == PORT || tob->type == UNKNOWN)) {
 	  if (tob->type == UNKNOWN) {
 	     obn = (struct objlist *)CALLOC(1, sizeof(struct objlist));
 	     obn->name = (char *)MALLOC(strlen(firstpin->instance.name)
@@ -4820,6 +4834,12 @@ struct nlist *addproxies(struct hashlist *p, void *clientdata)
 		HashPtrInstall(firstpin->instance.name, firstpin, &(ptr->instdict));
 	     }
 	  }
+	  else if (ob == NULL) {
+	     // This should not happen. . .
+	     Fprintf(stdout, "Error:  Premature end of pin list on instance %s.\n",
+			firstpin->instance.name);
+	     break;
+	  }
 	  else {
 	     lob = ob;
 	     ob->type = i++;

base/netcmp.h

@@ -32,7 +32,7 @@ extern int PermuteForget(char *model, int filenum, char *pin1, char *pin2);
 extern int EquivalenceElements(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceNodes(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceClasses(char *name1, int file1, char *name2, int file2);
-extern int IgnoreClass(char *name, int file);
+extern int IgnoreClass(char *name, int file, unsigned char type);
 extern int MatchPins(struct nlist *tp1, struct nlist *tp2);
 
 extern int  CreateCompareQueue(char *, int, char *, int);

base/netgen.c

@@ -1212,6 +1212,10 @@ void CellDefNoCase(char *name, int file)
    CurrentCell->flags |= CELL_NOCASE;
 }
 
+/*----------------------------------------------------------------------*/
+/* Return 0 if class 'name' is not being ignored (per the 'ignore'	*/
+/* command);  1 if it is ignored, and 2 if shorted instances should be	*/
+/* ignored.								*/
 /*----------------------------------------------------------------------*/
 
 int IsIgnored(char *name, int file)
@@ -1223,7 +1227,7 @@ int IsIgnored(char *name, int file)
     {
 	if ((file == -1) || (ilist->file == -1) || (file == ilist->file)) 
 	    if ((*matchfunc)(ilist->class, nptr))
-		return 1;
+		return ilist->type;	/* IGNORE_CLASS or IGNORE_SHORTED */
     }
    return 0;
 }
@@ -1361,10 +1365,6 @@ void Instance(char *model, char *instancename)
     return;
   }
   fnum = CurrentCell->file;
-  if (IsIgnored(model, fnum)) {
-    Printf("Class '%s' instanced in input but is being ignored.\n", model);
-    return;
-  }
   instanced_cell = LookupCellFile(model, fnum);
   if (instanced_cell == NULL) {
     Printf("Attempt to instance undefined model '%s'\n", model);
@@ -1504,7 +1504,7 @@ char *Cell(char *inststr, char *model, ...)
   struct objlist *namedporthead, *namedportp, *namedlisthead, *namedlistp;
   int portnum, portlist, done;
   char namedport[512]; /* tmp buffers */
-  int filenum;
+  int filenum, itype, samenode;
 
   static char *instancename = NULL;
   char *instnameptr;
@@ -1517,7 +1517,7 @@ char *Cell(char *inststr, char *model, ...)
      filenum = CurrentCell->file;
 	
   if (Debug) Printf("   calling cell: %s\n",model);
-  if (IsIgnored(model, filenum)) {
+  if ((itype = IsIgnored(model, filenum)) == IGNORE_CLASS) {
     Printf("Class '%s' instanced in input but is being ignored.\n", model);
     return NULL;
   }
@@ -1600,6 +1600,21 @@ char *Cell(char *inststr, char *model, ...)
   }
   va_end(ap);
 
+  /* Check for shorted pins */
+  if ((itype == IGNORE_SHORTED) && (head != NULL)) {
+     unsigned char shorted = (unsigned char)1;
+     for (tp = head->next; tp; tp = tp->next) {
+        if (strcasecmp(head->name, tp->name))
+           shorted = (unsigned char)0;
+           break;
+     }
+     if (shorted == (unsigned char)1) {
+        Printf("Instance of '%s' is shorted, ignoring.\n", model);
+        FreeObject(head);
+        return NULL;
+     }
+  }
+
   if (inststr == NULL) {
     if (instancename != NULL)
        FreeString(instancename);
@@ -1992,7 +2007,7 @@ struct objlist *LinkProperties(char *model, struct keyvalue *topptr)
     else
 	filenum = CurrentCell->file;
 
-    if (IsIgnored(model, filenum)) {
+    if (IsIgnored(model, filenum) == IGNORE_CLASS) {
 	Printf("Class '%s' instanced in input but is being ignored.\n", model);
 	return NULL;
     }

base/objlist.c

@@ -340,6 +340,71 @@ void CellRehash(char *name, char *newname, int file)
 
 struct nlist *OldCell;
 
+int removeshorted(struct hashlist *p, int file)
+{
+   struct nlist *ptr;
+   struct objlist *ob, *lob, *nob, *tob;
+   unsigned char shorted;
+
+   ptr = (struct nlist *)(p->ptr);
+
+   if ((file != -1) && (ptr->file != file)) return;
+
+   lob = NULL;
+   for (ob = ptr->cell; ob != NULL;) {
+      nob = ob->next;
+      if ((ob->type == FIRSTPIN) && (ob->model.class != NULL)) {
+	 if ((*matchfunc)(ob->model.class, OldCell->name)) {
+            shorted = (unsigned char)1;
+	    for (tob = nob; tob->type > FIRSTPIN; tob = tob->next) {
+	       if (tob->node != ob->node) {
+	           shorted = (unsigned char)0;
+	           break;
+	       }
+            }
+	    if (shorted == (unsigned char)0) {
+               lob = ob;
+               ob = nob;
+	       continue;
+	    }
+	    HashDelete(ob->instance.name, &(ptr->instdict));
+	    while (1) {
+	       FreeObjectAndHash(ob, ptr);
+	       ob = nob;
+	       if (ob == NULL) break;
+	       nob = ob->next;
+	       if (ob->type != PROPERTY && ob->type <= FIRSTPIN) break;
+	    }
+	    if (lob == NULL)
+	       ptr->cell = ob;
+	    else
+	       lob->next = ob;
+	 }
+	 else {
+	    lob = ob;
+	    ob = nob;
+	 }
+      }
+      else {
+         lob = ob;
+         ob = nob;
+      }
+   }
+}
+
+/* Remove shorted instances of class "class" from the database */
+
+void RemoveShorted(char *class, int file)
+{
+   if (file == -1)
+      OldCell = LookupCell(class);
+   else
+      OldCell = LookupCellFile(class, file);
+
+   if (OldCell == NULL) return;
+   RecurseCellFileHashTable(removeshorted, file);
+}
+
 int deleteclass(struct hashlist *p, int file)
 {
    struct nlist *ptr;
@@ -360,7 +425,7 @@ int deleteclass(struct hashlist *p, int file)
 	       ob = nob;
 	       if (ob == NULL) break;
 	       nob = ob->next;
-	       if (ob->type <= FIRSTPIN) break;
+	       if (ob->type != PROPERTY && ob->type <= FIRSTPIN) break;
 	    }
 	    if (lob == NULL)
 	       ptr->cell = ob;

base/objlist.h

@@ -159,9 +159,16 @@ extern struct objlist *LastPlaced;
 struct IgnoreList {
     char *class;
     int file;
+    unsigned char type;
     struct IgnoreList *next;
 };
 
+/* Types used by IgnoreList above */
+
+#define IGNORE_NONE	(unsigned char)0
+#define IGNORE_CLASS	(unsigned char)1
+#define IGNORE_SHORTED	(unsigned char)2
+
 /* Record structure for handling pin permutations in a cell	*/
 /* Linked list structure allows multiple permutations per cell.	*/
 

base/query.c

@@ -345,7 +345,7 @@ void ElementNodes(char *cell, char *element, int fnum)
   struct nlist *np;
   struct objlist *ob, *nob, *nob2;
   int ckto;
-  char *elementname;
+  char *elementname, *obname;
 
   if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       ElementNodes(cell, element, Circuit1->file);
@@ -368,8 +368,10 @@ void ElementNodes(char *cell, char *element, int fnum)
 
   ckto = strlen(elementname);
   for (ob = np->cell; ob != NULL; ob = ob->next) {
-    if (!strncmp(elementname, ob->name, ckto))
-       if (*(ob->name + ckto) == '/' || *(ob->name + ckto) == '\0')
+    obname = ob->name;
+    if (*obname == '/') obname++;
+    if (!strncmp(elementname, obname, ckto))
+       if (*(obname + ckto) == '/' || *(obname + ckto) == '\0')
 	  break;
   }
   if (ob == NULL) {
@@ -379,13 +381,15 @@ void ElementNodes(char *cell, char *element, int fnum)
 
   Printf("Device '%s' Pins:\n", elementname);
   for (; ob != NULL; ob = ob->next) {
-    if (!strncmp(elementname, ob->name, ckto)) {
-       if (*(ob->name + ckto) != '/' && *(ob->name + ckto) != '\0')
+    obname = ob->name;
+    if (*obname == '/') obname++;
+    if (!strncmp(elementname, obname, ckto)) {
+       if (*(obname + ckto) != '/' && *(obname + ckto) != '\0')
 	  continue;
 
        Printf("   ");
        PrintObjectType(ob->type);
-       Printf(" (%s)", ob->name + ckto + 1);
+       Printf(" (%s)", obname + ckto + 1);
        for (nob = np->cell; nob != NULL; nob = nob->next) {
 	 if (nob->node == ob->node) {
 	    if (nob->type == NODE) {

base/spice.c

@@ -42,6 +42,20 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 // Global storage for parameters from .PARAM
 struct hashdict spiceparams;
 
+// Check if a token represents a numerical value (with
+// units) or an expression.  This is basically a hack
+// to see if it either passes StringIsValue() or is
+// enclosed in braces.  Probably should attempt to
+// parse the expression, to be pedantic.  Not sure all
+// expressions have to be in braces.
+
+int StringIsValueOrExpression(char *token)
+{
+    if (StringIsValue(token)) return TRUE;
+    else if (*token == '{') return TRUE;
+    else return FALSE;
+}
+
 void SpiceSubCell(struct nlist *tp, int IsSubCell)
 {
   struct objlist *ob;
@@ -956,7 +970,7 @@ skip_ends:
 
 	/* Get capacitor value (if present), save as property "value" */
 	if (nexttok != NULL) {
-	   if (StringIsValue(nexttok)) {
+	   if (StringIsValueOrExpression(nexttok)) {
 	      AddProperty(&kvlist, "value", nexttok);
 	      SpiceTokNoNewline();
 	   }
@@ -984,7 +998,7 @@ skip_ends:
 	      if ((eqptr = strchr(model, ']')) != NULL)
 		 *eqptr = '\0';
 	   }
-	   else if (StringIsValue(nexttok)) {
+	   else if (StringIsValueOrExpression(nexttok)) {
 		// Suport for value passed to modeled capacitor
 	        AddProperty(&kvlist, "value", nexttok);
 	   }
@@ -1050,7 +1064,7 @@ skip_ends:
 	/* Get resistor value (if present); save as property "value" */
 
 	if (nexttok != NULL) {
-	   if (StringIsValue(nexttok)) {
+	   if (StringIsValueOrExpression(nexttok)) {
 	      AddProperty(&kvlist, "value", nexttok);
 	      SpiceTokNoNewline();
 	   }
@@ -1077,7 +1091,7 @@ skip_ends:
 	      if ((eqptr = strchr(model, ']')) != NULL)
 		 *eqptr = '\0';
 	   }
-	   else if (StringIsValue(nexttok)) {
+	   else if (StringIsValueOrExpression(nexttok)) {
 		// Suport for value passed to modeled resistor
 	        AddProperty(&kvlist, "value", nexttok);
 	   }
@@ -1277,7 +1291,7 @@ skip_ends:
       /* Get inductance value (if present); save as property "value" */
 
       if (nexttok != NULL) {
-	  if (StringIsValue(nexttok)) {
+	  if (StringIsValueOrExpression(nexttok)) {
 	      AddProperty(&kvlist, "value", nexttok);
 	      SpiceTokNoNewline();
 	  }
@@ -1368,7 +1382,7 @@ skip_ends:
 	    *eqptr = '\0';
 	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
-	 else if (StringIsValue(nexttok)) {
+	 else if (StringIsValueOrExpression(nexttok)) {
 	    AddProperty(&kvlist, "value", nexttok);
 	    SpiceTokNoNewline();
 	 }
@@ -1422,7 +1436,7 @@ skip_ends:
 	    *eqptr = '\0';
 	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
-	 else if (StringIsValue(nexttok)) {
+	 else if (StringIsValueOrExpression(nexttok)) {
 	    AddProperty(&kvlist, "value", nexttok);
 	    SpiceTokNoNewline();
 	 }
@@ -1485,7 +1499,7 @@ skip_ends:
 	    *eqptr = '\0';
 	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
-	 else if (StringIsValue(nexttok)) {
+	 else if (StringIsValueOrExpression(nexttok)) {
 	    AddProperty(&kvlist, "value", nexttok);
 	    SpiceTokNoNewline();
 	 }
@@ -1516,6 +1530,8 @@ skip_ends:
 
     else if (toupper(nexttok[0]) == 'X') {	/* subcircuit instances */
       char instancename[100], subcktname[100];
+      int itype;
+
       instancename[99] = '\0';
       subcktname[99] = '\0';
 
@@ -1588,6 +1604,34 @@ skip_ends:
       if (scan->next != NULL) scan = scan->next;
       tail->next = NULL;
 
+      /* Check for ignored class */
+
+      if ((itype = IsIgnored(subcktname, filenum)) == IGNORE_CLASS) {
+          Printf("Class '%s' instanced in input but is being ignored.\n", model);
+          return;
+      }
+
+      /* Check for shorted pins */
+
+      if ((itype == IGNORE_SHORTED) && (head != NULL)) {
+         unsigned char shorted = (unsigned char)1;
+         struct portelement *p;
+         for (p = head->next; p; p = p->next) {
+            if (strcasecmp(head->name, p->name))
+               shorted = (unsigned char)0;
+               break;
+         }
+         if (shorted == (unsigned char)1) {
+            Printf("Instance of '%s' is shorted, ignoring.\n", subcktname);
+	    while (head) {
+	       p = head->next;
+	       FREE(head);
+	       head = p;
+            }
+            return;
+         }
+      }
+
       /* Create cell name and revise instance name based on the cell name */
       /* For clarity, if "instancename" does not contain the cellname,	  */
       /* then prepend the cellname to the instance name.  HOWEVER, if any */
@@ -1644,6 +1688,7 @@ skip_ends:
       }
 
       /* nexttok is now NULL, scan->name points to class */
+
       Instance(subcktname, instancename);
       pobj = LinkProperties(subcktname, kvlist);
       ReduceExpressions(pobj, NULL, CurrentCell, TRUE);

defs.mak

@@ -56,7 +56,8 @@ 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 -ltk8.6 -L/usr/lib64 -ltcl8.6
+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
 
@@ -65,7 +66,8 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -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=\"54\" -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                 =  -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=\"60\" -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=\"60\" -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

netgen/Makefile

@@ -23,7 +23,7 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS}
 	${RM} tclnetgen${SHDLIB_EXT}
 	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \
 		${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} \
-		${TCL_LIB_SPEC} ${LDFLAGS}
+		${LIB_SPECS} ${LDFLAGS}
 
 $(DESTDIR)${BINDIR}/netgen:
 	${RM} $@

scripts/config.log

@@ -33,31 +33,30 @@ PATH: /sbin
 PATH: /usr/bin
 PATH: /usr/sbin
 PATH: /usr/local/bin
-PATH: /home/tim/src/timberwolf-6.3/bin
 
 
 ## ----------- ##
 ## Core tests. ##
 ## ----------- ##
 
-configure:2395: checking build system type
-configure:2409: result: x86_64-unknown-linux-gnu
-configure:2429: checking host system type
-configure:2442: result: x86_64-unknown-linux-gnu
-configure:2462: checking target system type
-configure:2475: result: x86_64-unknown-linux-gnu
-configure:2566: checking for gcc
-configure:2582: found /bin/gcc
-configure:2593: result: gcc
-configure:2822: checking for C compiler version
-configure:2831: gcc --version >&5
+configure:2397: checking build system type
+configure:2411: result: x86_64-unknown-linux-gnu
+configure:2431: checking host system type
+configure:2444: result: x86_64-unknown-linux-gnu
+configure:2464: checking target system type
+configure:2477: result: x86_64-unknown-linux-gnu
+configure:2568: checking for gcc
+configure:2584: found /bin/gcc
+configure:2595: result: gcc
+configure:2824: checking for C compiler version
+configure:2833: gcc --version >&5
 gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
 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:2842: $? = 0
-configure:2831: gcc -v >&5
+configure:2844: $? = 0
+configure:2833: 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
@@ -65,58 +64,58 @@ 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-20141101/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20141101/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 20141101 (Red Hat 4.9.2-1) (GCC) 
-configure:2842: $? = 0
-configure:2831: gcc -V >&5
+configure:2844: $? = 0
+configure:2833: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2842: $? = 4
-configure:2831: gcc -qversion >&5
+configure:2844: $? = 4
+configure:2833: gcc -qversion >&5
 gcc: error: unrecognized command line option '-qversion'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2842: $? = 4
-configure:2862: checking whether the C compiler works
-configure:2884: gcc -g   conftest.c  >&5
-configure:2888: $? = 0
-configure:2936: result: yes
-configure:2939: checking for C compiler default output file name
-configure:2941: result: a.out
-configure:2947: checking for suffix of executables
-configure:2954: gcc -o conftest -g   conftest.c  >&5
-configure:2958: $? = 0
-configure:2980: result: 
-configure:3002: checking whether we are cross compiling
-configure:3010: gcc -o conftest -g   conftest.c  >&5
-configure:3014: $? = 0
-configure:3021: ./conftest
-configure:3025: $? = 0
-configure:3040: result: no
-configure:3045: checking for suffix of object files
-configure:3067: gcc -c -g  conftest.c >&5
-configure:3071: $? = 0
-configure:3092: result: o
-configure:3096: checking whether we are using the GNU C compiler
-configure:3115: gcc -c -g  conftest.c >&5
-configure:3115: $? = 0
-configure:3124: result: yes
-configure:3133: checking whether gcc accepts -g
-configure:3153: gcc -c -g  conftest.c >&5
-configure:3153: $? = 0
-configure:3194: result: yes
-configure:3211: checking for gcc option to accept ISO C89
-configure:3274: gcc  -c -g  conftest.c >&5
-configure:3274: $? = 0
-configure:3287: result: none needed
-configure:3312: checking how to run the C preprocessor
-configure:3343: gcc -E  conftest.c
-configure:3343: $? = 0
-configure:3357: gcc -E  conftest.c
+configure:2844: $? = 4
+configure:2864: checking whether the C compiler works
+configure:2886: gcc -g   conftest.c  >&5
+configure:2890: $? = 0
+configure:2938: result: yes
+configure:2941: checking for C compiler default output file name
+configure:2943: result: a.out
+configure:2949: checking for suffix of executables
+configure:2956: gcc -o conftest -g   conftest.c  >&5
+configure:2960: $? = 0
+configure:2982: result: 
+configure:3004: checking whether we are cross compiling
+configure:3012: gcc -o conftest -g   conftest.c  >&5
+configure:3016: $? = 0
+configure:3023: ./conftest
+configure:3027: $? = 0
+configure:3042: result: no
+configure:3047: checking for suffix of object files
+configure:3069: gcc -c -g  conftest.c >&5
+configure:3073: $? = 0
+configure:3094: result: o
+configure:3098: checking whether we are using the GNU C compiler
+configure:3117: gcc -c -g  conftest.c >&5
+configure:3117: $? = 0
+configure:3126: result: yes
+configure:3135: checking whether gcc accepts -g
+configure:3155: gcc -c -g  conftest.c >&5
+configure:3155: $? = 0
+configure:3196: result: yes
+configure:3213: checking for gcc option to accept ISO C89
+configure:3276: gcc  -c -g  conftest.c >&5
+configure:3276: $? = 0
+configure:3289: result: none needed
+configure:3314: checking how to run the C preprocessor
+configure:3345: gcc -E  conftest.c
+configure:3345: $? = 0
+configure:3359: 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:3357: $? = 1
+configure:3359: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -126,18 +125,18 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "60"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3382: result: gcc -E
-configure:3402: gcc -E  conftest.c
-configure:3402: $? = 0
-configure:3416: gcc -E  conftest.c
+configure:3384: result: gcc -E
+configure:3404: gcc -E  conftest.c
+configure:3404: $? = 0
+configure:3418: 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:3416: $? = 1
+configure:3418: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -147,104 +146,104 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "60"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3445: checking for library containing strerror
-configure:3476: gcc -o conftest -g   conftest.c  >&5
-configure:3476: $? = 0
-configure:3493: result: none required
-configure:3515: checking for a BSD-compatible install
-configure:3583: result: /bin/install -c
-configure:3637: checking for ranlib
-configure:3653: found /bin/ranlib
-configure:3664: result: ranlib
-configure:3691: checking for gm4
-configure:3724: result: no
-configure:3691: checking for gnum4
-configure:3724: result: no
-configure:3691: checking for m4
-configure:3709: found /bin/m4
-configure:3721: result: /bin/m4
-configure:3762: checking for ld used by GCC
-configure:3825: result: /bin/ld
-configure:3832: checking if the linker (/bin/ld) is GNU ld
+configure:3447: checking for library containing strerror
+configure:3478: gcc -o conftest -g   conftest.c  >&5
+configure:3478: $? = 0
+configure:3495: result: none required
+configure:3517: checking for a BSD-compatible install
+configure:3585: result: /bin/install -c
+configure:3639: checking for ranlib
+configure:3655: found /bin/ranlib
+configure:3666: result: ranlib
+configure:3693: checking for gm4
+configure:3726: result: no
+configure:3693: checking for gnum4
+configure:3726: result: no
+configure:3693: checking for m4
+configure:3711: found /bin/m4
+configure:3723: result: /bin/m4
+configure:3764: checking for ld used by GCC
+configure:3827: result: /bin/ld
+configure:3834: checking if the linker (/bin/ld) is GNU ld
 GNU ld version 2.24
-configure:3844: result: yes
-configure:3851: checking for grep that handles long lines and -e
-configure:3909: result: /bin/grep
-configure:3914: checking for egrep
-configure:3976: result: /bin/grep -E
-configure:3981: checking for ANSI C header files
-configure:4001: gcc -c -g  conftest.c >&5
-configure:4001: $? = 0
-configure:4074: gcc -o conftest -g   conftest.c  >&5
-configure:4074: $? = 0
-configure:4074: ./conftest
-configure:4074: $? = 0
-configure:4085: result: yes
-configure:4098: checking for sys/types.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for sys/stat.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for stdlib.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for string.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for memory.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for strings.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for inttypes.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for stdint.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for unistd.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4114: checking size of void *
-configure:4119: gcc -o conftest -g   conftest.c  >&5
-configure:4119: $? = 0
-configure:4119: ./conftest
-configure:4119: $? = 0
-configure:4133: result: 8
-configure:4147: checking size of unsigned int
-configure:4152: gcc -o conftest -g   conftest.c  >&5
-configure:4152: $? = 0
-configure:4152: ./conftest
-configure:4152: $? = 0
-configure:4166: result: 4
-configure:4180: checking size of unsigned long
-configure:4185: gcc -o conftest -g   conftest.c  >&5
-configure:4185: $? = 0
-configure:4185: ./conftest
-configure:4185: $? = 0
-configure:4199: result: 8
-configure:4213: checking size of unsigned long long
-configure:4218: gcc -o conftest -g   conftest.c  >&5
-configure:4218: $? = 0
-configure:4218: ./conftest
-configure:4218: $? = 0
-configure:4232: result: 8
-configure:4243: checking whether byte ordering is bigendian
-configure:4258: gcc -c -g  conftest.c >&5
+configure:3846: result: yes
+configure:3853: checking for grep that handles long lines and -e
+configure:3911: result: /bin/grep
+configure:3916: checking for egrep
+configure:3978: result: /bin/grep -E
+configure:3983: checking for ANSI C header files
+configure:4003: gcc -c -g  conftest.c >&5
+configure:4003: $? = 0
+configure:4076: gcc -o conftest -g   conftest.c  >&5
+configure:4076: $? = 0
+configure:4076: ./conftest
+configure:4076: $? = 0
+configure:4087: result: yes
+configure:4100: checking for sys/types.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for sys/stat.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for stdlib.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for string.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for memory.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for strings.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for inttypes.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for stdint.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for unistd.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4116: checking size of void *
+configure:4121: gcc -o conftest -g   conftest.c  >&5
+configure:4121: $? = 0
+configure:4121: ./conftest
+configure:4121: $? = 0
+configure:4135: result: 8
+configure:4149: checking size of unsigned int
+configure:4154: gcc -o conftest -g   conftest.c  >&5
+configure:4154: $? = 0
+configure:4154: ./conftest
+configure:4154: $? = 0
+configure:4168: result: 4
+configure:4182: checking size of unsigned long
+configure:4187: gcc -o conftest -g   conftest.c  >&5
+configure:4187: $? = 0
+configure:4187: ./conftest
+configure:4187: $? = 0
+configure:4201: result: 8
+configure:4215: checking size of unsigned long long
+configure:4220: gcc -o conftest -g   conftest.c  >&5
+configure:4220: $? = 0
+configure:4220: ./conftest
+configure:4220: $? = 0
+configure:4234: result: 8
+configure:4245: checking whether byte ordering is bigendian
+configure:4260: gcc -c -g  conftest.c >&5
 conftest.c:26:9: error: unknown type name 'not'
          not a universal capable compiler
          ^
@@ -252,7 +251,7 @@ conftest.c:26:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before
          not a universal capable compiler
                ^
 conftest.c:26:15: error: unknown type name 'universal'
-configure:4258: $? = 1
+configure:4260: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -262,7 +261,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -283,9 +282,9 @@ configure: failed program was:
 | 	     #endif
 | 	     typedef int dummy;
 | 
-configure:4303: gcc -c -g  conftest.c >&5
-configure:4303: $? = 0
-configure:4321: gcc -c -g  conftest.c >&5
+configure:4305: gcc -c -g  conftest.c >&5
+configure:4305: $? = 0
+configure:4323: gcc -c -g  conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:32:4: error: unknown type name 'not'
     not big endian
@@ -293,7 +292,7 @@ conftest.c:32:4: error: unknown type name 'not'
 conftest.c:32:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian'
     not big endian
             ^
-configure:4321: $? = 1
+configure:4323: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -303,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -332,48 +331,48 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4449: result: no
-configure:4468: checking for ANSI C header files
-configure:4572: result: yes
-configure:4584: checking for setenv
-configure:4584: gcc -o conftest -g   conftest.c  >&5
-configure:4584: $? = 0
-configure:4584: result: yes
-configure:4584: checking for putenv
-configure:4584: gcc -o conftest -g   conftest.c  >&5
-configure:4584: $? = 0
-configure:4584: result: yes
-configure:4594: checking for vfork
-configure:4594: gcc -o conftest -g   conftest.c  >&5
-configure:4594: $? = 0
-configure:4594: result: yes
-configure:4602: checking dirent.h usability
-configure:4602: gcc -c -g  conftest.c >&5
-configure:4602: $? = 0
-configure:4602: result: yes
-configure:4602: checking dirent.h presence
-configure:4602: gcc -E -x c  conftest.c
-configure:4602: $? = 0
-configure:4602: result: yes
-configure:4602: checking for dirent.h
-configure:4602: result: yes
-configure:4615: checking limits.h usability
-configure:4615: gcc -c -g  conftest.c >&5
-configure:4615: $? = 0
-configure:4615: result: yes
-configure:4615: checking limits.h presence
-configure:4615: gcc -E -x c  conftest.c
-configure:4615: $? = 0
-configure:4615: result: yes
-configure:4615: checking for limits.h
-configure:4615: result: yes
-configure:4628: checking param.h usability
-configure:4628: gcc -c -g  conftest.c >&5
+configure:4451: result: no
+configure:4470: checking for ANSI C header files
+configure:4574: result: yes
+configure:4586: checking for setenv
+configure:4586: gcc -o conftest -g   conftest.c  >&5
+configure:4586: $? = 0
+configure:4586: result: yes
+configure:4586: checking for putenv
+configure:4586: gcc -o conftest -g   conftest.c  >&5
+configure:4586: $? = 0
+configure:4586: result: yes
+configure:4596: checking for vfork
+configure:4596: gcc -o conftest -g   conftest.c  >&5
+configure:4596: $? = 0
+configure:4596: result: yes
+configure:4604: checking dirent.h usability
+configure:4604: gcc -c -g  conftest.c >&5
+configure:4604: $? = 0
+configure:4604: result: yes
+configure:4604: checking dirent.h presence
+configure:4604: gcc -E -x c  conftest.c
+configure:4604: $? = 0
+configure:4604: result: yes
+configure:4604: checking for dirent.h
+configure:4604: result: yes
+configure:4617: checking limits.h usability
+configure:4617: gcc -c -g  conftest.c >&5
+configure:4617: $? = 0
+configure:4617: result: yes
+configure:4617: checking limits.h presence
+configure:4617: gcc -E -x c  conftest.c
+configure:4617: $? = 0
+configure:4617: result: yes
+configure:4617: checking for limits.h
+configure:4617: result: yes
+configure:4630: checking param.h usability
+configure:4630: 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:4628: $? = 1
+configure:4630: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -383,7 +382,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -438,14 +437,14 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <param.h>
-configure:4628: result: no
-configure:4628: checking param.h presence
-configure:4628: gcc -E -x c  conftest.c
+configure:4630: result: no
+configure:4630: checking param.h presence
+configure:4630: 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:4628: $? = 1
+configure:4630: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -455,7 +454,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "54"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -477,52 +476,52 @@ configure: failed program was:
 | #define HAVE_LIMITS_H 1
 | /* end confdefs.h.  */
 | #include <param.h>
-configure:4628: result: no
-configure:4628: checking for param.h
-configure:4628: result: no
-configure:4639: checking for va_copy
-configure:4657: gcc -o conftest -g   conftest.c  >&5
-configure:4657: $? = 0
-configure:4666: result: yes
-configure:4674: checking for __va_copy
-configure:4692: gcc -o conftest -g   conftest.c  >&5
-configure:4692: $? = 0
-configure:4701: result: yes
-configure:4831: checking for tclConfig.sh
-configure:4903: result: /usr/lib64/tclConfig.sh
-configure:4919: checking for tkConfig.sh
-configure:4992: result: /usr/lib64/tkConfig.sh
-configure:5106: checking for wish executable
-configure:5133: result: /usr/bin/wish
-configure:5139: checking for tclsh executable
-configure:5165: result: /usr/bin/tclsh
-configure:5288: checking for X
-configure:5427: gcc -o conftest -g   conftest.c -lX11  >&5
-configure:5427: $? = 0
-configure:5477: result: libraries , headers 
-configure:5576: gcc -o conftest -g   conftest.c   -lX11 >&5
-configure:5576: $? = 0
-configure:5674: checking for gethostbyname
-configure:5674: gcc -o conftest -g   conftest.c  >&5
-configure:5674: $? = 0
-configure:5674: result: yes
-configure:5771: checking for connect
-configure:5771: gcc -o conftest -g   conftest.c  >&5
-configure:5771: $? = 0
-configure:5771: result: yes
-configure:5820: checking for remove
-configure:5820: gcc -o conftest -g   conftest.c  >&5
-configure:5820: $? = 0
-configure:5820: result: yes
-configure:5869: checking for shmat
-configure:5869: gcc -o conftest -g   conftest.c  >&5
-configure:5869: $? = 0
-configure:5869: result: yes
-configure:5927: checking for IceConnectionNumber in -lICE
-configure:5952: gcc -o conftest -g   conftest.c -lICE   >&5
-configure:5952: $? = 0
-configure:5961: result: yes
-configure:6675: creating ./config.status
+configure:4630: result: no
+configure:4630: checking for param.h
+configure:4630: result: no
+configure:4641: checking for va_copy
+configure:4659: gcc -o conftest -g   conftest.c  >&5
+configure:4659: $? = 0
+configure:4668: result: yes
+configure:4676: checking for __va_copy
+configure:4694: gcc -o conftest -g   conftest.c  >&5
+configure:4694: $? = 0
+configure:4703: result: yes
+configure:4834: checking for tclConfig.sh
+configure:4906: result: /usr/lib64/tclConfig.sh
+configure:4922: checking for tkConfig.sh
+configure:4995: result: /usr/lib64/tkConfig.sh
+configure:5128: checking for wish executable
+configure:5155: result: /usr/bin/wish
+configure:5161: checking for tclsh executable
+configure:5187: result: /usr/bin/tclsh
+configure:5310: checking for X
+configure:5449: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5449: $? = 0
+configure:5499: result: libraries , headers 
+configure:5598: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5598: $? = 0
+configure:5696: checking for gethostbyname
+configure:5696: gcc -o conftest -g   conftest.c  >&5
+configure:5696: $? = 0
+configure:5696: result: yes
+configure:5793: checking for connect
+configure:5793: gcc -o conftest -g   conftest.c  >&5
+configure:5793: $? = 0
+configure:5793: result: yes
+configure:5842: checking for remove
+configure:5842: gcc -o conftest -g   conftest.c  >&5
+configure:5842: $? = 0
+configure:5842: result: yes
+configure:5891: checking for shmat
+configure:5891: gcc -o conftest -g   conftest.c  >&5
+configure:5891: $? = 0
+configure:5891: result: yes
+configure:5949: checking for IceConnectionNumber in -lICE
+configure:5974: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:5974: $? = 0
+configure:5983: result: yes
+configure:6705: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -539,8 +538,8 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 
 on stravinsky
 
-config.status:781: creating defs.mak
-config.status:884: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
+config.status:783: creating defs.mak
+config.status:886: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -622,7 +621,7 @@ 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=\"54\" -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'
+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=\"60\" -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'
@@ -642,7 +641,8 @@ LDFLAGS=''
 LD_RUN_PATH=''
 LIBOBJS=''
 LIBS=''
-LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
+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'
@@ -713,6 +713,7 @@ 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'
@@ -735,7 +736,7 @@ unused=''
 #define PACKAGE_BUGREPORT "[email protected]"
 #define PACKAGE_URL ""
 #define NETGEN_VERSION "1.5"
-#define NETGEN_REVISION "54"
+#define NETGEN_REVISION "60"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1

scripts/config.status

@@ -601,6 +601,7 @@ 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"]=""
@@ -609,7 +610,8 @@ S["VERSION"]=""
 S["TCL_LIB_DIR"]="/usr/lib"
 S["TCLSH_EXE"]="/usr/bin/tclsh"
 S["WISH_EXE"]="/usr/bin/wish"
-S["LIB_SPECS"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
+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"]=""
@@ -657,7 +659,7 @@ 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=\\\"54\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
+"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"60\\\" -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 -D"\
 "SIZEOF_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 -DHA"\
 "VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"

scripts/configure

@@ -641,6 +641,7 @@ sub_extra_libs
 top_extra_libs
 ld_extra_objs
 ld_extra_libs
+stub_defs
 extra_defs
 extra_libs
 SCRIPTS
@@ -649,6 +650,7 @@ VERSION
 TCL_LIB_DIR
 TCLSH_EXE
 WISH_EXE
+LIB_SPECS_NOSTUB
 LIB_SPECS
 INC_SPECS
 EXTRA_LIB_SPECS
@@ -4712,6 +4714,7 @@ fi
 $as_echo "#define DBUG_OFF 1" >>confdefs.h
 
 
+stub_defs=""
 extra_defs="$extra_defs -DCAD_DIR=\\\"\${LIBDIR}\\\""
 X_LIBS=
 X_CFLAGS=
@@ -4861,7 +4864,7 @@ $as_echo_n "checking for tclConfig.sh... " >&6; }
     #  1. Search previously named locations.
 
     for dir in \
-     $prefix \
+     $ac_default_prefix \
      $exec_prefix
     do
       if test -r "$dir/tclConfig.sh" ; then
@@ -4948,7 +4951,7 @@ $as_echo_n "checking for tkConfig.sh... " >&6; }
     #  1. Search previously named locations.
     #
     for dir in \
-     $prefix \
+     $ac_default_prefix \
      $exec_prefix
     do
       if test -r "$dir/tkConfig.sh" ; then
@@ -5007,6 +5010,25 @@ if test $usingTcl ; then
   . $tcl_config_sh
   . $tk_config_sh
 
+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
     :
   elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
@@ -5992,6 +6014,7 @@ if test $usingTcl ; then
 
   extra_libs="$extra_libs \${NETGENDIR}/tcltk/libtcltk.o"
   extra_defs="$extra_defs -DTCL_DIR=\\\"\${TCLDIR}\\\""
+  stub_defs="$stub_defs -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 else
   programs="$programs netgen"
   unused="$unused tcltk"
@@ -6070,6 +6093,7 @@ esac
 # -----------------------------------------------------------------------
 
 if test $usingTcl ; then
+    LIB_SPECS_NOSTUB="${LIB_SPECS}"
 
 # -----------------------------------------------------------------------
 #
@@ -6081,9 +6105,11 @@ if test $usingTcl ; then
   fi
   if test "${TK_LIB_DIR}" = "/usr/lib" -o \
         "${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TK_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TK_LIB_DIR}"
     else
@@ -6107,9 +6133,11 @@ if test $usingTcl ; then
   if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
         "${TCL_LIB_DIR}" = "/usr/lib64" -o \
         "${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TCL_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TCL_LIB_DIR}"
     else
@@ -6482,6 +6510,7 @@ fi
 
 
 
+
 fi
 
 if test "$GCC" = "yes" ; then
@@ -6517,6 +6546,7 @@ fi
 
 
 
+
 
 
 ac_config_files="$ac_config_files defs.mak"

scripts/configure.in

@@ -195,6 +195,7 @@ fi
 # not ANSI-compliant and won't compile without quite a bit of work.
 AC_DEFINE(DBUG_OFF)
 
+stub_defs=""
 extra_defs="$extra_defs -DCAD_DIR=\\\"\${LIBDIR}\\\""
 X_LIBS=
 X_CFLAGS=
@@ -472,6 +473,25 @@ if test $usingTcl ; then
   . $tcl_config_sh
   . $tk_config_sh
 
+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
     :
   elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
@@ -779,6 +799,7 @@ if test $usingTcl ; then
   AC_DEFINE(TCL_NETGEN)
   extra_libs="$extra_libs \${NETGENDIR}/tcltk/libtcltk.o"
   extra_defs="$extra_defs -DTCL_DIR=\\\"\${TCLDIR}\\\""
+  stub_defs="$stub_defs -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 else
   programs="$programs netgen"
   unused="$unused tcltk"
@@ -858,6 +879,7 @@ esac
 # -----------------------------------------------------------------------
 
 if test $usingTcl ; then
+    LIB_SPECS_NOSTUB="${LIB_SPECS}"
 
 # -----------------------------------------------------------------------
 #
@@ -869,9 +891,11 @@ if test $usingTcl ; then
   fi
   if test "${TK_LIB_DIR}" = "/usr/lib" -o \
         "${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TK_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TK_LIB_DIR}"
     else
@@ -895,9 +919,11 @@ if test $usingTcl ; then
   if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
         "${TCL_LIB_DIR}" = "/usr/lib64" -o \
         "${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TCL_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TCL_LIB_DIR}"
     else
@@ -1216,6 +1242,7 @@ if test $usingTcl ; then
   AC_SUBST(LDFLAGS)
   AC_SUBST(INC_SPECS)
   AC_SUBST(LIB_SPECS)
+  AC_SUBST(LIB_SPECS_NOSTUB)
   AC_SUBST(WISH_EXE)
   AC_SUBST(TCLSH_EXE)
   AC_SUBST(TCL_LIB_DIR)
@@ -1233,6 +1260,7 @@ AC_SUBST(PACKAGE)
 AC_SUBST(SCRIPTS)
 AC_SUBST(extra_libs)
 AC_SUBST(extra_defs)
+AC_SUBST(stub_defs)
 AC_SUBST(ld_extra_libs)
 AC_SUBST(ld_extra_objs)
 AC_SUBST(top_extra_libs)

scripts/defs.mak

@@ -56,7 +56,8 @@ 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 -ltk8.6 -L/usr/lib64 -ltcl8.6
+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
 
@@ -65,7 +66,8 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -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=\"54\" -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                 =  -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=\"60\" -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=\"60\" -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

scripts/defs.mak.in

@@ -57,6 +57,7 @@ SHDLIB_EXT	       = @SHDLIB_EXT@
 LDDL_FLAGS             = @LDDL_FLAGS@
 LD_RUN_PATH            = @LD_RUN_PATH@
 LIB_SPECS              = @LIB_SPECS@
+LIB_SPECS_NOSTUB       = @LIB_SPECS_NOSTUB@
 WISH_EXE	       = @WISH_EXE@
 TCL_LIB_DIR	       = @TCL_LIB_DIR@
 
@@ -65,7 +66,8 @@ CPP                    = @CPP@
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} @CPPFLAGS@
-DFLAGS                 = @extra_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
+DFLAGS                 = @extra_defs@ @stub_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
+DFLAGS_NOSTUB          = @extra_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
 CFLAGS                 = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@
 
 DEPEND_FILE            = Depend

tcltk/Makefile

@@ -23,8 +23,9 @@ install-tcl: netgenexec${EXEEXT} $(DESTDIR)${BINDIR}/netgen.sh ${TCL_FILES}
 	${CP} netgenexec${EXEEXT} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT}
 
 netgenexec${EXEEXT}: netgenexec.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netgenexec.c -o netgenexec${EXEEXT} \
-		${LDFLAGS} ${LIBS} ${LIB_SPECS}
+	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} netgenexec.c \
+		-o netgenexec${EXEEXT} \
+		${LDFLAGS} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 netgen.tcl: netgen.tcl.in
 	sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \

tcltk/netgen.tcl.in

@@ -20,7 +20,11 @@ foreach i $nlist {
    }
 }
 
-load TCL_DIR/tclnetgenSHDLIB_EXT
+if {${tcl_version} >= 8.6} {
+   load -lazy TCL_DIR/tclnetgenSHDLIB_EXT
+} else {
+   load TCL_DIR/tclnetgenSHDLIB_EXT
+}
 
 #----------------------------------------------------------------
 # Define the "lvs" command as a way of calling the netgen options

tcltk/tclnetgen.c

@@ -2518,10 +2518,10 @@ _netcmp_ignore(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
-      "class", NULL
+      "class", "shorted", NULL
    };
    enum OptionIdx {
-      CLASS_IDX
+      CLASS_IDX, SHORTED_IDX
    };
    int result, index;
    int file = -1;
@@ -2542,7 +2542,14 @@ _netcmp_ignore(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "[class] valid_cellname");
       return TCL_ERROR;
    }
-   IgnoreClass(name, file);
+   switch (index) {
+      case CLASS_IDX:
+         IgnoreClass(name, file, IGNORE_CLASS);
+	 break;
+      case SHORTED_IDX:
+         IgnoreClass(name, file, IGNORE_SHORTED);
+	 break;
+   }
    return TCL_OK;
 }
 
@@ -3043,6 +3050,7 @@ _netcmp_property(ClientData clientData,
 	    }
 	    tp = NextCell();
 	}
+	return TCL_OK;
     }
 
     result = CommonParseCell(interp, objv[1], &tp, &fnum);
@@ -3785,7 +3793,7 @@ int Tclnetgen_Init(Tcl_Interp *interp)
    /* Remember the interpreter */
    netgeninterp = interp;
 
-   if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+   if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
   
    for (n = 0; netgen_cmds[n].name != NULL; n++) {
       sprintf(keyword, "netgen::%s", netgen_cmds[n].name);