Fresh Fish 2/FFMCD02.bin/useful/dist/gnu/diffutils/diffutils-2.6.diffs

Text File | 1993-12-12 | 10.5 KB | 504 lines

# Most of the changes to configure are to work around problems in
# pdksh with the 'eval' command.
#
# -fnf

diff -rc diffutils-2.6-fsf/Makefile.in diffutils-2.6-amiga/Makefile.in
*** diffutils-2.6-fsf/Makefile.in    Mon Sep 27 06:18:21 1993
--- diffutils-2.6-amiga/Makefile.in    Sat Dec 11 16:42:00 1993
***************
*** 28,42 ****
  INSTALL_DATA = @INSTALL_DATA@
  MAKEINFO = makeinfo

! CFLAGS = -g
! LDFLAGS = -g
  LIBS = @LIBS@

  # Some System V machines do not come with libPW.
  # If this is true for you, use the GNU alloca.o here.
  ALLOCA = @ALLOCA@

! prefix = /usr/local
  exec_prefix = $(prefix)

  # Prefix for each installed program, normally empty or `g'.
--- 28,42 ----
  INSTALL_DATA = @INSTALL_DATA@
  MAKEINFO = makeinfo

! CFLAGS = -O
! LDFLAGS =
  LIBS = @LIBS@

  # Some System V machines do not come with libPW.
  # If this is true for you, use the GNU alloca.o here.
  ALLOCA = @ALLOCA@

! prefix = /usr
  exec_prefix = $(prefix)

  # Prefix for each installed program, normally empty or `g'.
diff -rc diffutils-2.6-fsf/configure diffutils-2.6-amiga/configure
*** diffutils-2.6-fsf/configure    Wed Nov 10 08:41:58 1993
--- diffutils-2.6-amiga/configure    Sat Dec 11 16:06:37 1993
***************
*** 69,75 ****
           *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;;
           *) val=1 ;;
         esac
!        eval "with_$package='$val'" ;;

       -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v)
         verbose=yes ;;
--- 69,75 ----
           *=*) val="`echo $arg|sed 's/[^=]*=//'`" ;;
           *) val=1 ;;
         esac
!        with_$package='$val' ;;

       -v | -verbose | --verbose | --verbos | --verbo | --verb | --ver | --ve | --v)
         verbose=yes ;;
***************
*** 91,97 ****
  rm -f conftest* confdefs.h
  # AIX cpp loses on an empty file, so make sure it contains at least a newline.
  echo > confdefs.h
! compile='${CC-cc} $CFLAGS conftest.c -o conftest $LIBS >/dev/null 2>&1'

  # A filename unique to this package, relative to the directory that
  # configure is in, which we can look for to find out if srcdir is correct.
--- 91,97 ----
  rm -f conftest* confdefs.h
  # AIX cpp loses on an empty file, so make sure it contains at least a newline.
  echo > confdefs.h
! compile="${CC-gcc} $CFLAGS conftest.c -o conftest $LIBS"

  # A filename unique to this package, relative to the directory that
  # configure is in, which we can look for to find out if srcdir is correct.
***************
*** 109,114 ****
--- 109,115 ----
      srcdir=..
    fi
  fi
+ srcdir=../diffutils-2.6-amiga    #HACK
  if test ! -r $srcdir/$unique_file; then
    if test x$srcdirdefaulted = xyes; then
      echo "configure: Can not find sources in \`${confdir}' or \`..'." 1>&2
***************
*** 152,169 ****
    yes
  #endif
  EOF
! ${CC-cc} -E conftest.c > conftest.out 2>&1
  if egrep yes conftest.out >/dev/null 2>&1; then
    GCC=1 # For later tests.
  fi
  rm -f conftest*

  echo checking how to run the C preprocessor
  if test -z "$CPP"; then
    # This must be in double quotes, not single quotes, because CPP may get
!   # substituted into the Makefile and ``${CC-cc}'' will simply confuse
    # make.  It must be expanded now.
!   CPP="${CC-cc} -E"
    cat > conftest.c <<EOF
  #include "confdefs.h"
  #include <stdio.h>
--- 153,171 ----
    yes
  #endif
  EOF
! ${CC-gcc} -E conftest.c > conftest.out 2>&1
  if egrep yes conftest.out >/dev/null 2>&1; then
    GCC=1 # For later tests.
  fi
  rm -f conftest*

  echo checking how to run the C preprocessor
+ CPP="/lib/gcc-lib/amigados/2.3.3/cpp"    #HACK
  if test -z "$CPP"; then
    # This must be in double quotes, not single quotes, because CPP may get
!   # substituted into the Makefile and ``${CC-gcc}'' will simply confuse
    # make.  It must be expanded now.
!   CPP="${CC-gcc} -E"
    cat > conftest.c <<EOF
  #include "confdefs.h"
  #include <stdio.h>
***************
*** 311,317 ****
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 313,319 ----
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 338,344 ****
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 340,346 ----
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 365,371 ****
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 367,373 ----
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 392,398 ****
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 394,400 ----
  int main() { exit(0); }
  int t() { DIR *dirp = 0; }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 418,424 ****
  #include <$dirheader>
  int closedir(); main() { exit(closedir(opendir(".")) != 0); }
  EOF
