From: "Juan Manuel Guerrero" Organization: Darmstadt University of Technology To: djgpp-workers AT delorie DOT com Date: Tue, 13 Feb 2001 22:15:20 +0200 MIME-Version: 1.0 Content-type: text/plain; charset=US-ASCII Content-transfer-encoding: 7BIT Subject: Re: [alain AT qnx DOT com: GNU_grep-2.5b_beta] CC: Eli Zaretskii , "Alain Magloire" X-mailer: Pegasus Mail for Windows (v2.54DE) Message-ID: <1E4DC52385A@HRZ1.hrz.tu-darmstadt.de> Reply-To: djgpp-workers AT delorie DOT com Date: Sun, 11 Feb 2001 18:29:16 +0200 From: "Eli Zaretskii" > Alain kindly sent me this announcement about the pretest version of > Grep. Unfortunately, I'm too swamped these days to be able to do > anything useful with the pretest. > > Could people please try this out and return feedback to Alain? > > TIA I have configured, compiled, tested and installed this package on win95 using command.com and on msdos 6.22 using 4dos.com and command.com. All targets worked ok after 2 bugs had been fixed. The file djgpp/config.bat is broken, making configuration impossible on msdos 6.22 if 4dos.com is used as shell. This has been fixed. The file m4/dosfile.m4 is also broken generating a broken config.h This makes compilation fail with the following error message: make.exe[3]: Entering directory `z:/0/grep-2.5b/src' gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl -DLOCALEDIR=\"/dev/env/DJDIR/share/locale\" -g -O2 -c grep.c grep.c:146: parse error grep.c:440: parse error grep.c:482: parse error grep.c:541: parse error grep.c:1322: parse error grep.c:1327: parse error make.exe[3]: *** [grep.o] Error 1 make.exe[3]: Leaving directory `z:/0/grep-2.5b/src' make.exe[2]: *** [all-recursive] Error 1 make.exe[2]: Leaving directory `z:/0/grep-2.5b/src' make.exe[1]: *** [all-recursive] Error 1 make.exe[1]: Leaving directory `z:/0/grep-2.5b' make.exe: *** [all-recursive-am] Error 2 The macro HAVE_DOS_FILE_CONTENTS is defined to *nothing* instead to be defined to 1. The patch below is based on grep-2.5b.tar.gz and fixes both issues. Regards, Guerrero, Juan Manuel diff -acprNC5 grep-2.5b.orig/djgpp/config.bat grep-2.5b/djgpp/config.bat *** grep-2.5b.orig/djgpp/config.bat Thu Mar 2 03:00:38 2000 --- grep-2.5b/djgpp/config.bat Tue Feb 13 21:25:14 2001 *************** test -f %XSRC%/po/Makefile.in.in *** 33,43 **** if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in Rem This is required because DOS/Windows are case-insensitive Rem to file names, and "make install" will do nothing if Make Rem finds a file called `install'. ! if exist INSTALL ren INSTALL INSTALL.txt Rem Set HOSTNAME so it shows in config.status if not "%HOSTNAME%" == "" goto hostdone if "%windir%" == "" goto msdos set OS=MS-Windows --- 33,52 ---- if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in Rem This is required because DOS/Windows are case-insensitive Rem to file names, and "make install" will do nothing if Make Rem finds a file called `install'. ! if exist INSTALL mv -f INSTALL INSTALL.txt ! ! Rem install-sh is required by the configure script but clashes with the ! Rem various Makefile install-foo targets, so we MUST have it before the ! Rem script runs and rename it afterwards ! test -f %XSRC%/install-sh ! if not errorlevel 1 goto NoRen0 ! test -f %XSRC%/install-sh.sh ! if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh ! :NoRen0 Rem Set HOSTNAME so it shows in config.status if not "%HOSTNAME%" == "" goto hostdone if "%windir%" == "" goto msdos set OS=MS-Windows *************** goto haveos *** 47,87 **** set OS=MS-DOS if not "%OS%" == "MS-DOS" goto SmallEnv :haveos if not "%USERNAME%" == "" goto haveuname if not "%USER%" == "" goto haveuser set HOSTNAME=Unknown PC if not "%HOSTNAME%" == "Unknown PC" goto SmallEnv :haveuser set HOSTNAME=%USER%'s PC if not "%HOSTNAME%" == "%USER%'s PC" goto SmallEnv goto userdone :haveuname set HOSTNAME=%USERNAME%'s PC if not "%HOSTNAME%" == "%USERNAME%'s PC" goto SmallEnv :userdone ! set HOSTNAME=%HOSTNAME%, %OS% ! if not "%HOSTNAME%" == "%HOSTNAME%, %OS%" goto SmallEnv :hostdone set OS= - Rem install-sh is required by the configure script but clashes with the - Rem various Makefile install-foo targets, so we MUST have it before the - Rem script runs and rename it afterwards - if not exist install-sh if exist install-sh.sh ren install-sh.sh install-sh - echo Running the ./configure script... sh ./configure --src=%XSRC% --disable-nls if errorlevel 1 goto CfgError - if not exist install-sh.sh if exist install-sh ren install-sh install-sh.sh echo Done. goto End :CfgError echo ./configure script exited abnormally! goto End :SmallEnv echo Your environment size is too small. Enlarge it and run me again. echo Configuration NOT done! :End set XSRC= --- 56,102 ---- set OS=MS-DOS if not "%OS%" == "MS-DOS" goto SmallEnv :haveos if not "%USERNAME%" == "" goto haveuname if not "%USER%" == "" goto haveuser + echo No USERNAME and no USER found in the environment, using default values set HOSTNAME=Unknown PC if not "%HOSTNAME%" == "Unknown PC" goto SmallEnv + goto userdone :haveuser set HOSTNAME=%USER%'s PC if not "%HOSTNAME%" == "%USER%'s PC" goto SmallEnv goto userdone :haveuname set HOSTNAME=%USERNAME%'s PC if not "%HOSTNAME%" == "%USERNAME%'s PC" goto SmallEnv :userdone ! set _HOSTNAME=%HOSTNAME%, %OS% ! if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto SmallEnv ! set HOSTNAME=%_HOSTNAME% :hostdone + set _HOSTNAME= set OS= echo Running the ./configure script... sh ./configure --src=%XSRC% --disable-nls if errorlevel 1 goto CfgError echo Done. goto End :CfgError echo ./configure script exited abnormally! goto End :SmallEnv echo Your environment size is too small. Enlarge it and run me again. echo Configuration NOT done! + :End + test -f %XSRC%/install-sh.sh + if not errorlevel 1 goto NoRen1 + test -f %XSRC%/install-sh + if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh + :NoRen1 + set CONFIG_SITE= + set HOSTNAME= set XSRC= diff -acprNC5 grep-2.5b.orig/m4/dosfile.m4 grep-2.5b/m4/dosfile.m4 *** grep-2.5b.orig/m4/dosfile.m4 Thu Feb 8 16:51:02 2001 --- grep-2.5b/m4/dosfile.m4 Tue Feb 13 21:20:12 2001 *************** *** 5,15 **** dnl AC_DOSFILE() AC_DEFUN(AC_DOSFILE, [AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile, [if test -d ".\."; then ac_cv_dosfile=yes ! AC_DEFINE(HAVE_DOS_FILE_CONTENTS, , [Define if text file lines end in CRLF.]) AC_DEFINE(HAVE_DOS_FILE_NAMES) else ac_cv_dosfile=no fi ])]) --- 5,15 ---- dnl AC_DOSFILE() AC_DEFUN(AC_DOSFILE, [AC_CACHE_CHECK([for dos file convention], ac_cv_dosfile, [if test -d ".\."; then ac_cv_dosfile=yes ! AC_DEFINE(HAVE_DOS_FILE_CONTENTS, 1, [Define if text file lines end in CRLF.]) AC_DEFINE(HAVE_DOS_FILE_NAMES) else ac_cv_dosfile=no fi ])])