ChangeLog configure.in doc/grep.1 doc/grep.texi src/dfa.c

 	src/getpagesize.h src/grep.c src/kwset.c src/search.c
 	src/system.h src/vms_fab.c src/vms_fab.h vms/make.com
more support for VMS.

* doc/grep.1:  corrected typo.
Noted by Ruslan Ermilob.
* vms/config_vms.h: New File, contains macros specific to VMS and
avoid namespace collision with operating system supplied C library.
* vms/make.com: Updated.
* src/getpagesize.h: New macros for VMS.
* src/vms_fab.c: Cast to some assigments.
* src/vms_fab.h: Added new include files.
Those patches were provided by zinser@decus.de (Martin).

1 files changed, 52 insertions, 17 deletions

diff --git a/vms/make.com b/vms/make.com
index 4a076fca..c816966c 100644
--- a/vms/make.com
+++ b/vms/make.com
@@ -1,36 +1,71 @@
 $ ! Set the LOGICAL SYS to SYS$LIBRARY if it isn't defined
 $ ! so that #include <sys/...> will search SYS$LIBRARY for the file.
 $ IF F$TRNLNM("SYS") .EQS. "" THEN DEFINE SYS SYS$LIBRARY
+$ ccopt = "/include=sys$disk:[]"
+$ if (f$search("sys$system:decc$compiler.exe").nes."")
+$ then
+$   if f$getsyi("HW_MODEL").ge.1024
+$   then
+$     ccopt = "/prefix=all" + ccopt
+$   else
+$     ccopt = "/decc/prefix=all" + ccopt
+$   endif
+$ endif
+$ if f$extract(1,3,f$getsyi("Version")) .lts. "7.0"
+$ then 
+$   if f$search("x11vms:xvmsutils.olb").eqs.""
+$   then
+$     type sys$input
+To build grep on OpenVMS versions prior to 7.x you need to install the 
+xvmsutils to get the close-/open-/readdir functions. The library can be 
+found at http://www.decus.de:8080/www/vms/sw/xvmsutils.htmlx
+
+Exiting now
+$     exit
+$   endif
+$   llib = ",x11vms:xvmsutils.olb/lib"
+$ else
+$   llib = ""
+$ endif
+$ copy [-.vms]config_vms.h config.h
+$ cdefs ="HAVE_CONFIG_H"
 $ WRITE SYS$OUTPUT "Compiling ALLOCA..."
-$ CC ALLOCA.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' ALLOCA.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling DFA..."
-$ CC DFA.C      /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' DFA.C      /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling GETOPT..."
-$ CC GETOPT.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' GETOPT.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling GETOPT1..."
-$ CC GETOPT1.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' GETOPT1.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling GREP..."
-$ CC GREP.C     /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR, -
-             VERSION="2.3.1",initialize_main="vms_fab")
+$ CC'ccopt' GREP.C     /DEFINE=('cdefs',initialize_main="vms_fab")
 $ WRITE SYS$OUTPUT "Compiling KWSET..."
-$ CC KWSET.C    /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' KWSET.C    /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling OBSTACK..."
-$ CC OBSTACK.C  /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' OBSTACK.C  /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling REGEX..."
-$ CC REGEX.C    /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' REGEX.C    /DEFINE=('cdefs')
+$ WRITE SYS$OUTPUT "Compiling SAVEDIR..."
+$ CC'ccopt' SAVEDIR.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling SEARCH..."
-$ CC SEARCH.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' SEARCH.C   /DEFINE=('cdefs')
+$ WRITE SYS$OUTPUT "Compiling STPCPY..."
+$ CC'ccopt' STPCPY.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling VMS_FAB..."
-$ CC VMS_FAB.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' VMS_FAB.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Compiling GREPMAT..."
-$ CC GREPMAT.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' GREPMAT.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Linking GREP..."
-$ LINK GREP,ALLOCA,DFA,GETOPT,GETOPT1,KWSET,OBSTACK,REGEX,SEARCH,VMS_FAB,GREPMAT
+$ LINK GREP,ALLOCA,DFA,GETOPT,GETOPT1,KWSET,OBSTACK,REGEX,SEARCH,VMS_FAB,-
+       SAVEDIR,STPCPY,GREPMAT'llib'
 $ WRITE SYS$OUTPUT "Compiling EGREPMAT..."
-$ CC EGREPMAT.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ CC'ccopt' EGREPMAT.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Linking EGREP..."
-$ LINK EGREP,ALLOCA,DFA,GETOPT,GETOPT1,KWSET,OBSTACK,REGEX,SEARCH,VMS_FAB,EGREPMAT
-$ CC FGREPMAT.C   /DEFINE=(HAVE_STRING_H,HAVE_MEMCHR,HAVE_STRERROR)
+$ LINK/exe=egrep.exe grep,ALLOCA,DFA,GETOPT,GETOPT1,KWSET,OBSTACK,REGEX,SEARCH,-
+       VMS_FAB,SAVEDIR,STPCPY,EGREPMAT'llib'
+$ WRITE SYS$OUTPUT "Compiling FGREPMAT..."
+$ CC'ccopt' FGREPMAT.C   /DEFINE=('cdefs')
 $ WRITE SYS$OUTPUT "Linking FGREP..."
-$ LINK FGREP,ALLOCA,DFA,GETOPT,GETOPT1,KWSET,OBSTACK,REGEX,SEARCH,VMS_FAB,FGREPMAT
+$ LINK/exe=fgrep.exe GREP,ALLOCA,DFA,GETOPT,GETOPT1,KWSET,OBSTACK,REGEX,SEARCH,-
+       VMS_FAB,savedir,stpcpy,FGREPMAT'llib'
 $ EXIT