Re: tvh-6-various-DJGPP-fixes.diff

[Akim Demaille]

| Index: lib/autoconf/general.m4
| ===================================================================
| RCS file: /cvs/autoconf/lib/autoconf/general.m4,v
| retrieving revision 1.762
| diff -u -r1.762 general.m4
| --- lib/autoconf/general.m4   2001/09/13 06:57:29     1.762
| +++ lib/autoconf/general.m4   2001/09/16 09:33:16
| @@ -481,7 +481,11 @@
|  #
|  # Initializations.
|  #
| -ac_default_prefix=/usr/local
| +if test -r /dev/env/DJDIR/djgpp.env; then
| +  ac_default_prefix=/dev/env/DJDIR
| +else
| +  ac_default_prefix=/usr/local
| +fi

I don't like this too much.  If we start walking that direction, all
the systems providers will ask for support for their specificities.
Let's hold it for a while, and wait for other opinions.

|  cross_compiling=no
|  subdirs=
|  MFLAGS=
| Index: lib/autoconf/status.m4
| ===================================================================
| RCS file: /cvs/autoconf/lib/autoconf/status.m4,v
| retrieving revision 1.7
| diff -u -r1.7 status.m4
| --- lib/autoconf/status.m4    2001/09/13 06:57:29     1.7
| +++ lib/autoconf/status.m4    2001/09/16 09:33:17
| @@ -133,9 +133,9 @@
|  # - `ac_top_srcdir' is `build -> top-src'
|  m4_define([_AC_SRCPATHS],
|  [if test $1 != .; then
| -  ac_dir_suffix=/`echo $1 | sed 's,^\./,,'`
| +  ac_dir_suffix=/`echo $1 | sed 's,^\.[[\\/]],,'`
|    # A "../" for each directory in $ac_dir_suffix.
| -  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[[^/]]*,../,g'`
| +  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[[^\\/]]*,../,g'`
|  else
|    ac_dir_suffix= ac_top_builddir=
|  fi

Fine.

| @@ -148,9 +148,17 @@
|      else
|         ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
|      fi ;;
| -  [[\\/]]* | ?:[[\\/]]* )  # Absolute path.
| +  [[\\/]]* )  # Absolute path.
|      ac_srcdir=$srcdir$ac_dir_suffix;
|      ac_top_srcdir=$srcdir ;;
| +  ?:[[\\/]]* ) # Absolute DOS path with drivespec
| +    if test -r /dev/env/DJDIR/djgpp.env; then
| +      # This takes out the colon, so the loop for ac_file_inputs still works
| +      # on DOS (IFS = ':'!)
| +      srcdir=`echo $srcdir |tr '\\\\' '/' |sed 's,^\(.\):[[\\/]],/dev/\1/,'`;
| +    fi
| +    ac_srcdir=$srcdir$ac_dir_suffix;
| +    ac_top_srcdir=$srcdir ;;

:(  This is really obfuscating.


|    *) # Relative path.
|      ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
|      ac_top_srcdir=$ac_top_builddir$srcdir ;;
| @@ -473,6 +481,17 @@
|  ac_uD=',;t']
|  
|  for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
| +  if test -r /dev/env/DJDIR/djgpp.env; then
| +    # Special rule for DOS paths. In order to prevent confusion between the
| +    # drivespec and the delimiter, we make it a /dev/-style path.
| +    case $ac_file in
| +      ?:[[\\/]]* )
| +     ac_file=`echo "$ac_file" |tr '\\\\' '/' \
| +              |sed 's,^\(.\):\([[\\/]].*:\),/dev/\1\2,' \
| +                 |sed 's,:\(.\):[[\\/]],:/dev/\1/,'`;;
| +    esac
| +  fi
| +
|    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|    case $ac_file in
|    - | *:- | *:-:* ) # input from stdin
| @@ -880,6 +899,17 @@
|  _ACEOF
|  cat >>$CONFIG_STATUS <<\_ACEOF
|  for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
| +  if test -r /dev/env/DJDIR/djgpp.env; then
| +    # Special rule for DOS paths. In order to prevent confusion between the
| +    # drivespec and the delimiter, we make it a /dev/-style path.
| +    case $ac_file in
| +      ?:[[\\/]]* )
| +     ac_file=`echo "$ac_file" |tr '\\\\' '/' \
| +              |sed 's,^\(.\):\([[\\/]].*:\),/dev/\1\2,' \
| +                 |sed 's,:\(.\):[[\\/]],:/dev/\1/,'`;;
| +    esac
| +  fi
| +
|    # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
|    case $ac_file in
|    - | *:- | *:-:* ) # input from stdin

I would feel much better if you could find something more elegant.  I
don't feel comfortable with this patch at all :(  Sorry.