Message-ID: <B0000061615@stargate.astr.lu.lv>
From: "Andris Pavenis" <pavenis AT lanet DOT lv>
To: "Mark E." <snowball3 AT usa DOT net>, djgpp-workers AT delorie DOT com
Date: Mon, 11 Jan 1999 13:14:50 +0200
MIME-Version: 1.0
Content-type: Multipart/Mixed; boundary=Message-Boundary-18270
Subject: Re: patch for autoconf 2.13
In-reply-to: <199901071842.SAA88774@out4.ibm.net>
X-mailer: Pegasus Mail for Win32 (v3.01d)
Reply-To: djgpp-workers AT delorie DOT com


--Message-Boundary-18270
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Content-description: Mail message body

On 7 Jan 99, at 13:42, Mark E. wrote:

> The patch attached to this message modifies the djgppcfg.sh 
> found in the autoconf 2.12 distribution so it can be used to modify 
> autoconf 2.13.
> 
> Mark
> 

Only one suggestion. Maybe it's better to use patch instead of sed for
modifying files in original distribution. I think it's simplier:
	cp Makefile.ori Makefile
	patch Makefile << 'EOF'
	   ...
	EOF

Anyway I adding modified version of djgppcfg.sh (I included also building
autoconf there). It's still not Ok as I had to manually edit created files.

Also take look on workaround needed under Win95 for autoheader I mentioned
at end of file in readme.DJGPP in gcc-2.8.1 and egcs-1.1.1 archives. It paerhaps 
would be nice to find something better

Andris


--Message-Boundary-18270
Content-type: text/plain; charset=US-ASCII
Content-disposition: inline
Content-description: Attachment information.

The following section of this message contains a file attachment
prepared for transmission using the Internet MIME message format.
If you are using Pegasus Mail, or any another MIME-compliant system,
you should be able to save it or view it from within your mailer.
If you cannot, please ask your system administrator for assistance.

   ---- File information -----------
     File:  djgppcfg.sh
     Date:  11 Jan 1999, 12:30
     Size:  2139 bytes.
     Type:  Text

--Message-Boundary-18270
Content-type: Application/Octet-stream; name="djgppcfg.sh"; type=Text
Content-disposition: attachment; filename="djgppcfg.sh"

if ! test -f Makefile.ori; then
  echo Saving the original file 'Makefile.in' to 'Makefile.ori'
  cp -p Makefile.in Makefile.ori
fi

# Change the 'editsh' sed's in Makefile.in to have in the
# resulting 'auto...' scripts the variable ${DJDIR} and not
# the expanded variable, so the script is portable to different
# computers, where DJDIR is in most cases different.
# This is, because on MS-DOS you don't have a default directory
# tree like under unix.
# Change also the *.info* to *.inf*, because this will fail, if
# we are not using long filenames

sed -e 's,\*\.info\*,\*\.inf\*,g' -e "s!,\\\$(SHELL),g.*\$!& -e 's,\\\$(DJDIR),\\\$\\\${DJDIR},g'!g" Makefile.ori > Makefile.in

# Change the IFS to take care of bash's PATH_SEPARATOR
# It defaults to ';'
# Change the 'test -f' to 'test -x' since only 'test -x' will
# return correct test on executables when testing a file without
# a suffix
# Example for testing of $DJDIR/bin/m4.exe
# test -f $DJDIR/bin/m4 will fail, but
# test -x $DJDIR/bin/m4 will succeed
#
# These sed's have to be done for 'acgeneral.m4' and 'acspecific.m4'

if ! test -f acgeneral.ori; then
  echo Saving the original file 'acgeneral.m4' to 'acgeneral.ori'
  cp -p acgeneral.m4 acgeneral.ori
fi

sed -e 's,IFS}:,IFS}\${PATH_SEPARATOR-\;},g' -e 's,test -f \$ac_dir/\$ac_word,test -x \$ac_dir/\$ac_word,g' acgeneral.ori > acgeneral.m4

if ! test -f acspecific.ori; then
  echo Saving the original file 'acspecific.m4' to 'acspecific.ori'
  cp -p acspecific.m4 acspecific.ori
fi

sed -e 's,IFS}:,IFS}\${PATH_SEPARATOR-\;},g' -e 's,test -f \$ac_dir/\$ac_prog,test -x \$ac_dir/\$ac_prog,g' acspecific.ori > acspecific.m4

# give configure a hint about these programs
export AWK=awk
export INSTALL=ginstall
export PATH=${DJDIR}/bin;$PATH
test -x ${DJDIR}/bin/perl && export ac_cv_path_PERL=/bin/perl
test -x ${DJDIR}/bin/m4   && export ac_cv_path_M4=m4
export CONFIG_SHELL=bash

# now run the configure script. The prefix arguments allows to have in the
# Makefile the variable ${DJDIR} and not it's expanded contents

bash ./configure --prefix=\${DJDIR}
make

--Message-Boundary-18270--