iwidgets/iwidgets4.0.1.patch

   1 --- configure.in.orig   2005-07-08 11:17:02.000000000 +0100
   2 +++ configure.in        2005-07-08 11:14:08.000000000 +0100
   3 @@ -19,6 +19,8 @@
   4  AC_SUBST(PACKAGE)
   5  AC_SUBST(VERSION)
   6
   7 +AC_PROG_INSTALL
   8 +
   9  AC_PREREQ(2.0)
  10
  11  case "`uname -s`" in
  12 @@ -52,30 +54,46 @@
  13  SC_LOAD_TKCONFIG
  14
  15  #--------------------------------------------------------------------
  16 -# See if --with-itcl was specified to give the [incr Tcl] and [incr Tk]
  17 -# source code location.  If not, then we'll assume that the Iwidgets
  18 -# package is being installed directly beneath the toplevel Itcl directory.
  19 +# See if --with-itcl was specified to give the [incr Tcl] source code
  20 +# location.  If not, then we'll assume that the Iwidgets package is being
  21 +# installed as a sibling directory to itcl and we attempt to guess the
  22 +# correct path by the last item matched with ../itcl*.
  23  #--------------------------------------------------------------------
  24
  25 -AC_ARG_WITH(itcl, [  --with-itcl=DIR         use Itcl 3.0 binaries from DIR],
  26 -        itcl_search=$withval, itcl_search=`cd ${IWIDGETS_SRC_DIR}/..; pwd`)
  27 +AC_ARG_WITH(itcl, [  --with-itcl=DIR         use Itcl 3.3 binaries from DIR],
  28 +        itcl_search=$withval, itcl_search="/usr/lib/itcl3.4")
  29
  30  ITCL_LIB_DIR=""
  31 -if test -r $itcl_search/itcl/library/itcl.tcl; then
  32 -    if test -r $itcl_search/itk/library/itk.tcl; then
  33 -        if test -r $itcl_search/config/mkinstalldirs; then
  34 -            ITCL_LIB_DIR=$itcl_search/itcl/library
  35 -            ITCL_SRC_DIR=$itcl_search/itcl
  36 -            ITK_LIB_DIR=$itcl_search/itk/library
  37 -            ITK_SRC_DIR=$itcl_search/itk
  38 -        fi
  39 -    fi
  40 +if test -r $itcl_search/itcl.tcl; then
  41 +    ITCL_LIB_DIR=$itcl_search
  42 +    ITCL_SRC_DIR=$itcl_search
  43  fi
  44
  45  if test -z "$ITCL_LIB_DIR"; then
  46 -    AC_MSG_ERROR(Can't find Itcl source.  Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system.  (This directory should contain itcl/library/itcl.tcl, itk/library/itk.tcl, and config/mkinstalldirs.))
  47 +    AC_MSG_ERROR(Can't find Itcl source.  Use --with-itcl to specify the the toplevel [incr Tcl] directory on your system.  (This directory should contain itcl.tcl.))
  48  fi
  49
  50 +#--------------------------------------------------------------------
  51 +# See if --with-itk was specified to give the [incr Tk] source code
  52 +# location.  If not, then we'll assume that the Iwidgets package is being
  53 +# installed as a sibling directory to itcl and we attempt to guess the
  54 +# correct path by the last item matched with ../itk*.
  55 +#--------------------------------------------------------------------
  56 +
  57 +AC_ARG_WITH(itk, [  --with-itk=DIR         use Itk 3.3 binaries from DIR],
  58 +        itk_search=$withval, itk_search="/usr/lib/itk3.3")
  59 +
  60 +ITK_LIB_DIR=""
  61 +if test -r $itk_search/itk.tcl; then
  62 +    ITK_LIB_DIR=$itk_search
  63 +    ITK_SRC_DIR=$itk_search
  64 +fi
  65 +
  66 +if test -z "$ITK_LIB_DIR"; then
  67 +    AC_MSG_ERROR(Can't find Itk source.  Use --with-itk to specify the the toplevel [incr Tk] directory on your system.  (This directory should contain itk.tcl.))
  68 +fi
  69 +
  70 +
  71
  72  #--------------------------------------------------------------------
  73  #   Needed for running the test suite
  74 --- Makefile.in.orig    2005-07-08 11:17:12.000000000 +0100
  75 +++ Makefile.in 2005-07-08 11:01:20.000000000 +0100
  76 @@ -78,11 +78,11 @@
  77  # modify any of this stuff by hand.
  78  #----------------------------------------------------------------
  79
  80 -INSTALL =              $(TCLSH_PROG) `$(CYGPATH) $(ITCL_SRC_DIR)/../config/installFile.tcl` -c
  81 -INSTALL_PROGRAM =      $(INSTALL)
  82 -INSTALL_DATA =         $(INSTALL) -m 644
  83 -INSTALL_SCRIPT =       $(INSTALL) -m 555
  84 -MKINSTALLDIRS =                $(ITCL_SRC_DIR)/../config/mkinstalldirs
  85 +INSTALL =              @INSTALL@
  86 +INSTALL_PROGRAM =      @INSTALL_PROGRAM@
  87 +INSTALL_DATA =         @INSTALL_DATA@
  88 +INSTALL_SCRIPT =       @INSTALL_SCRIPT@
  89 +MKINSTALLDIRS =                mkdir -p
  90  RANLIB =               @RANLIB@
  91  LN_S =                 ln -s
  92  TOP_DIR =              $(srcdir)
  93 --- install-sh.orig     2005-07-08 11:38:48.000000000 +0100
  94 +++ install-sh  2005-07-08 11:14:05.000000000 +0100
  95 @@ -0,0 +1,119 @@
  96 +#!/bin/sh
  97 +
  98 +#
  99 +# install - install a program, script, or datafile
 100 +# This comes from X11R5; it is not part of GNU.
 101 +#
 102 +# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
 103 +#
 104 +# This script is compatible with the BSD install script, but was written
 105 +# from scratch.
 106 +#
 107 +
 108 +
 109 +# set DOITPROG to echo to test this script
 110 +
 111 +# Don't use :- since 4.3BSD and earlier shells don't like it.
 112 +doit="${DOITPROG-}"
 113 +
 114 +
 115 +# put in absolute paths if you don't have them in your path; or use env. vars.
 116 +
 117 +mvprog="${MVPROG-mv}"
 118 +cpprog="${CPPROG-cp}"
 119 +chmodprog="${CHMODPROG-chmod}"
 120 +chownprog="${CHOWNPROG-chown}"
 121 +chgrpprog="${CHGRPPROG-chgrp}"
 122 +stripprog="${STRIPPROG-strip}"
 123 +rmprog="${RMPROG-rm}"
 124 +
 125 +instcmd="$mvprog"
 126 +chmodcmd=""
 127 +chowncmd=""
 128 +chgrpcmd=""
 129 +stripcmd=""
 130 +rmcmd="$rmprog -f"
 131 +mvcmd="$mvprog"
 132 +src=""
 133 +dst=""
 134 +
 135 +while [ x"$1" != x ]; do
 136 +    case $1 in
 137 +       -c) instcmd="$cpprog"
 138 +           shift
 139 +           continue;;
 140 +
 141 +       -m) chmodcmd="$chmodprog $2"
 142 +           shift
 143 +           shift
 144 +           continue;;
 145 +
 146 +       -o) chowncmd="$chownprog $2"
 147 +           shift
 148 +           shift
 149 +           continue;;
 150 +
 151 +       -g) chgrpcmd="$chgrpprog $2"
 152 +           shift
 153 +           shift
 154 +           continue;;
 155 +
 156 +       -s) stripcmd="$stripprog"
 157 +           shift
 158 +           continue;;
 159 +
 160 +       *)  if [ x"$src" = x ]
 161 +           then
 162 +               src=$1
 163 +           else
 164 +               dst=$1
 165 +           fi
 166 +           shift
 167 +           continue;;
 168 +    esac
 169 +done
 170 +
 171 +if [ x"$src" = x ]
 172 +then
 173 +       echo "install:  no input file specified"
 174 +       exit 1
 175 +fi
 176 +
 177 +if [ x"$dst" = x ]
 178 +then
 179 +       echo "install:  no destination specified"
 180 +       exit 1
 181 +fi
 182 +
 183 +
 184 +# If destination is a directory, append the input filename; if your system
 185 +# does not like double slashes in filenames, you may need to add some logic
 186 +
 187 +if [ -d $dst ]
 188 +then
 189 +       dst="$dst"/`basename $src`
 190 +fi
 191 +
 192 +# Make a temp file name in the proper directory.
 193 +
 194 +dstdir=`dirname $dst`
 195 +dsttmp=$dstdir/#inst.$$#
 196 +
 197 +# Move or copy the file name to the temp name
 198 +
 199 +$doit $instcmd $src $dsttmp
 200 +
 201 +# and set any options; do chmod last to preserve setuid bits
 202 +
 203 +if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; fi
 204 +if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; fi
 205 +if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; fi
 206 +if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; fi
 207 +
 208 +# Now rename the file to the real destination.
 209 +
 210 +$doit $rmcmd $dst
 211 +$doit $mvcmd $dsttmp $dst
 212 +
 213 +
 214 +exit 0