parallel/mpi-ch/patches/patch-aj

   1 $NetBSD$
   2 --- mpe/profiling/nupshot/configure.orig        Sat Jul  4 07:50:32 1998
   3 +++ mpe/profiling/nupshot/configure     Thu Aug  6 05:42:48 1998
   4 @@ -1219,9 +1219,9 @@
   5      /local/encap/tcl-7.1 ; do
   6 -    if test -r $dir/include/tcl.h ; then
   7 +    if test -r $dir/include/tcl8.0/tcl.h ; then
   8         # Check for correct version
   9
  10 -       tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl.h | \
  11 +       tclversion=`grep 'TCL_MAJOR_VERSION' $dir/include/tcl8.0/tcl.h | \
  12                 sed -e 's/^.*TCL_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'`
  13
  14 -       if test "$tclversion" != "7" ; then
  15 +       if test "$tclversion" != "8" ; then
  16             # Skip if it is the wrong version
  17 @@ -1243,5 +1243,5 @@
  18    if test -z "$ac_echo_test" -a 1 = 1 ; then
  19 -echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl"
  20 +echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl"
  21  else
  22 -echo "$ac_t""found $TCL_DIR/include/tcl.h and $TCL_DIR/lib/libtcl" 1>&1
  23 +echo "$ac_t""found $TCL_DIR/include/tcl8.0/tcl.h and $TCL_DIR/lib/libtcl" 1>&1
  24  fi
  25 @@ -1335,9 +1335,9 @@
  26      /local/encap/tk-3.4 $TCL_DIR ; do
  27 -    if test -r $dir/include/tk.h ; then
  28 +    if test -r $dir/include/tk8.0/tk.h ; then
  29         # Check for correct version
  30
  31 -       tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk.h | \
  32 +       tkversion=`grep 'TK_MAJOR_VERSION' $dir/include/tk8.0/tk.h | \
  33                 sed -e 's/^.*TK_MAJOR_VERSION[^0-9]*\([0-9]*\).*$/\1/'`
  34
  35 -       if test "$tkversion" != "3" ; then
  36 +       if test "$tkversion" != "8" ; then
  37             # Skip if it is the wrong version
  38 @@ -1359,3 +1359,3 @@
  39    if test -z "$ac_echo_test" -a 1 = 1 ; then
  40 -echo "$ac_t""found $TK_DIR/include/tk.h and $TK_DIR/lib/libtk"
  41 +echo "$ac_t""found $TK_DIR/include/tk8.0/tk.h and $TK_DIR/lib/libtk"
  42  else
  43 @@ -1431,3 +1431,3 @@
  44    CFLAGSsave="$CFLAGS"
  45 -  CFLAGS="$CFLAGS -I$TK_DIR/include -I$TCL_DIR/include $XINCLUDES"
  46 +  CFLAGS="$CFLAGS -I$TK_DIR/include/tk8.0 -I$TCL_DIR/include/tcl8.0 $XINCLUDES"
  47
  48 @@ -1565,4 +1565,4 @@
  49
  50 -if test "$TK_VERSION" != 3.6 ; then
  51 -    print_error "This version of nupshot requires tk 3.6  The version in"
  52 +if test "$TK_VERSION" != 8.0 ; then
  53 +    print_error "This version of nupshot requires tk 8.0  The version in"
  54      print_error "$TK_DIR seems to be version $TK_VERSION."