# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/rene/libtiff/libtiff_configure.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- ./configure.orig 2001-11-15 19:21:05.000000000 +0200
+++ ./configure 2002-05-17 09:11:51.000000000 +0300
@@ -44,15 +44,15 @@
#
# Setup general configuration parameters.
#
-PREFIX=/usr/local # root of installation
+PREFIX=/usr # root of installation
EPREFIX=${PREFIX}
DIRS_LIBINC= # dirs to search for ancillary includes
DIR_JPEGLIB= # dir for IJG -ljpeg
DIR_GZLIB= # dir for zlib -lgz
DSO=auto # auto-enable DSO support
LIBCOPTS= # library-specific C-compiler options
-JPEG=no # configure JPEG support
-ZIP=no # configure ZIP/Deflate support
+JPEG=yes # configure JPEG support
+ZIP=yes # configure ZIP/Deflate support
PORT=auto # enable portability emulations
HTML=no # install HTML documentation
LIBGL=auto # auto-enable build of SGI -lgl apps
@@ -97,7 +97,7 @@
--verbose opposite of --quiet
--noninteractive don't ask any questions
--version print the version of autoconf that created configure
- --prefix=PREFIX root of installation [PREFIX=/usr/local]
+ --prefix=PREFIX root of installation [PREFIX=/usr]
--exec-prefix=EPREFIX root of installation [EPREFIX=PREFIX]
--target=TARGET configure for TARGET [TARGET=HOST]
--srcdir=DIR find the sources in DIR [configure dir or ..]
@@ -356,7 +356,7 @@
#
case $TARGET in
mips-dec-*) FILLORDER=LSB2MSB;;
- i[345]86-*) FILLORDER=LSB2MSB;;
+ i[3456]86-*) FILLORDER=LSB2MSB;;
*) FILLORDER=MSB2LSB;;
esac
fi
@@ -1355,12 +1355,7 @@
# stripped for pages to be found (only for 4F pages).
#
if [ -z "${DIR_MAN-}" ]; then
- MANPATH="
- $MANPATH
- /usr/local/man
- /usr/contrib/man
- /usr/catman/local
- "
+ MANPATH="/usr/share/man"
DIR_MAN=
for i in $MANPATH; do
test -d $i && { DIR_MAN=$i; break; }
@@ -1372,7 +1367,7 @@
case $TARGET in
*-bsdi*|*-netbsd*) MANSCHEME=bsd-nroff-gzip-0.gz;;
*-freebsd*) MANSCHEME=bsd-source-cat;;
- *-linux*) MANSCHEME=bsd-source-cat;;
+ *-linux*) MANSCHEME=sysv-source-cat;;
*-ultrix*) MANSCHEME=bsd-source-cat;;
*-sunos*) MANSCHEME=bsd-source-cat-strip;;
*-sysv[234]*) MANSCHEME=sysv-source-cat-strip;;
@@ -1389,15 +1384,15 @@
MANSCHEME=sysv-source-cat
if [ -d /usr/share/man ]; then
if [ -d /usr/share/man/u_man ]; then
- MANSCHEME=sysv-source-cat
- elif [ -d /usr/share/man/man8 ]; then
MANSCHEME=bsd-source-cat
+ elif [ -d /usr/share/man/man8 ]; then
+ MANSCHEME=sysv-source-cat
fi
elif [ -d /usr/share/catman ]; then
if [ -d /usr/share/catman/u_man ]; then
- MANSCHEME=sysv-nroff-cat
- elif [ -d /usr/share/catman/man8 ]; then
MANSCHEME=bsd-nroff-cat
+ elif [ -d /usr/share/catman/man8 ]; then
+ MANSCHEME=sysv-nroff-cat
fi
fi
;;
--- ./config.sub.orig Fri Jul 14 20:31:39 2000
+++ ./config.sub Fri Jul 14 20:35:30 2000
@@ -119,7 +119,7 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
+ tahoe | i[3456]86 | i860 | m68k | m68000 | m88k | ns32k | arm | pyramid \
| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
| powerpc | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
@@ -132,7 +132,7 @@
exit 1
;;
# Recognize the basic CPU types with company name.
- vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
+ vax-* | tahoe-* | i[3456]86-* | i860-* | m68k-* | m68000-* | m88k-* \
| sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \
| none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
@@ -296,19 +296,19 @@
os=-mvs
;;
# I'm not sure what "Sysv32" means. Should this be sysv3.2?
- i[345]86v32)
+ i[3456]86v32)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv32
;;
- i[345]86v4*)
+ i[3456]86v4*)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv4
;;
- i[345]86v)
+ i[3456]86v)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-sysv
;;
- i[345]86sol2)
+ i[3456]86sol2)
basic_machine=`echo $1 | sed -e 's/86.*/86-unknown/'`
os=-solaris2
;;
@@ -580,7 +580,7 @@
# Each alternative must end in a *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
- | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
+ | -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[3456]* \
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
| -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \