Merge branch 'master' into autotools-conversion

cde/programs/dthelp/parser/canon1/helptag/Imakefile

@@ -44,10 +44,10 @@ APPLHDRS = $(PARSEHDRS) $(ELTHDRS) \
         ../parser/pval.h ../parser/globdec.h ../parser/signonx.h \
         ../parser/userinc.h
 
-SRCS =  custom.c default.c help.c make.c option.c out.c special.c xref.c \
+SRCS =  custom.c default.c global.c help.c make.c option.c out.c special.c xref.c \
         $(XLATESRCS)
 
-OBJS =  custom.o default.o help.o make.o option.o out.o special.o xref.o \
+OBJS =  custom.o default.o global.o help.o make.o option.o out.o special.o xref.o \
         $(XLATEOBJS)
 
 LOCAL_LIBRARIES = $(HELPUTILLIB)

cde/programs/dthelp/parser/canon1/helptag/global.c

@@ -0,0 +1,47 @@
+/*
+ * CDE - Common Desktop Environment
+ *
+ * Copyright (c) 1993-2012, The Open Group. All rights reserved.
+ *
+ * These libraries and programs are free software; you can
+ * redistribute them and/or modify them under the terms of the GNU
+ * Lesser General Public License as published by the Free Software
+ * Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * These libraries and programs are distributed in the hope that
+ * they will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with these libraries and programs; if not, write
+ * to the Free Software Foundation, Inc., 51 Franklin Street, Fifth
+ * Floor, Boston, MA 02110-1301 USA
+ */
+ 
+#include "basic.h"
+#include "trie.h"
+#include "common.h"
+
+#include "global.h"
+
+/* global variables */
+PBLOCK blockinfo INIT(NULL);
+LOGICAL inParText INIT(FALSE);
+LOGICAL inSdlP    INIT(FALSE);
+
+/* Save these ids and reuse them on the current virpage.
+ * We need two of each (except for the first) so we can alternate to
+ * avoid <form> thinking it is supposed to span them.  The bullet id
+ * indexes will flip back and forth between 0 and 1 to pick an id.
+*/
+int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
+int bulletIdIndex INIT(1);
+int looseBulletIdIndex INIT(1);
+
+/* Should we use these BASENAME_LIMIT on the size of file names? */
+LOGICAL usingshortnames INIT(FALSE);
+
+

cde/programs/dthelp/parser/canon1/helptag/global.h

@@ -227,20 +227,21 @@ struct _block {
     char   *pclass;
     char   *pssi;
     PBLOCK  pprev;
-} block, *pblock;
-PBLOCK blockinfo INIT(NULL);
+};
+/*block, *pblock;*/
+extern PBLOCK blockinfo;
 
-LOGICAL inParText INIT(FALSE);
-LOGICAL inSdlP    INIT(FALSE);
+extern LOGICAL inParText;
+extern LOGICAL inSdlP;
 
 /* Save these ids and reuse them on the current virpage.
  * We need two of each (except for the first) so we can alternate to
  * avoid <form> thinking it is supposed to span them.  The bullet id
  * indexes will flip back and forth between 0 and 1 to pick an id.
 */
-int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
-int bulletIdIndex INIT(1);
-int looseBulletIdIndex INIT(1);
+extern int bulletId[2], looseBulletId[2], firstBulletId, firstLooseBulletId;
+extern int bulletIdIndex;
+extern int looseBulletIdIndex;
 
 /* indent for p, image, ex, vex, based on plain list */
 #define LISTFIRSTINDENT 2
@@ -289,7 +290,7 @@ EXTERN char *helpext;
 EXTERN char helptmpbuf[2] INIT("0");
 
 /* Should we use these BASENAME_LIMIT on the size of file names? */
-LOGICAL usingshortnames INIT(FALSE);
+extern LOGICAL usingshortnames;
 /* Limit on how long the basename can be for a .ht file */
 #define BASENAME_LIMIT 6
 /* limit on how many additional character are allowed before the ext */

cde/programs/dthelp/parser/canon1/parser/Imakefile

@@ -44,6 +44,7 @@ XLATEOBJECTS = $(HELPTAGSRC)/LocaleXlate.o $(HELPTAGSRC)/XlationSvc.o
 APPLOBJECTS = \
 	$(HELPTAGSRC)/custom.o \
 	$(HELPTAGSRC)/default.o \
+	$(HELPTAGSRC)/global.o \
 	$(HELPTAGSRC)/help.o \
 	$(HELPTAGSRC)/make.o \
 	$(HELPTAGSRC)/option.o \

cde/programs/dthelp/parser/canon1/parser/parser.c

@@ -35,6 +35,8 @@
 #include "if.h"
 #include "entext.h"
 
+char *user_defined_entities M_PARINIT("USER-DEFINED-ENTITIES");
+
 static void scanloop(LOGICAL prolog);
 
 /* Main procedure */

cde/programs/dthelp/parser/canon1/parser/parser.h

@@ -301,7 +301,7 @@ M_PAREXTERN int m_prevcon ;
 M_PAREXTERN int m_token ;
 M_PAREXTERN int m_scanval ;
 
-char *user_defined_entities M_PARINIT("USER-DEFINED-ENTITIES");
+extern char *user_defined_entities;
 
 /* Declarations for tentative list of omitted tags when checking for tag
    MINimization */