diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-07 14:33:48 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2009-05-07 14:33:48 +0000 |
| commit | 8243edfca0be6770fa56b9bc220b05ae505d1082 (patch) | |
| tree | 0fc8b06d0c1ffdc32b1184c2e0815fe5359fcb35 | |
| parent | 47a56b5dc7f17f502aee404c912490f135ca3c52 (diff) | |
build system: remove --enable-fmtutil, fix option defaults, general cleanup
git-svn-id: svn://tug.org/texlive/trunk@12986 c570f23f-e606-0410-a88d-b1316a301751
59 files changed, 158 insertions, 5836 deletions
diff --git a/Build/source/README.config b/Build/source/README.config index 59447eedb6e..ed09b300a3c 100644 --- a/Build/source/README.config +++ b/Build/source/README.config @@ -48,6 +48,11 @@ somewhat improving portability. Omit support for large files (>=2GB). +1.5. --without-x +---------------- + +Do not use the X Window System. + 2. Configure options for program packages ========================================= @@ -74,8 +79,8 @@ filename is encountered. 2.3.2. --disable-dump-share -Make the fmt/base/mem dump files architecture dependend (somewhat increasing -performance on little-endian systems). +Make the fmt/base/mem dump files architecture dependend (somewhat faster +on little-endian architectures). 2.3.3. --enable-ipc @@ -94,9 +99,9 @@ Use the X toolkit (libXt) for METAFONT (default is yes). Include various types of window support for METAFONT. -2.3.7. --enable-mf-nowin +2.3.7. --disable-mf-nowin -Build a separate non-windows-capable METAFONT. +Do not build a separate non-windows-capable METAFONT. 2.3.8. --disable-web-progs diff --git a/Build/source/config/config.guess b/Build/source/config/config.guess deleted file mode 100755 index da833146088..00000000000 --- a/Build/source/config/config.guess +++ /dev/null @@ -1,1561 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2009-04-27' - -# This file 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. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Originally written by Per Bothner <per@bothner.com>. -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <config-patches@gnu.org>." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; set_cc_for_build= ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - sh5el) machine=sh5le-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # contains redundant information, the shorter form: - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} - exit ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit ;; - *:SolidBSD:*:*) - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} - exit ;; - macppc:MirBSD:*:*) - echo powerpc-unknown-mirbsd${UNAME_RELEASE} - exit ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # A Xn.n version is an unreleased experimental baselevel. - # 1.2 uses "1.2" for uname -r. - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; - Alpha\ *:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # Should we change UNAME_MACHINE based on the output of uname instead - # of the specific Alpha model? - echo alpha-pc-interix - exit ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit ;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit ;; - *:z/VM:*:*) - echo s390-ibm-zvmoe - exit ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; - arm:riscos:*:*|arm:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit ;; - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. - if test "`(/bin/universe) 2>/dev/null`" = att ; then - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit ;; - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7; exit ;; - esac ;; - s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - eval $set_cc_for_build - SUN_ARCH="i386" - # If there is a compiler, see if it is configured for 64-bit objects. - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. - # This test works for both compilers. - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - SUN_ARCH="x86_64" - fi - fi - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:6*:*) - # According to config.sub, this is the proper way to canonicalize - # SunOS6. Hard to guess exactly what SunOS6 will be like, but - # it's likely to be more like Solaris than SunOS4. - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - esac - # Japanese Language versions have a version number like `4.1.3-JL'. - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` - exit ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit ;; - sun*:*:4.2BSD:*) - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit ;; - # The situation for MiNT is a little confusing. The machine name - # can be virtually everything (everything which is not - # "atarist" or "atariste" at least should have a processor - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include <stdio.h> /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && - SYSTEM_NAME=`$dummy $dummyarg` && - { echo "$SYSTEM_NAME"; exit; } - echo mips-mips-riscos${UNAME_RELEASE} - exit ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit ;; - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <sys/systemcfg.h> - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` - then - echo "$SYSTEM_NAME" - else - echo rs6000-ibm-aix3.2.5 - fi - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then - echo rs6000-ibm-aix3.2.4 - else - echo rs6000-ibm-aix3.2 - fi - exit ;; - *:AIX:*:[456]) - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to - exit ;; # report: romp-ibm BSD 4.3 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include <stdlib.h> - #include <unistd.h> - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - esac - if [ ${HP_ARCH} = "hppa2.0w" ] - then - eval $set_cc_for_build - - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler - # generating 64-bit code. GNU and HP use different nomenclature: - # - # $ CC_FOR_BUILD=cc ./config.guess - # => hppa2.0w-hp-hpux11.23 - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess - # => hppa64-hp-hpux11.23 - - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | - grep __LP64__ >/dev/null - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <unistd.h> - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - echo unknown-hitachi-hiuxwe2 - exit ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*[A-Z]90:*:*:*) - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ - -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit ;; - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - 5000:UNIX_System_V:4.*:*) - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" - exit ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit ;; - *:FreeBSD:*:*) - case ${UNAME_MACHINE} in - pc98) - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - amd64) - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - *) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; - esac - exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; - i*:windows32*:*) - # uname -m includes "-pc" on this system. - echo ${UNAME_MACHINE}-mingw32 - exit ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit ;; - *:Interix*:[3456]*) - case ${UNAME_MACHINE} in - x86) - echo i586-pc-interix${UNAME_RELEASE} - exit ;; - EM64T | authenticamd | genuineintel) - echo x86_64-unknown-interix${UNAME_RELEASE} - exit ;; - IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; - esac ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit ;; - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) - # How do we know it's Interix rather than the generic POSIX subsystem? - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we - # UNAME_MACHINE based on the output of uname instead of i386? - echo i586-pc-interix - exit ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) - echo x86_64-unknown-cygwin - exit ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit ;; - *:GNU/*:*:*) - # other systems with GNU libc and userland - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu - exit ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; - arm*:Linux:*:*) - eval $set_cc_for_build - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_EABI__ - then - echo ${UNAME_MACHINE}-unknown-linux-gnu - else - echo ${UNAME_MACHINE}-unknown-linux-gnueabi - fi - exit ;; - avr32*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit ;; - crisv32:Linux:*:*) - echo crisv32-axis-linux-gnu - exit ;; - frv:Linux:*:*) - echo frv-unknown-linux-gnu - exit ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^CPU/{ - s: ::g - p - }'`" - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } - ;; - or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit ;; - padre:Linux:*:*) - echo sparc-unknown-linux-gnu - exit ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - vax:Linux:*:*) - echo ${UNAME_MACHINE}-dec-linux-gnu - exit ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit ;; - xtensa*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit ;; - "") - # Either a pre-BFD a.out linker (linux-gnuoldld) or - # one that does not give us useful --help. - echo "${UNAME_MACHINE}-pc-linux-gnuoldld" - exit ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include <features.h> - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #endif -EOF - eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' - /^LIBC/{ - s: ::g - p - }'`" - test x"${LIBC}" != x && { - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" - exit - } - test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; } - ;; - i*86:DYNIX/ptx:4*:*) - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. - # earlier versions are messed up and put the nodename in both - # sysname and nodename. - echo i386-sequent-sysv4 - exit ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit ;; - i*86:OS/2:*:*) - # If we were able to find `uname', then EMX Unix compatibility - # is probably installed. - echo ${UNAME_MACHINE}-pc-os2-emx - exit ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit ;; - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit ;; - i*86:*:5:[678]*) - # UnixWare 7.x, OpenUNIX and OpenServer 6. - case `/bin/uname -X | grep "^Machine"` in - *486*) UNAME_MACHINE=i486 ;; - *Pentium) UNAME_MACHINE=i586 ;; - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; - esac - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} - exit ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL - elif /bin/uname -X 2>/dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit ;; - pc:*:*:*) - # Left here for compatibility: - # uname -m prints for DJGPP always 'pc', but it prints nothing about - # the processor, so we play safe by assuming i586. - # Note: whatever this is, it MUST be the same as what config.sub - # prints for the "djgpp" host, or else GDB configury will decide that - # this is a cross-build. - echo i586-pc-msdosdjgpp - exit ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit ;; - i860:*:4.*:*) # i860-SVR4 - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 - else # Add other i860-SVR4 vendors below as they are discovered. - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 - fi - exit ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) - OS_REL='' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4; exit; } ;; - NCR*:*:4.2:* | MPRAS*:*:4.2:*) - OS_REL='.3' - test -r /etc/.relid \ - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says <Richard.M.Bartel@ccMail.Census.GOV> - echo i586-unisys-sysv4 - exit ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes <hewes@openmarket.com>. - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit ;; - i*86:VOS:*:*) - # From Paul.Green@stratus.com. - echo ${UNAME_MACHINE}-stratus-vos - exit ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit ;; - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) - if [ -d /usr/nec ]; then - echo mips-nec-sysv${UNAME_RELEASE} - else - echo mips-unknown-sysv${UNAME_RELEASE} - fi - exit ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit ;; - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit ;; - SX-7:SUPER-UX:*:*) - echo sx7-nec-superux${UNAME_RELEASE} - exit ;; - SX-8:SUPER-UX:*:*) - echo sx8-nec-superux${UNAME_RELEASE} - exit ;; - SX-8R:SUPER-UX:*:*) - echo sx8r-nec-superux${UNAME_RELEASE} - exit ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit ;; - NSE-?:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit ;; - *:*VMS:*:*) - UNAME_MACHINE=`(uname -p) 2>/dev/null` - case "${UNAME_MACHINE}" in - A*) echo alpha-dec-vms ; exit ;; - I*) echo ia64-dec-vms ; exit ;; - V*) echo vax-dec-vms ; exit ;; - esac ;; - *:XENIX:*:SysV) - echo i386-pc-xenix - exit ;; - i*86:skyos:*:*) - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' - exit ;; - i*86:rdos:*:*) - echo ${UNAME_MACHINE}-pc-rdos - exit ;; - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - -cat >&2 <<EOF -$0: unable to guess system type - -This script, last modified $timestamp, has failed to recognize -the operating system you are using. It is advised that you -download the most up to date version of the config scripts from - - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD -and - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD - -If the version you run ($0) is already up to date, please -send the following data and any information you think might be -pertinent to <config-patches@gnu.org> in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Build/source/config/config.sub b/Build/source/config/config.sub deleted file mode 100755 index a39437d0158..00000000000 --- a/Build/source/config/config.sub +++ /dev/null @@ -1,1686 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. - -timestamp='2009-04-17' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# This file 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. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA -# 02110-1301, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - - -# Please send patches to <config-patches@gnu.org>. Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to <config-patches@gnu.org>." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, -2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit ;; - --version | -v ) - echo "$version" ; exit ;; - --help | --h* | -h ) - echo "$usage"; exit ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit ;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco6) - os=-sco5v6 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ - | bfin \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fido | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ - | maxq | mb | microblaze | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64octeon | mips64octeonel \ - | mips64orion | mips64orionel \ - | mips64r5900 | mips64r5900el \ - | mips64vr | mips64vrel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mips64vr5900 | mips64vr5900el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | moxie \ - | mt \ - | msp430 \ - | nios | nios2 \ - | ns16k | ns32k \ - | or32 \ - | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ - | pyramid \ - | score \ - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ - | z8k | z80) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - ms1) - basic_machine=mt-unknown - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* | avr32-* \ - | bfin-* | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64octeon-* | mips64octeonel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64r5900-* | mips64r5900el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mips64vr5900-* | mips64vr5900el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | mt-* \ - | msp430-* \ - | nios-* | nios2-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ - | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ - | xstormy16-* | xtensa*-* \ - | ymp-* \ - | z8k-* | z80-*) - ;; - # Recognize the basic CPU types without company name, with glob match. - xtensa*) - basic_machine=$basic_machine-unknown - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aros) - basic_machine=i386-pc - os=-aros - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=-linux - ;; - blackfin-*) - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - cegcc) - basic_machine=arm-unknown - os=-cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16) - basic_machine=cr16-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - crisv32 | crisv32-* | etraxfs*) - basic_machine=crisv32-axis - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dicos) - basic_machine=i686-pc - os=-dicos - ;; - djgpp) - basic_machine=i586-pc - os=-msdosdjgpp - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=-linux - ;; - m68knommu-*) - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=-mingw32ce - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - ms1-*) - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - openrisc | openrisc-*) - basic_machine=or32-unknown - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - parisc) - basic_machine=hppa-unknown - os=-linux - ;; - parisc-*) - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` - os=-linux - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pc98) - basic_machine=i386-pc - ;; - pc98-*) - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rdos) - basic_machine=i386-pc - os=-rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sde) - basic_machine=mipsisa32-sde - os=-elf - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh5el) - basic_machine=sh5le-unknown - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tile*) - basic_machine=tile-unknown - os=-linux-gnu - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xbox) - basic_machine=i686-pc - os=-mingw32 - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - z80-*-coff) - basic_machine=z80-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) - basic_machine=sh-unknown - ;; - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) - basic_machine=sparc-sun - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # 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[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -kopensolaris* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* | -aros* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ - | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -zvmoe) - os=-zvmoe - ;; - -dicos*) - os=-dicos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - score-*) - os=-elf - ;; - spu-*) - os=-elf - ;; - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mep-*) - os=-elf - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-haiku) - os=-haiku - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff --git a/Build/source/config/install-sh b/Build/source/config/install-sh deleted file mode 100644 index 6781b987bdb..00000000000 --- a/Build/source/config/install-sh +++ /dev/null @@ -1,520 +0,0 @@ -#!/bin/sh -# install - install a program, script, or datafile - -scriptversion=2009-04-28.21; # UTC - -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. - -nl=' -' -IFS=" "" $nl" - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi - -# Put in absolute file names if you don't have them in your path; -# or use environment vars. - -chgrpprog=${CHGRPPROG-chgrp} -chmodprog=${CHMODPROG-chmod} -chownprog=${CHOWNPROG-chown} -cmpprog=${CMPPROG-cmp} -cpprog=${CPPROG-cp} -mkdirprog=${MKDIRPROG-mkdir} -mvprog=${MVPROG-mv} -rmprog=${RMPROG-rm} -stripprog=${STRIPPROG-strip} - -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - -posix_mkdir= - -# Desired mode of installed file. -mode=0755 - -chgrpcmd= -chmodcmd=$chmodprog -chowncmd= -mvcmd=$mvprog -rmcmd="$rmprog -f" -stripcmd= - -src= -dst= -dir_arg= -dst_arg= - -copy_on_change=false -no_target_directory= - -usage="\ -Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE - or: $0 [OPTION]... SRCFILES... DIRECTORY - or: $0 [OPTION]... -t DIRECTORY SRCFILES... - or: $0 [OPTION]... -d DIRECTORIES... - -In the 1st form, copy SRCFILE to DSTFILE. -In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. -In the 4th, create DIRECTORIES. - -Options: - --help display this help and exit. - --version display version info and exit. - - -c (ignored) - -C install only if different (preserve the last data modification time) - -d create directories instead of installing files. - -g GROUP $chgrpprog installed files to GROUP. - -m MODE $chmodprog installed files to MODE. - -o USER $chownprog installed files to USER. - -s $stripprog installed files. - -t DIRECTORY install into DIRECTORY. - -T report an error if DSTFILE is a directory. - -Environment variables override the default commands: - CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG - RMPROG STRIPPROG -" - -while test $# -ne 0; do - case $1 in - -c) ;; - - -C) copy_on_change=true;; - - -d) dir_arg=true;; - - -g) chgrpcmd="$chgrpprog $2" - shift;; - - --help) echo "$usage"; exit $?;; - - -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; - - -o) chowncmd="$chownprog $2" - shift;; - - -s) stripcmd=$stripprog;; - - -t) dst_arg=$2 - shift;; - - -T) no_target_directory=true;; - - --version) echo "$0 $scriptversion"; exit $?;; - - --) shift - break;; - - -*) echo "$0: invalid option: $1" >&2 - exit 1;; - - *) break;; - esac - shift -done - -if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then - # When -d is used, all remaining arguments are directories to create. - # When -t is used, the destination is already specified. - # Otherwise, the last argument is the destination. Remove it from $@. - for arg - do - if test -n "$dst_arg"; then - # $@ is not empty: it contains at least $arg. - set fnord "$@" "$dst_arg" - shift # fnord - fi - shift # arg - dst_arg=$arg - done -fi - -if test $# -eq 0; then - if test -z "$dir_arg"; then - echo "$0: no input file specified." >&2 - exit 1 - fi - # It's OK to call `install-sh -d' without argument. - # This can happen when creating conditional directories. - exit 0 -fi - -if test -z "$dir_arg"; then - trap '(exit $?); exit' 1 2 13 15 - - # Set umask so as not to create temps with too-generous modes. - # However, 'strip' requires both read and write access to temps. - case $mode in - # Optimize common cases. - *644) cp_umask=133;; - *755) cp_umask=22;; - - *[0-7]) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw='% 200' - fi - cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; - *) - if test -z "$stripcmd"; then - u_plus_rw= - else - u_plus_rw=,u+rw - fi - cp_umask=$mode$u_plus_rw;; - esac -fi - -for src -do - # Protect names starting with `-'. - case $src in - -*) src=./$src;; - esac - - if test -n "$dir_arg"; then - dst=$src - dstdir=$dst - test -d "$dstdir" - dstdir_status=$? - else - - # Waiting for this to be detected by the "$cpprog $src $dsttmp" command - # might cause directories to be created, which would be especially bad - # if $src (and thus $dsttmp) contains '*'. - if test ! -f "$src" && test ! -d "$src"; then - echo "$0: $src does not exist." >&2 - exit 1 - fi - - if test -z "$dst_arg"; then - echo "$0: no destination specified." >&2 - exit 1 - fi - - dst=$dst_arg - # Protect names starting with `-'. - case $dst in - -*) dst=./$dst;; - esac - - # If destination is a directory, append the input filename; won't work - # if double slashes aren't ignored. - if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 - fi - dstdir=$dst - dst=$dstdir/`basename "$src"` - dstdir_status=0 - else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - - test -d "$dstdir" - dstdir_status=$? - fi - fi - - obsolete_mkdir_used=false - - if test $dstdir_status != 0; then - case $posix_mkdir in - '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writeable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; - esac - - if - $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" - ) - then : - else - - # The umask is ridiculous, or mkdir does not conform to POSIX, - # or it failed possibly due to a race condition. Create the - # directory the slow way, step by step, checking for races as we go. - - case $dstdir in - /*) prefix='/';; - -*) prefix='./';; - *) prefix='';; - esac - - eval "$initialize_posix_glob" - - oIFS=$IFS - IFS=/ - $posix_glob set -f - set fnord $dstdir - shift - $posix_glob set +f - IFS=$oIFS - - prefixes= - - for d - do - test -z "$d" && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ - done - - if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true - fi - fi - fi - - if test -n "$dir_arg"; then - { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && - { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || - test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 - else - - # Make a couple of temp file names in the proper directory. - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - - # Trap to clean up those temp files at exit. - trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 - - # Copy the file name to the temp name. - (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && - - # and set any options; do chmod last to preserve setuid bits. - # - # If any of these fail, we abort the whole thing. If we want to - # ignore errors from any of these, just make sure not to ignore - # errors from the above "$doit $cpprog $src $dsttmp" command. - # - { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } && - { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } && - { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } && - { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && - - # If -C, don't bother to copy if it wouldn't change the file. - if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && - set X $old && old=:$2:$4:$5:$6 && - set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - - test "$old" = "$new" && - $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 - then - rm -f "$dsttmp" - else - # Rename the file to the real destination. - $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null || - - # The rename failed, perhaps because mv can't rename something else - # to itself, or perhaps because mv is so ancient that it does not - # support -f. - { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" - } - fi || exit 1 - - trap '' 0 - fi -done - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Build/source/config/missing b/Build/source/config/missing deleted file mode 100755 index 727cfa0a15e..00000000000 --- a/Build/source/config/missing +++ /dev/null @@ -1,376 +0,0 @@ -#! /bin/sh -# Common stub for a few missing GNU programs while installing. - -scriptversion=2009-04-28.21; # UTC - -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, -# 2008, 2009 Free Software Foundation, Inc. -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. - -# 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 3, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. - -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -if test $# -eq 0; then - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 -fi - -run=: -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' - -# In the cases where this matters, `missing' is being run in the -# srcdir already. -if test -f configure.ac; then - configure_ac=configure.ac -else - configure_ac=configure.in -fi - -msg="missing on your system" - -case $1 in ---run) - # Try to run requested program, and just exit if it succeeds. - run= - shift - "$@" && exit 0 - # Exit code 63 means version mismatch. This often happens - # when the user try to use an ancient version of a tool on - # a file that requires a minimum version. In this case we - # we should proceed has if the program had been absent, or - # if --run hadn't been passed. - if test $? = 63; then - run=: - msg="probably too old" - fi - ;; - - -h|--h|--he|--hel|--help) - echo "\ -$0 [OPTION]... PROGRAM [ARGUMENT]... - -Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an -error status if there is no known handling for PROGRAM. - -Options: - -h, --help display this help and exit - -v, --version output version information and exit - --run try to run the given command, and emulate it if it fails - -Supported PROGRAM values: - aclocal touch file \`aclocal.m4' - autoconf touch file \`configure' - autoheader touch file \`config.h.in' - autom4te touch the output file, or create a stub one - automake touch all \`Makefile.in' files - bison create \`y.tab.[ch]', if possible, from existing .[ch] - flex create \`lex.yy.c', if possible, from existing .c - help2man touch the output file - lex create \`lex.yy.c', if possible, from existing .c - makeinfo touch the output file - tar try tar, gnutar, gtar, then tar without non-portable flags - yacc create \`y.tab.[ch]', if possible, from existing .[ch] - -Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and -\`g' are ignored when checking the name. - -Send bug reports to <bug-automake@gnu.org>." - exit $? - ;; - - -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing $scriptversion (GNU Automake)" - exit $? - ;; - - -*) - echo 1>&2 "$0: Unknown \`$1' option" - echo 1>&2 "Try \`$0 --help' for more information" - exit 1 - ;; - -esac - -# normalize program name to check for. -program=`echo "$1" | sed ' - s/^gnu-//; t - s/^gnu//; t - s/^g//; t'` - -# Now exit if we have it, but it failed. Also exit now if we -# don't have it and --version was passed (most likely to detect -# the program). This is about non-GNU programs, so use $1 not -# $program. -case $1 in - lex*|yacc*) - # Not GNU programs, they don't have --version. - ;; - - tar*) - if test -n "$run"; then - echo 1>&2 "ERROR: \`tar' requires --run" - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - exit 1 - fi - ;; - - *) - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then - # We have it, but it failed. - exit 1 - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then - # Could not run --version or --help. This is probably someone - # running `$TOOL --version' or `$TOOL --help' to check whether - # $TOOL exists and not knowing $TOOL uses missing. - exit 1 - fi - ;; -esac - -# If it does not exist, or fails to run (possibly an outdated version), -# try to emulate it. -case $program in - aclocal*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acinclude.m4' or \`${configure_ac}'. You might want - to install the \`Automake' and \`Perl' packages. Grab them from - any GNU archive site." - touch aclocal.m4 - ;; - - autoconf*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`${configure_ac}'. You might want to install the - \`Autoconf' and \`GNU m4' packages. Grab them from any GNU - archive site." - touch configure - ;; - - autoheader*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`acconfig.h' or \`${configure_ac}'. You might want - to install the \`Autoconf' and \`GNU m4' packages. Grab them - from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` - test -z "$files" && files="config.h" - touch_files= - for f in $files; do - case $f in - *:*) touch_files="$touch_files "`echo "$f" | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; - *) touch_files="$touch_files $f.in";; - esac - done - touch $touch_files - ;; - - automake*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. - You might want to install the \`Automake' and \`Perl' packages. - Grab them from any GNU archive site." - find . -type f -name Makefile.am -print | - sed 's/\.am$/.in/' | - while read f; do touch "$f"; done - ;; - - autom4te*) - echo 1>&2 "\ -WARNING: \`$1' is needed, but is $msg. - You might have modified some files without having the - proper tools for further handling them. - You can get \`$1' as part of \`Autoconf' from any GNU - archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo "#! /bin/sh" - echo "# Created by GNU Automake missing as a replacement of" - echo "# $ $@" - echo "exit 0" - chmod +x $file - exit 1 - fi - ;; - - bison*|yacc*) - echo 1>&2 "\ -WARNING: \`$1' $msg. You should only need it if - you modified a \`.y' file. You may need the \`Bison' package - in order for those modifications to take effect. You can get - \`Bison' from any GNU archive site." - rm -f y.tab.c y.tab.h - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.y) - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.c - fi - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" y.tab.h - fi - ;; - esac - fi - if test ! -f y.tab.h; then - echo >y.tab.h - fi - if test ! -f y.tab.c; then - echo 'main() { return 0; }' >y.tab.c - fi - ;; - - lex*|flex*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.l' file. You may need the \`Flex' package - in order for those modifications to take effect. You can get - \`Flex' from any GNU archive site." - rm -f lex.yy.c - if test $# -ne 1; then - eval LASTARG="\${$#}" - case $LASTARG in - *.l) - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` - if test -f "$SRCFILE"; then - cp "$SRCFILE" lex.yy.c - fi - ;; - esac - fi - if test ! -f lex.yy.c; then - echo 'main() { return 0; }' >lex.yy.c - fi - ;; - - help2man*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a dependency of a manual page. You may need the - \`Help2man' package in order for those modifications to take - effect. You can get \`Help2man' from any GNU archive site." - - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -f "$file"; then - touch $file - else - test -z "$file" || exec >$file - echo ".ab help2man is required to generate this page" - exit $? - fi - ;; - - makeinfo*) - echo 1>&2 "\ -WARNING: \`$1' is $msg. You should only need it if - you modified a \`.texi' or \`.texinfo' file, or any other file - indirectly affecting the aspect of the manual. The spurious - call might also be the consequence of using a buggy \`make' (AIX, - DU, IRIX). You might want to install the \`Texinfo' package or - the \`GNU make' package. Grab either from any GNU archive site." - # The file to touch is that specified with -o ... - file=`echo "$*" | sed -n "$sed_output"` - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` - if test -z "$file"; then - # ... or it is the one specified with @setfilename ... - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` - file=`sed -n ' - /^@setfilename/{ - s/.* \([^ ]*\) *$/\1/ - p - q - }' $infile` - # ... or it is derived from the source name (dir/f.texi becomes f.info) - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info - fi - # If the file does not exist, the user really needs makeinfo; - # let's fail without touching anything. - test -f $file || exit 1 - touch $file - ;; - - tar*) - shift - - # We have already tried tar in the generic part. - # Look for gnutar/gtar before invocation to avoid ugly error - # messages. - if (gnutar --version > /dev/null 2>&1); then - gnutar "$@" && exit 0 - fi - if (gtar --version > /dev/null 2>&1); then - gtar "$@" && exit 0 - fi - firstarg="$1" - if shift; then - case $firstarg in - *o*) - firstarg=`echo "$firstarg" | sed s/o//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - case $firstarg in - *h*) - firstarg=`echo "$firstarg" | sed s/h//` - tar "$firstarg" "$@" && exit 0 - ;; - esac - fi - - echo 1>&2 "\ -WARNING: I can't seem to be able to run \`tar' with the given arguments. - You may want to install GNU tar or Free paxutils, or check the - command line arguments." - exit 1 - ;; - - *) - echo 1>&2 "\ -WARNING: \`$1' is needed, and is $msg. - You might have modified some files without having the - proper tools for further handling them. Check the \`README' file, - it often tells you about the needed prerequisites for installing - this package. You may also peek at any GNU archive site, in case - some other package would contain this missing \`$1' program." - exit 1 - ;; -esac - -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Build/source/config/mkinstalldirs b/Build/source/config/mkinstalldirs deleted file mode 100755 index 4191a45dbd7..00000000000 --- a/Build/source/config/mkinstalldirs +++ /dev/null @@ -1,162 +0,0 @@ -#! /bin/sh -# mkinstalldirs --- make directory hierarchy - -scriptversion=2009-04-28.21; # UTC - -# Original author: Noah Friedman <friedman@prep.ai.mit.edu> -# Created: 1993-05-16 -# Public domain. -# -# This file is maintained in Automake, please report -# bugs to <bug-automake@gnu.org> or send patches to -# <automake-patches@gnu.org>. - -nl=' -' -IFS=" "" $nl" -errstatus=0 -dirmode= - -usage="\ -Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ... - -Create each directory DIR (with mode MODE, if specified), including all -leading file name components. - -Report bugs to <bug-automake@gnu.org>." - -# process command line arguments -while test $# -gt 0 ; do - case $1 in - -h | --help | --h*) # -h for help - echo "$usage" - exit $? - ;; - -m) # -m PERM arg - shift - test $# -eq 0 && { echo "$usage" 1>&2; exit 1; } - dirmode=$1 - shift - ;; - --version) - echo "$0 $scriptversion" - exit $? - ;; - --) # stop option processing - shift - break - ;; - -*) # unknown option - echo "$usage" 1>&2 - exit 1 - ;; - *) # first non-opt arg - break - ;; - esac -done - -for file -do - if test -d "$file"; then - shift - else - break - fi -done - -case $# in - 0) exit 0 ;; -esac - -# Solaris 8's mkdir -p isn't thread-safe. If you mkdir -p a/b and -# mkdir -p a/c at the same time, both will detect that a is missing, -# one will create a, then the other will try to create a and die with -# a "File exists" error. This is a problem when calling mkinstalldirs -# from a parallel make. We use --version in the probe to restrict -# ourselves to GNU mkdir, which is thread-safe. -case $dirmode in - '') - if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then - echo "mkdir -p -- $*" - exec mkdir -p -- "$@" - else - # On NextStep and OpenStep, the `mkdir' command does not - # recognize any option. It will interpret all options as - # directories to create, and then abort because `.' already - # exists. - test -d ./-p && rmdir ./-p - test -d ./--version && rmdir ./--version - fi - ;; - *) - if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 && - test ! -d ./--version; then - echo "mkdir -m $dirmode -p -- $*" - exec mkdir -m "$dirmode" -p -- "$@" - else - # Clean up after NextStep and OpenStep mkdir. - for d in ./-m ./-p ./--version "./$dirmode"; - do - test -d $d && rmdir $d - done - fi - ;; -esac - -for file -do - case $file in - /*) pathcomp=/ ;; - *) pathcomp= ;; - esac - oIFS=$IFS - IFS=/ - set fnord $file - shift - IFS=$oIFS - - for d - do - test "x$d" = x && continue - - pathcomp=$pathcomp$d - case $pathcomp in - -*) pathcomp=./$pathcomp ;; - esac - - if test ! -d "$pathcomp"; then - echo "mkdir $pathcomp" - - mkdir "$pathcomp" || lasterr=$? - - if test ! -d "$pathcomp"; then - errstatus=$lasterr - else - if test ! -z "$dirmode"; then - echo "chmod $dirmode $pathcomp" - lasterr= - chmod "$dirmode" "$pathcomp" || lasterr=$? - - if test ! -z "$lasterr"; then - errstatus=$lasterr - fi - fi - fi - fi - - pathcomp=$pathcomp/ - done -done - -exit $errstatus - -# Local Variables: -# mode: shell-script -# sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "scriptversion=" -# time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" -# time-stamp-end: "; # UTC" -# End: diff --git a/Build/source/configure b/Build/source/configure index 50b79598065..bdcca286b5b 100755 --- a/Build/source/configure +++ b/Build/source/configure @@ -931,7 +931,6 @@ enable_web2c with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1707,8 +1706,8 @@ Optional Features: --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --disable-ipc disable TeX's --ipc option, i.e., pipe to a + program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -1716,7 +1715,8 @@ Optional Features: --disable-luatex do not compile and install luaTeX --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support @@ -1796,7 +1796,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] - --with-mf-x-toolkit Use X toolkit for METAFONT + --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi @@ -2633,10 +2633,6 @@ fi if test "${enable_dump_share+set}" = set; then enableval=$enable_dump_share; fi -# Check whether --enable-fmtutil was given. -if test "${enable_fmtutil+set}" = set; then - enableval=$enable_fmtutil; -fi ## configure options for TeX # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -5962,13 +5958,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5965: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5961: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5968: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5964: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5971: output\"" >&5) + (eval echo "\"\$as_me:5967: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7174,7 +7170,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7177 "configure"' > conftest.$ac_ext + echo '#line 7173 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -9221,11 +9217,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9224: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9220: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9228: \$? = $ac_status" >&5 + echo "$as_me:9224: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9560,11 +9556,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9563: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9559: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9567: \$? = $ac_status" >&5 + echo "$as_me:9563: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9665,11 +9661,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9664: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9672: \$? = $ac_status" >&5 + echo "$as_me:9668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9720,11 +9716,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9723: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9719: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9727: \$? = $ac_status" >&5 + echo "$as_me:9723: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12520,7 +12516,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12523 "configure" +#line 12519 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12616,7 +12612,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12619 "configure" +#line 12615 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19012,11 +19008,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19015: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19011: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:19019: \$? = $ac_status" >&5 + echo "$as_me:19015: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -19111,11 +19107,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19114: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19110: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19118: \$? = $ac_status" >&5 + echo "$as_me:19114: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -19163,11 +19159,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:19166: $lt_compile\"" >&5) + (eval echo "\"\$as_me:19162: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:19170: \$? = $ac_status" >&5 + echo "$as_me:19166: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized diff --git a/Build/source/libs/configure b/Build/source/libs/configure index c40c14bc9c2..b639bcd0912 100755 --- a/Build/source/libs/configure +++ b/Build/source/libs/configure @@ -696,7 +696,6 @@ enable_web2c with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1459,8 +1458,8 @@ Optional Features: --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --disable-ipc disable TeX's --ipc option, i.e., pipe to a + program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -1468,7 +1467,8 @@ Optional Features: --disable-luatex do not compile and install luaTeX --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support @@ -1540,7 +1540,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] - --with-mf-x-toolkit Use X toolkit for METAFONT + --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi @@ -2356,10 +2356,6 @@ fi if test "${enable_dump_share+set}" = set; then enableval=$enable_dump_share; fi -# Check whether --enable-fmtutil was given. -if test "${enable_fmtutil+set}" = set; then - enableval=$enable_fmtutil; -fi ## configure options for TeX # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then diff --git a/Build/source/libs/gd/ChangeLog b/Build/source/libs/gd/ChangeLog index 327c56808ff..23dc097edce 100644 --- a/Build/source/libs/gd/ChangeLog +++ b/Build/source/libs/gd/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-01-31 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/libs/gd/Makefile.in.orig b/Build/source/libs/gd/Makefile.in.orig deleted file mode 100644 index b86ba7e837f..00000000000 --- a/Build/source/libs/gd/Makefile.in.orig +++ /dev/null @@ -1,32 +0,0 @@ -# @configure_input@ - -kpse_include ../../texk/make/common.mk -kpse_include ../../texk/make/programs.mk -kpse_include ../../texk/make/library.mk - -ZLIBDIR=../zlib -ZLIBSRCDIR=$(srcdir)/$(ZLIBDIR) - -LIBPNGDIR=../libpng -LIBPNGSRCDIR=$(srcdir)/$(LIBPNGDIR) - -XDEFS = -DHAVE_LIBPNG @ZLIBCPPFLAGS@ @LIBPNGCPPFLAGS@ - -OBJS = gdcache.o gdfontg.o gdfontl.o gdfontmb.o gdfonts.o gdfontt.o gdft.o \ - gdfx.o gd_gd2.o gd_gd.o gd_gif_in.o gd_gif_out.o gdhelpers.o gd_io_dp.o \ - gd_io_file.o gd_io.o gd_io_ss.o gd_jpeg.o gdkanji.o gd.o gd_png.o \ - gd_ss.o gdtables.o gd_topal.o gd_wbmp.o gdxpm.o wbmp.o gd_security.o -all: libgd.a - -libgd.a: $(OBJS) - rm -f $@ - $(AR) $(ARFLAGS) $@ $(OBJS) - $(RANLIB) $@ - -kpse_include ../../texk/make/clean.mk - -clean:: - rm -f libgd.a - -distclean:: clean - rm -f config.h diff --git a/Build/source/libs/gd/configure.in.orig b/Build/source/libs/gd/configure.in.orig deleted file mode 100644 index f779102b465..00000000000 --- a/Build/source/libs/gd/configure.in.orig +++ /dev/null @@ -1,32 +0,0 @@ -AC_INIT(gd.c) -AC_CONFIG_AUX_DIR(../../config) - -GDLIB_MAJOR=2 -GDLIB_MINOR=0 -GDLIB_REVISION=33 -GDLIBNAME=gd - -AC_SUBST(GDLIB_MAJOR) -AC_SUBST(GDLIB_MINOR) -AC_SUBST(GDLIB_REVISION) -AC_SUBST(GDLIBNAME) - -AC_CONFIG_HEADERS(config.h:config.hin) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_RANLIB - -AC_HEADER_STDC -AC_CHECK_HEADERS([errno.h limits.h stddef.h stdlib.h string.h unistd.h]) - -sinclude(../../texk/kpathsea/withenable.ac) -sinclude(../zlib/withenable.ac) -sinclude(../zlib/zlib.ac) -sinclude(../libpng/withenable.ac) -sinclude(../libpng/libpng.ac) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/libs/obsdcompat/ChangeLog b/Build/source/libs/obsdcompat/ChangeLog new file mode 100644 index 00000000000..9cc14b044f6 --- /dev/null +++ b/Build/source/libs/obsdcompat/ChangeLog @@ -0,0 +1,4 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + diff --git a/Build/source/libs/obsdcompat/Makefile.in b/Build/source/libs/obsdcompat/Makefile.in index b1b66532117..997e47f12ce 100644 --- a/Build/source/libs/obsdcompat/Makefile.in +++ b/Build/source/libs/obsdcompat/Makefile.in @@ -44,7 +44,7 @@ DIST_COMMON = README $(am__configure_deps) \ ../../build-aux/config.guess ../../build-aux/config.sub \ ../../build-aux/depcomp ../../build-aux/install-sh \ ../../build-aux/ltmain.sh ../../build-aux/missing \ - ../../build-aux/texinfo.tex ../../build-aux/ylwrap + ../../build-aux/texinfo.tex ../../build-aux/ylwrap ChangeLog ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ diff --git a/Build/source/libs/obsdcompat/libobsd-compat.ac b/Build/source/libs/obsdcompat/libobsd-compat.ac deleted file mode 100644 index 5958ee7ecc9..00000000000 --- a/Build/source/libs/obsdcompat/libobsd-compat.ac +++ /dev/null @@ -1,13 +0,0 @@ -if test "$needs_obsdcompat" = no; then - LIBOBSDCFLAGS= - LDLIBOBSD= - LIBOBSDDEP= -else - LIBOBSDCFLAGS='-I$(LIBOBSDCOMPATDIR)' - LDLIBOBSD='$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a' - LIBOBSDDEP='$(LIBOBSDCOMPATDIR)/libopenbsd-compat.a' -fi - -AC_SUBST(LIBOBSDCFLAGS) -AC_SUBST(LDLIBOBSD) -AC_SUBST(LIBOBSDDEP) diff --git a/Build/source/libs/teckit/ChangeLog b/Build/source/libs/teckit/ChangeLog index e69de29bb2d..9cc14b044f6 100644 --- a/Build/source/libs/teckit/ChangeLog +++ b/Build/source/libs/teckit/ChangeLog @@ -0,0 +1,4 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + diff --git a/Build/source/libs/teckit/teckit.ac b/Build/source/libs/teckit/teckit.ac deleted file mode 100644 index 3760c7aa312..00000000000 --- a/Build/source/libs/teckit/teckit.ac +++ /dev/null @@ -1,13 +0,0 @@ -if test "$needs_teckit" = no; then - TECKITCPPFLAGS= - LDTECKIT= - TECKITDEP= -else - TECKITCPPFLAGS='-I$(TECKITSRCDIR)/source/Public-headers' - LDTECKIT='$(TECKITDIR)/lib/.libs/libTECkit.a' - TECKITDEP='$(TECKITDIR)/lib/.libs/libTECkit.a' -fi - -AC_SUBST(TECKITCPPFLAGS) -AC_SUBST(LDTECKIT) -AC_SUBST(TECKITDEP) diff --git a/Build/source/libs/teckit/withenable.ac b/Build/source/libs/teckit/withenable.ac deleted file mode 100644 index ddb0c8b61a7..00000000000 --- a/Build/source/libs/teckit/withenable.ac +++ /dev/null @@ -1 +0,0 @@ -# we don't currently support use of an installed teckit lib diff --git a/Build/source/texk/afm2pl/ChangeLog b/Build/source/texk/afm2pl/ChangeLog index ac5c3d88527..107b3246fa8 100644 --- a/Build/source/texk/afm2pl/ChangeLog +++ b/Build/source/texk/afm2pl/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-01-30 Peter Breitenlohner <peb@mppmu.mpg.de> Convert from autoconf-2.13 to autoconf-2.59+: diff --git a/Build/source/texk/afm2pl/Makefile.in.orig b/Build/source/texk/afm2pl/Makefile.in.orig deleted file mode 100644 index d22379fbd5a..00000000000 --- a/Build/source/texk/afm2pl/Makefile.in.orig +++ /dev/null @@ -1,43 +0,0 @@ -# @configure_input@ -# Makefile for afm2pl. Thomas Esser. public domain. - -program = afm2pl -default all: $(program) $(program).1 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -# See INSTALL for compilation options. -# DEFS = @DEFS@ $(XDEFS) -DKPATHSEA -I$(srcdir)/../dvipsk -DEFS = @DEFS@ $(XDEFS) -DKPATHSEA - -objects = $(program).o - -$(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(program) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) -uninstall-exec: - rm -f $(bindir)/$(program) - -install-data: $(program).1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/$(program).1 $(man1dir)/$(program).$(manext) -uninstall-data: - rm -f $(man1dir)/$(program).$(manext) - -kpse_include ../make/clean.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/afm2pl/configure.in.orig b/Build/source/texk/afm2pl/configure.in.orig deleted file mode 100644 index 4678c90e576..00000000000 --- a/Build/source/texk/afm2pl/configure.in.orig +++ /dev/null @@ -1,25 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(afm2pl.c) - -AC_CONFIG_HEADERS(c-auto.h:c-auto.in) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -# If libm is present, use it. -AC_CHECK_LIB(m, main,LIBS="$LIBS -lm") - -sinclude(../kpathsea/withenable.ac) - -dnl These tests prevent reliable cross-compilation. Sigh. -dnl Some special hacks are used to make cross-compilation -dnl succeed in one special case. - -AC_UNSET_CC -AC_RESET_CC - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT -date >stamp-auto diff --git a/Build/source/texk/configure b/Build/source/texk/configure index 08c07cb8f5a..6ddd3f391e9 100755 --- a/Build/source/texk/configure +++ b/Build/source/texk/configure @@ -696,7 +696,6 @@ enable_web2c with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1478,8 +1477,8 @@ Optional Features: --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --disable-ipc disable TeX's --ipc option, i.e., pipe to a + program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -1487,7 +1486,8 @@ Optional Features: --disable-luatex do not compile and install luaTeX --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support @@ -1559,7 +1559,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] - --with-mf-x-toolkit Use X toolkit for METAFONT + --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi @@ -2375,10 +2375,6 @@ fi if test "${enable_dump_share+set}" = set; then enableval=$enable_dump_share; fi -# Check whether --enable-fmtutil was given. -if test "${enable_fmtutil+set}" = set; then - enableval=$enable_fmtutil; -fi ## configure options for TeX # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then diff --git a/Build/source/texk/dviljk/ChangeLog b/Build/source/texk/dviljk/ChangeLog index caad3d00676..110138393f6 100644 --- a/Build/source/texk/dviljk/ChangeLog +++ b/Build/source/texk/dviljk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> * acconfig.h: removed. diff --git a/Build/source/texk/dviljk/Makefile.in.orig b/Build/source/texk/dviljk/Makefile.in.orig deleted file mode 100644 index 2b5ea365d1e..00000000000 --- a/Build/source/texk/dviljk/Makefile.in.orig +++ /dev/null @@ -1,112 +0,0 @@ -# @configure_input@ -# Makefile for dviljk -- kb@mail.tug.org. Public domain. -version = 2.6 - -.NOTPARALLEL: - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -prog_cflags = -DKPATHSEA - -common_objects = tfm.o - -program = dvilj -objects = dvilj.o $(common_objects) -objects2p = dvilj2p.o $(common_objects) -program2p = dvilj2p -objects4 = dvilj4.o $(common_objects) -program4 = dvilj4 -objects4l = dvilj4l.o $(common_objects) -program4l = dvilj4l -program6 = dvilj6 - -programs = $(program) $(program2p) $(program4) $(program4l) - -default: $(program4) -all: $(programs) - -$(program): $(objects) $(kpathsea) - $(kpathsea_link) $(objects) $(LOADLIBES) -$(program2p): $(objects2p) $(kpathsea) - $(kpathsea_link) $(objects2p) $(LOADLIBES) -$(program4): $(objects4) $(kpathsea) - $(kpathsea_link) $(objects4) $(LOADLIBES) -$(program4l): $(objects4l) $(kpathsea) - $(kpathsea_link) $(objects4l) $(LOADLIBES) - -dvilj.o: - $(compile) -c -DLJ $(srcdir)/dvi2xx.c -o $@ -dvilj2p.o: - $(compile) -c -DLJ2P $(srcdir)/dvi2xx.c -o $@ -dvilj4.o: - $(compile) -c -DLJ4 $(srcdir)/dvi2xx.c -o $@ -dvilj4l.o: - $(compile) -c -DLJ4 -DLJ4L $(srcdir)/dvi2xx.c -o $@ - -dvilj.o dvilj2p.o dvilj4.o dvilj4l.o: dvi2xx.c - -VERSION = `grep 'define VERSION' dvi2xx.c | sed -e 's/^.*version //' -e 's/).*//'` -dvilj.man: dvilj.pod dvi2xx.c - pod2man --center="TeX-Live" --release="Version $(VERSION)" $< >$@ -dvilj.ps: dvilj.man - man -t -l $< >$@ - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - test ! -f $(program) \ - || $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) - test ! -f $(program2p) \ - || $(INSTALL_LIBTOOL_PROG) $(program2p) $(bindir) - test ! -f $(program4) \ - || $(INSTALL_LIBTOOL_PROG) $(program4) $(bindir) - test ! -f $(program4l) \ - || $(INSTALL_LIBTOOL_PROG) $(program4l) $(bindir) - $(INSTALL_SCRIPT) $(srcdir)/dvihp $(scriptdir)/dvihp - cd $(bindir) && (rm -f $(program6); $(LN) $(program4) $(program6)) -uninstall-exec: - cd $(bindir); rm -f $(programs) - -install-data: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/dvilj.man $(man1dir)/dvilj.$(manext) - for p in dvilj2p dvilj4 dvilj4l dvilj6; do \ - rm -f $(man1dir)/$$p.$(manext); \ - ln -s dvilj.$(manext) $(man1dir)/$$p.$(manext); \ - done - $(INSTALL_DATA) $(srcdir)/dvihp.man $(man1dir)/dvihp.$(manext) - -# It seems simplest to keep this separate. Use find and cpio instead of -# just cp -r in case the source hierarchy is cvs- or rcs-ified. -# Use "" to quote wildcards because backslash is a directory separator -# on MS-DOS and MS-Windows. -install-fonts: - find fonts -name \( "*.tfm" -o -name "*.vf" \) -print | cpio -pld $(texmf) - -uninstall-data: - rm -f $(man1dir)/dvilj.$(manext) - - -distname = dviljk -program_files = dvihp dvilj.man README.fonts -version_files = dvi2xx.c dvihp - -pre-dist-$(distname): -post-dist-$(distname): - ln -s `pwd`/fonts `pwd`/tex `pwd`/src.fonts $(distdir) - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/dviljk/configure.in.orig b/Build/source/texk/dviljk/configure.in.orig deleted file mode 100644 index 32c3066d897..00000000000 --- a/Build/source/texk/dviljk/configure.in.orig +++ /dev/null @@ -1,20 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(dvi2xx.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) - -dnl These tests prevent reliable cross-compilation. Sigh. -AC_C_CHAR_UNSIGNED -AC_CHECK_SIZEOF(long) - -AC_CHECK_FUNCS(rmdir unlink mkdtemp mktemp) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/gsftopk/ChangeLog b/Build/source/texk/gsftopk/ChangeLog index 7101504aec1..5a3a6432aa9 100644 --- a/Build/source/texk/gsftopk/ChangeLog +++ b/Build/source/texk/gsftopk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-27 Peter Breitenlohner <peb@mppmu.mpg.de> * acconfig.h: removed (empty file). * configure.in: stricter m4 quoting. diff --git a/Build/source/texk/gsftopk/Makefile.in.orig b/Build/source/texk/gsftopk/Makefile.in.orig deleted file mode 100644 index ca7916ed1dd..00000000000 --- a/Build/source/texk/gsftopk/Makefile.in.orig +++ /dev/null @@ -1,64 +0,0 @@ -# @configure_input@ -# Makefile for gsftopkk --kb@cs.umb.edu. Modified Yves.Arrouye@imag.fr -version = 1.19 - -program = gsftopk -default all: $(program) gsftopk.1 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -gsftopkpsheaderdir = $(psheaderdir)/gsftopk - -# (Optional) The fully-qualified path of Ghostscript. -# GSPATH=-DGS=\"/usr/local/gnu/bin/gs\" - -# See INSTALL for compilation options. -DEFS = @DEFS@ $(XDEFS) $(GSPATH) -DKPATHSEA - -objects = gsftopk.o - - -$(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -gsftopk.1: gsftopk1.sed sedscript - sed -f sedscript <$(srcdir)/gsftopk1.sed >$@ - -sedscript: mksedscript Makefile - $(SHELL) $(srcdir)/mksedscript $(DEFS) >$@ - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(program) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) -uninstall-exec: - rm -f $(bindir)/$(program) - -install-data: gsftopk.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(gsftopkpsheaderdir) - $(INSTALL_DATA) gsftopk.1 $(man1dir)/gsftopk.$(manext) - $(INSTALL_DATA) $(srcdir)/render.ps $(gsftopkpsheaderdir)/render.ps -uninstall-data: - rm -f $(man1dir)/gsftopk.$(manext) - rm -f $(gsftopkpsheaderdir)/render.ps - -kpse_include ../make/clean.mk - -clean:: - rm -f sedscript - -distclean:: - rm -f gsftopk.1 - -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/gsftopk/configure.in.orig b/Build/source/texk/gsftopk/configure.in.orig deleted file mode 100644 index e81367859fa..00000000000 --- a/Build/source/texk/gsftopk/configure.in.orig +++ /dev/null @@ -1,28 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(gsftopk.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) - -dnl Checks for header files. -AC_HEADER_SYS_WAIT -AC_HEADER_TIME -AC_CHECK_HEADERS([poll.h sys/time.h]) - -dnl Checks for library functions. -AC_FUNC_VFORK -AC_TYPE_SIGNAL -AC_CHECK_FUNCS([poll sigaction]) - -if test "$ac_cv_header_poll_h" = no || test "$ac_cv_func_poll" = no; then - AC_CHECK_HEADERS([sys/select.h select.h]) -fi - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/makeindexk/ChangeLog b/Build/source/texk/makeindexk/ChangeLog index 2b355ec3ede..ad9793c8b71 100644 --- a/Build/source/texk/makeindexk/ChangeLog +++ b/Build/source/texk/makeindexk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-03-04 Karl Berry <karl@tug.org> * mkind.h (ARABIC_MAX, ROMAN_MAX, NUMBER_MAX): increase to 99. diff --git a/Build/source/texk/makeindexk/Makefile.in.orig b/Build/source/texk/makeindexk/Makefile.in.orig deleted file mode 100644 index d3c5f49aaa2..00000000000 --- a/Build/source/texk/makeindexk/Makefile.in.orig +++ /dev/null @@ -1,54 +0,0 @@ -# @configure_input@ -# Makefile for makeindexk --te@dbs.uni-hannover.de. Public domain. -version = 2.13 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -objects = genind.o mkind.o qsort.o scanid.o scanst.o sortid.o -program = makeindex -programs = $(program) - -default all: $(programs) - -$(program): $(kpathsea) $(objects) - $(kpathsea_link) $(objects) $(LOADLIBES) -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(programs) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - $(INSTALL_LIBTOOL_PROG) $(program) $(bindir) - $(INSTALL_SCRIPT) $(srcdir)/mkindex $(scriptdir)/mkindex -uninstall-exec: - cd $(bindir) && rm -f $(program) - cd $(scriptdir) && rm -f mkindex - -install-data: makeindex.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/makeindex.1 $(man1dir)/makeindex.$(manext) - $(INSTALL_DATA) $(srcdir)/mkindex.1 $(man1dir)/mkindex.$(manext) - -uninstall-data: - -distname = makeindex -program_files = -version_files = - -pre-dist-$(distname): -post-dist-$(distname): - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk - -distclean:: - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/makeindexk/configure.in.orig b/Build/source/texk/makeindexk/configure.in.orig deleted file mode 100644 index 434e56f1008..00000000000 --- a/Build/source/texk/makeindexk/configure.in.orig +++ /dev/null @@ -1,18 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(mkind.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) - -AC_ARG_PROGRAM -AC_HAVE_HEADERS(ctype.h types.h locale.h) -AC_CHECK_FUNCS(strchr strrchr setlocale) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/musixflx/ChangeLog b/Build/source/texk/musixflx/ChangeLog index 112f761c848..8464641037a 100644 --- a/Build/source/texk/musixflx/ChangeLog +++ b/Build/source/texk/musixflx/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.in: added AC_CONFIG_HEADERS (moved diff --git a/Build/source/texk/musixflx/Makefile.in.orig b/Build/source/texk/musixflx/Makefile.in.orig deleted file mode 100644 index 52beb1f7037..00000000000 --- a/Build/source/texk/musixflx/Makefile.in.orig +++ /dev/null @@ -1,42 +0,0 @@ -# @configure_input@ -# Makefile for musixflx. Public domain. -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes - -program = musixflx -objects = musixflx.o - -programs = $(program) - -default: $(program) -all: $(program) - -$(program): $(objects) - $(kpathsea_link) $(objects) - -install: install-exec - -uninstall: uninstall-exec - -install-exec: all - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -uninstall-exec: - for p in $(programs); do rm -f $(bindir)/$$p; done - -install-data: - -uninstall-data: - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk -kpse_include ../make/rdepend.mk -kpse_include depend.mk - diff --git a/Build/source/texk/musixflx/configure.in.orig b/Build/source/texk/musixflx/configure.in.orig deleted file mode 100644 index ee2b36b9d30..00000000000 --- a/Build/source/texk/musixflx/configure.in.orig +++ /dev/null @@ -1,14 +0,0 @@ -dnl Public domain. -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(musixflx.c) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -sinclude(../kpathsea/common.ac) - -dnl These tests prevent reliable cross-compilation. Sigh. -AC_C_CHAR_UNSIGNED -AC_CHECK_SIZEOF(long) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/ps2pkm/ChangeLog b/Build/source/texk/ps2pkm/ChangeLog index a95a4eccb0b..60d874aab36 100644 --- a/Build/source/texk/ps2pkm/ChangeLog +++ b/Build/source/texk/ps2pkm/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> * acconfig.h: removed. diff --git a/Build/source/texk/ps2pkm/Makefile.in.orig b/Build/source/texk/ps2pkm/Makefile.in.orig deleted file mode 100644 index 0a55b49752f..00000000000 --- a/Build/source/texk/ps2pkm/Makefile.in.orig +++ /dev/null @@ -1,64 +0,0 @@ -# @configure_input@ -# Makefile for ps2pkm --te@dbs.uni-hannover.de. Public domain. -version = 1.5m - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -prog_cflags = -DUNIX -DKPATHSEA - -libobj = arith.o curves.o fontfcn.o hints.o lines.o objects.o paths.o \ - regions.o scanfont.o spaces.o t1funcs.o t1info.o t1io.o \ - t1snap.o t1stub.o token.o type1.o util.o bstring.o basics.o -common_objects = pkout.o filenames.o -ps2pkobjs = $(libobj) ps2pk.o encoding.o pkout.o filenames.o -pk2bmobjs = pk2bm.o pkin.o -pfb2pfaobjs = pfb2pfa.o filenames.o basics.o -magobjs = mag.o basics.o - -program = ps2pk -programs = pfb2pfa mag pk2bm $(program) - -default all: $(programs) - -$(program): $(kpathsea) $(ps2pkobjs) - $(kpathsea_link) $(ps2pkobjs) $(LOADLIBES) -pk2bm: $(kpathsea) $(pk2bmobjs) - $(kpathsea_link) $(pk2bmobjs) $(LOADLIBES) -pfb2pfa: $(kpathsea) $(pfb2pfaobjs) - $(kpathsea_link) $(pfb2pfaobjs) $(LOADLIBES) -mag: $(kpathsea) $(magobjs) - $(kpathsea_link) $(magobjs) $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(programs) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -uninstall-exec: - for p in $(programs); do rm -f $(bindir)/$$p; done - -install-data: mag.1 pfb2pfa.1 pk2bm.1 ps2pk.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/mag.1 $(man1dir)/mag.$(manext) - $(INSTALL_DATA) $(srcdir)/pfb2pfa.1 $(man1dir)/pfb2pfa.$(manext) - $(INSTALL_DATA) $(srcdir)/pk2bm.1 $(man1dir)/pk2bm.$(manext) - $(INSTALL_DATA) $(srcdir)/ps2pk.1 $(man1dir)/ps2pk.$(manext) -uninstall-data: - rm -f $(man1dir)/ps2pk.$(manext) $(man1dir)/pk2bm.$(manext) \ - $(man1dir)/pfb2pfa.$(manext) $(man1dir)/mag.$(manext) - -pre-dist-$(distname): -post-dist-$(distname): - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/ps2pkm/configure.in.orig b/Build/source/texk/ps2pkm/configure.in.orig deleted file mode 100644 index 4f750585481..00000000000 --- a/Build/source/texk/ps2pkm/configure.in.orig +++ /dev/null @@ -1,23 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(arith.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) -AC_CHECK_LIB(m, main) - -dnl Checks for header files. -AC_HEADER_STDC -AC_CHECK_HEADERS(fcntl.h) - -dnl Checks for library functions. -AC_FUNC_VPRINTF -AC_CHECK_FUNCS(memset) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/tetex/ChangeLog b/Build/source/texk/tetex/ChangeLog index 2d8b9ab3490..7aef2d38d4b 100644 --- a/Build/source/texk/tetex/ChangeLog +++ b/Build/source/texk/tetex/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2009-04-03 Karl Berry <karl@tug.org> * Makefile.am (EXTRA_DIST): remove texdoc.man from list. diff --git a/Build/source/texk/tetex/Makefile.in.orig b/Build/source/texk/tetex/Makefile.in.orig deleted file mode 100644 index 012005bf879..00000000000 --- a/Build/source/texk/tetex/Makefile.in.orig +++ /dev/null @@ -1,113 +0,0 @@ -# $Id$ -# @configure_input@ -# Makefile for teTeX's extra scripts - te@dbs.uni-hannover.de. -# Public domain. - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -man5dir = $(mandir)/man5 - -SCRIPTS = \ - allcm allneeded dvi2fax dvired fmtutil fmtutil-sys fontinst \ - kpsetool kpsewhere ps2frag ps4pdf pslatex rubibtex rumakeindex \ - texconfig texconfig-dialog texconfig-sys \ - texlinks updmap updmap-sys - -contextmanpgs = \ - ctxtools makempy mptopdf pstopdf texfind texmfstart \ - pdftools texexec texfont textools texutil - -# The man pages for script packages such as thumbpdf and mkjobtexmf are -# copied here by hand; ctan2tl doesn't know how to handle this case. Help. -manpgs = \ - allcm allec allneeded dvi2fax dvired e2pall epstopdf fontinst \ - kpsetool kpsewhere mkjobtexmf mkocp mkofm ofm2opl opl2ofm otp2ocp outocp \ - ovf2ovp ovp2ovf ps2frag pslatex rubibtex rumakeindex texconfig \ - texdoctk thumbpdf ttf2afm updmap - -all: $(SCRIPTS) -default: all - -install: install-data install-exec - -# Auxiliary files. -install-data:: - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) $(man5dir) $(texpooldir) $(texmf)/doc/tetex - for p in $(manpgs); do \ - $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ - done - for p in $(contextmanpgs); do \ - $(INSTALL_DATA) $(srcdir)/context/$$p.man $(man1dir)/$$p.$(manext); \ - done - $(INSTALL_DATA) $(srcdir)/fmtutil.man $(man1dir)/fmtutil.1 - $(INSTALL_DATA) $(srcdir)/texlinks.man $(man1dir)/texlinks.1 - $(INSTALL_DATA) $(srcdir)/fmtutil.cnf.5 $(man5dir)/fmtutil.cnf.5 - $(INSTALL_DATA) $(srcdir)/updmap.cfg.5 $(man5dir)/updmap.cfg.5 - cd $(man1dir); rm -f allec.$(manext) texhash.$(manext) \ - lambda.$(manext) pdflatex.$(manext) kpsepath.$(manext) \ - kpsexpand.$(manext) mf-nowin.$(manext) ctangle.$(manext) \ - cweave.$(manext) odvicopy.$(manext) \ - odvitype.$(manext) texconfig-sys.$(manext) \ - updmap-sys.$(manext) mktexfmt.$(manext) fmtutil-sys.$(manext) - ln -s allcm.$(manext) $(man1dir)/allec.$(manext) - ln -s mktexlsr.$(manext) $(man1dir)/texhash.$(manext) - ln -s omega.$(manext) $(man1dir)/lambda.$(manext) - ln -s pdftex.$(manext) $(man1dir)/pdflatex.$(manext) - ln -s kpsetool.$(manext) $(man1dir)/kpsepath.$(manext) - ln -s kpsetool.$(manext) $(man1dir)/kpsexpand.$(manext) - ln -s mf.$(manext) $(man1dir)/mf-nowin.$(manext) - ln -s cweb.$(manext) $(man1dir)/ctangle.$(manext) - ln -s cweb.$(manext) $(man1dir)/cweave.$(manext) - ln -s dvicopy.$(manext) $(man1dir)/odvicopy.$(manext) - ln -s dvitype.$(manext) $(man1dir)/odvitype.$(manext) - ln -s texconfig.$(manext) $(man1dir)/texconfig-sys.$(manext) - ln -s updmap.$(manext) $(man1dir)/updmap-sys.$(manext) - ln -s fmtutil.$(manext) $(man1dir)/mktexfmt.$(manext) - ln -s fmtutil.$(manext) $(man1dir)/fmtutil-sys.$(manext) - for p in TETEXDOC.pdf TETEXDOC.ps TETEXDOC.dvi teTeX-FAQ; do \ - $(INSTALL_DATA) $(srcdir)/doc/$$p $(texmf)/doc/tetex; \ - done - $(SHELL) $(top_srcdir)/../mkinstalldirs $(texmf)/texconfig $(texmf)/texconfig/g $(texmf)/texconfig/v $(texmf)/texconfig/x - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/g/generic $(texmf)/texconfig/g - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/v/vt100 $(texmf)/texconfig/v - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/x/xterm $(texmf)/texconfig/x - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/README $(texmf)/texconfig - $(INSTALL_DATA) $(srcdir)/texmf/texconfig/generic $(texmf)/texconfig - $(INSTALL_SCRIPT) $(srcdir)/tcfmgr $(texmf)/texconfig/tcfmgr - $(INSTALL_DATA) $(srcdir)/tcfmgr.map $(texmf)/texconfig/tcfmgr.map - $(INSTALL_DATA) $(srcdir)/fmtutil.cnf $(texmf)/web2c/fmtutil.cnf - -install-exec: - -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) - for s in $(SCRIPTS); do \ - $(INSTALL_SCRIPT) $(srcdir)/$$s $(scriptdir)/$$s; \ - done - cd $(scriptdir) && rm -f allec kpsepath kpsexpand texhash; \ - ln -s allcm allec; \ - ln -s kpsetool kpsepath; \ - ln -s kpsetool kpsexpand; \ - ln -s mktexlsr texhash - cd $(scriptdir) && rm -f mktexfmt; ln -s fmtutil mktexfmt - -# -# This target is invoked by the top-level make, -# to create the per-format engine symlinks in $(bindir), -# after everything else is installed. We explicitly specify the -# fmtutil.cnf file to use for the sake of distro builds. Also, that way -# we don't have to run mktexlsr also. -run_texlinks = $(bindir)/texlinks -f $(web2cdir)/fmtutil.cnf -run-texlinks: - PATH="$(bindir):$(PATH)"; export PATH; $(run_texlinks) - -kpse_include ../make/clean.mk - -config.status: $(srcdir)/configure - $(SHELL) $(srcdir)/configure --no-create --verbose - -Makefile: $(srcdir)/Makefile.in config.status - $(SHELL) config.status - -depend: -check: diff --git a/Build/source/texk/tetex/configure.in.orig b/Build/source/texk/tetex/configure.in.orig deleted file mode 100644 index fcaf2e14755..00000000000 --- a/Build/source/texk/tetex/configure.in.orig +++ /dev/null @@ -1,12 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(texconfig) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_LN_S -AC_PROG_MAKE_SET - -sinclude(../kpathsea/withenable.ac) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/tex4htk/ChangeLog b/Build/source/texk/tex4htk/ChangeLog index 40026903b90..bb87d0e66ec 100644 --- a/Build/source/texk/tex4htk/ChangeLog +++ b/Build/source/texk/tex4htk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.in: added AC_CONFIG_HEADERS (moved diff --git a/Build/source/texk/tex4htk/Makefile.in.orig b/Build/source/texk/tex4htk/Makefile.in.orig deleted file mode 100644 index d7859d85fda..00000000000 --- a/Build/source/texk/tex4htk/Makefile.in.orig +++ /dev/null @@ -1,79 +0,0 @@ -# @configure_input@ -# Makefile for tex4ht in TeX Live. Public domain. -# Originally written by S. Rahtz. -version = 1.0 - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk -kpse_include ../make/texi.mk -prog_cflags = -DUNIX -DKPATHSEA -DNeedFunctionPrototypes - -objects = tex4ht.o t4ht.o - -programs = tex4ht t4ht -shell_scripts = htcontext htlatex htmex httex httexi htxelatex htxetex ht -perl_scripts = mk4ht - -default all: $(programs) - -t4ht: $(kpathsea) t4ht.o - $(kpathsea_link) t4ht.o $(LOADLIBES) - -tex4ht: $(kpathsea) tex4ht.o - $(kpathsea_link) tex4ht.o $(LOADLIBES) - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data - -uninstall: uninstall-exec uninstall-data - -install-exec: all - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done - $(INSTALL) -d "$(prefix)/texmf-dist/scripts/tex4ht" - for p in $(shell_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.sh"; done - for p in $(perl_scripts); do $(INSTALL_SCRIPT) $(srcdir)/$$p "$(prefix)/texmf-dist/scripts/tex4ht/$$p.pl"; done - if test -d "$(bindir)/../../texmf-dist/scripts/tex4ht"; then \ - d=../../texmf-dist/scripts/tex4ht; \ - elif test -d "$(bindir)/../texmf-dist/scripts/tex4ht"; then \ - d=../texmf-dist/scripts/tex4ht; \ - else \ - echo "Error: texmf-dist/scripts/tex4ht directory not found" >&2; \ - exit 1; \ - fi; \ - for p in $(shell_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.sh $(bindir)/$$p; done; \ - for p in $(perl_scripts); do rm -f $(bindir)/$$p; ln -s $$d/$$p.pl $(bindir)/$$p; done - -uninstall-exec: - for p in $(programs) $(scripts); do rm -f $(bindir)/$$p; done - -install-data: - -uninstall-data: - -distname = tex4ht - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk -kpse_include ../make/clean.mk -distclean:: - -rm v*.tex *.txt i*.tex *.gif *.toc *.otc *.lg *.xref *.html *.idv *.log *.aux tmp.* tex4ht.env - -dvi info check: - -maybecheck: - TEXINPUTS=$(srcdir): $(SHELL) $(srcdir)/ht latex test - - -tex4ht.env: tex4ht.in - sed -e "s;@texmf@;$(texmf);" < $(srcdir)/tex4ht.in \ - | sed -e "s;@prefix@;$(prefix);g" \ - | sed -e "s;@imbindir@.;;g" \ - | sed -e "s/Mmove/Mmv/" \ - | sed -e "s/Ccopy/Ccp/" \ - > tex4ht.env - -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/tex4htk/configure.in.orig b/Build/source/texk/tex4htk/configure.in.orig deleted file mode 100644 index 4a988f8dab2..00000000000 --- a/Build/source/texk/tex4htk/configure.in.orig +++ /dev/null @@ -1,11 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(tex4ht.c) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -sinclude(../kpathsea/common.ac) - -AC_CHECK_SIZEOF(int) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/texlive/ChangeLog b/Build/source/texk/texlive/ChangeLog index 0a1b18dda5f..ff3905cc7a3 100644 --- a/Build/source/texk/texlive/ChangeLog +++ b/Build/source/texk/texlive/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2009-04-03 Karl Berry <karl@tug.org> * Makefile.am (EXTRA_DIST): remove texdoc.man from list. diff --git a/Build/source/texk/texlive/Makefile.in.orig b/Build/source/texk/texlive/Makefile.in.orig deleted file mode 100644 index ca77c09c249..00000000000 --- a/Build/source/texk/texlive/Makefile.in.orig +++ /dev/null @@ -1,148 +0,0 @@ -# $Id$ -# @configure_input@ -# Makefile for texlive's extra scripts. -# Public domain. - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -# Copies of these scripts exist in /source/live_scripts/ for the sake -# of avoiding dangling links produced by Build; the instances -# in texmf are the masters (except when it is CTAN). -LINKED_SCRIPTS = \ - texmf/scripts/a2ping/a2ping.pl \ - texmf/scripts/epstopdf/epstopdf.pl \ - texmf/scripts/pkfix/pkfix.pl \ - texmf/scripts/ps2eps/ps2eps.pl \ - texmf/scripts/simpdftex/simpdftex \ - texmf/scripts/tetex/e2pall.pl \ - texmf/scripts/tetex/texdoctk.pl \ - texmf/scripts/texlive/getnonfreefonts.pl \ - texmf/scripts/texlive/rungs.tlu \ - texmf/scripts/texlive/tlmgr.pl \ - texmf/scripts/texdoc/texdoc.tlu \ - texmf-dist/scripts/bengali/ebong.py \ - texmf-dist/scripts/dviasm/dviasm.py \ - texmf-dist/scripts/epspdf/epspdf \ - texmf-dist/scripts/epspdf/epspdftk \ - texmf-dist/scripts/fragmaster/fragmaster.pl \ - texmf-dist/scripts/glossaries/makeglossaries \ - texmf-dist/scripts/latex2man/latex2man \ - texmf-dist/scripts/latexmk/latexmk.pl \ - texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl \ - texmf-dist/scripts/oberdiek/pdfatfi.pl \ - texmf-dist/scripts/pax/pdfannotextractor.pl \ - texmf-dist/scripts/ppower4/ppower4.texlua \ - texmf-dist/scripts/pdfcrop/pdfcrop.pl \ - texmf-dist/scripts/perltex/perltex \ - texmf-dist/scripts/pkfix-helper/pkfix-helper \ - texmf-dist/scripts/ppower4/pdfthumb.texlua \ - texmf-dist/scripts/ppower4/ppower4.texlua \ - texmf-dist/scripts/pst-pdf/ps4pdf \ - texmf-dist/scripts/pst2pdf/pst2pdf.pl \ - texmf-dist/scripts/purifyeps/purifyeps \ - texmf-dist/scripts/splitindex/perl/splitindex.pl \ - texmf-dist/scripts/svn-multi/svn-multi.pl \ - texmf-dist/scripts/texcount/TeXcount.pl \ - texmf-dist/scripts/texloganalyser/texloganalyser \ - texmf-dist/scripts/thumbpdf/thumbpdf.pl \ - texmf-dist/scripts/vpe/vpe.pl \ - texmf-dist/scripts/context/ruby/texmfstart.rb \ - texmf-dist/scripts/context/lua/luatools.lua \ - texmf-dist/scripts/context/lua/mtxrun.lua \ - texmf-dist/scripts/context/stubs/unix/context \ - texmf-dist/scripts/context/stubs/unix/ctxtools \ - texmf-dist/scripts/context/stubs/unix/exatools \ - texmf-dist/scripts/context/stubs/unix/makempy \ - texmf-dist/scripts/context/stubs/unix/mpstools \ - texmf-dist/scripts/context/stubs/unix/mptopdf \ - texmf-dist/scripts/context/stubs/unix/mtxtools \ - texmf-dist/scripts/context/stubs/unix/pdftools \ - texmf-dist/scripts/context/stubs/unix/pdftrimwhite \ - texmf-dist/scripts/context/stubs/unix/pstopdf \ - texmf-dist/scripts/context/stubs/unix/rlxtools \ - texmf-dist/scripts/context/stubs/unix/runtools \ - texmf-dist/scripts/context/stubs/unix/texexec \ - texmf-dist/scripts/context/stubs/unix/texfind \ - texmf-dist/scripts/context/stubs/unix/texfont \ - texmf-dist/scripts/context/stubs/unix/texshow \ - texmf-dist/scripts/context/stubs/unix/textools \ - texmf-dist/scripts/context/stubs/unix/texutil \ - texmf-dist/scripts/context/stubs/unix/tmftools \ - texmf-dist/scripts/context/stubs/unix/xmltools \ - -manpgs = getnonfreefonts getnonfreefonts-sys - -all: -default: all - -install: install-data install-exec - -# Auxiliary files. -install-data:: - for p in $(manpgs); do \ - $(INSTALL_DATA) $(srcdir)/$$p.man $(man1dir)/$$p.$(manext); \ - done - -# The idea is to install the scripts themselves in texmf*/scripts, and -# have bin/arch/foo be a symlink to, say, -# ../../texmf/scripts/foo/foo.pl. That way we save a bit of disk space, -# but more importantly omit duplication, and most importantly make it -# possible to invoke the same Perl script on Windows (via -# tl-w32-wrapper.texlua). -# -# The installation into texmf*/scripts is ideally done with ctan2tl. -# The copy of the texlua wrapper for Windows is also done by hand, but -# could/should also be done by ctan2tl. The check-wrapper-consistency -# script at least checks after the fact for problems. -# -# We also keep a copy of all the scripts here, in the linked_scripts -# subdirectory, and install from there into the runtime. This is purely -# for other distro builders, so symlinks are not dangling in the -# inst/bin dir (it is meaningless in native TL). We have not yet -# written the auto-update to ensure linked_scripts is actually up to -# date with the masters in Master/texmf*/script, but it will happen. -# -# By the way, $(scriptdir) here is the binary directory, e.g., -# bin/i386-linux, not the texmf*/scripts dir. -# -install-exec: - -$(SHELL) $(srcdir)/../mkinstalldirs $(scriptdir) -# - link to the basename, removing any extension, of the source. -# - we downcase for the sake of TeXcount.pl -> texcount. -# - the purpose of the case..esac is to support both multiplatform and -# non-multiplatform builds. - for s in $(LINKED_SCRIPTS); do \ - target=$(scriptdir)/`basename $$s | sed 's,\.[^/]*$$,,' | tr '[A-Z]' '[a-z]'`; \ - target=$$target; \ - rm -f $$target; \ - case "$(scriptdir)" in \ - */bin) d=..;; \ - */bin/*) d=../..;; \ - *) echo "$(scriptdir): strange directory for linked scripts" >&2;\ - exit 1;; \ - esac; \ - $(SHELL) $(srcdir)/../mkinstalldirs $(prefix)/`dirname $$s`; \ - $(INSTALL_SCRIPT) $(srcdir)/linked_scripts/`basename $$s` $(prefix)/$$s; \ - ln -s $$d/$$s $$target; \ - done -# -# one -sys variant we don't want to program. - rm -f $(scriptdir)/getnonfreefonts-sys - ln -s getnonfreefonts $(scriptdir)/getnonfreefonts-sys -# -# man dir link for those mans which can use it. - rm -f $(scriptdir)/man - ln -s ../../texmf/doc/man $(scriptdir)/man - -kpse_include ../make/clean.mk - -config.status: $(srcdir)/configure - $(SHELL) $(srcdir)/configure --no-create --verbose - -Makefile: $(srcdir)/Makefile.in config.status - $(SHELL) config.status - -depend: -check: diff --git a/Build/source/texk/texlive/configure.in.orig b/Build/source/texk/texlive/configure.in.orig deleted file mode 100644 index 15409c4ea40..00000000000 --- a/Build/source/texk/texlive/configure.in.orig +++ /dev/null @@ -1,11 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(hugetex) -AC_CONFIG_HEADERS([c-auto.h:c-auto.in], [date >stamp-auto]) - -AC_PROG_MAKE_SET - -sinclude(../kpathsea/common.ac) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/ttf2pk/ChangeLog b/Build/source/texk/ttf2pk/ChangeLog index a84a79382ae..b8805da4cad 100644 --- a/Build/source/texk/ttf2pk/ChangeLog +++ b/Build/source/texk/ttf2pk/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + Adapt to TL2009 build system. + 2008-02-29 Peter Breitenlohner <peb@mppmu.mpg.de> * configure.in: added AC_CONFIG_HEADERS (moved diff --git a/Build/source/texk/ttf2pk/Makefile.in.orig b/Build/source/texk/ttf2pk/Makefile.in.orig deleted file mode 100644 index 64669ac3189..00000000000 --- a/Build/source/texk/ttf2pk/Makefile.in.orig +++ /dev/null @@ -1,64 +0,0 @@ -# @configure_input@ -# Makefile for ttf2pk --te@dbs.uni-hannover.de. Public domain. - -kpse_include ../make/paths.mk -kpse_include ../make/common.mk -kpse_include ../make/programs.mk - -LDFREETYPE=@LDFREETYPE@ -FREETYPECPPFLAGS=@FREETYPECPPFLAGS@ -FREETYPEDEP=@FREETYPEDEP@ -FREETYPEDIR = ../../libs/freetype -FREETYPESRCDIR = $(srcdir)/$(FREETYPEDIR) - -prog_cflags = -DHAVE_LIBKPATHSEA $(FREETYPECPPFLAGS) -prog_ldflags = $(LDFREETYPE) - -ttf2pkobjs = errormsg.o filesrch.o ligkern.o newobj.o parse.o pklib.o \ - subfont.o texenc.o ttf2pk.o ttfenc.o ttflib.o - -ttf2tfmobjs = case.o errormsg.o filesrch.o ligkern.o newobj.o parse.o \ - subfont.o texenc.o tfmaux.o ttf2tfm.o ttfaux.o ttfenc.o vplaux.o - -programs = ttf2pk ttf2tfm - -default all: $(programs) - -ttf2pk: $(kpathsea) $(ttf2pkobjs) $(FREETYPEDEP) - $(kpathsea_link) $(ttf2pkobjs) $(prog_ldflags) $(LOADLIBES) - -ttf2tfm: $(kpathsea) $(ttf2tfmobjs) $(FREETYPEDEP) - $(kpathsea_link) $(ttf2tfmobjs) $(prog_ldflags) $(LOADLIBES) - -$(FREETYPEDIR)/lib/.libs/libttf.a: - cd $(FREETYPEDIR); $(MAKE) $(makeargs) - -kpse_include ../make/tkpathsea.mk - -install: install-exec install-data -uninstall: uninstall-exec uninstall-data - -install-exec: $(programs) - $(SHELL) $(top_srcdir)/../mkinstalldirs $(bindir) - for p in $(programs); do $(INSTALL_LIBTOOL_PROG) $$p $(bindir); done -uninstall-exec: - for p in $(programs); do rm -f $(bindir)/$$p; done - -install-data: ttf2pk.1 ttf2tfm.1 - $(SHELL) $(top_srcdir)/../mkinstalldirs $(man1dir) - $(INSTALL_DATA) $(srcdir)/ttf2pk.1 $(man1dir)/ttf2pk.$(manext) - $(INSTALL_DATA) $(srcdir)/ttf2tfm.1 $(man1dir)/ttf2tfm.$(manext) -uninstall-data: - rm -f $(man1dir)/ttf2pk.$(manext) $(man1dir)/ttf2tfm.$(manext) - -pre-dist-$(distname): -post-dist-$(distname): - -kpse_include ../make/dist.mk -kpse_include ../make/config.mk - -info dvi check: - -kpse_include ../make/clean.mk -kpse_include ../make/rdepend.mk -kpse_include depend.mk diff --git a/Build/source/texk/ttf2pk/configure.in.orig b/Build/source/texk/ttf2pk/configure.in.orig deleted file mode 100644 index c8a32886130..00000000000 --- a/Build/source/texk/ttf2pk/configure.in.orig +++ /dev/null @@ -1,19 +0,0 @@ -dnl Public domain. -dnl Process this file with autoconf to produce a configure script. -AC_INIT(ttf2pk.c) - -AC_CONFIG_HEADERS([c-auto.h:c-auto.in]) - -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET -AC_PROG_LN_S - -sinclude(../kpathsea/withenable.ac) -sinclude(../../libs/freetype/withenable.ac) -sinclude(../../libs/freetype/freetype.ac) - -AC_CHECK_LIB(m, main) - -KPSE_CONFIG_FILES([Makefile]) -AC_OUTPUT diff --git a/Build/source/texk/web2c/ChangeLog b/Build/source/texk/web2c/ChangeLog index 6d61844e467..7f66194032c 100644 --- a/Build/source/texk/web2c/ChangeLog +++ b/Build/source/texk/web2c/ChangeLog @@ -1,3 +1,7 @@ +2009-05-07 Peter Breitenlohner <peb@mppmu.mpg.de> + + * ac/web2c.ac, configure.ac: Remove --enable-fmtutil option. + 2009-05-05 Peter Breitenlohner <peb@mppmu.mpg.de> * texmfmp.h: remove references to pdfeTeX. diff --git a/Build/source/texk/web2c/ac/web2c.ac b/Build/source/texk/web2c/ac/web2c.ac index e024927493b..c387810e650 100644 --- a/Build/source/texk/web2c/ac/web2c.ac +++ b/Build/source/texk/web2c/ac/web2c.ac @@ -16,14 +16,10 @@ AC_ARG_ENABLE([dump-share], [AS_HELP_STRING([--disable-dump-share], [make fmt/base/mem files architecture-dependent], kpse_indent_26)])[]dnl -AC_ARG_ENABLE([fmtutil], - [AS_HELP_STRING([--enable-fmtutil], - [use fmtutil for build dumps], - kpse_indent_26)])[]dnl ## configure options for TeX AC_ARG_ENABLE([ipc], - [AS_HELP_STRING([--enable-ipc], - [enable TeX's --ipc option, i.e., pipe to a program], + [AS_HELP_STRING([--disable-ipc], + [disable TeX's --ipc option, i.e., pipe to a program], kpse_indent_26)])[]dnl m4_define([kpse_tex_progs], [dnl [[tex], [yes], [no], [TeX], []], @@ -42,12 +38,12 @@ AC_ARG_ENABLE([mf], [do not build METAFONT], kpse_indent_26)])[]dnl AC_ARG_ENABLE([mf-nowin], - [AS_HELP_STRING([--enable-mf-nowin], - [build a separate non-windows-capable METAFONT], + [AS_HELP_STRING([--disable-mf-nowin], + [do not build a separate non-windows-capable METAFONT], kpse_indent_26+2)])[]dnl AC_ARG_WITH([mf-x-toolkit], - [AS_HELP_STRING([--with-mf-x-toolkit], - [Use X toolkit for METAFONT])])[]dnl + [AS_HELP_STRING([--without-mf-x-toolkit], + [do not use X toolkit for METAFONT])])[]dnl m4_define([kpse_mf_win], [dnl [[epsf], [EPSF], [EPSF pseudo]], [[hp2627], [HP2627], [HP 2627]], diff --git a/Build/source/texk/web2c/configure b/Build/source/texk/web2c/configure index 24ea78626d3..2bd844b3a0c 100755 --- a/Build/source/texk/web2c/configure +++ b/Build/source/texk/web2c/configure @@ -899,8 +899,6 @@ MINGW32_FALSE MINGW32_TRUE WIN32_FALSE WIN32_TRUE -FMU_FALSE -FMU_TRUE CXX_HACK_LIBS CXX_HACK_DEPS CXXLD @@ -1035,7 +1033,6 @@ enable_cxx_runtime_hack with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1739,8 +1736,7 @@ Optional Features: --enable-cxx-runtime-hack link C++ runtime statically --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --disable-ipc disable TeX's --ipc option, i.e., pipe to a program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -1748,7 +1744,7 @@ Optional Features: --disable-luatex do not compile and install luaTeX --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT + --disable-mf-nowin do not build a separate non-windows-capable METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support @@ -1767,7 +1763,7 @@ Optional Packages: both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] - --with-mf-x-toolkit Use X toolkit for METAFONT + --without-mf-x-toolkit do not use X toolkit for METAFONT --with-fontconfig=DIR use fontconfig include/library files from DIR --with-x use the X Window System --with-system-kpathsea use installed kpathsea headers and library @@ -4406,13 +4402,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:4409: $ac_compile\"" >&5) + (eval echo "\"\$as_me:4405: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:4412: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:4408: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:4415: output\"" >&5) + (eval echo "\"\$as_me:4411: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -5618,7 +5614,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5621 "configure"' > conftest.$ac_ext + echo '#line 5617 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7665,11 +7661,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7668: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7664: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7672: \$? = $ac_status" >&5 + echo "$as_me:7668: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8004,11 +8000,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8007: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8003: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8011: \$? = $ac_status" >&5 + echo "$as_me:8007: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8109,11 +8105,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8112: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8108: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8116: \$? = $ac_status" >&5 + echo "$as_me:8112: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8164,11 +8160,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8167: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8163: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8171: \$? = $ac_status" >&5 + echo "$as_me:8167: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10964,7 +10960,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10967 "configure" +#line 10963 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11060,7 +11056,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11063 "configure" +#line 11059 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16076,11 +16072,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16079: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16075: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16083: \$? = $ac_status" >&5 + echo "$as_me:16079: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16175,11 +16171,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16178: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16174: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16182: \$? = $ac_status" >&5 + echo "$as_me:16178: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -16227,11 +16223,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16230: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16226: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16234: \$? = $ac_status" >&5 + echo "$as_me:16230: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17491,10 +17487,6 @@ fi if test "${enable_dump_share+set}" = set; then enableval=$enable_dump_share; fi -# Check whether --enable-fmtutil was given. -if test "${enable_fmtutil+set}" = set; then - enableval=$enable_fmtutil; -fi ## configure options for TeX # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then @@ -17734,13 +17726,10 @@ _ACEOF fi - if test "x$enable_fmtutil" = xyes; then - FMU_TRUE= - FMU_FALSE='#' -else - FMU_TRUE='#' - FMU_FALSE= -fi +case $enable_ipc in + yes|no) : ;; + *) enable_ipc=yes ;; +esac { $as_echo "$as_me:$LINENO: checking for native WIN32 or MINGW32" >&5 @@ -18536,7 +18525,7 @@ else MF_FALSE= fi - if test "x$enable_mf_nowin" = xyes; then + if test "x$enable_mf_nowin" != xno; then MFN_TRUE= MFN_FALSE='#' else @@ -18547,17 +18536,17 @@ fi # Handle --with-mf-x-toolkit and --with-x case $with_mf_x_toolkit in - ''|yes|no) : ;; + yes|no) : ;; ''|y|ye) with_mf_x_toolkit=yes ;; n) with_mf_x_toolkit=no ;; *) { $as_echo "$as_me:$LINENO: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&5 $as_echo "$as_me: WARNING: unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes." >&2;} - with_mf_x_toolkit=yes ;; + with_mf_x_toolkit=yes ;; esac test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=no} # tell PATH_XTRA no X by default, if not specified. +: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified. # Distinguish no X at all, no toolkit, or toolkit. { $as_echo "$as_me:$LINENO: checking for X" >&5 @@ -24597,13 +24586,6 @@ $as_echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${FMU_TRUE}" && test -z "${FMU_FALSE}"; then - { { $as_echo "$as_me:$LINENO: error: conditional \"FMU\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -$as_echo "$as_me: error: conditional \"FMU\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${WIN32_TRUE}" && test -z "${WIN32_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"WIN32\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/Build/source/texk/web2c/configure.ac b/Build/source/texk/web2c/configure.ac index 9b7358e9b08..2556a517803 100644 --- a/Build/source/texk/web2c/configure.ac +++ b/Build/source/texk/web2c/configure.ac @@ -46,7 +46,8 @@ m4_include([ac/web2c.ac]) KPSE_ASM_UNDERSCORE -AS_CASE([$with_editor], [''|yes|no], [with_editor='vi +%d %s']) +AS_CASE([$with_editor], + [''|yes|no], [with_editor='vi +%d %s']) AC_DEFINE_UNQUOTED([EDITOR], ["$with_editor"], [web2c: Default editor for interactive `e' option.]) @@ -59,7 +60,9 @@ AS_IF([test "x$enable_dump_share" = xno], [web2c: Define to disable architecture-independent dump files. Faster on LittleEndian architectures.])]) -AM_CONDITIONAL([FMU], [test "x$enable_fmtutil" = xyes]) +AS_CASE([$enable_ipc], + [yes|no], [], + [enable_ipc=yes]) KPSE_CHECK_WIN32 AM_CONDITIONAL([WIN32], [test "x$kpse_cv_have_win32" != xno]) @@ -75,7 +78,7 @@ AS_IF([test "x$enable_luatex:$enable_ipc" != xno:no], AS_IF([test "x$enable_ipc" = xyes], [AC_MSG_WARN([no socket library: disabling ipc]) enable_ipc=no])], - [socketlibs=$ac_cv_search_connect])]) + [socketlibs=$ac_cv_search_connect])]) if test "x$enable_ipc" = xyes; then ipc_socketlibs=$socketlibs AC_DEFINE([IPC], 1, [tex: Define to enable --ipc.]) @@ -94,13 +97,13 @@ if test "x$kpse_cv_have_win32" = xno; then [no], [AS_IF([test "x$enable_luatex" = xyes], [AC_MSG_WARN([Sorry, no gethostbyname(): can not build luaTeX]) enable_luatex=no])], - [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"]) + [lua_socketlibs="$lua_socketlibs $ac_cv_search_gethostbyname"]) AS_CASE([$ac_cv_search_nanosleep], ["none required"], [], [no], [AS_IF([test "x$enable_luatex" = xyes], [AC_MSG_WARN([Sorry, no nanosleep(): can not build luaTeX]) enable_luatex=no])], - [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"]) + [lua_socketlibs="$lua_socketlibs $ac_cv_search_nanosleep"]) fi AC_SUBST([lua_socketlibs]) AC_SUBST([ipc_socketlibs]) @@ -128,18 +131,18 @@ AM_CONDITIONAL([OTANGLE], AM_CONDITIONAL([OMFONTS], [true]) AM_CONDITIONAL([MF], [test "x$enable_mf" != xno]) -AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" = xyes]) +AM_CONDITIONAL([MFN], [test "x$enable_mf_nowin" != xno]) # Handle --with-mf-x-toolkit and --with-x AS_CASE([$with_mf_x_toolkit], - [''|yes|no], , - [''|y|ye], [with_mf_x_toolkit=yes], - [n], [with_mf_x_toolkit=no], - [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.]) - with_mf_x_toolkit=yes]) + [yes|no], [], + [''|y|ye], [with_mf_x_toolkit=yes], + [n], [with_mf_x_toolkit=no], + [AC_MSG_WARN([unknown --with-mf-x-toolkit argument \`$with_mf_x_toolkit'; using yes.]) + with_mf_x_toolkit=yes]) test "x$with_x_toolkit" = xyes && with_x=yes test "x$with_x" = xno && with_x_toolkit=no -: ${with_x=no} # tell PATH_XTRA no X by default, if not specified. +: ${with_x=yes} # tell PATH_XTRA to use X by default, if not specified. # Distinguish no X at all, no toolkit, or toolkit. AC_PATH_XTRA diff --git a/Build/source/utils/configure b/Build/source/utils/configure index efcfc2a5edd..f4abe2497ba 100755 --- a/Build/source/utils/configure +++ b/Build/source/utils/configure @@ -696,7 +696,6 @@ enable_web2c with_editor enable_auto_core enable_dump_share -enable_fmtutil enable_ipc enable_tex enable_etex @@ -1455,8 +1454,8 @@ Optional Features: --enable-auto-core cause TeX&MF to dump core, given a certain filename --disable-dump-share make fmt/base/mem files architecture-dependent - --enable-fmtutil use fmtutil for build dumps - --enable-ipc enable TeX's --ipc option, i.e., pipe to a program + --disable-ipc disable TeX's --ipc option, i.e., pipe to a + program --disable-tex do not compile and install TeX --enable-etex compile and install e-TeX --disable-aleph do not compile and install Aleph @@ -1464,7 +1463,8 @@ Optional Features: --disable-luatex do not compile and install luaTeX --disable-xetex do not compile and install XeTeX --disable-mf do not build METAFONT - --enable-mf-nowin build a separate non-windows-capable METAFONT + --disable-mf-nowin do not build a separate non-windows-capable + METAFONT --enable-epsfwin include EPSF pseudo window support --enable-hp2627win include HP 2627 window support --enable-mftalkwin include mftalk (generic server) window support @@ -1536,7 +1536,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-editor=CMD invoke CMD from the `e' option [vi +%d %s] - --with-mf-x-toolkit Use X toolkit for METAFONT + --without-mf-x-toolkit do not use X toolkit for METAFONT --with-gs=/PATH/TO/gs Hard-wire the location of GhostScript --with-xdvi-x-toolkit=KIT Use toolkit KIT (motif/xaw/xaw3d/neXtaw) for xdvi @@ -2352,10 +2352,6 @@ fi if test "${enable_dump_share+set}" = set; then enableval=$enable_dump_share; fi -# Check whether --enable-fmtutil was given. -if test "${enable_fmtutil+set}" = set; then - enableval=$enable_fmtutil; -fi ## configure options for TeX # Check whether --enable-ipc was given. if test "${enable_ipc+set}" = set; then diff --git a/Build/source/utils/pdfopen/Makefile.am.orig b/Build/source/utils/pdfopen/Makefile.am.orig deleted file mode 100644 index 7aab0fdef8a..00000000000 --- a/Build/source/utils/pdfopen/Makefile.am.orig +++ /dev/null @@ -1,12 +0,0 @@ - -AM_CFLAGS = $(X_CFLAGS) - -LDADD = $(X_LIBS) -lX11 -lXmu $(X_EXTRA_LIBS) - -bin_PROGRAMS = pdfopen pdfclose - -pdfopen_SOURCES = pdfopen.c sendx.c - -pdfclose_SOURCES = pdfclose.c sendx.c - - diff --git a/Build/source/utils/pdfopen/configure.ac.orig b/Build/source/utils/pdfopen/configure.ac.orig deleted file mode 100644 index 882aa35bd14..00000000000 --- a/Build/source/utils/pdfopen/configure.ac.orig +++ /dev/null @@ -1,25 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl this is for autoconf 2.5x - -AC_INIT(pdfopen, 0.5, taco@metatex.org) - -AC_CONFIG_AUX_DIR(config) - -AM_INIT_AUTOMAKE(pdfopen, 0.5) - -AC_CONFIG_FILES(Makefile) - -AC_PROG_CC - -dnl AC_PROG_INSTALL - -dnl Checks for header files. - -dnl Checks for typedefs, structures, and compiler characteristics. - -dnl Checks for library functions. - -dnl Find Xlibs. -AC_PATH_XTRA - -AC_OUTPUT diff --git a/Build/source/utils/ps2eps/Makefile.in.orig b/Build/source/utils/ps2eps/Makefile.in.orig deleted file mode 100644 index f7dd345b3c6..00000000000 --- a/Build/source/utils/ps2eps/Makefile.in.orig +++ /dev/null @@ -1,53 +0,0 @@ -# Public domain, written by Vladimir Volovich. - -VPATH = @srcdir@ -srcdir = @srcdir@ - -CC = @CC@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ - -prefix = @prefix@ -datarootdir = @datarootdir@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -mandir = @mandir@ -manext = 1 -man1dir = $(mandir)/man$(manext) - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_DATA = @INSTALL_DATA@ - -default all: bbox - -bbox: bbox.o - $(CC) $(LDFLAGS) bbox.o -o bbox - -.c.o: - $(CC) $(CPPFLAGS) $(CFLAGS) -c $< - -install: bbox - $(INSTALL) -d $(bindir) - $(INSTALL) -d $(man1dir) - $(INSTALL_SCRIPT) $(srcdir)/ps2eps $(bindir)/ps2eps - $(INSTALL_PROGRAM) bbox $(bindir)/bbox - $(INSTALL_DATA) $(srcdir)/ps2eps.1 $(man1dir)/ps2eps.1 - $(INSTALL_DATA) $(srcdir)/bbox.1 $(man1dir)/bbox.1 - -check: - -uninstall: - -rm -f $(bindir)/ps2eps $(bindir)/bbox $(man1dir)/ps2eps.1 $(man1dir)/bbox.1 - -clean: - -rm -f bbox bbox.o - -distclean: clean - -rm -f Makefile config.status config.log config.cache - -realclean: distclean - -mostlyclean: clean diff --git a/Build/source/utils/ps2eps/configure.in.orig b/Build/source/utils/ps2eps/configure.in.orig deleted file mode 100644 index 23a72b87b3d..00000000000 --- a/Build/source/utils/ps2eps/configure.in.orig +++ /dev/null @@ -1,9 +0,0 @@ -AC_INIT(ps2eps, 1.61, texlive@tug.org) - -AC_CONFIG_FILES(Makefile) - -AC_PROG_INSTALL - -AC_PROG_CC - -AC_OUTPUT diff --git a/Build/source/utils/psutils/Makefile.in.orig b/Build/source/utils/psutils/Makefile.in.orig deleted file mode 100644 index 28b8f61b48d..00000000000 --- a/Build/source/utils/psutils/Makefile.in.orig +++ /dev/null @@ -1,230 +0,0 @@ -# @configure_input@ -# -# Makefile for psutils -# - -VPATH = @srcdir@ -srcdir = @srcdir@ - -CC = @CC@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -defines = -DUNIX -DPAPER=\"$(PAPER)\" - -prefix = @prefix@ -exec_prefix = @exec_prefix@ -bindir = @bindir@ -scriptdir = $(bindir) -mandir = @mandir@ -man1dir = $(mandir)/man$(manext) -manext = 1 - -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL = @INSTALL@ - -BIN = psbook psselect pstops epsffit psnup psresize -SHELLSCRIPTS = getafm showchar -PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps fixtpps fixwfwps fixwpps fixscribeps fixwwps fixdlsrps extractres includeres psmerge -MANPAGES = psbook.$(manext) psselect.$(manext) pstops.$(manext) epsffit.$(manext) psnup.$(manext) psresize.$(manext) psmerge.$(manext) fixscribeps.$(manext) getafm.$(manext) fixdlsrps.$(manext) fixfmps.$(manext) fixmacps.$(manext) fixpsditps.$(manext) fixpspps.$(manext) fixtpps.$(manext) fixwfwps.$(manext) fixwpps.$(manext) fixwwps.$(manext) extractres.$(manext) includeres.$(manext) -INCLUDES = md68_0.ps md71_0.ps -OS = UNIX -PAPER = a4 - -default all: $(BIN) $(PERLSCRIPTS) $(MANPAGES) $(SHELLSCRIPTS) - -.SUFFIXES: -.SUFFIXES: .o .c .h .ps .dvi .info .texinfo - -.c.o: - $(CC) $(defines) -c -I. -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $< - -PERL = /usr/bin/env perl -BINMODE = 0755 -MANMODE = 0644 -CHMOD = chmod -MAKETEXT = $(PERL) $(srcdir)/maketext - -epsffit: epsffit.o pserror.o - $(CC) $(LDFLAGS) -o epsffit pserror.o epsffit.o - -psnup: psnup.o psutil.o psspec.o pserror.o - $(CC) $(LDFLAGS) -o psnup psutil.o psspec.o pserror.o psnup.o - -psresize: psresize.o psutil.o pserror.o psspec.o - $(CC) $(LDFLAGS) -o psresize psutil.o psspec.o pserror.o psresize.o - -psbook: psbook.o psutil.o pserror.o - $(CC) $(LDFLAGS) -o psbook psutil.o pserror.o psbook.o - -psselect: psselect.o psutil.o pserror.o - $(CC) $(LDFLAGS) -o psselect psutil.o pserror.o psselect.o - -pstops: pstops.o psutil.o psspec.o pserror.o - $(CC) $(LDFLAGS) -o pstops psutil.o psspec.o pserror.o pstops.o - -getafm: getafm.sh - cp $(srcdir)/getafm.sh getafm - $(CHMOD) $(BINMODE) getafm - -showchar: showchar.sh - cp $(srcdir)/showchar.sh showchar - $(CHMOD) $(BINMODE) showchar - -psmerge: psmerge.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/psmerge.pl > psmerge - $(CHMOD) $(BINMODE) psmerge - -fixfmps: fixfmps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixfmps.pl > fixfmps - $(CHMOD) $(BINMODE) fixfmps - -fixmacps: fixmacps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" INCLUDE=$(INCLUDEDIR) $(srcdir)/fixmacps.pl > fixmacps - $(CHMOD) $(BINMODE) fixmacps - -fixpsditps: fixpsditps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixpsditps.pl > fixpsditps - $(CHMOD) $(BINMODE) fixpsditps - -fixpspps: fixpspps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixpspps.pl > fixpspps - $(CHMOD) $(BINMODE) fixpspps - -fixscribeps: fixscribeps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixscribeps.pl > fixscribeps - $(CHMOD) $(BINMODE) fixscribeps - -fixtpps: fixtpps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixtpps.pl > fixtpps - $(CHMOD) $(BINMODE) fixtpps - -fixwfwps: fixwfwps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixwfwps.pl > fixwfwps - $(CHMOD) $(BINMODE) fixwfwps - -fixwpps: fixwpps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixwpps.pl > fixwpps - $(CHMOD) $(BINMODE) fixwpps - -fixwwps: fixwwps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixwwps.pl > fixwwps - $(CHMOD) $(BINMODE) fixwwps - -fixdlsrps: fixdlsrps.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/fixdlsrps.pl > fixdlsrps - $(CHMOD) $(BINMODE) fixdlsrps - -extractres: extractres.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" $(srcdir)/extractres.pl > extractres - $(CHMOD) $(BINMODE) extractres - -includeres: includeres.pl - $(MAKETEXT) OS=$(OS) PERL="$(PERL)" INCLUDE=$(INCLUDEDIR) $(srcdir)/includeres.pl > includeres - $(CHMOD) $(BINMODE) includeres - -epsffit.$(manext): epsffit.man - $(MAKETEXT) MAN="$(MANPAGES)" $(srcdir)/epsffit.man > epsffit.$(manext) - -psnup.$(manext): psnup.man - $(MAKETEXT) MAN="$(MANPAGES)" PAPER=$(PAPER) $(srcdir)/psnup.man > psnup.$(manext) - -psresize.$(manext): psresize.man - $(MAKETEXT) MAN="$(MANPAGES)" PAPER=$(PAPER) $(srcdir)/psresize.man > psresize.$(manext) - -psbook.$(manext): psbook.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/psbook.man > psbook.$(manext) - -psselect.$(manext): psselect.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/psselect.man > psselect.$(manext) - -pstops.$(manext): pstops.man - $(MAKETEXT) "MAN=$(MANPAGES)" PAPER=$(PAPER) $(srcdir)/pstops.man > pstops.$(manext) - -psmerge.$(manext): psmerge.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/psmerge.man > psmerge.$(manext) - -fixfmps.$(manext): fixfmps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixfmps.man > fixfmps.$(manext) - -fixmacps.$(manext): fixmacps.man - $(MAKETEXT) "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $(srcdir)/fixmacps.man > fixmacps.$(manext) - -fixpsditps.$(manext): fixpsditps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixpsditps.man > fixpsditps.$(manext) - -fixpspps.$(manext): fixpspps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixpspps.man > fixpspps.$(manext) - -fixscribeps.$(manext): fixscribeps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixscribeps.man > fixscribeps.$(manext) - -fixtpps.$(manext): fixtpps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixtpps.man > fixtpps.$(manext) - -fixwfwps.$(manext): fixwfwps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixwfwps.man > fixwfwps.$(manext) - -fixwpps.$(manext): fixwpps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixwpps.man > fixwpps.$(manext) - -fixwwps.$(manext): fixwwps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixwwps.man > fixwwps.$(manext) - -fixdlsrps.$(manext): fixdlsrps.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/fixdlsrps.man > fixdlsrps.$(manext) - -extractres.$(manext): extractres.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/extractres.man > extractres.$(manext) - -includeres.$(manext): includeres.man - $(MAKETEXT) "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $(srcdir)/includeres.man > includeres.$(manext) - -getafm.$(manext): getafm.man - $(MAKETEXT) "MAN=$(MANPAGES)" $(srcdir)/getafm.man > getafm.$(manext) - -info: -dvi: - -SHELL = /bin/sh -@SET_MAKE@ - -.PHONY: install installdirs install-exec install-man clean realclean distclean mostlyclean all check info dvi -install: install-exec install-man - -install-exec: installdirs - for p in $(BIN); do $(INSTALL_PROGRAM) $$p $(bindir)/$$p; done - for p in $(SHELLSCRIPTS) $(PERLSCRIPTS); do $(INSTALL_PROGRAM) $$p $(scriptdir)/$$p; done - -install-man: installdirs - for p in $(MANPAGES); do $(INSTALL_DATA) $$p $(man1dir)/$$p; done - -installdirs: - $(SHELL) ${srcdir}/../../texk/mkinstalldirs $(bindir) $(scriptdir) $(man1dir) - -clean: - rm -f *.o $(BIN) $(SHELLSCRIPTS) $(PERLSCRIPTS) $(MANPAGES) - -distclean: mostlyclean - rm -f Makefile config.cache config.log config.status patchlev.h - -realclean: distclean -mostlyclean: clean - -Makefile: config.status $(srcdir)/Makefile.in - $(SHELL) config.status - -# This tells versions [3.59,3.63) of GNU make not to export all variables. -.NOEXPORT: - -# Automatically generated dependencies will be put at the end of the file. -psutil.o: psutil.h patchlev.h pserror.h psutil.c -psspec.o: psutil.h patchlev.h psspec.h pserror.h psspec.c -pserror.o: psutil.h patchlev.h pserror.h pserror.c -epsffit.o: epsffit.c pserror.h patchlev.h -psnup.o: psutil.h patchlev.h psspec.h pserror.h psnup.c -psresize.o: psutil.h patchlev.h psspec.h pserror.h psresize.c -psbook.o: psutil.h patchlev.h pserror.h psbook.c -psselect.o: psutil.h patchlev.h pserror.h psselect.c -pstops.o: psutil.h patchlev.h psspec.h pserror.h pstops.c diff --git a/Build/source/utils/psutils/configure.in.orig b/Build/source/utils/psutils/configure.in.orig deleted file mode 100644 index 35a06cdf7c1..00000000000 --- a/Build/source/utils/psutils/configure.in.orig +++ /dev/null @@ -1,15 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -AC_INIT(psutil.c) - -AC_CONFIG_AUX_DIR(../../config) - -AC_PROG_CC -AC_PROG_CPP -AC_ISC_POSIX -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -sinclude(../../multiplatform.ac) - -AC_CONFIG_FILES([Makefile patchlev.h]) -AC_OUTPUT |