Mail Archives: djgpp-workers/1999/01/14/12:45:53
--Message-Boundary-24952
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Content-description: Mail message body
Attached is a revised djgppcfg.sh script that should fix most of the
problems noted. Substitute this one and re-run configure.bat.
I've noted another problem requiring a workaround. In bash, 'exec
/bin/sh' reports a 'not found' error and then exits bash. Somehow, I
don't think that's right.
Mark
---
Mark Elbrecht snowball3 AT usa DOT net
http://members.xoom.com/snowball3/
--Message-Boundary-24952
Content-type: text/plain; charset=US-ASCII
Content-transfer-encoding: 7BIT
Content-description: Text from file 'djgppcfg.sh'
# Patch autoconf sources
patch -Nb Makefile.in << 'EOF'
*** makefile.in.orig Tue Jan 5 08:27:16 1999
--- makefile.in Thu Jan 14 12:31:12 1999
***************
*** 79,86 ****
editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e \
's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' \
! -e 's,@''SHELL''@,$(SHELL),g'
! editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g'
all: ${SCRIPTS} ${M4FROZEN} info
--- 79,87 ----
editsh = sed -e 's,@''datadir''@,$(acdatadir),g' -e \
's,@''M4''@,$(M4),g' -e 's,@''AWK''@,$(AWK),g' \
! -e 's,@''SHELL''@,/bin/sh,g' -e 's,${DJDIR},$${DJDIR},g'
! editpl = sed -e 's,@''datadir''@,$(acdatadir),g' -e 's,@''PERL''@,$(PERL),g' \
! -e 's,${DJDIR}, $${DJDIR},g'
all: ${SCRIPTS} ${M4FROZEN} info
***************
*** 160,170 ****
# Don't cd, to avoid breaking install-sh references.
install-info: info installdirs
if test -f autoconf.info; then \
! for i in *.info*; do \
$(INSTALL_DATA) $$i $(infodir)/$$i; \
done; \
else \
! for i in $(srcdir)/*.info*; do \
$(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
done; \
fi
--- 161,171 ----
# Don't cd, to avoid breaking install-sh references.
install-info: info installdirs
if test -f autoconf.info; then \
! for i in *.inf*; do \
$(INSTALL_DATA) $$i $(infodir)/$$i; \
done; \
else \
! for i in $(srcdir)/*.inf*; do \
$(INSTALL_DATA) $$i $(infodir)/`echo $$i | sed 's|^$(srcdir)/||'`; \
done; \
fi
***************
*** 191,197 ****
maintainer-clean::
@echo "This command is intended for maintainers to use;"
@echo "rebuilding the deleted files requires makeinfo."
! rm -f TAGS *.info* INSTALL
clean mostlyclean distclean maintainer-clean::
for dir in $(SUBDIRS); do \
--- 192,198 ----
maintainer-clean::
@echo "This command is intended for maintainers to use;"
@echo "rebuilding the deleted files requires makeinfo."
! rm -f TAGS *.inf* INSTALL
clean mostlyclean distclean maintainer-clean::
for dir in $(SUBDIRS); do \
EOF
patch -Nb acgeneral.m4 << 'EOF'
*** acgeneral.m4.orig Tue Jan 5 08:27:36 1999
--- acgeneral.m4 Wed Jan 13 16:35:40 1999
***************
*** 1328,1336 ****
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="ifelse([$5], , $PATH, [$5])"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
! if test -f $ac_dir/$ac_word; then
ifelse([$6], , , dnl
[ if test "[$ac_dir/$ac_word]" = "$6"; then
ac_prog_rejected=yes
--- 1328,1341 ----
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="ifelse([$5], , $PATH, [$5])"
+ ac_test_flag="-f"
+ if ! test -z "$COMSPEC$ComSpec"; then
+ ac_test_flag="-x"
+ IFS=";"
+ fi
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
! if test $ac_test_flag $ac_dir/$ac_word; then
ifelse([$6], , , dnl
[ if test "[$ac_dir/$ac_word]" = "$6"; then
ac_prog_rejected=yes
***************
*** 1396,1404 ****
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="ifelse([$4], , $PATH, [$4])"
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
! if test -f $ac_dir/$ac_word; then
ac_cv_path_$1="$ac_dir/$ac_word"
break
fi
--- 1401,1414 ----
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="ifelse([$4], , $PATH, [$4])"
+ ac_test_flag="-f"
+ if ! test -z "$COMSPEC$ComSpec"; then
+ ac_test_flag="-x"
+ IFS=";"
+ fi;
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
! if test $ac_test_flag $ac_dir/$ac_word; then
ac_cv_path_$1="$ac_dir/$ac_word"
break
fi
EOF
patch -Nb acspecific.m4 << 'EOF'
*** acspecific.m4.orig Tue Jan 5 08:27:52 1999
--- acspecific.m4 Wed Jan 13 16:37:44 1999
***************
*** 606,611 ****
--- 606,616 ----
if test -z "$INSTALL"; then
AC_CACHE_VAL(ac_cv_path_install,
[ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":"
+ ac_test_flag="-f"
+ if ! test -z "$COMSPEC$ComSpec"; then
+ ac_test_flag="-x"
+ IFS=";"
+ fi
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
***************
*** 615,621 ****
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
! if test -f $ac_dir/$ac_prog; then
if test $ac_prog = install &&
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
--- 620,626 ----
# Don't use installbsd from OSF since it installs stuff as root
# by default.
for ac_prog in ginstall scoinst install; do
! if test $ac_test_flag $ac_dir/$ac_prog; then
if test $ac_prog = install &&
grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
EOF
patch -Nb autoheader.sh << 'EOF'
*** autoheader.sh.bak Tue Jan 5 08:28:38 1999
--- autoheader.sh Tue Jan 12 09:39:22 1999
***************
*** 265,270 ****
--- 265,272 ----
fi
if test $# -eq 0; then
+ # Force $tmpout to close to avoid file sharing problems under Windows
+ exec > /dev/null
if test $status -eq 0; then
if test -f ${config_h_in} && cmp -s $tmpout ${config_h_in}; then
rm -f $tmpout # File didn't change, so don't update its mod time.
EOF
# give configure a hint about these programs
export AWK=awk
export INSTALL=ginstall
test -x ${DJDIR}/bin/perl && export ac_cv_path_PERL=/bin/perl
test -x ${DJDIR}/bin/m4 && export ac_cv_path_M4=m4
#Set PATH_SEPARATOR
export PATH_SEPARATOR=;
export CONFIG_SHELL=sh
# 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-24952--
- Raw text -