! eval $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
--- 420,426 ----
  #include <$dirheader>
  int closedir(); main() { exit(closedir(opendir(".")) != 0); }
  EOF
! $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
***************
*** 482,488 ****
  int main() { exit(0); }
  int t() { $prog }
  EOF
! if eval $compile; then
    :
  else
    rm -rf conftest*
--- 484,490 ----
  int main() { exit(0); }
  int t() { $prog }
  EOF
! if $compile; then
    :
  else
    rm -rf conftest*
***************
*** 530,536 ****
  exit (0); }

  EOF
! eval $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then

  {
--- 532,538 ----
  exit (0); }

  EOF
! $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then

  {
***************
*** 618,624 ****
  int main() { exit(0); }
  int t() { int i; }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 620,626 ----
  int main() { exit(0); }
  int t() { int i; }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 671,677 ****
  #endif
   }
  EOF
! if eval $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
--- 673,679 ----
  #endif
   }
  EOF
! if $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
***************
*** 799,805 ****
    }
  }
  EOF
! eval $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
--- 801,807 ----
    }
  }
  EOF
! $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
***************
*** 825,831 ****
  int main() { exit(0); }
  int t() { vprintf(); }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 827,833 ----
  int main() { exit(0); }
  int t() { vprintf(); }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 854,860 ****
  int main() { exit(0); }
  int t() { _doprnt(); }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 856,862 ----
  int main() { exit(0); }
  int t() { _doprnt(); }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 883,889 ****
  int main() { exit(0); }
  int t() { char *p = alloca(2 * sizeof(int)); }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 885,891 ----
  int main() { exit(0); }
  int t() { char *p = alloca(2 * sizeof(int)); }
  EOF
! if $compile; then
    rm -rf conftest*

  {
***************
*** 922,928 ****
  int main() { exit(0); }
  int t() { char *p = (char *) alloca(1); }
  EOF
! if eval $compile; then
    :
  else
    rm -rf conftest*
--- 924,930 ----
  int main() { exit(0); }
  int t() { char *p = (char *) alloca(1); }
  EOF
! if $compile; then
    :
  else
    rm -rf conftest*
***************
*** 957,963 ****
  #endif
   }
  EOF
! if eval $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
--- 959,965 ----
  #endif
   }
  EOF
! if $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
***************
*** 990,996 ****
  #endif
   }
  EOF
! if eval $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
--- 992,998 ----
  #endif
   }
  EOF
! if $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
***************
*** 1023,1029 ****
  #endif
   }
  EOF
! if eval $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
--- 1025,1031 ----
  #endif
   }
  EOF
! if $compile; then
    rm -rf conftest*
    {
  test -n "$verbose" && \
***************
*** 1080,1086 ****
  #include "confdefs.h"
  main(){exit(0);}
  EOF
! eval $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
--- 1082,1088 ----
  #include "confdefs.h"
  main(){exit(0);}
  EOF
! $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then
    :
  else
***************
*** 1122,1128 ****
    exit (find_stack_direction() < 0);
  }
  EOF
! eval $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then

  {
--- 1124,1130 ----
    exit (find_stack_direction() < 0);
  }
  EOF
! $compile
  if test -s conftest && (./conftest; exit) 2>/dev/null; then

  {
***************
*** 1163,1169 ****
  int main() { exit(0); }
  int t() { struct stat s; s.st_blksize; }
  EOF
! if eval $compile; then
    rm -rf conftest*

  {
--- 1165,1171 ----
  int main() { exit(0); }
  int t() { struct stat s; s.st_blksize; }
  EOF
! if $compile; then
    rm -rf conftest*

  {
diff -rc diffutils-2.6-fsf/fnmatch.h diffutils-2.6-amiga/fnmatch.h
*** diffutils-2.6-fsf/fnmatch.h    Sun Apr 11 22:54:32 1993
--- diffutils-2.6-amiga/fnmatch.h    Sat Dec 11 14:00:59 1993
***************
*** 35,41 ****
--- 35,43 ----
  #endif /* C++ or ANSI C.  */

  /* Bits set in the FLAGS argument to `fnmatch'.  */
+ #ifndef FNM_PATHNAME
  #define    FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
+ #endif
  #define    FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special chars.  */
  #define    FNM_PERIOD    (1 << 2) /* Leading `.' is matched only explicitly.  */

diff -rc diffutils-2.6-fsf/system.h diffutils-2.6-amiga/system.h
*** diffutils-2.6-fsf/system.h    Mon Sep 27 04:54:33 1993
--- diffutils-2.6-amiga/system.h    Sat Dec 11 14:01:04 1993
***************
*** 115,121 ****
  #define O_RDONLY 0
  #endif

! #if HAVE_SYS_WAIT_H
  #ifndef _POSIX_VERSION
  /* Prevent the NeXT prototype using union wait from causing problems.  */
  #define wait system_wait
--- 115,121 ----
  #define O_RDONLY 0
  #endif

! #if HAVE_SYS_WAIT_H && !defined (amigados)
  #ifndef _POSIX_VERSION
  /* Prevent the NeXT prototype using union wait from causing problems.  */
  #define wait system_wait