--- autoconf2.13-2.13.orig/Makefile.in +++ autoconf2.13-2.13/Makefile.in @@ -49,7 +49,7 @@ # Directory in which to install library files. datadir = @datadir@ -acdatadir = $(datadir)/autoconf +acdatadir = $(datadir)/autoconf2.13 # Directory in which to install documentation info files. infodir = @infodir@ --- autoconf2.13-2.13.orig/acgeneral.m4 +++ autoconf2.13-2.13/acgeneral.m4 @@ -1988,6 +1988,7 @@ AC_MSG_CHECKING(size of $1) AC_CACHE_VAL(AC_CV_NAME, [AC_TRY_RUN([#include +#include main() { FILE *f=fopen("conftestval", "w"); @@ -2601,7 +2602,7 @@ fi fi - cd $ac_popdir + cd "$ac_popdir" done fi ]) --- autoconf2.13-2.13.orig/acspecific.m4 +++ autoconf2.13-2.13/acspecific.m4 @@ -1477,14 +1477,19 @@ AC_DEFUN(AC_FUNC_GETLOADAVG, [ac_have_func=no # yes means we've found a way to get the load average. -# Some systems with -lutil have (and need) -lkvm as well, some do not. -# On Solaris, -lkvm requires nlist from -lelf, so check that first -# to get the right answer into the cache. -AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS") -AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS") -# Check for the 4.4BSD definition of getloadavg. -AC_CHECK_LIB(util, getloadavg, - [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) +# Some systems have getloadavg without any extra libraries. +AC_CHECK_FUNC(getloadavg, [ac_have_func=yes]) + +if test $ac_have_func = no; then + # Some systems with -lutil have (and need) -lkvm as well, some do not. + # On Solaris, -lkvm requires nlist from -lelf, so check that first + # to get the right answer into the cache. + AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS") + AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS") + # Check for the 4.4BSD definition of getloadavg. + AC_CHECK_LIB(util, getloadavg, + [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) +fi if test $ac_have_func = no; then # There is a commonly available library for RS/6000 AIX. @@ -2659,7 +2664,7 @@ if AC_TRY_EVAL(ac_link); then for file in conftest.*; do case $file in - *.c | *.o | *.obj) ;; + *.$ac_ext | *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done --- autoconf2.13-2.13.orig/autoconf.sh +++ autoconf2.13-2.13/autoconf.sh @@ -45,7 +45,8 @@ esac : ${TMPDIR=/tmp} -tmpout=${TMPDIR}/acout.$$ +tmpout=`mktemp ${TMPDIR}/acout.XXXXXX` || exit 1 +trap 'rm -f $tmpin $tmpout' 0 localdir= show_version=no @@ -97,7 +98,7 @@ trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15 -tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's. +tmpin=`mktemp ${TMPDIR}/acin.XXXXXX` || exit 1 # Always set this, to avoid bogus errors from some rm's. if test z$infile = z-; then infile=$tmpin cat > $infile --- autoconf2.13-2.13.orig/autoconf.texi +++ autoconf2.13-2.13/autoconf.texi @@ -14,20 +14,20 @@ @finalout @end iftex -@ifinfo -@format -START-INFO-DIR-ENTRY -* Autoconf: (autoconf). Create source code configuration scripts. -END-INFO-DIR-ENTRY -@end format +@dircategory Software development +@direntry +* Autoconf2.13: (autoconf2.13). Create configuration scripts, only for + compatibility with old source packages. +@end direntry +@ifinfo Autoconf: Creating Automatic Configuration Scripts, by David MacKenzie. This file documents the GNU Autoconf package for creating scripts to configure source code packages using templates and an @code{m4} macro package. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998 Free Software Foundation, Inc. +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2010 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this manual provided the copyright notice and this permission notice @@ -779,7 +779,7 @@ scripts by calling @code{AC_CONFIG_AUX_DIR}, though the default places it looks are correct for most cases. -@defmac AC_CONFIG_AUX_DIR(@var{dir}) +@defmac AC_CONFIG_AUX_DIR (@var{dir}) @maindex CONFIG_AUX_DIR Use the @file{install-sh}, @file{config.sub}, @file{config.guess}, and Cygnus @code{configure} scripts that are in directory @var{dir}. These @@ -1680,7 +1680,7 @@ but that name is obsolete because some @code{make} programs have a rule that creates @file{install} from it if there is no @file{Makefile}. -A copy of @file{install-sh} which you may use comes with Autoconf. If +A copy of @file{install-sh} which you may use comes with Automake. If you use @code{AC_PROG_INSTALL}, you must include either @file{install-sh} or @file{install.sh} in your distribution, or @code{configure} will produce an error message saying it can't find --- autoconf2.13-2.13.orig/autoheader.sh +++ autoconf2.13-2.13/autoheader.sh @@ -155,7 +155,7 @@ # Don't write "do not edit" -- it will get copied into the # config.h, which it's ok to edit. cat < $fgrep_tmp </dev/null; then @@ -194,9 +194,12 @@ : else test $verbose = yes && echo running autoheader in $dir - $autoheader $macrodir_opt $localdir_opt && - { test $verbose != yes || echo touching $stamp; } && - touch $stamp + if $autoheader $macrodir_opt $localdir_opt; then + { test $verbose != yes || echo touching $stamp; } && + touch $stamp + else + exit 1 + fi fi fi fi --- autoconf2.13-2.13.orig/autoupdate.sh +++ autoconf2.13-2.13/autoupdate.sh @@ -26,7 +26,7 @@ Usage: autoupdate [-h] [--help] [-m dir] [--macrodir=dir] [--version] [template-file]" -sedtmp=/tmp/acups.$$ +sedtmp=`mktemp -t acups.XXXXXX` || exit 1 # For debugging. #sedtmp=/tmp/acups show_version=no @@ -66,7 +66,7 @@ : ${SIMPLE_BACKUP_SUFFIX='~'} -tmpout=acupo.$$ +tmpout=`mktemp -t acupo.XXXXXX` || exit 1 trap 'rm -f $sedtmp $tmpout; exit 1' 1 2 15 case $# in 0) infile=configure.in; out="> $tmpout" @@ -75,7 +75,6 @@ # Make sure $infile can be written. if test ! -w $infile; then - rm -f $tmpout echo "$0: $infile: cannot write" >&2 exit 1 fi --- autoconf2.13-2.13.orig/config.guess +++ autoconf2.13-2.13/config.guess @@ -1,7 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright (C) 1992, 93, 94, 95, 96, 97, 1998 Free Software Foundation, Inc. -# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. + +timestamp='2000-11-23' + # 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 @@ -22,19 +25,88 @@ # the same distribution terms that you use for the rest of that program. # Written by Per Bothner . -# The master version of this file is at the FSF in /home/gd/gnu/lib. +# Please send patches to . # # 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 system type (host/target name). +# don't specify an explicit build system type. # # Only a few systems have been added to this list; please add others # (but try to keep the structure clean). # +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 + +Report bugs and patches to . + +Written by Per Bothner. +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Free Software Foundation, Inc. See the source for copying conditions." + +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 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # 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 + + +dummy=dummy-$$ +trap 'rm -f $dummy.c $dummy.o $dummy; exit 1' 1 2 15 + +# CC_FOR_BUILD -- compiler used by this script. +# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still +# use `HOST_CC' if defined, but it is deprecated. + +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int dummy(){}" > $dummy.c + for c in cc gcc c89 ; do + ($c $dummy.c -c -o $dummy.o) >/dev/null 2>&1 + if test $? = 0 ; then + CC_FOR_BUILD="$c"; break + fi + done + rm -f $dummy.c $dummy.o + 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 + # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 8/24/94.) if (test -f /.attbin/uname) >/dev/null 2>&1 ; then @@ -43,14 +115,49 @@ 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_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown -trap 'rm -f dummy.c dummy.o dummy; exit 1' 1 2 15 - # 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. + # Determine the machine/vendor (is the vendor relevant). + case "${UNAME_MACHINE}" in + amiga) machine=m68k-unknown ;; + arm32) machine=arm-unknown ;; + atari*) machine=m68k-atari ;; + sun3*) machine=m68k-sun ;; + mac68k) machine=m68k-apple ;; + macppc) machine=powerpc-apple ;; + hp3[0-9][05]) machine=m68k-hp ;; + ibmrt|romp-ibm) machine=romp-ibm ;; + *) machine=${UNAME_MACHINE}-unknown ;; + esac + # The Operating System including object format. + 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 + # The OS release + release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` + # 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 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` @@ -59,56 +166,69 @@ # 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. - cat <dummy.s + cat <$dummy.s + .data +\$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text .globl main + .align 4 .ent main main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit .end main EOF - ${CC-cc} dummy.s -o dummy 2>/dev/null + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; + 2-307) + UNAME_MACHINE="alphaev67" + ;; esac fi - rm -f dummy.s dummy - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr [[A-Z]] [[a-z]]` + rm -f $dummy.s $dummy + echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` + exit 0 ;; + 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 0 ;; 21064:Windows_NT:50:3) echo alpha-dec-winnt3.5 exit 0 ;; Amiga*:UNIX_System_V:4.0:*) - echo m68k-cbm-sysv4 + echo m68k-unknown-sysv4 exit 0;; - amiga:NetBSD:*:*) - echo m68k-cbm-netbsd${UNAME_RELEASE} - exit 0 ;; amiga:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -133,16 +253,16 @@ wgrisc:OpenBSD:*:*) echo mipsel-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:OS/390:*:*) + echo i370-ibm-openedition + exit 0 ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix${UNAME_RELEASE} exit 0;; - arm32:NetBSD:*:*) - echo arm-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; SR2?01:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit 0;; - Pyramid*:OSx*:*:*|MIS*:OSx*:*:*|MIS*:SMP_DC-OSx*:*:*) + 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 @@ -150,7 +270,7 @@ echo pyramid-pyramid-bsd fi exit 0 ;; - NILE:*:*:dcosx) + NILE*:*:*:dcosx) echo pyramid-pyramid-svr4 exit 0 ;; sun4H:SunOS:5.*:*) @@ -195,21 +315,38 @@ aushp:SunOS:*:*) echo sparc-auspex-sunos${UNAME_RELEASE} exit 0 ;; - atari*:NetBSD:*:*) - echo m68k-atari-netbsd${UNAME_RELEASE} - exit 0 ;; atari*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - sun3*:NetBSD:*:*) - echo m68k-sun-netbsd${UNAME_RELEASE} + # 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 0 ;; + atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} + exit 0 ;; + *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) + echo m68k-atari-mint${UNAME_RELEASE} exit 0 ;; + milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) + echo m68k-milan-mint${UNAME_RELEASE} + exit 0 ;; + hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) + echo m68k-hades-mint${UNAME_RELEASE} + exit 0 ;; + *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) + echo m68k-unknown-mint${UNAME_RELEASE} + exit 0 ;; sun3*:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; - mac68k:NetBSD:*:*) - echo m68k-apple-netbsd${UNAME_RELEASE} - exit 0 ;; mac68k:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; @@ -222,9 +359,6 @@ powerpc:machten:*:*) echo powerpc-apple-machten${UNAME_RELEASE} exit 0 ;; - macppc:NetBSD:*:*) - echo powerpc-apple-netbsd${UNAME_RELEASE} - exit 0 ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit 0 ;; @@ -234,12 +368,17 @@ VAX*:ULTRIX*:*:*) echo vax-dec-ultrix${UNAME_RELEASE} exit 0 ;; - 2020:CLIX:*:*) + 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix${UNAME_RELEASE} exit 0 ;; mips:*:*:UMIPS | mips:*:*:RISCos) - sed 's/^ //' << EOF >dummy.c - int main (argc, argv) int argc; char **argv; { + sed 's/^ //' << EOF >$dummy.c +#ifdef __cplusplus +#include /* 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); @@ -254,10 +393,10 @@ exit (-1); } EOF - ${CC-cc} dummy.c -o dummy \ - && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy \ + && ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ + && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Night_Hawk:Power_UNIX:*:*) @@ -275,15 +414,18 @@ AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \ - -o ${TARGET_BINARY_INTERFACE}x = x ] ; then + 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 + else echo m88k-dg-dguxbcs${UNAME_RELEASE} + fi + else + echo i586-dg-dgux${UNAME_RELEASE} fi - else echo i586-dg-dgux${UNAME_RELEASE} - fi exit 0 ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 @@ -309,7 +451,7 @@ exit 0 ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include main() @@ -320,8 +462,8 @@ exit(0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -349,7 +491,7 @@ ibmrt:4.4BSD:*|romp-ibm:BSD:*) echo romp-ibm-bsd4.4 exit 0 ;; - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and + ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to exit 0 ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) @@ -365,28 +507,48 @@ echo m68k-hp-bsd4.4 exit 0 ;; 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/6?? | 9000/7?? | 9000/80[24] | 9000/8?[13679] | 9000/892 ) - sed 's/^ //' << EOF >dummy.c + 9000/[678][0-9][0-9]) + case "${HPUX_REV}" in + 11.[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" ;; + esac ;; + esac + fi ;; + esac + if [ "${HP_ARCH}" = "" ]; then + sed 's/^ //' << EOF >$dummy.c + + #define _HPUX_SOURCE #include #include - + int main () { #if defined(_SC_KERNEL_BITS) long bits = sysconf(_SC_KERNEL_BITS); - #endif + #endif long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) + + 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: + case CPU_PA_RISC2_0: #if defined(_SC_KERNEL_BITS) - switch (bits) + switch (bits) { case 64: puts ("hppa2.0w"); break; case 32: puts ("hppa2.0n"); break; @@ -394,20 +556,21 @@ } break; #else /* !defined(_SC_KERNEL_BITS) */ puts ("hppa2.0"); break; - #endif + #endif default: puts ("hppa1.0"); break; } exit (0); } EOF - (${CC-cc} dummy.c -o dummy 2>/dev/null ) && HP_ARCH=`./dummy` - rm -f dummy.c dummy + (CCOPTS= $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null ) && HP_ARCH=`./$dummy` + if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi + rm -f $dummy.c $dummy + fi ;; esac - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; 3050*:HI-UX:*:*) - sed 's/^ //' << EOF >dummy.c + sed 's/^ //' << EOF >$dummy.c #include int main () @@ -432,8 +595,8 @@ exit (0); } EOF - ${CC-cc} dummy.c -o dummy && ./dummy && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy && ./$dummy && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -442,6 +605,9 @@ 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit 0 ;; + *9??*:MPE/iX:*:*) + echo hppa1.0-hp-mpeix + exit 0 ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) echo hppa1.1-hp-osf exit 0 ;; @@ -458,6 +624,9 @@ parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit 0 ;; + hppa*:OpenBSD:*:*) + echo hppa-unknown-openbsd + exit 0 ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd exit 0 ;; @@ -488,37 +657,43 @@ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ exit 0 ;; CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} + echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3D:*:*:*) + echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*T3E:*:*:*) + echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; + CRAY*SV1:*:*:*) + echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY-2:*:*:*) echo cray2-cray-unicos exit 0 ;; F300:UNIX_System_V:*:*) - FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'` + FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit 0 ;; F301:UNIX_System_V:*:*) echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'` exit 0 ;; - hp3[0-9][05]:NetBSD:*:*) - echo m68k-hp-netbsd${UNAME_RELEASE} - exit 0 ;; hp300:OpenBSD:*:*) echo m68k-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + i?86:BSD/386:*:* | i?86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) + echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + exit 0 ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi${UNAME_RELEASE} exit 0 ;; - i?86:BSD/386:*:* | *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} + *:BSD/OS:*:*) + echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} exit 0 ;; *:FreeBSD:*:*) echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` exit 0 ;; - *:NetBSD:*:*) - echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - exit 0 ;; *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` exit 0 ;; @@ -528,6 +703,18 @@ i*:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit 0 ;; + i*:PW*:*) + echo ${UNAME_MACHINE}-pc-pw32 + exit 0 ;; + 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 i386-pc-interix + exit 0 ;; + i*:UWIN*:*) + echo ${UNAME_MACHINE}-pc-uwin + exit 0 ;; p*:CYGWIN*:*) echo powerpcle-unknown-cygwin exit 0 ;; @@ -537,85 +724,164 @@ *:GNU:*:*) echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` exit 0 ;; + i*86:Minix:*:*) + echo ${UNAME_MACHINE}-pc-minix + exit 0 ;; *:Linux:*:*) - # uname on the ARM produces all sorts of strangeness, and we need to - # filter it out. - case "$UNAME_MACHINE" in - arm* | sa110*) UNAME_MACHINE="arm" ;; - esac # The BFD linker knows what the default object file format is, so - # first see if it will tell us. - ld_help_string=`ld --help 2>&1` - ld_supported_emulations=`echo $ld_help_string \ + # 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. + ld_supported_emulations=`cd /; ld --help 2>&1 \ | sed -ne '/supported emulations:/!d s/[ ][ ]*/ /g s/.*supported emulations: *// s/ .*// p'` case "$ld_supported_emulations" in - i?86linux) echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0 ;; - i?86coff) echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0 ;; - sparclinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - armlinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - m68klinux) echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0 ;; - elf32ppc) echo "powerpc-unknown-linux-gnu" ; exit 0 ;; + *ia64) + echo "${UNAME_MACHINE}-unknown-linux" + exit 0 + ;; + i?86linux) + echo "${UNAME_MACHINE}-pc-linux-gnuaout" + exit 0 + ;; + elf_i?86) + TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" + ;; + i?86coff) + echo "${UNAME_MACHINE}-pc-linux-gnucoff" + exit 0 + ;; + sparclinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32_sparc) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + armlinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32arm*) + echo "${UNAME_MACHINE}-unknown-linux-gnuoldld" + exit 0 + ;; + armelf_linux*) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; + m68klinux) + echo "${UNAME_MACHINE}-unknown-linux-gnuaout" + exit 0 + ;; + elf32ppc | elf32ppclinux) + # Determine Lib Version + cat >$dummy.c < +#if defined(__GLIBC__) +extern char __libc_version[]; +extern char __libc_release[]; +#endif +main(argc, argv) + int argc; + char *argv[]; +{ +#if defined(__GLIBC__) + printf("%s %s\n", __libc_version, __libc_release); +#else + printf("unkown\n"); +#endif + return 0; +} +EOF + LIBC="" + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null + if test "$?" = 0 ; then + ./$dummy | grep 1\.99 > /dev/null + if test "$?" = 0 ; then + LIBC="libc1" + fi + fi + rm -f $dummy.c $dummy + echo powerpc-unknown-linux-gnu${LIBC} + exit 0 + ;; + shelf_linux) + echo "${UNAME_MACHINE}-unknown-linux-gnu" + exit 0 + ;; esac if test "${UNAME_MACHINE}" = "alpha" ; then - sed 's/^ //' <dummy.s - .globl main - .ent main - main: - .frame \$30,0,\$26,0 - .prologue 0 - .long 0x47e03d80 # implver $0 - lda \$2,259 - .long 0x47e20c21 # amask $2,$1 - srl \$1,8,\$2 - sll \$2,2,\$2 - sll \$0,3,\$0 - addl \$1,\$0,\$0 - addl \$2,\$0,\$0 - ret \$31,(\$26),1 - .end main + cat <$dummy.s + .data + \$Lformat: + .byte 37,100,45,37,120,10,0 # "%d-%x\n" + + .text + .globl main + .align 4 + .ent main + main: + .frame \$30,16,\$26,0 + ldgp \$29,0(\$27) + .prologue 1 + .long 0x47e03d80 # implver \$0 + lda \$2,-1 + .long 0x47e20c21 # amask \$2,\$1 + lda \$16,\$Lformat + mov \$0,\$17 + not \$1,\$18 + jsr \$26,printf + ldgp \$29,0(\$26) + mov 0,\$16 + jsr \$26,exit + .end main EOF LIBC="" - ${CC-cc} dummy.s -o dummy 2>/dev/null + $CC_FOR_BUILD $dummy.s -o $dummy 2>/dev/null if test "$?" = 0 ; then - ./dummy - case "$?" in - 7) + case `./$dummy` in + 0-0) UNAME_MACHINE="alpha" ;; - 15) + 1-0) UNAME_MACHINE="alphaev5" ;; - 14) + 1-1) UNAME_MACHINE="alphaev56" ;; - 10) + 1-101) UNAME_MACHINE="alphapca56" ;; - 16) + 2-303) UNAME_MACHINE="alphaev6" ;; - esac + 2-307) + UNAME_MACHINE="alphaev67" + ;; + esac - objdump --private-headers dummy | \ + objdump --private-headers $dummy | \ grep ld.so.1 > /dev/null if test "$?" = 0 ; then LIBC="libc1" fi - fi - rm -f dummy.s dummy + fi + rm -f $dummy.s $dummy echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} ; exit 0 elif test "${UNAME_MACHINE}" = "mips" ; then - cat >dummy.c <$dummy.c < /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #ifdef __MIPSEB__ printf ("%s-unknown-linux-gnu\n", argv[1]); #endif @@ -625,16 +891,34 @@ return 0; } EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + elif test "${UNAME_MACHINE}" = "s390"; then + echo s390-ibm-linux && exit 0 + elif test "${UNAME_MACHINE}" = "x86_64"; then + echo x86_64-unknown-linux-gnu && exit 0 + elif test "${UNAME_MACHINE}" = "parisc" -o "${UNAME_MACHINE}" = "hppa"; then + # 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 0 else # Either a pre-BFD a.out linker (linux-gnuoldld) # or one that does not give us useful --help. # GCC wants to distinguish between linux-gnuoldld and linux-gnuaout. # If ld does not provide *any* "supported emulations:" # that means it is gnuoldld. - echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations:" - test $? != 0 && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 + test -z "$ld_supported_emulations" \ + && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0 case "${UNAME_MACHINE}" in i?86) @@ -645,12 +929,14 @@ ;; esac # Determine whether the default compiler is a.out or elf - cat >dummy.c <$dummy.c < -main(argc, argv) - int argc; - char *argv[]; -{ +#ifdef __cplusplus +#include /* for printf() prototype */ + int main (int argc, char *argv[]) { +#else + int main (argc, argv) int argc; char *argv[]; { +#endif #ifdef __ELF__ # ifdef __GLIBC__ # if __GLIBC__ >= 2 @@ -667,8 +953,9 @@ return 0; } EOF - ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0 - rm -f dummy.c dummy + $CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy "${UNAME_MACHINE}" && rm $dummy.c $dummy && exit 0 + rm -f $dummy.c $dummy + test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 fi ;; # 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. @@ -684,10 +971,20 @@ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} exit 0 ;; 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_RELEASE} + echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} + else + echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} + fi + exit 0 ;; + i?86:*:5:7*) + # Fixed at (any) Pentium or better + UNAME_MACHINE=i586 + if [ ${UNAME_SYSTEM} = "UnixWare" ] ; then + echo ${UNAME_MACHINE}-sco-sysv${UNAME_RELEASE}uw${UNAME_VERSION} else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} + echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE} fi exit 0 ;; i?86:*:3.2:*) @@ -699,19 +996,20 @@ (/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 + (/bin/uname -X|egrep '^Machine.*Pent ?II' >/dev/null) \ + && UNAME_MACHINE=i686 + (/bin/uname -X|egrep '^Machine.*Pentium Pro' >/dev/null) \ + && UNAME_MACHINE=i686 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL else echo ${UNAME_MACHINE}-pc-sysv32 fi exit 0 ;; - i?86:UnixWare:*:*) - if /bin/uname -X 2>/dev/null >/dev/null ; then - (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - fi - echo ${UNAME_MACHINE}-unixware-${UNAME_RELEASE}-${UNAME_VERSION} + i?86:*DOS:*:*) + echo ${UNAME_MACHINE}-pc-msdosdjgpp exit 0 ;; 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 i386. echo i386-pc-msdosdjgpp @@ -735,7 +1033,7 @@ exit 0 ;; M68*:*:R3V[567]*:*) test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) + 3[34]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` @@ -752,7 +1050,7 @@ mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit 0 ;; - i?86:LynxOS:2.*:*) + i?86:LynxOS:2.*:* | i?86:LynxOS:3.[01]*:*) echo i386-unknown-lynxos${UNAME_RELEASE} exit 0 ;; TSUNAMI:LynxOS:2.*:*) @@ -764,6 +1062,9 @@ SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv${UNAME_RELEASE} exit 0 ;; + RM*:ReliantUNIX-*:*:*) + echo mips-sni-sysv4 + exit 0 ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit 0 ;; @@ -791,10 +1092,10 @@ mc68*:A/UX:*:*) echo m68k-apple-aux${UNAME_RELEASE} exit 0 ;; - news*:NEWS-OS:*:6*) + news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit 0 ;; - R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R4000:UNIX_SV:*:*) + R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv${UNAME_RELEASE} else @@ -810,12 +1111,64 @@ BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit 0 ;; + SX-4:SUPER-UX:*:*) + echo sx4-nec-superux${UNAME_RELEASE} + exit 0 ;; + SX-5:SUPER-UX:*:*) + echo sx5-nec-superux${UNAME_RELEASE} + exit 0 ;; + Power*:Rhapsody:*:*) + echo powerpc-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Rhapsody:*:*) + echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} + exit 0 ;; + *:Darwin:*:*) + echo `uname -p`-apple-darwin${UNAME_RELEASE} + exit 0 ;; + *:procnto*:*:* | *:QNX:[0123456789]*:*) + if test "${UNAME_MACHINE}" = "x86pc"; then + UNAME_MACHINE=pc + fi + echo `uname -p`-${UNAME_MACHINE}-nto-qnx + exit 0 ;; + *:QNX:*:4*) + echo i386-pc-qnx + exit 0 ;; + NSR-[KW]:NONSTOP_KERNEL:*:*) + echo nsr-tandem-nsk${UNAME_RELEASE} + exit 0 ;; + *:NonStop-UX:*:*) + echo mips-compaq-nonstopux + exit 0 ;; + BS2000:POSIX*:*:*) + echo bs2000-siemens-sysv + exit 0 ;; + DS/*:UNIX_System_V:*:*) + echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} + exit 0 ;; + *: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 0 ;; + 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 0 ;; esac #echo '(No uname command or uname output not recognized.)' 1>&2 #echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -cat >dummy.c <$dummy.c < # include @@ -853,7 +1206,10 @@ #endif int version; version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + if (version < 4) + printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); + else + printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); exit (0); #endif @@ -913,8 +1269,8 @@ } EOF -${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy && rm dummy.c dummy && exit 0 -rm -f dummy.c dummy +$CC_FOR_BUILD $dummy.c -o $dummy 2>/dev/null && ./$dummy && rm $dummy.c $dummy && exit 0 +rm -f $dummy.c $dummy # Apollos put the system type in the environment. @@ -946,6 +1302,47 @@ esac fi -#echo '(Unable to guess system type)' 1>&2 +cat >&2 < in order to provide the needed +information to handle your system. + +config.guess version = $version + +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: --- autoconf2.13-2.13.orig/config.sub +++ autoconf2.13-2.13/config.sub @@ -1,6 +1,10 @@ #! /bin/sh -# Configuration validation subroutine script, version 1.1. -# Copyright (C) 1991, 92-97, 1998 Free Software Foundation, Inc. +# Configuration validation subroutine script. +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 +# Free Software Foundation, Inc. + +timestamp='2000-11-23' + # 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. @@ -25,6 +29,8 @@ # 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 . +# # 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. @@ -45,30 +51,64 @@ # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. -if [ x$1 = x ] -then - echo Configuration name missing. 1>&2 - echo "Usage: $0 CPU-MFR-OPSYS" 1>&2 - echo "or $0 ALIAS" 1>&2 - echo where ALIAS is a recognized configuration type. 1>&2 - exit 1 -fi +me=`echo "$0" | sed -e 's,.*/,,'` -# First pass through any local machine types. -case $1 in - *local*) - echo $1 - exit 0 - ;; - *) - ;; +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 + +Report bugs and patches to . + +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000 +Free Software Foundation, Inc. See the source for copying conditions." + +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 0 ;; + --help | --h* | -h ) + echo "$usage"; exit 0 ;; + -- ) # 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 0;; + + * ) + 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 - linux-gnu*) + nto-qnx* | linux-gnu* | storm-chaos*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -94,15 +134,25 @@ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple) + -apple | -axis) + os= + basic_machine=$1 + ;; + -sim | -cisco | -oki | -wec | -winbond) os= basic_machine=$1 ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; -hiux*) os=-hiuxwe2 ;; -sco5) - os=sco3.2v5 + os=-sco3.2v5 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` ;; -sco4) @@ -121,6 +171,9 @@ 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/'` @@ -143,26 +196,46 @@ -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. - tahoe | i860 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ - | arme[lb] | pyramid | mn10200 | mn10300 | tron | a29k \ - | 580 | i960 | h8300 | hppa | hppa1.0 | hppa1.1 | hppa2.0 \ - | alpha | alphaev5 | alphaev56 | we32k | ns16k | clipper \ - | i370 | sh | powerpc | powerpcle | 1750a | dsp16xx | pdp11 \ - | mips64 | mipsel | mips64el | mips64orion | mips64orionel \ - | mipstx39 | mipstx39el \ - | sparc | sparclet | sparclite | sparc64 | v850) + tahoe | i860 | ia64 | m32r | m68k | m68000 | m88k | ns32k | arc | arm \ + | arme[lb] | armv[2345] | armv[345][lb] | pyramid | mn10200 | mn10300 | tron | a29k \ + | 580 | i960 | h8300 \ + | x86 | ppcbe | mipsbe | mipsle | shbe | shle | armbe | armle \ + | hppa | hppa1.0 | hppa1.1 | hppa2.0 | hppa2.0w | hppa2.0n \ + | hppa64 \ + | alpha | alphaev[4-8] | alphaev56 | alphapca5[67] \ + | alphaev6[78] \ + | we32k | ns16k | clipper | i370 | sh | sh[34] \ + | powerpc | powerpcle \ + | 1750a | dsp16xx | pdp11 | mips16 | mips64 | mipsel | mips64el \ + | mips64orion | mips64orionel | mipstx39 | mipstx39el \ + | mips64vr4300 | mips64vr4300el | mips64vr4100 | mips64vr4100el \ + | mips64vr5000 | miprs64vr5000el | mcore \ + | sparc | sparclet | sparclite | sparc64 | sparcv9 | v850 | c4x \ + | thumb | d10v | d30v | fr30 | avr) + 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 | z8k | v70 | h8500 | w65 | pj | pjl) ;; + # 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[34567]86) + i[234567]86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. @@ -171,27 +244,49 @@ exit 1 ;; # Recognize the basic CPU types with company name. - vax-* | tahoe-* | i[34567]86-* | i860-* | m32r-* | m68k-* | m68000-* \ + # FIXME: clean up the formatting here. + vax-* | tahoe-* | i[234567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \ | m88k-* | sparc-* | ns32k-* | fx80-* | arc-* | arm-* | c[123]* \ | mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* \ - | power-* | none-* | 580-* | cray2-* | h8300-* | i960-* \ - | xmp-* | ymp-* | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* \ - | alpha-* | alphaev5-* | alphaev56-* | we32k-* | cydra-* \ - | ns16k-* | pn-* | np1-* | xps100-* | clipper-* | orion-* \ + | power-* | none-* | 580-* | cray2-* | h8300-* | h8500-* | i960-* \ + | xmp-* | ymp-* \ + | x86-* | ppcbe-* | mipsbe-* | mipsle-* | shbe-* | shle-* | armbe-* | armle-* \ + | hppa-* | hppa1.0-* | hppa1.1-* | hppa2.0-* | hppa2.0w-* \ + | hppa2.0n-* | hppa64-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphapca5[67]-* \ + | alphaev6[78]-* \ + | we32k-* | cydra-* | ns16k-* | pn-* | np1-* | xps100-* \ + | clipper-* | orion-* \ | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \ - | sparc64-* | mips64-* | mipsel-* \ - | mips64el-* | mips64orion-* | mips64orionel-* \ - | mipstx39-* | mipstx39el-* \ - | f301-*) + | sparc64-* | sparcv9-* | sparc86x-* | mips16-* | mips64-* | mipsel-* \ + | mips64el-* | mips64orion-* | mips64orionel-* \ + | mips64vr4100-* | mips64vr4100el-* | mips64vr4300-* | mips64vr4300el-* \ + | mipstx39-* | mipstx39el-* | mcore-* \ + | f301-* | armv*-* | s390-* | sv1-* | t3e-* \ + | m88110-* | m680[01234]0-* | m683?2-* | m68360-* | z8k-* | d10v-* \ + | thumb-* | v850-* | d30v-* | tic30-* | c30-* | fr30-* \ + | bs2000-* | tic54x-* | c54x-* | x86_64-*) ;; # 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 + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; alliant | fx80) basic_machine=fx80-alliant ;; @@ -207,20 +302,24 @@ os=-sysv ;; amiga | amiga-*) - basic_machine=m68k-cbm + basic_machine=m68k-unknown ;; amigaos | amigados) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-amigaos ;; amigaunix | amix) - basic_machine=m68k-cbm + basic_machine=m68k-unknown os=-sysv4 ;; apollo68) basic_machine=m68k-apollo os=-sysv ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; aux) basic_machine=m68k-apple os=-aux @@ -264,6 +363,9 @@ crds | unos) basic_machine=m68k-crds ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; da30 | da30-*) basic_machine=m68k-da30 ;; @@ -297,6 +399,10 @@ encore | umax | mmax) basic_machine=ns32k-encore ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; fx2800) basic_machine=i860-alliant ;; @@ -315,6 +421,14 @@ 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 @@ -330,13 +444,30 @@ 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 ;; - hp9k7[0-9][0-9] | hp7[0-9][0-9] | hp9k8[0-9]7 | hp8[0-9]7) + 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]) @@ -345,9 +476,16 @@ 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 - os=-mvs ;; # I'm not sure what "Sysv32" means. Should this be sysv3.2? i[34567]86v32) @@ -366,6 +504,26 @@ 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 + ;; + i386-go32 | go32) + basic_machine=i386-unknown + os=-go32 + ;; + i386-mingw32 | mingw32) + basic_machine=i386-unknown + os=-mingw32 + ;; + i[34567]86-pw32 | pw32) + basic_machine=i586-unknown + os=-pw32 + ;; iris | iris4d) basic_machine=mips-sgi case $os in @@ -394,6 +552,10 @@ miniframe) basic_machine=m68000-convergent ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; mipsel*-linux*) basic_machine=mipsel-unknown os=-linux-gnu @@ -408,10 +570,34 @@ mips3*) basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown ;; + mmix*) + basic_machine=mmix-knuth + os=-mmixware + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + msdos) + basic_machine=i386-unknown + os=-msdos + ;; + 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 @@ -424,6 +610,10 @@ basic_machine=mips-sony os=-newsos ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; next | m*-next ) basic_machine=m68k-next case $os in @@ -449,9 +639,32 @@ 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 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; pa-hitachi) basic_machine=hppa1.1-hitachi os=-hiuxwe2 @@ -469,28 +682,28 @@ pc532 | pc532-*) basic_machine=ns32k-pc532 ;; - pentium | p5 | k5 | nexen) + pentium | p5 | k5 | k6 | nexgen) basic_machine=i586-pc ;; - pentiumpro | p6 | k6 | 6x86) + pentiumpro | p6 | 6x86 | athlon) basic_machine=i686-pc ;; pentiumii | pentium2) - basic_machine=i786-pc + basic_machine=i686-pc ;; - pentium-* | p5-* | k5-* | nexen-*) + pentium-* | p5-* | k5-* | k6-* | nexgen-*) basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` ;; - pentiumpro-* | p6-* | k6-* | 6x86-*) + pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` + basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; - power) basic_machine=rs6000-ibm + power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown ;; @@ -505,12 +718,20 @@ ps2) basic_machine=i386-ibm ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; rm[46]00) basic_machine=mips-siemens ;; rtpc | rtpc-*) basic_machine=romp-ibm ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; sequent) basic_machine=i386-sequent ;; @@ -518,6 +739,10 @@ basic_machine=sh-hitachi os=-hms ;; + sparclite-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; sps7) basic_machine=m68k-bull os=-sysv2 @@ -525,6 +750,13 @@ spur) basic_machine=spur-unknown ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; sun2) basic_machine=m68000-sun ;; @@ -565,10 +797,22 @@ sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; symmetry) basic_machine=i386-sequent os=-dynix ;; + t3e) + basic_machine=t3e-cray + os=-unicos + ;; + tic54x | c54x*) + basic_machine=tic54x-unknown + os=-coff + ;; tx39) basic_machine=mipstx39-unknown ;; @@ -586,6 +830,10 @@ basic_machine=a29k-nyu os=-sym1 ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; vaxv) basic_machine=vax-dec os=-sysv @@ -609,6 +857,14 @@ basic_machine=a29k-wrs os=-vxworks ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; xmp) basic_machine=xmp-cray os=-unicos @@ -616,6 +872,10 @@ xps | xps100) basic_machine=xps100-honeywell ;; + z8k-*-coff) + basic_machine=z8k-unknown + os=-sim + ;; none) basic_machine=none-none os=-none @@ -623,6 +883,15 @@ # 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 + ;; mips) if [ x$os = x-linux-gnu ]; then basic_machine=mips-unknown @@ -645,7 +914,10 @@ we32k) basic_machine=we32k-att ;; - sparc) + sh3 | sh4) + basic_machine=sh-unknown + ;; + sparc | sparcv9) basic_machine=sparc-sun ;; cydra) @@ -657,6 +929,16 @@ orion105) basic_machine=clipper-highlevel ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + c4x*) + basic_machine=c4x-none + os=-coff + ;; *) echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 exit 1 @@ -710,13 +992,34 @@ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -386bsd* | -netbsd* | -openbsd* | -freebsd* | -riscix* \ - | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \ + | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -uxpv* | -beos*) + | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ + | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* | -storm-chaos*) # Remember, each alternative MUST END IN *, to match a version number. ;; + -qnx*) + case $basic_machine in + x86-* | i[34567]86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto*) + os=-nto-qnx + ;; + -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo $os | sed -e 's|mac|macos|'` + ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; @@ -726,6 +1029,12 @@ -sunos6*) os=`echo $os | sed -e 's|sunos6|solaris3|'` ;; + -opened*) + os=-openedition + ;; + -wince*) + os=-wince + ;; -osfrose*) os=-osfrose ;; @@ -741,12 +1050,18 @@ -acis*) os=-aos ;; + -386bsd) + os=-bsd + ;; -ctix* | -uts*) os=-sysv ;; -ns2 ) os=-nextstep2 ;; + -nsk*) + os=-nsk + ;; # Preserve the version number of sinix5. -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` @@ -772,9 +1087,18 @@ # This must come after -sysvr4. -sysv*) ;; + -ose*) + os=-ose + ;; + -es1800*) + os=-ose + ;; -xenix) os=-xenix ;; + -*mint | -*MiNT) + os=-mint + ;; -none) ;; *) @@ -800,6 +1124,9 @@ *-acorn) os=-riscix1.2 ;; + arm*-rebel) + os=-linux + ;; arm*-semi) os=-aout ;; @@ -821,6 +1148,15 @@ # default. # os=-sunos4 ;; + m68*-cisco) + os=-aout + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; @@ -833,6 +1169,15 @@ *-ibm) os=-aix ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; *-hp) os=-hpux ;; @@ -896,6 +1241,18 @@ f301-fujitsu) os=-uxpv ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; *) os=-none ;; @@ -917,9 +1274,15 @@ -aix*) vendor=ibm ;; + -beos*) + vendor=be + ;; -hpux*) vendor=hp ;; + -mpeix*) + vendor=hp + ;; -hiux*) vendor=hitachi ;; @@ -935,7 +1298,7 @@ -genix*) vendor=ns ;; - -mvs*) + -mvs* | -opened*) vendor=ibm ;; -ptx*) @@ -947,9 +1310,26 @@ -aux*) vendor=apple ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -*MiNT) + vendor=atari + ;; esac basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` ;; esac echo $basic_machine$os +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: --- autoconf2.13-2.13.orig/configure +++ autoconf2.13-2.13/configure @@ -547,7 +547,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:551: checking for $ac_word" >&5 +echo "configure:__oline__: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_M4'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -588,7 +588,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:592: checking for $ac_word" >&5 +echo "configure:__oline__: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -621,7 +621,7 @@ # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:625: checking for $ac_word" >&5 +echo "configure:__oline__: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -691,7 +691,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:695: checking for a BSD compatible install" >&5 +echo "configure:__oline__: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 --- autoconf2.13-2.13.orig/make-stds.texi +++ autoconf2.13-2.13/make-stds.texi @@ -209,12 +209,11 @@ Each program-name variable should come with an options variable that is used to supply options to the program. Append @samp{FLAGS} to the program-name variable name to get the options variable name---for -example, @code{BISONFLAGS}. (The names @code{CFLAGS} for the C -compiler, @code{YFLAGS} for yacc, and @code{LFLAGS} for lex, are -exceptions to this rule, but we keep them because they are standard.) -Use @code{CPPFLAGS} in any compilation command that runs the -preprocessor, and use @code{LDFLAGS} in any compilation command that -does linking as well as in any direct use of @code{ld}. +example, @code{BISONFLAGS}. (The name @code{CFLAGS} is an exception to +this rule, but we keep it because it is standard.) Use @code{CPPFLAGS} +in any compilation command that runs the preprocessor, and use +@code{LDFLAGS} in any compilation command that does linking as well as +in any direct use of @code{ld}. If there are C compiler options that @emph{must} be used for proper compilation of certain files, do not include them in @code{CFLAGS}. --- autoconf2.13-2.13.orig/autoheader.1 +++ autoconf2.13-2.13/autoheader.1 @@ -0,0 +1,197 @@ +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +.\" Copyright (C) 1998 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH AUTOHEADER 1 "Autoconf" +.SH NAME +autoheader2.13 - creates a template file of C #define's for use by +configure. +.SH SYNOPSIS +.B autoheader2.13 +[ +.B --help +| +.B -h +] [ +.B --localdir=dir +| +.B -l dir +] [ +.B --macrodir=dir +| +.B -m dir +] [ +.B --version +] +.SH DESCRIPTION +.PP +The +.B autoheader2.13 +program can create a template file of C +.B #define +statements for +.B configure +to use. If +.B configure.in +invokes +.BR AC_CONFIG_HEADER(FILE) , +.B autoheader2.13 +creates +.BR FILE.in ; +if multiple +file arguments are given, the first one is used. Otherwise, +.B autoheader2.13 +creates +.BR config.h.in . +.PP +If you give +.B autoheader2.13 +an argument, it uses that file instead of +.B configure.in +and writes the header file to the standard output +instead of to +.BR config.h.in . +If you give +.B autoheader2.13 +an argument of +.BR - , +it reads the standard input instead of +.B configure.in +and writes +the header file to the standard output. +.PP +.B autoheader2.13 +scans +.B configure.in +and figures out which C +preprocessor symbols it might define. It copies comments and +.B #define +and +.B #undef +statements from a file called +.BR acconfig.h , +which comes +with and is installed with Autoconf. It also uses a file called +.B acconfig.h +in the current directory, if present. If you +.B AC_DEFINE +any additional symbols, you must create that file with entries for +them. For symbols defined by +.BR AC_CHECK_HEADERS , +.BR AC_CHECK_FUNCS , +.BR AC_CHECK_SIZEOF , +or +.BR AC_CHECK_LIB , +.B autoheader2.13 +generates comments +and +.B #undef +statements itself rather than copying them from a file, +since the possible symbols are effectively limitless. +.PP +The file that +.B autoheader2.13 +creates contains mainly +.B #define +and +.B #undef +statements and their accompanying comments. If +.B ./acconfig.h +contains the string +.BR @TOP@ , +.B autoheader2.13 +copies the lines before the +line containing +.B @TOP@ +into the top of the file that it generates. +Similarly, if +.B ./acconfig.h +contains the string +.BR @BOTTOM@ , +.B autoheader2.13 +copies the lines after that line to the end of the file it +generates. Either or both of those strings may be omitted. +.PP +An alternate way to produce the same effect is to create the files +.B FILE.top +(typically +.BR config.h.top ) +and/or +.B FILE.bot +in the current +directory. If they exist, +.B autoheader2.13 +copies them to the beginning +and end, respectively, of its output. Their use is discouraged because +they have file names that contain two periods, and so can not be stored +on MS-DOS; also, they are two more files to clutter up the directory. +But if you use the +.B --localdir=DIR +option to use an +.B acconfig.h +in +another directory, they give you a way to put custom boilerplate in each +individual +.BR config.h.in . +.PP +.B autoheader2.13 +accepts the following options: +.TP +.BI --help +.TP +.BI -h +Print a summary of the command line options and exit. +.TP +.BI --localdir=DIR +.TP +.BI -l\ DIR +Look for the package files +.B aclocal.m4 +and +.B acconfig.h +(but not +.B FILE.top +and +.BR FILE.bot ) +in directory DIR instead of in the current +directory. +.TP +.BI --macrodir=DIR +.TP +.BI -m\ DIR +Look for the installed macro files and +.B acconfig.h +in directory DIR. +You can also set the +.B AC_MACRODIR +environment variable to a +directory; this option overrides the environment variable. +.TP +.BI --version +Print the version number of Autoconf and exit. +.SH "SEE ALSO" +.BR autoconf2.13 (1), +.BR autoreconf2.13 (1), +.BR autoscan2.13 (1), +.BR autoupdate2.13 (1), +.BR ifnames2.13 (1) +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/autoconf.1 +++ autoconf2.13-2.13/autoconf.1 @@ -0,0 +1,126 @@ +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +.\" Copyright (C) 1998 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH AUTOCONF 1 "Autoconf" +.SH NAME +autoconf2.13 - creates scripts to configure source code packages using templates +.SH SYNOPSIS +.B autoconf2.13 +[ +.B --help +| +.B -h +] [ +.B --localdir=dir +| +.B -l dir +] [ +.B --macrodir=dir +| +.B -m dir +] [ +.B --version +] +.SH DESCRIPTION +.PP +To create +.B configure +from +\fBconfigure.in\fP, run the +.B autoconf2.13 +program with no arguments. +.B autoconf2.13 +processes +.B configure.in +with +the +.B m4 +macro processor, using the Autoconf macros. If you give +.B autoconf2.13 +an argument, it reads that file instead of +.B configure.in +and writes the configuration script to the standard output instead of +to +.BR configure . +If you give +.B autoconf2.13 +the argument +.BR - , +it reads the +standard input instead of +.B configure.in +and writes the configuration +script on the standard output. +.PP +The Autoconf macros are defined in several files. Some of the files +are distributed with Autoconf; +.B autoconf2.13 +reads them first. Then it +looks for the optional file +.B acsite.m4 +in the directory that contains +the distributed Autoconf macro files, and for the optional file +.B aclocal.m4 +in the current directory. Those files can contain your +site's or the package's own Autoconf macro definitions. If a macro is +defined in more than one of the files that +.B autoconf2.13 +reads, the last +definition it reads overrides the earlier ones. +.PP + +.B autoconf2.13 +accepts the following options: +.TP +.BI --help +.TP +.BI -h +Print a summary of the command line options and exit. +.TP +.BI --localdir=DIR +.TP +.BI -l\ DIR +Look for the package file +.B aclocal.m4 +in directory DIR instead of +in the current directory. +.TP +.BI --macrodir=DIR +.TP +.BI -m\ DIR +Look for the installed macro files in directory DIR. You can also +set the +.B AC_MACRODIR +environment variable to a directory; this +option overrides the environment variable. +.TP +.BI --version +Print the version number of Autoconf and exit. +.PP +.SH "SEE ALSO" +.BR autoheader2.13 (1), +.BR autoreconf2.13 (1), +.BR autoscan2.13 (1), +.BR autoupdate2.13 (1), +.BR ifnames2.13 (1) +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/autoreconf.1 +++ autoconf2.13-2.13/autoreconf.1 @@ -0,0 +1,165 @@ +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +.\" Copyright (C) 1998 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH AUTORECONF 1 "Autoconf" +.SH NAME +autoreconf2.13 - update configure scripts +.SH SYNOPSIS +.B autoreconf2.13 +[ +.B --help +| +.B -h +] [ +.B --force +| +.B -f +] [ +.B --localdir=dir +| +.B -l dir +] [ +.B --macrodir=dir +| +.B -m dir +] [ +.B --verbose +] [ +.B --version +] +.SH DESCRIPTION +.PP +If you have a lot of Autoconf-generated +.B configure +scripts, the +.B autoreconf2.13 +program can save you some work. It runs +.B autoconf2.13 +(and +.BR autoheader2.13 , +where appropriate) repeatedly to remake the Autoconf +.B configure +scripts and configuration header templates in the directory +tree rooted at the current directory. By default, it only remakes +those files that are older than their +.B configure.in +or (if present) +.BR aclocal.m4 . +Since +.B autoheader2.13 +does not change the timestamp of its +output file if the file wouldn't be changing, this is not necessarily +the minimum amount of work. If you install a new version of Autoconf, +you can make +.B autoreconf2.13 +remake +.I all +of the files by giving it the +.B --force +option. +.PP +If you give +.B autoreconf2.13 +the +.B --macrodir=DIR +or +.B --localdir=DIR +options, it passes them down to +.B autoconf2.13 +and +.B autoheader2.13 +(with +relative paths adjusted properly). +.PP +.B autoreconf2.13 +does not support having, in the same directory tree, +both directories that are parts of a larger package (sharing +.B aclocal.m4 +and +.BR acconfig.h ), +and directories that are independent +packages (each with their own +.B aclocal.m4 +and +.BR acconfig.h ). +It +assumes that they are all part of the same package, if you use +.BR --localdir , +or that each directory is a separate package, if you +don't use it. This restriction may be removed in the future. +.PP +.B autoreconf2.13 +accepts the following options: +.TP +.BI --help +.TP +.BI -h +Print a summary of the command line options and exit. +.TP +.BI --force +.TP +.BI -f +Remake even +.B configure +scripts and configuration headers that are +newer than their input files +.RB ( configure.in +and, if present, +.BR aclocal.m4 ). +.TP +.BI --localdir=DIR +.TP +.BI -l\ DIR +Look for the package file +.B aclocal.m4 +in directory DIR instead of +in the current directory. +.TP +.BI --macrodir=DIR +.TP +.BI -m\ DIR +Look for the installed macro files in directory DIR. You can also +set the +.B AC_MACRODIR +environment variable to a directory; this +option overrides the environment variable. +.TP +.BI --verbose +Print the name of each directory where +.B autoreconf2.13 +runs +.B autoconf2.13 +(and +.BR autoheader2.13 , +if appropriate). +.TP +.BI --version +Print the version number of Autoconf and exit. +.PP +.SH "SEE ALSO" +.BR autoconf2.13 (1), +.BR autoheader2.13 (1), +.BR autoscan2.13 (1), +.BR autoupdate2.13 (1), +.BR ifnames2.13 (1) +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/autoscan.1 +++ autoconf2.13-2.13/autoscan.1 @@ -0,0 +1,122 @@ +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +.\" Copyright (C) 1998 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH AUTOCONF 1 "Autoconf" +.SH NAME +autoscan2.13 - help to create a configure.in file for a software package +.SH SYNOPSIS +.B autoscan2.13 +[ +.B --help +] [ +.B --macrodir=dir +] [ +.B --verbose +] [ +.B --version +] +.SH DESCRIPTION +The +.B autoscan2.13 +program can help you create a +.B configure.in +file for a +software package. +.B autoscan2.13 +examines source files in the directory +tree rooted at a directory given as a command line argument, or the +current directory if none is given. It searches the source files for +common portability problems and creates a file +.B configure.scan +which +is a preliminary +.B configure.in +for that package. +.PP +You should manually examine +.B configure.scan +before renaming it to +.BR configure.in ; +it will probably need some adjustments. Occasionally +.B autoscan2.13 +outputs a macro in the wrong order relative to another +macro, so that +.B autoconf2.13 +produces a warning; you need to move such +macros manually. Also, if you want the package to use a configuration +header file, you must add a call to +.BR AC_CONFIG_HEADER . +You might +also have to change or add some +.B #if +directives to your program in +order to make it work with Autoconf (see +.BR ifnames2.13 (1)), +for information about a program that can help with that job). +.PP +.B autoscan2.13 +uses several data files, which are installed along with the +distributed Autoconf macro files, to determine which macros to output +when it finds particular symbols in a package's source files. These +files all have the same format. Each line consists of a symbol, +whitespace, and the Autoconf macro to output if that symbol is +encountered. Lines starting with +.B # +are comments. +.PP + +.B autoscan2.13 +requires that a Perl interpreter is installed. +.PP + +.B autoscan2.13 +accepts the following options: +.TP +.BI --help +.TP +.BI -h +Print a summary of the command line options and exit. +.TP +.BI --macrodir=DIR +.TP +.BI -m\ DIR +Look for the installed macro files in directory DIR. You can also +set the +.B AC_MACRODIR +environment variable to a directory; this +option overrides the environment variable. +.TP +.BI --verbose +Print the names of the fiels it examines and the potentially +interesting symbols it finds in them. This output can be voluminous. +.TP +.BI --version +Print the version number of Autoconf and exit. +.PP +.SH "SEE ALSO" +.BR autoconf2.13 (1), +.BR autoheader2.13 (1), +.BR autoreconf2.13 (1), +.BR autoupdate2.13 (1), +.BR ifnames2.13 (1) +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/autoupdate.1 +++ autoconf2.13-2.13/autoupdate.1 @@ -0,0 +1,97 @@ +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +.\" Copyright (C) 1998 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH AUTOUPDATE 1 "Autoconf" +.SH NAME +autoupdate2.13 - updates an old configure.in file to version 2 +.SH SYNOPSIS +.B autoconf2.13 +[ +.B --help +| +.B -h +] [ +.B --macrodir=dir +| +.B -m dir +] [ +.B --version +] +.SH DESCRIPTION +The +.B autoupdate2.13 +program updates a +.B configure.in +file that calls +Autoconf macros by their old names to use the current macro names. In +version 2 of Autoconf, most of the macros were renamed to use a more +uniform and descriptive naming scheme. Although the old names still +work , you can make your +.B configure.in +files more readable and make +it easier to use the current Autoconf documentation if you update them +to use the new macro names. +If given no arguments, +.B autoupdate2.13 +updates +.BR configure.in , +backing up +the original version with the suffix +.B ~ +(or the value of the +environment variable +.BR SIMPLE_BACKUP_SUFFIX , +if that is set). If you +give +.B autoupdate2.13 +an argument, it reads that file instead of +.B configure.in +and writes the updated file to the standard output. +.PP +.B autoconf2.13 +accepts the following options: +.TP +.BI --help +.TP +.BI -h +Print a summary of the command line options and exit. +.TP +.BI --macrodir=DIR +.TP +.BI -m\ DIR +Look for the installed macro files in directory DIR. You can also +set the +.B AC_MACRODIR +environment variable to a directory; this +option overrides the environment variable. +.TP +.BI --version +Print the version number of Autoconf and exit. +.PP +.SH "SEE ALSO" +.BR autoconf2.13 (1), +.BR autoheader2.13 (1), +.BR autoreconf2.13 (1), +.BR autoscan2.13 (1), +.BR ifnames2.13 (1) +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/ifnames.1 +++ autoconf2.13-2.13/ifnames.1 @@ -0,0 +1,98 @@ +.\" Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, Inc. +.\" Copyright (C) 1998 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH IFNAMES 1 "Autoconf" +.SH NAME +ifnames2.13 - print identifiers that a package uses in C preprocessor +conditionals +.SH SYNOPSIS +.B ifnames2.13 +[ +.B --help +| +.B -h +] [ +.B --macrodir=dir +| +.B -m dir +] [ +.B --version +] +.SH DESCRIPTION +.PP +.B ifnames2.13 +can help when writing a +.B configure.in +for a software +package. It prints the identifiers that the package already uses in C +preprocessor conditionals. If a package has already been set up to +have some portability, this program can help you figure out what its +.B configure +needs to check for. It may help fill in some gaps in a +.B configure.in +generated by +.B autoscan2.13 +(see +.BR autoscan2.13 (1)). +.PP +.B ifnames2.13 +scans all of the C source files named on the command line +(or the standard input, if none are given) and writes to the standard +output a sorted list of all the identifiers that appear in those files +in +.BR #if , +.BR #elif , +.BR #ifdef , +or +.B #ifndef +directives. It prints each +identifier on a line, followed by a space-separated list of the files +in which that identifier occurs. +.PP +.B ifnames2.13 +accepts the following options: +.TP +.BI --help +.TP +.BI -h +Print a summary of the command line options and exit. +.TP +.BI --macrodir=DIR +.TP +.BI -m\ DIR +Look for the installed macro files in directory DIR. You can also +set the +.B AC_MACRODIR +environment variable to a directory; this +option overrides the environment variable. +.TP +.BI --version +Print the version number of Autoconf and exit. +.PP +.SH "SEE ALSO" +.BR autoconf2.13 (1), +.BR autoheader2.13 (1), +.BR autoreconf2.13 (1), +.BR autoscan2.13 (1), +.BR autoupdate2.13 (1) +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/config.h.in +++ autoconf2.13-2.13/config.h.in @@ -0,0 +1 @@ +/* config.h.in. Generated automatically from configure.in by autoheader 2.13. */ --- autoconf2.13-2.13.orig/debian/control +++ autoconf2.13-2.13/debian/control @@ -0,0 +1,24 @@ +Source: autoconf2.13 +Section: devel +Priority: optional +Maintainer: Ben Pfaff +Standards-Version: 3.8.4 +Build-Depends-Indep: texinfo, texi2html (>= 1.64-cvs20010402-2), m4 +Build-Depends: debhelper (>= 7.2.17) + +Package: autoconf2.13 +Architecture: all +Depends: m4, debianutils (>= 1.8), autoconf (>= 2.50), perl, libfile-temp-perl, ${misc:Depends}, dpkg (>= 1.15.4) | install-info +Replaces: autoconf (<< 2.50) +Conflicts: autoconf (<< 2.50) +Recommends: automake1.4 +Suggests: gnu-standards +Description: automatic configure script builder (obsolete version) + Obsolete compatibility package of Autoconf 2.13. For use only with + packages that cannot easily be updated to use Autoconf 2.50+. + . + This package provides compatibility wrappers for autoconf, + autoheader, and autoreconf that attempt to automatically choose which + version of Autoconf to use, based on some simple heuristics. For + information on these heuristics or how to force use of a particular + Autoconf version, see /usr/share/doc/autoconf2.13/README.Debian.gz. --- autoconf2.13-2.13.orig/debian/rules +++ autoconf2.13-2.13/debian/rules @@ -0,0 +1,70 @@ +#!/usr/bin/make -f +# Model by Ian Jackson. +# Debhelper model by Joey Hess. +# Autoconf details by Ben Pfaff. +# Released under the GNU GPL. + +SHELL = /bin/bash + +build: build-stamp +build-stamp: + dh_testdir + AWK=awk ./configure --prefix=/usr + $(MAKE) CFLAGS=-O2 LDFLAGS=-s + texi2html -monolithic autoconf.texi + chmod a+x debian/fixlinks + ./debian/fixlinks autoconf.html + touch build-stamp + +clean: + dh_testdir + dh_testroot + [ ! -f Makefile ] || $(MAKE) distclean + rm -f autoconf.info + rm -f autoconf.html + rm -f *.m4f + dh_clean + +D = debian/autoconf2.13 +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) CFLAGS=-O2 LDFLAGS=-s prefix=$D/usr datadir=$D/usr/share infodir=$D/usr/share/info install + for d in auto{{re,}conf,scan,update,header} ifnames; do \ + mv $D/usr/bin/$${d}{,2.13}; \ + done + rm -f $D/usr/{share/,}info/{standards*.info*,maintain*.info*} + +export DH_OPTIONS +M = $D/usr/share/man/man1 +binary-indep: DH_OPTIONS = -pautoconf2.13 +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + install -d $M + cp [a-z]*.1 $M + for d in auto{{re,}conf,scan,update,header} ifnames; do \ + mv $D/usr/share/man/man1/$${d}{,2.13}.1; \ + done + cp debian/wrapper.1 $M/autoconf.1 + install -d $D/etc/autoconf2.13 + mv $D/usr/share/autoconf2.13/acconfig.h $D/etc/autoconf2.13/acconfig.h + mv $D/usr/share/info/autoconf{,2.13}.info + install -m755 debian/wrapper $D/usr/bin/autoconf + dh_link + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +binary-arch: build install +# We have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- autoconf2.13-2.13.orig/debian/changelog +++ autoconf2.13-2.13/debian/changelog @@ -0,0 +1,602 @@ +autoconf2.13 (2.13-60) unstable; urgency=low + + * autoconf.info: Add modern-style Info directory entry. + + * Remove all uses of install-info from maintainer scripts and require + Debhelper 7.2.17 or later, which handles Info files itself via + triggers. Also require dpkg (>= 1.15.4) | install-info to ensure + support. Thanks to Jonathan Nieder for reporting + this. Closes: #569265. + * Add doc-base support. + + * debian/control: Update standards version from 3.7.2 to 3.8.4 (no + changes necessary). + + * debian/control: Remove duplicate Section and Priority fields from + binary package stanza. + + * debian/rules: Don't ignore "make clean" and other errors. + + * Upgrade to Debhelper version 7. + + * debian/rules: Don't delete install-stamp and build-stamp explicitly, + because dh_clean deletes them itself in version 7. Use dh_prep + instead of "dh_clean -k" as recommended for version 7. + + -- Ben Pfaff Sat, 13 Feb 2010 12:27:09 -0800 + +autoconf2.13 (2.13-59) unstable; urgency=low + + * Bundling of short options indicates that autoheader2.50 or + autoreconf2.50 should be invoked. Closes: #454284. Thanks to Clinton + Roy for reporting this bug. + + * Fix detected macrodir and localdir when --macrodir and --localdir + options are used. + + -- Ben Pfaff Sun, 09 Dec 2007 15:44:57 -0800 + +autoconf2.13 (2.13-58) unstable; urgency=low + + * Recommend automake1.4 instead of automake. Thanks to Luk Claes + for pointing out that automake is no longer in the + archive. Closes: #394708. + + * Update Debian standards version. + + * Move debhelper from Build-Depends-Indep to Build-Depends, to comply + with policy. + + -- Ben Pfaff Mon, 23 Oct 2006 20:27:17 -0700 + +autoconf2.13 (2.13-57) unstable; urgency=low + + * debian/autoconf2.13.postinst: Fix filename in install-info call. + Closes: #374139. Thanks to Nicolas Fran,cois + for reporting this bug. + + -- Ben Pfaff Sun, 18 Jun 2006 09:31:22 -0700 + +autoconf2.13 (2.13-56) unstable; urgency=low + + * debian/wrapper: Passing --force to autoconf or autoheader indicates + version 2.50+. Thanks to Ralf Wildenhues for + bug and patch. Closes: #343629. + + * debian/wrapper: Print information about wrapper on --version or --help. + + * debian/copyright: Update FSF address. + + * debian/control: Update Debian standards version. + + * Update to Debhelper v4, from Debhelper v1, and rewrite debian/rules etc. + + -- Ben Pfaff Sun, 8 Jan 2006 19:55:00 -0800 + +autoconf2.13 (2.13-55) unstable; urgency=low + + * autoreconf.sh: If aclocal, automake, autoconf, or autoheader fails, + exit immediately with an error code of 1. Thanks to Goswin Brederlow + for reporting this bug. (I + decided not to use set -e because it has such a broad effect.) + Closes: #310169. + + -- Ben Pfaff Tue, 24 May 2005 20:20:39 -0700 + +autoconf2.13 (2.13-54) unstable; urgency=low + + * autoupdate.sh: Honor $TMPDIR and don't delete temporary files twice. + Thanks to Javier Fernandez-Sanguino Pena for + reporting this bug and providing a patch. Closes: #297488. + + -- Ben Pfaff Mon, 28 Feb 2005 22:55:50 -0800 + +autoconf2.13 (2.13-53) unstable; urgency=low + + * debian/wrapper: Remove "print STDERR" used for debugging. + + -- Ben Pfaff Wed, 13 Oct 2004 00:19:33 -0700 + +autoconf2.13 (2.13-52) unstable; urgency=low + + * debian/wrapper: If aclocal.m4 doesn't exist, run aclocal before + checking further, because aclocal.m4 might contain AC_PREREQ. Closes: + #273186. + + -- Ben Pfaff Tue, 12 Oct 2004 23:56:29 -0700 + +autoconf2.13 (2.13-51) unstable; urgency=low + + * Put in placeholder manpages to remind people that we have wrapper + scripts. Closes: #273183. + + * Update my email address to pfaffben@debian.org uniformly. + + -- Ben Pfaff Sat, 9 Oct 2004 20:12:32 -0700 + +autoconf2.13 (2.13-49) unstable; urgency=low + + * Remove XSIism in postinst, prerm. Thanks to David Weinehall + for the bug and the patch. Closes: #256094. + + -- Ben Pfaff Sun, 27 Jun 2004 15:38:54 -0700 + +autoconf2.13 (2.13-48) unstable; urgency=low + + * acgeneral.m4: Quote $ac_popdir in cd command to fix behavior in + directories whose names contain special characters. Thanks to Alban + Browaeys for suggestion. Closes: #205606. + + -- Ben Pfaff Sun, 17 Aug 2003 18:55:05 -0700 + +autoconf2.13 (2.13-47) unstable; urgency=low + + * debian/wrapper: support new option -B with long form + --prepend-include= in version 2.54. + + * debian/control: Update Standards-Version: and change Build-Depends: to + Build-Depends-Indep: on suggestion of lintian. + + -- Ben Pfaff Tue, 17 Sep 2002 21:05:56 -0400 + +autoconf2.13 (2.13-46) unstable; urgency=low + + * debian/wrapper: autoreconf gained the --install option around the time + of Autoconf 2.50. Closes: #155563. + + -- Ben Pfaff Tue, 6 Aug 2002 20:01:34 -0700 + +autoconf2.13 (2.13-45) unstable; urgency=low + + * In wrapper script do s/v250/ac250/g and s/v213/ac213/g because Perl + 5.8 now interprets v250() as a reference to a version number. Thanks + to Joey Hess for reporting this bug. Closes: + #155012. + + -- Ben Pfaff Wed, 31 Jul 2002 21:50:20 -0700 + +autoconf2.13 (2.13-44) unstable; urgency=low + + * Fix typo in wrapper script. Thanks to "Thom May" + for reporting this bug. Closes: #147786. + + -- Ben Pfaff Wed, 22 May 2002 15:58:50 -0700 + +autoconf2.13 (2.13-43) unstable; urgency=low + + * Update maintainer address to make my packages consistently refer to + pfaffben@debian.org. + + -- Ben Pfaff Wed, 27 Mar 2002 21:54:17 -0800 + +autoconf2.13 (2.13-42) unstable; urgency=low + + * Fix detection of executable extension. Closes: Bug#105493. + + -- Ben Pfaff Fri, 15 Mar 2002 09:38:39 -0800 + +autoconf2.13 (2.13-41) unstable; urgency=low + + * wrapper: Add support for --include and -I new in Autoconf 2.53. + + * Update description. + + -- Ben Pfaff Wed, 13 Mar 2002 09:54:11 -0800 + +autoconf2.13 (2.13-40) unstable; urgency=low + + * wrapper: Add support for -W and --warnings. Closes: #134682. + + -- Ben Pfaff Fri, 22 Feb 2002 09:07:22 -0800 + +autoconf2.13 (2.13-39) unstable; urgency=low + + * wrapper: Check, approximately, that AC_PREREQ calls are not commented + out. Closes: #114364. + + -- Ben Pfaff Mon, 8 Oct 2001 02:30:52 -0700 + +autoconf2.13 (2.13-38) unstable; urgency=low + + * wrapper: Parse include files, too. Thanks to Dale Thatcher + . Closes: #110965. + + -- Ben Pfaff Wed, 5 Sep 2001 13:41:15 -0400 + +autoconf2.13 (2.13-37) unstable; urgency=low + + * wrapper: Make AC_PREREQ regex more liberal. Closes: #108421. + + -- Ben Pfaff Tue, 21 Aug 2001 14:58:09 -0400 + +autoconf2.13 (2.13-36) unstable; urgency=low + + * wrapper: Also scan aclocal.m4 for AC_PREREQ. Closes: #108421. + + -- Ben Pfaff Fri, 17 Aug 2001 11:10:50 -0400 + +autoconf2.13 (2.13-35) unstable; urgency=low + + * Need a recent version of texi2html for build. + + -- Ben Pfaff Sun, 10 Jun 2001 10:58:07 -0400 + +autoconf2.13 (2.13-34) unstable; urgency=low + + * Add Conflicts and Replaces: autoconf (<< 2.50). Closes: #99199. + + * Fix perl depends. + + -- Ben Pfaff Fri, 8 Jun 2001 15:28:37 -0400 + +autoconf2.13 (2.13-33) unstable; urgency=low + + * Move /etc/autoconf/acconfig.h to /etc/autoconf2.13/acconfig. Closes: + #99171. + + * Add support for quoting and comments in AC_PREREQ. Closes: #99088. + + -- Ben Pfaff Tue, 29 May 2001 14:18:47 -0400 + +autoconf2.13 (2.13-32) unstable; urgency=low + + * Change priority to optional. + + -- Ben Pfaff Mon, 28 May 2001 15:13:33 -0400 + +autoconf2.13 (2.13-31) unstable; urgency=low + + * Make nonaction options like --help and --version work. Closes: + #98971. + + -- Ben Pfaff Sun, 27 May 2001 20:39:15 -0400 + +autoconf2.13 (2.13-30) unstable; urgency=low + + * Shut up the autoconf wrapper. Should make autoheader work okay again. + + -- Ben Pfaff Sun, 27 May 2001 15:14:15 -0400 + +autoconf2.13 (2.13-29) unstable; urgency=low + + * Compatibility strategy changed: now provides wrappers for autoconf, + autoheader, autoreconf that choose either 2.13 or 2.50 based on simple + heuristics documented in /usr/share/doc/autoconf2.13/README.Debian.gz. + + * Fix manpage typos. + + -- Ben Pfaff Sat, 26 May 2001 15:28:22 -0400 + +autoconf2.13 (2.13-28) unstable; urgency=low + + * Obsolete package for compatibility reasons. Do not use unless + Autoconf 2.13 will not work. + + -- Ben Pfaff Fri, 25 May 2001 12:13:54 -0400 + +autoconf (2.13-27) unstable; urgency=low + + * Use /bin/bash for debian/rules shell. Closes: #91315. + + -- Ben Pfaff Sun, 25 Mar 2001 16:07:27 -0500 + +autoconf (2.13-26) unstable; urgency=low + + * Fix autoconf.1 manpage. Closes: #80561. + + * Add build-depends for m4. Closes: #87687. + + -- Ben Pfaff Wed, 28 Feb 2001 18:42:01 -0500 + +autoconf (2.13-25) unstable; urgency=low + + * Fix test for AC_CHECK_SIZE by including in the test + program. Patch by Eric Gillespie, Jr. . + + -- Ben Pfaff Wed, 7 Feb 2001 22:34:04 -0500 + +autoconf (2.13-24) unstable; urgency=low + + * Fix test for getloadavg (Bug#84170). + + * Remove generic install instructions (Bug#84048). + + -- Ben Pfaff Wed, 31 Jan 2001 19:12:03 -0500 + +autoconf (2.13-23) unstable; urgency=low + + * Declare Build-Depends on texinfo, texi2html. Fixes Bug#69328, + Bug#70142. + + * New config.guess, config.sub. Fixes Bug#76741. + + -- Ben Pfaff Fri, 24 Nov 2000 17:15:01 -0500 + +autoconf (2.13-22) unstable; urgency=low + + * Install the INSTALL file so that autoconf users can include it in + their own packages. Fixes Bug#75272. + + -- Ben Pfaff Mon, 23 Oct 2000 14:15:02 -0400 + +autoconf (2.13-21) unstable; urgency=low + + * No longer generates gnu-standard binary package. + + -- Ben Pfaff Tue, 4 Jul 2000 17:07:45 -0400 + +autoconf (2.13-20) frozen unstable; urgency=low + + * Don't leave /tmp droppings even if --help supplied to configure. + Thanks to Stephan Kulow for reporting this bug. Fixes + Bug#54427. + + -- Ben Pfaff Thu, 3 Feb 2000 11:25:48 -0500 + +autoconf (2.13-19) frozen unstable; urgency=low + + * Remove mawk | gawk dependency since Santiago Vila + pointed out that although original-awk doesn't provide /usr/bin/nawk, + it does actually support everything nawk should support. + + * rules: Changed reference to `nawk' to `awk'. + + -- Ben Pfaff Thu, 20 Jan 2000 14:23:55 -0500 + +autoconf (2.13-18) frozen unstable; urgency=low + + * Add back mawk | gawk dependency since someone put original-awk in + potato, which doesn't provide nawk. Fixes Bug#55722. + + -- Ben Pfaff Thu, 20 Jan 2000 00:19:01 -0500 + +autoconf (2.13-17) unstable; urgency=medium + + * I've added a small patch from "Nicolás" Lichtmaier . + Much as I hate to do so, this effectively forks Debian autoconf (in a + small way) for potato. Hopefully this patch, or equivalent, will be + incorporated upstream before release of woody. Closes: #54740. + + -- Ben Pfaff Thu, 13 Jan 2000 00:16:53 -0500 + +autoconf (2.13-16) unstable; urgency=low + + * autoconf: Don't leave ugly temp files in /tmp. Thanks to Stephan + Kulow for reporting the fix. + + -- Ben Pfaff Sat, 8 Jan 2000 10:20:19 -0500 + +autoconf (2.13-15) unstable; urgency=low + + * Fixed incorrect removal of Info directory entries by autoconf + postinst. Fixes Bug#53961. + + * Install Info files to /usr/share/info not /usr/info. + + -- Ben Pfaff Mon, 3 Jan 2000 22:31:39 -0500 + +autoconf (2.13-14) unstable; urgency=low + + * standards.info and maintain.info have been moved to the gnu-standards + package, so they should be handled by the gnu-standards postinst, + prerm, not autoconf's. Fixes Bug#52592. + + -- Ben Pfaff Sun, 12 Dec 1999 18:08:28 -0500 + +autoconf (2.13-13) unstable; urgency=low + + * Change to use /usr/share/doc. Fixes Bug#47277. + + -- Ben Pfaff Sat, 6 Nov 1999 23:17:22 -0500 + +autoconf (2.13-12) unstable; urgency=low + + * It's not necessary to use mktemp to create autoheader temporary file in + current directory, and it creates permissions problems for the + generated config.h.in. Thanks to Richard Kettlewell + for reporting this bug. (Bug#45593). + + -- Ben Pfaff Mon, 20 Sep 1999 13:50:29 -0400 + +autoconf (2.13-11) unstable; urgency=low + + * install-sh no longer installed with autoconf. Recommend automake to make + sure that the user still has this utility. Fixes Bug#42000. + + -- Ben Pfaff Sun, 12 Sep 1999 23:33:05 -0400 + +autoconf (2.13-10) unstable; urgency=low + + * Newer upstream maintain.texi, standards.texi. Fixes Bug#42844. + + -- Ben Pfaff Wed, 11 Aug 1999 10:25:57 -0400 + +autoconf (2.13-9) unstable; urgency=low + + * Fix typo introduced last upload. Fixes Bug#42632. + + -- Ben Pfaff Sun, 8 Aug 1999 11:46:35 -0400 + +autoconf (2.13-8) unstable; urgency=low + + * Fix typo in autoconf.sh. Fixes Bug#42616. + + -- Ben Pfaff Sat, 7 Aug 1999 10:43:04 -0400 + +autoconf (2.13-7) unstable; urgency=low + + * Depend on perl | perl5. + + -- Ben Pfaff Sat, 10 Jul 1999 18:59:11 -0400 + +autoconf (2.13-6) unstable; urgency=low + + * Don't install changelog in /usr/doc. Fixes Bug#40959. + + -- Ben Pfaff Thu, 8 Jul 1999 10:04:29 -0400 + +autoconf (2.13-5) unstable; urgency=low + + * chmod a+x debian/fixlinks. + + -- Ben Pfaff Wed, 9 Jun 1999 16:02:47 -0400 + +autoconf (2.13-4) unstable; urgency=low + + * Broke GNU coding and package maintenance standards, and the GNU task + list, into separate package. + + * Converted to use debhelper. + + * Supplies HTML versions of Info documents as well. + + -- Ben Pfaff Sun, 16 May 1999 12:58:37 -0400 + +autoconf (2.13-3) unstable; urgency=low + + * Patch to config.guess to support PCA-class Alphas. From Christopher C + Chimelis . + + -- Ben Pfaff Mon, 25 Jan 1999 16:34:41 -0500 + +autoconf (2.13-2) unstable; urgency=high + + * Somehow I fscked up the upstream source in the last update, so + although it was marked as being 2.13 on the packaging, it was actually + an older version. + + -- Ben Pfaff Wed, 20 Jan 1999 18:16:07 -0500 + +autoconf (2.13-1) unstable; urgency=low + + * New upstream version. + + -- Ben Pfaff Sun, 10 Jan 1999 16:17:36 -0500 + +autoconf (2.12.1998.12.07-1) experimental; urgency=low + + * New upstream experimental version from CVS. + + -- Ben Pfaff Mon, 7 Dec 1998 17:38:23 -0500 + +autoconf (2.12-12) unstable; urgency=low + + * Remove unnecessary dependency on mawk | gawk since base-files (an + essential package) has an awk dependency. + + -- Ben Pfaff Mon, 19 Oct 1998 11:24:25 -0400 + +autoconf (2.12-11) unstable; urgency=low + + * config.sub: Handle alphapca56 same as alphaev5. + + -- Ben Pfaff Sat, 17 Oct 1998 20:54:59 -0400 + +autoconf (2.12-10) unstable; urgency=low + + * Move /usr/lib/autoconf to /usr/share/autoconf for FHS compliance. + Closes: #25193. + + -- Ben Pfaff Tue, 8 Sep 1998 10:37:53 -0400 + +autoconf (2.12-9) unstable; urgency=low + + * updated standard.texi, make-stds.texi, maintain.texi + + * updated config.guess, config.sub + + -- Ben Pfaff Mon, 17 Aug 1998 10:11:25 -0400 + +autoconf (2.12-8) frozen unstable; urgency=high + + * need mktemp so depend on debianutils >= 1.8 + + -- Ben Pfaff Tue, 7 Apr 1998 15:57:57 -0400 + +autoconf (2.12-7) frozen unstable; urgency=low + + * use `mktemp' for creating temporary files (Bug #19780). + + -- Ben Pfaff Wed, 25 Mar 1998 14:03:40 -0500 + +autoconf (2.12-6) unstable; urgency=low + + * update standards-version. + + * add manpages. + + * change /usr/lib/autoconf/acconfig.h to a symlink to + /etc/autoconf/acconfig.h so as to keep conffiles out of /usr. + + * fix fsf address in copyright file. + + * updated standards.info to latest fsf release. + + * added maintain.info. + + -- Ben Pfaff Thu, 12 Feb 1998 00:05:39 -0500 + +autoconf (2.12-5) unstable; urgency=low + + * remove PACKAGE, VERSION from acconfig.h. + + * make /usr/lib/autoconf/acconfig.h a conffile. + + -- Ben Pfaff Sun, 7 Dec 1997 11:07:46 -0500 + +autoconf (2.12-4) unstable; urgency=low + + * add PACKAGE, VERSION to acconfig.h. + + -- Ben Pfaff Sat, 6 Dec 1997 20:59:45 -0500 + +autoconf (2.12-3) unstable; urgency=low + + * don't compress installed copyright file (Bug #14379). + + * added sample acinclude.m4 for prevention of spurious dependencies on + libelf. + + -- Ben Pfaff Sun, 9 Nov 1997 16:12:12 -0500 + +autoconf (2.12-2) unstable; urgency=low + + * Fixed description. + + -- Ben Pfaff Thu, 4 Sep 1997 16:01:26 -0400 + +autoconf (2.12-1) unstable; urgency=low + + * New maintainer. + + * Upgraded upstream version. + + * Converted to new standards version. + + -- Ben Pfaff Sat, 11 Jan 1997 21:04:32 -0500 + +autoconf (2.10-3) stable; urgency=low + + * debian.rules (build): force nawk, instead of /usr/bin/gawk, + since nawk is whichever of (currently gawk or mawk) has functions, + and ifnames needs function support. + + * debian.control (Depends): add mawk|gawk dependency. + + -- Mark W. Eichin Thu, 6 Jun 1996 00:10:09 -0500 + +autoconf (2.10-2) stable; urgency=low + + * debian.rules (binary): name package with correct architecture. + (version): extract version from acgeneral.m4, just like the + Makefile.in does. + (build): set AWK=/usr/bin/gawk so that configure gets it "right" + for linux even if mawk is available. + + * Makefile.in (SUPPORTFILES): new variable, for other parts of + autoconf that should be installed somewhere. + (install): install SUPPORTFILES in acdatadir. + + -- Mark W. Eichin Fri, 31 May 1996 00:13:00 -0500 + + --- autoconf2.13-2.13.orig/debian/acinclude.m4.Debian +++ autoconf2.13-2.13/debian/acinclude.m4.Debian @@ -0,0 +1,117 @@ +dnl aclocal.m4 generated automatically by aclocal 1.2 + +dnl do not make this a ac_defun, since it will then have no effect +define([AC_FUNC_GETLOADAVG], +[ac_have_func=no # yes means we've found a way to get the load average. + +# Some systems with -lutil have (and need) -lkvm as well, some do not. +# On Solaris, -lkvm requires nlist from -lelf, so check that first +# to get the right answer into the cache. + +# On Linux, we do not need to link with -lelf, so somment that out. +# This is not a general problem, per se, but it gives make a spurious +# dependency on libelf, which is a bad thing (also interferes with +# automatic rebuilds). This is lifted straight from the standard +# /usr/lib/autoconf/acspecific.m4, with the check for libelf commented +# out. +# Commented for Debian by Manoj Srivastava + +dnl AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS") +AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS") +# Check for the 4.4BSD definition of getloadavg. +AC_CHECK_LIB(util, getloadavg, + [LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes]) + +if test $ac_have_func = no; then + # There is a commonly available library for RS/6000 AIX. + # Since it is not a standard part of AIX, it might be installed locally. + ac_getloadavg_LIBS="$LIBS" LIBS="-L/usr/local/lib $LIBS" + AC_CHECK_LIB(getloadavg, getloadavg, + LIBS="-lgetloadavg $LIBS", LIBS="$ac_getloadavg_LIBS") +fi + +# Make sure it is really in the library, if we think we found it. +AC_REPLACE_FUNCS(getloadavg) + +if test $ac_cv_func_getloadavg = yes; then + AC_DEFINE(HAVE_GETLOADAVG) + ac_have_func=yes +else + # Figure out what our getloadavg.c needs. + ac_have_func=no + AC_CHECK_HEADER(sys/dg_sys_info.h, + [ac_have_func=yes; AC_DEFINE(DGUX) + AC_CHECK_LIB(dgc, dg_sys_info)]) + + # We cannot check for , because Solaris 2 does not use dwarf (it + # uses stabs), but it is still SVR4. We cannot check for because + # Irix 4.0.5F has the header but not the library. + if test $ac_have_func = no && test $ac_cv_lib_elf_elf_begin = yes; then + ac_have_func=yes; AC_DEFINE(SVR4) + fi + + if test $ac_have_func = no; then + AC_CHECK_HEADER(inq_stats/cpustats.h, + [ac_have_func=yes; AC_DEFINE(UMAX) + AC_DEFINE(UMAX4_3)]) + fi + + if test $ac_have_func = no; then + AC_CHECK_HEADER(sys/cpustats.h, + [ac_have_func=yes; AC_DEFINE(UMAX)]) + fi + + if test $ac_have_func = no; then + AC_CHECK_HEADERS(mach/mach.h) + fi + + AC_CHECK_HEADER(nlist.h, + [AC_DEFINE(NLIST_STRUCT) + AC_CACHE_CHECK([for n_un in struct nlist], ac_cv_struct_nlist_n_un, + [AC_TRY_COMPILE([#include ], + [struct nlist n; n.n_un.n_name = 0;], + ac_cv_struct_nlist_n_un=yes, ac_cv_struct_nlist_n_un=no)]) + if test $ac_cv_struct_nlist_n_un = yes; then + AC_DEFINE(NLIST_NAME_UNION) + fi + ])dnl +fi # Do not have getloadavg in system libraries. + + +# Some definitions of getloadavg require that the program be installed setgid. +dnl FIXME Don't hardwire the path of getloadavg.c in the top-level directory. +AC_CACHE_CHECK(whether getloadavg requires setgid, + ac_cv_func_getloadavg_setgid, +[AC_EGREP_CPP([Yowza Am I SETGID yet], +[#include "$srcdir/getloadavg.c" +#ifdef LDAV_PRIVILEGED +Yowza Am I SETGID yet +#endif], + ac_cv_func_getloadavg_setgid=yes, ac_cv_func_getloadavg_setgid=no)]) +if test $ac_cv_func_getloadavg_setgid = yes; then + NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED) +else + NEED_SETGID=false +fi +AC_SUBST(NEED_SETGID)dnl + +if test $ac_cv_func_getloadavg_setgid = yes; then + AC_CACHE_CHECK(group of /dev/kmem, ac_cv_group_kmem, +[changequote(, )dnl + # On Solaris, /dev/kmem is a symlink. Get info on the real file. + ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null` + # If we got an error (system does not support symlinks), try without -L. + test -z "$ac_ls_output" && ac_ls_output=`ls -lg /dev/kmem` + ac_cv_group_kmem=`echo $ac_ls_output \ + | sed -ne 's/[ ][ ]*/ /g; + s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/; + / /s/.* //;p;'` +changequote([, ])dnl +]) + KMEM_GROUP=$ac_cv_group_kmem +fi +AC_SUBST(KMEM_GROUP)dnl +]) + + + --- autoconf2.13-2.13.orig/debian/copyright +++ autoconf2.13-2.13/debian/copyright @@ -0,0 +1,64 @@ +FSF GNU autoconf as packaged for Debian GNU/Linux. + +This package is assembled from the GNU sources found in + ftp.gnu.org:/pub/gnu/autoconf/autoconf-2.13.tar.gz +with the addition of debian.* files based on those in the Debian +hello package. + +Packaged originally by Mark Eichin . +Currently maintained by Ben Pfaff . + +Upstream copyright notice: +---------------------------------------------------------------------- +Copyright (C) 1992, 1993, 1994, 1995, 1996 Free Software Foundation, +Inc. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, 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 St, Fifth Floor, Boston, MA 02110-1301, +USA. + +As a special exception, the Free Software Foundation gives unlimited +permission to copy, distribute and modify the configure scripts that +are the output of Autoconf. You need not follow the terms of the GNU +General Public License when using or distributing such scripts, even +though portions of the text of Autoconf appear in them. The GNU +General Public License (GPL) does govern all other use of the material +that constitutes the Autoconf program. + +Certain portions of the Autoconf source text are designed to be copied +(in certain cases, depending on the input) into the output of +Autoconf. We call these the "data" portions. The rest of the +Autoconf source text consists of comments plus executable code that +decides which of the data portions to output in any given case. We +call these comments and executable code the "non-data" portions. +Autoconf never copies any of the non-data portions into its output. + +This special exception to the GPL applies to versions of Autoconf +released by the Free Software Foundation. When you make and +distribute a modified version of Autoconf, you may extend this special +exception to the GPL to apply to your modified version as well, +*unless* your modified version has the potential to copy into its +output some of the text that was the non-data portion of the version +that you started with. (In other words, unless your change moves or +copies text from the non-data portions to the data portions.) If your +modification has such potential, you must delete any notice of this +special exception to the GPL from your modified version. +---------------------------------------------------------------------- + +On a Debian system, a copy of the GNU GPL is installed in + /usr/share/common-licenses/GPL + +Written by David MacKenzie, with help from Franc,ois Pinard, Karl +Berry, Richard Pixley, Ian Lance Taylor, Roland McGrath, Noah +Friedman, david d zuhn, and many others. --- autoconf2.13-2.13.orig/debian/fixlinks +++ autoconf2.13-2.13/debian/fixlinks @@ -0,0 +1,2 @@ +#! /usr/bin/perl -pi +s/[a-z]*\.html#/#/g; --- autoconf2.13-2.13.orig/debian/wrapper +++ autoconf2.13-2.13/debian/wrapper @@ -0,0 +1,371 @@ +#! /usr/bin/perl + +use POSIX; +use Fcntl; +use File::Temp; +use Getopt::Long; + +if ($0 =~ /autoconf$/) { + $mode = 'autoconf'; +} elsif ($0 =~ /autoheader$/) { + $mode = 'autoheader'; +} elsif ($0 =~ /autoreconf$/) { + $mode = 'autoreconf'; +} else { + die "autoconf-wrapper: unrecognized mode '$0'\n"; +} + +$print_version = 0; + +OPTION: for ($i = 0; $i <= $#ARGV; $i++) { + $_ = $arg = $ARGV[$i]; + + # --install was added to autoreconf around version 2.50 + if ($mode eq 'autoreconf' && $arg eq '--install') { + ac250 (); + } + # --force was added to autoconf around version 2.53 + elsif (($mode eq 'autoconf' || $mode eq 'autoheader') + && $arg eq '--force') { + ac250 (); + } + # Note that help or version was requested, so that we can append the + # wrapper info after Autoconf runs. + elsif (/--vers.*/ || $arg eq '-V' + || /^--h.+/ || $arg eq '-h' + ) { + $print_version = 1; + } + # Most options don't tell us anything or need any special handling. + elsif ($arg eq '--verbose' || $arg eq '-v' + || $arg eq '--debug' || $arg eq '-d' + || /^--output=/ || /^-o.+/ + || $arg eq '--force' || $arg eq '-f' + || $arg eq '--install' || $arg eq '-i' + || $arg eq '--symlink' || $arg eq '-s' + || /^--m4dir=/ || /^-M.+/ + || $arg eq '--cygnus' + || $arg eq '--foreign' + || $arg eq '--gnits' + || $arg eq '--gnu' + || $arg eq '--include-deps' || $arg eq '-i' + ) { + # Nothing to do + } + # We need to know the macro dir in order to properly search for aclocal.m4. + # Only a fsckwit would use --macrodir to find aclocal.m4, but I'm trying + # to be bug-for-bug compatible here. + elsif ($arg eq '--macrodir' || $arg eq '-m') { + $macrodir = $ARGV[++$i]; + } + elsif (/^--macrodir=(.*)$/ || /^-m(.+)$/) { + $macrodir = $1; + } + + # Ditto for the local dir. + elsif ($arg eq '--localdir' || $arg eq '-l') { + $localdir = $ARGV[++$i]; + } + elsif (/^--localdir=(.*)$/ || /^-l(.+)$/) { + $localdir = $1; + } + + # Some options require that we skip the next argument too. + elsif ($arg eq '--output' || $arg eq '-o' + ) { + $i++; + } + + # Some options are new in autoconf 2.50, so we know what version to use. + elsif (/^--trace/ || /^-t/ + || /^--autoconf-dir/ || /^-A/ + || $arg eq '--initialization' || $arg eq '-i' + || $arg eq '--m4dir' || $arg eq '-M' + || /^--warnings=/ || /^-W.+/ || $arg eq '-W' + || /^--include=/ || /^-I.+/ || $arg eq '-I' + || /^--prepend-include=/ || /^-B.+/ || $arg eq '-B' + ) { + ac250 (); + } + + # autoheader2.50 and autoreconf2.50 allow short options to be bundled + # together, but autoconf2.50 and auto*2.13 do not. + elsif (($mode eq 'autoheader' || $mode eq 'autoreconf') && /^-[^-]./) { + ac250 (); + } + + # -- causes us to stop option processing. + elsif ($arg eq '--') { + for ($i++; $i <= $#ARGV; $i++) { + nonoption_arg ($arg); + } + last OPTION; + } + + # Check for an option we don't understand. + elsif (/^-.+/) { + print "autoconf-wrapper: unrecognized option $arg\n"; + } + + # Otherwise, it's a nonoption argument. + else { + nonoption_arg ($arg); + } +} + +# If no input file was passed on the command line, +# find the default. +if (!defined ($infile)) { + if (-e 'configure.ac') { + $infile = 'configure.ac'; + } elsif (-e 'configure.in') { + $infile = 'configure.in'; + } elsif ($mode eq 'autoreconf') { + # A cop-out, but autoreconf is pretty uncommon in practice. + ac213 (); + } +} + +# If we're running autoreconf and there's no aclocal.m4, run +# aclocal first so that we'll catch any AC_PREREQs in the +# generated aclocal.m4. +if ($mode eq 'autoreconf' && ! -f 'aclocal.m4') { + do_run_aclocal (); +} + +if (defined ($infile)) { + # Assume an input file ending in .ac is 2.50, + # because that extension was introduced after 2.13. + if ($infile =~ /\.ac$/) { + ac250 (); + } + + # If the input file is stdin, copy it to a temporary file. + if ($infile eq '-') { + ($fh) = File::Temp::tmpfile (); + fcntl ($fh, F_SETFD, fcntl ($fh, F_GETFD, 0) & ~FD_CLOEXEC); + while () { + print $fh $_; + } + seek ($fh, SEEK_SET, 0); + } else { + $fh = 'INFILE'; + open ($fh, "<$infile") || die "autoconf-wrapper: $infile: $!\n"; + } + + # Read the input file and check for AC_PREREQ calls. + check_fh (); + + if ($infile ne '-') { + close ($fh); + } + + # Check aclocal.m4, too. + check_file ('aclocal.m4'); + + # Check include files, recursively, too. + while (@included_files) { + my ($filename) = pop (@included_files); + check_file ($filename); + } +} + +# Default to 2.13. +ac213 (); + +# Check the specified file for AC_PREREQ and include directives. +# Searches the m4 include path to find the file. +sub check_file { + my ($basename) = @_; + my ($filename); + if (-e $basename) { + $filename = $basename; + } else { + foreach $dir ($macrodir, $localdir, split (/:/, $ENV{'M4PATH'})) { + my ($try) = "$dir/basename"; + if (-e $try) { + $filename = $try; + last; + } + } + } + + if (defined ($filename)) { + $fh = 'INFILE'; + open ($fh, "<$filename") || die ("autoconf-wrapper: $filename: $!\n"); + check_fh (); + close ($fh); + } +} + +# Checks $fh for a line containing a v2.50+ AC_PREREQ call +# and adds any not-yet-processed included files to @included_files. +sub check_fh { + while (<$fh>) { + if (/AC_PREREQ\s*\(\s*\[?\s*2\.(\d+).*\)/) { + $prematch = $`; + if (!($prematch =~ /(\bdnl\b)|#/)) { + if ($1 > 13) { + ac250 (); + } + } + } + elsif (/\bs?include\((.*)\)/) { + push (@included_files, $1) unless $checked_files{$1}; + $checked_files{$1} = 1; + } + } +} + +# Handle nonoption argument. +sub nonoption_arg { + my ($arg) = @_; + die "autoconf-wrapper: invalid number of arguments\n" + if defined ($infile) || $mode eq 'autoreconf'; + $infile = $arg; +} + +sub ac213 { + run_autoconf ("2.13"); +} + +sub ac250 { + run_autoconf ("2.50"); +} + +sub run_autoconf { + my ($version) = @_; + my ($binary) = "/usr/bin/${mode}${version}"; + + # If we read input from stdin, rewind the temporary file + # and make the temporary stream available as a new stdin. + if ($infile eq '-') { + seek ($fh, SEEK_SET, 0); + dup2 (fileno ($fh), 0); + } + + if (!$print_version) { + exec { $binary } $binary, @ARGV; + die "couldn't exec $binary: $!"; + } else { + my ($code) = system { $binary } $binary, @ARGV; + print STDERR "couldn't exec $binary: $!\n" if $code == -1; + print "---\n"; + print "Autoconf $version chosen by Debian wrapper script.\n"; + print "For information and tuning advice see autoconf(1).\n"; + exit $code; + } +} + +# autoreconf - install the GNU Build System in a directory tree +# Copyright (C) 1994, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, 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., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# Written by David J. MacKenzie. +# Extended and rewritten in Perl by Akim Demaille. + +BEGIN +{ + my $datadir = $ENV{'autom4te_perllibdir'} || '/usr/share/autoconf'; + unshift @INC, $datadir; +} +use Autom4te::XFile; +use Autom4te::FileUtils; + +sub do_run_aclocal { + my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; + + # If there are flags for aclocal in Makefile.am, use them. + my $aclocal_flags = ''; + if ($uses_aclocal && -f 'Makefile.am') + { + my $makefile = new Autom4te::XFile 'Makefile.am'; + while ($_ = $makefile->getline) + { + if (/^ACLOCAL_[A-Z_]*FLAGS\s*=\s*(.*)/) + { + $aclocal_flags = $1; + last; + } + } + } + run_aclocal ($aclocal, $aclocal_flags); +} + +# &run_aclocal ($ACLOCAL, $FLAGS) +# ------------------------------- +# Update aclocal.m4 as lazily as possible, as aclocal pre-1.8 always +# overwrites aclocal.m4, hence triggers autoconf, autoheader, automake +# etc. uselessly. aclocal 1.8+ does not need this. +sub run_aclocal ($$) +{ + my ($aclocal, $flags) = @_; + + # Does aclocal support --force? + my ($aclocal_supports_force) = `$aclocal --help` =~ /--force/; + + # aclocal 1.8+ does all this for free. It can be recognized by its + # --force support. + if ($aclocal_supports_force) + { + xsystem ("$aclocal $flags"); + } + else + { + xsystem ("$aclocal $flags --output=aclocal.m4t"); + # aclocal may produce no output. + if (-f 'aclocal.m4t') + { + update_file ('aclocal.m4t', 'aclocal.m4'); + # Make sure that the local m4 files are older than + # aclocal.m4. + # + # Why is not always the case? Because we already run + # aclocal at first (before tracing), which, for instance, + # can find Gettext's macros in .../share/aclocal, so we may + # have had the right aclocal.m4 already. Then autopoint is + # run, and installs locally these M4 files. Then + # autoreconf, via update_file, sees it is the _same_ + # aclocal.m4, and doesn't change its timestamp. But later, + # Automake's Makefile expresses that aclocal.m4 depends on + # these local files, which are newer, so it triggers aclocal + # again. + # + # To make sure aclocal.m4 is no older, we change the + # modification times of the local M4 files to be not newer + # than it. + # + # First, where are the local files? + my $aclocal_local_dir = '.'; + if ($flags =~ /-I\s+(\S+)/) + { + $aclocal_local_dir = $1; + } + # All the local files newer than aclocal.m4 are to be + # made not newer than it. + my $aclocal_m4_mtime = mtime ('aclocal.m4'); + for my $file (glob ("$aclocal_local_dir/*.m4"), 'acinclude.m4') + { + if ($aclocal_m4_mtime < mtime ($file)) + { + utime $aclocal_m4_mtime, $aclocal_m4_mtime, $file; + } + } + } + } +} --- autoconf2.13-2.13.orig/debian/README.Debian +++ autoconf2.13-2.13/debian/README.Debian @@ -0,0 +1,46 @@ +Autoconf 2.13 -*- text -*- +------------- + +This is the Debian packaging of Autoconf 2.13, an obsolete release of +the Autoconf system for creating configuration scripts using +templates. This version of Autoconf is obsolete and its use is +deprecated. + +It is troublesome to determine which programs need this compatibility +package and adapt them for it. As a result, this package has wrappers +for autoconf, autoheader, and autoreconf. Each of these attempts to +detect which Autoconf is needed and run the correct version of the +tool. + +There are no wrappers for autoupdate, autoscan, or ifnames. These are +not used during a package build. Choose the proper version by hand. + +The following heuristics are used to choose an Autoconf version: + + * If file `configure.ac' exists, Autoconf 2.50 is used. + Autoconf 2.13 used the name `configure.in' instead, but + version 2.50 supports both. + + (Usually autoconf is run without nonoption arguments. If a + filename is supplied on the command line, then version 2.50 + is used if the filename ends in `.ac'.) + + * Otherwise, `configure.in' (or the file specified on the + command line, if any) is read. It is checked for the + presence of an AC_PREREQ directive. If it specifies a + minimum version higher than 2.13, Autoconf 2.50 is used. + `aclocal.m4', if present, is also scanned. + + * Otherwise, Autoconf 2.13 is used. + +To force Autoconf 2.13 to be used, name the Autoconf input file +`configure.in' and omit the use of AC_PREREQ() or specify a minimum +version of 2.13 or earlier. To force Autoconf 2.50 to be used, name +the input file `configure.ac' or use AC_PREREQ(2.50). + +I recommend not calling the programs autoconf2.13 or autoconf2.50, +etc., directly, instead of through the wrappers. When used with +programs like Automake, these direct calls won't propagate through +into the Makefile, so later re-autoconf'ings won't use the correct +version. It's better to use one of the methods explained above to +force a particular version. --- autoconf2.13-2.13.orig/debian/compat +++ autoconf2.13-2.13/debian/compat @@ -0,0 +1 @@ +7 --- autoconf2.13-2.13.orig/debian/autoconf2.13.postrm +++ autoconf2.13-2.13/debian/autoconf2.13.postrm @@ -0,0 +1,11 @@ +#! /bin/sh -e +if [ remove = "$1" ]; then + for d in autoconf autoheader autoreconf; do + dpkg-divert --package autoconf2.13 --remove --rename \ + --divert /usr/bin/${d}2.50 /usr/bin/${d} + dpkg-divert --package autoconf2.13 --remove --rename \ + --divert /usr/share/man/man1/${d}2.50.1.gz \ + /usr/share/man/man1/${d}.1.gz + done +fi +#DEBHELPER# --- autoconf2.13-2.13.orig/debian/wrapper.1 +++ autoconf2.13-2.13/debian/wrapper.1 @@ -0,0 +1,125 @@ +.\" Copyright (C) 2004 Ben Pfaff. +.\" +.\" Permission is granted to make and distribute verbatim copies of +.\" this manual provided the copyright notice and this permission notice +.\" are preserved on all copies. +.\" +.\" Permission is granted to copy and distribute modified versions of this +.\" manual under the conditions for verbatim copying, provided that the entire +.\" resulting derived work is distributed under the terms of a permission +.\" notice identical to this one. +.\" +.\" Permission is granted to copy and distribute translations of this manual +.\" into another language, under the above conditions for modified versions, +.\" except that this permission notice may be stated in a translation approved +.\" by the Foundation. +.\" +.TH AUTOCONF 1 "Autoconf Wrapper" +.SH NAME +wrapper - Wrapper for distinguishing Autoconf 2.13 and 2.50 +.SH SYNOPSIS +.B autoconf +[ +.I options +] +.br +.B autoheader +[ +.I options +] +.br +.B autoreconf +[ +.I options +] +.SH DESCRIPTION +.PP +Autoconf is an automatic configure script builder with two major +version series: 2.13 and earlier, 2.50 and later. Versions within +either series are largely compatible, but the two series are largely +incompatible. When both versions are installed, as they are on your +system (given that you're reading this manpage), Debian selects +between the two versions simultaneously. This manpage documents how +the automatic selection works. If you are actually looking for the +documentation for either version of Autoconf, then refer to the +.B SEE ALSO +section below. +.PP +Automatic version selection works via a wrapper script installed +under the names +.BR autoconf , +.BR autoheader , +and +.BR autoreconf . +Each of these attempts to detect which Autoconf is needed and run the +correct version of the tool. +.PP +There are no wrappers for +.BR autoupdate , +.BR autoscan , +or +.BR ifnames . +These are not used during a package build. Choose the proper version +by hand. +.PP +The following heuristics are used to choose an Autoconf version: +.TP +* \ \ +If file +.B configure.ac +exists, Autoconf 2.50 is used. Autoconf 2.13 used the name +.B configure.in +instead, but version 2.50 supports both. + +(Usually autoconf is run without nonoption arguments. If a +filename is supplied on the command line, then version 2.50 +is used if the filename ends in +.BR .ac .) +.TP +* \ \ +Otherwise, +.B configure.in +(or the file specified on the command line, if any) is read. It is +checked for the presence of an AC_PREREQ directive. If it specifies a +minimum version higher than 2.13, Autoconf 2.50 is used. +.BR aclocal.m4 , +if present, is also scanned. +.TP +* \ \ +Otherwise, Autoconf 2.13 is used. +.PP +To force Autoconf 2.13 to be used, name the Autoconf input file +.B configure.in +and omit the use of AC_PREREQ() or specify a minimum version of 2.13 +or earlier. To force Autoconf 2.50 to be used, name the input file +.B configure.ac +or use AC_PREREQ(2.50). +.PP +I recommend not calling the programs +.B autoconf2.13 +or +.BR autoconf2.50 , +etc., directly, instead of through the wrappers. When used with +programs like Automake, these direct calls won't propagate through +into the Makefile, so later re-autoconf'ings won't use the correct +version. It's better to use one of the methods explained above to +force a particular version. +.PP +.SH "SEE ALSO" +.BR autoconf2.13 (1), +.BR autoheader2.13 (1), +.BR autoreconf2.13 (1), +.BR autoconf2.50 (1), +.BR autoheader2.50 (1), +.BR autoreconf2.50 (1), +and the Autoconf manuals +.B autoconf +and +.BR autoconf2.13 . +.SH AUTHORS +David MacKenzie, with help from Franc,ois Pinard, Karl Berry, Richard +Pixley, Ian Lance Taylor, Roland McGrath, Noah Friedman, David +D. Zuhn, and many others. This manpage written by Ben Pfaff + for the Debian GNU/Linux +.B autoconf2.13 +package. --- autoconf2.13-2.13.orig/debian/autoconf2.13.links +++ autoconf2.13-2.13/debian/autoconf2.13.links @@ -0,0 +1,5 @@ +usr/bin/autoconf usr/bin/autoreconf +usr/bin/autoconf usr/bin/autoheader +/usr/share/man/man1/autoconf.1.gz /usr/share/man/man1/autoreconf.1.gz +/usr/share/man/man1/autoconf.1.gz /usr/share/man/man1/autoheader.1.gz +/etc/autoconf2.13/acconfig.h /usr/share/autoconf2.13/acconfig.h --- autoconf2.13-2.13.orig/debian/autoconf2.13.docs +++ autoconf2.13-2.13/debian/autoconf2.13.docs @@ -0,0 +1,4 @@ +NEWS +README +debian/acinclude.m4.Debian +autoconf.html --- autoconf2.13-2.13.orig/debian/autoconf2.13.preinst +++ autoconf2.13-2.13/debian/autoconf2.13.preinst @@ -0,0 +1,11 @@ +#! /bin/sh -e + +for d in autoconf autoheader autoreconf; do + dpkg-divert --package autoconf2.13 --add --rename \ + --divert /usr/bin/${d}2.50 /usr/bin/${d} + dpkg-divert --package autoconf2.13 --add --rename \ + --divert /usr/share/man/man1/${d}2.50.1.gz \ + /usr/share/man/man1/${d}.1.gz +done + +#DEBHELPER# --- autoconf2.13-2.13.orig/debian/autoconf2.13.doc-base +++ autoconf2.13-2.13/debian/autoconf2.13.doc-base @@ -0,0 +1,17 @@ +Document: autoconf2.13 +Title: GNU Autoconf Manual (obsolete version) +Author: David MacKenzie and Ben Elliston +Abstract: This manual documents version 2.13 of the GNU Autoconf + package for creating scripts to configure source code packages using + templates and an `m4' macro package. (This is an obsolete version + of Autoconf that is provided only for compatibility with old + software.) +Section: Programming + +Format: HTML +Index: /usr/share/doc/autoconf2.13/autoconf.html +Files: /usr/share/doc/autoconf2.13/autoconf.html + +Format: Info +Index: /usr/share/info/autoconf2.13.info.gz +Files: /usr/share/info/autoconf2.13.info.gz