[Pkg-silc-commits] r4 - in /silc-toolkit/trunk: ./ debian/ debian/unused/ lib/silccore/tests/ lib/silccrypt/ lib/silccrypt/tests/ lib/silcsftp/tests/ lib/silcutil/tests/
lunar at users.alioth.debian.org
lunar at users.alioth.debian.org
Wed May 23 14:44:14 UTC 2007
Author: lunar
Date: Wed May 23 14:37:30 2007
New Revision: 4
URL: http://svn.debian.org/wsvn/pkg-silc/?sc=1&rev=4
Log:
[svn-inject] Applying Debian modifications to trunk
Added:
silc-toolkit/trunk/debian/
silc-toolkit/trunk/debian/README.Debian
silc-toolkit/trunk/debian/changelog
silc-toolkit/trunk/debian/compat
silc-toolkit/trunk/debian/control
silc-toolkit/trunk/debian/control.sh
silc-toolkit/trunk/debian/copyright
silc-toolkit/trunk/debian/ctest
silc-toolkit/trunk/debian/docs
silc-toolkit/trunk/debian/libpackagename
silc-toolkit/trunk/debian/libsilc-1.0-2-dev.install
silc-toolkit/trunk/debian/libsilc-1.0-2.install
silc-toolkit/trunk/debian/rules (with props)
silc-toolkit/trunk/debian/silc.pc
silc-toolkit/trunk/debian/unused/
silc-toolkit/trunk/debian/unused/NAME
silc-toolkit/trunk/debian/unused/control
silc-toolkit/trunk/debian/unused/substitute.sh
silc-toolkit/trunk/debian/unused/unsubstitute.sh
Modified:
silc-toolkit/trunk/config.guess
silc-toolkit/trunk/config.sub
silc-toolkit/trunk/lib/silccore/tests/Makefile
silc-toolkit/trunk/lib/silccrypt/Makefile.am
silc-toolkit/trunk/lib/silccrypt/Makefile.in
silc-toolkit/trunk/lib/silccrypt/ciphers.h
silc-toolkit/trunk/lib/silccrypt/tests/Makefile
silc-toolkit/trunk/lib/silcsftp/tests/Makefile
silc-toolkit/trunk/lib/silcutil/tests/Makefile
Modified: silc-toolkit/trunk/config.guess
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/config.guess?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/config.guess (original)
+++ silc-toolkit/trunk/config.guess Wed May 23 14:37:30 2007
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-01-24'
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
+
+timestamp='2006-07-02'
# 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
@@ -17,12 +18,14 @@
#
# 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.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Originally written by Per Bothner <per at bothner.com>.
# Please send patches to <config-patches at gnu.org>. Submit a context
@@ -53,7 +56,7 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -66,11 +69,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -104,7 +107,7 @@
trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
{ test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
{ tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
{ echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
@@ -123,7 +126,7 @@
;;
,,*) CC_FOR_BUILD=$CC ;;
,*,*) CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
+esac ; set_cc_for_build= ;'
# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
# (ghazi at noc.rutgers.edu 1994-08-24)
@@ -196,53 +199,32 @@
# contains redundant information, the shorter form:
# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
echo "${machine}-${os}${release}"
- exit 0 ;;
- amiga:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- arc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- hp300:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mac68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- macppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme68k:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvme88k:OpenBSD:*:*)
- echo m88k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- mvmeppc:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pegasos:OpenBSD:*:*)
- echo powerpc-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- pmax:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sgi:OpenBSD:*:*)
- echo mipseb-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- sun3:OpenBSD:*:*)
- echo m68k-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
- wgrisc:OpenBSD:*:*)
- echo mipsel-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:OpenBSD:*:*)
- echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
- exit 0 ;;
+ UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
+ exit ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit ;;
+ *:SolidBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+ exit ;;
+ macppc:MirBSD:*:*)
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit ;;
alpha:OSF1:*:*)
- if test $UNAME_RELEASE = "V4.0"; then
+ case $UNAME_RELEASE in
+ *4.0)
UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
- fi
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
# According to Compaq, /usr/sbin/psrinfo has been available on
# OSF/1 and Tru64 systems produced since 1995. I hope that
# covers most systems running today. This code pipes the CPU
@@ -280,45 +262,49 @@
"EV7.9 (21364A)")
UNAME_MACHINE="alphaev79" ;;
esac
+ # A Pn.n version is a patched version.
# A Vn.n version is a released version.
# A Tn.n version is a released field test version.
# A Xn.n version is an unreleased experimental baselevel.
# 1.2 uses "1.2" for uname -r.
- echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
- exit 0 ;;
- Alpha*:OpenVMS:*:*)
- echo alpha-hp-vms
- exit 0 ;;
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit ;;
Alpha\ *:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# Should we change UNAME_MACHINE based on the output of uname instead
# of the specific Alpha model?
echo alpha-pc-interix
- exit 0 ;;
+ exit ;;
21064:Windows_NT:50:3)
echo alpha-dec-winnt3.5
- exit 0 ;;
+ exit ;;
Amiga*:UNIX_System_V:4.0:*)
echo m68k-unknown-sysv4
- exit 0;;
+ exit ;;
*:[Aa]miga[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-amigaos
- exit 0 ;;
+ exit ;;
*:[Mm]orph[Oo][Ss]:*:*)
echo ${UNAME_MACHINE}-unknown-morphos
- exit 0 ;;
+ exit ;;
*:OS/390:*:*)
echo i370-ibm-openedition
- exit 0 ;;
+ exit ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit ;;
*:OS400:*:*)
echo powerpc-ibm-os400
- exit 0 ;;
+ exit ;;
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
echo arm-acorn-riscix${UNAME_RELEASE}
- exit 0;;
+ exit ;;
+ arm:riscos:*:*|arm:RISCOS:*:*)
+ echo arm-unknown-riscos
+ exit ;;
SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
echo hppa1.1-hitachi-hiuxmpp
- exit 0;;
+ exit ;;
Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
# akee at wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -326,32 +312,32 @@
else
echo pyramid-pyramid-bsd
fi
- exit 0 ;;
+ exit ;;
NILE*:*:*:dcosx)
echo pyramid-pyramid-svr4
- exit 0 ;;
+ exit ;;
DRS?6000:unix:4.0:6*)
echo sparc-icl-nx6
- exit 0 ;;
- DRS?6000:UNIX_SV:4.2*:7*)
+ exit ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
case `/usr/bin/uname -p` in
- sparc) echo sparc-icl-nx7 && exit 0 ;;
+ sparc) echo sparc-icl-nx7; exit ;;
esac ;;
sun4H:SunOS:5.*:*)
echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
i86pc:SunOS:5.*:*)
echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:6*:*)
# According to config.sub, this is the proper way to canonicalize
# SunOS6. Hard to guess exactly what SunOS6 will be like, but
# it's likely to be more like Solaris than SunOS4.
echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
sun4*:SunOS:*:*)
case "`/usr/bin/arch -k`" in
Series*|S4*)
@@ -360,10 +346,10 @@
esac
# Japanese Language versions have a version number like `4.1.3-JL'.
echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
- exit 0 ;;
+ exit ;;
sun3*:SunOS:*:*)
echo m68k-sun-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sun*:*:4.2BSD:*)
UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -375,10 +361,10 @@
echo sparc-sun-sunos${UNAME_RELEASE}
;;
esac
- exit 0 ;;
+ exit ;;
aushp:SunOS:*:*)
echo sparc-auspex-sunos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
# The situation for MiNT is a little confusing. The machine name
# can be virtually everything (everything which is not
# "atarist" or "atariste" at least should have a processor
@@ -389,40 +375,40 @@
# be no problem.
atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
echo m68k-atari-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
echo m68k-milan-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
echo m68k-hades-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
echo m68k-unknown-mint${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
m68k:machten:*:*)
echo m68k-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
powerpc:machten:*:*)
echo powerpc-apple-machten${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RISC*:Mach:*:*)
echo mips-dec-mach_bsd4.3
- exit 0 ;;
+ exit ;;
RISC*:ULTRIX:*:*)
echo mips-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
VAX*:ULTRIX*:*:*)
echo vax-dec-ultrix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
2020:CLIX:*:* | 2430:CLIX:*:*)
echo clipper-intergraph-clix${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mips:*:*:UMIPS | mips:*:*:RISCos)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -446,32 +432,33 @@
exit (-1);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c \
- && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
- && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c &&
+ dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+ SYSTEM_NAME=`$dummy $dummyarg` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo mips-mips-riscos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Motorola:PowerMAX_OS:*:*)
echo powerpc-motorola-powermax
- exit 0 ;;
+ exit ;;
Motorola:*:4.3:PL8-*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
echo powerpc-harris-powermax
- exit 0 ;;
+ exit ;;
Night_Hawk:Power_UNIX:*:*)
echo powerpc-harris-powerunix
- exit 0 ;;
+ exit ;;
m88k:CX/UX:7*:*)
echo m88k-harris-cxux7
- exit 0 ;;
+ exit ;;
m88k:*:4*:R4*)
echo m88k-motorola-sysv4
- exit 0 ;;
+ exit ;;
m88k:*:3*:R3*)
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
AViiON:dgux:*:*)
# DG/UX returns AViiON for all architectures
UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -487,29 +474,29 @@
else
echo i586-dg-dgux${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
echo m88k-dolphin-sysv3
- exit 0 ;;
+ exit ;;
M88*:*:R3*:*)
# Delta 88k system running SVR3
echo m88k-motorola-sysv3
- exit 0 ;;
+ exit ;;
XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
echo m88k-tektronix-sysv3
- exit 0 ;;
+ exit ;;
Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
echo m68k-tektronix-bsd
- exit 0 ;;
+ exit ;;
*:IRIX*:*:*)
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
- exit 0 ;;
+ exit ;;
????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
- exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
i*86:AIX:*:*)
echo i386-ibm-aix
- exit 0 ;;
+ exit ;;
ia64:AIX:*:*)
if [ -x /usr/bin/oslevel ] ; then
IBM_REV=`/usr/bin/oslevel`
@@ -517,7 +504,7 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:2:3)
if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
eval $set_cc_for_build
@@ -532,14 +519,18 @@
exit(0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
- echo rs6000-ibm-aix3.2.5
+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
+ then
+ echo "$SYSTEM_NAME"
+ else
+ echo rs6000-ibm-aix3.2.5
+ fi
elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
echo rs6000-ibm-aix3.2.4
else
echo rs6000-ibm-aix3.2
fi
- exit 0 ;;
+ exit ;;
*:AIX:*:[45])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
@@ -553,28 +544,28 @@
IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
fi
echo ${IBM_ARCH}-ibm-aix${IBM_REV}
- exit 0 ;;
+ exit ;;
*:AIX:*:*)
echo rs6000-ibm-aix
- exit 0 ;;
+ exit ;;
ibmrt:4.4BSD:*|romp-ibm:BSD:*)
echo romp-ibm-bsd4.4
- exit 0 ;;
+ exit ;;
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
+ exit ;; # report: romp-ibm BSD 4.3
*:BOSX:*:*)
echo rs6000-bull-bosx
- exit 0 ;;
+ exit ;;
DPX/2?00:B.O.S.:*:*)
echo m68k-bull-sysv3
- exit 0 ;;
+ exit ;;
9000/[34]??:4.3bsd:1.*:*)
echo m68k-hp-bsd
- exit 0 ;;
+ exit ;;
hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
echo m68k-hp-bsd4.4
- exit 0 ;;
+ exit ;;
9000/[34678]??:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
case "${UNAME_MACHINE}" in
@@ -636,9 +627,19 @@
esac
if [ ${HP_ARCH} = "hppa2.0w" ]
then
- # avoid double evaluation of $set_cc_for_build
- test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
- if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ eval $set_cc_for_build
+
+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
+ # generating 64-bit code. GNU and HP use different nomenclature:
+ #
+ # $ CC_FOR_BUILD=cc ./config.guess
+ # => hppa2.0w-hp-hpux11.23
+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+ # => hppa64-hp-hpux11.23
+
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+ grep __LP64__ >/dev/null
then
HP_ARCH="hppa2.0w"
else
@@ -646,11 +647,11 @@
fi
fi
echo ${HP_ARCH}-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
ia64:HP-UX:*:*)
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
echo ia64-hp-hpux${HPUX_REV}
- exit 0 ;;
+ exit ;;
3050*:HI-UX:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -678,163 +679,179 @@
exit (0);
}
EOF
- $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
echo unknown-hitachi-hiuxwe2
- exit 0 ;;
+ exit ;;
9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
echo hppa1.1-hp-bsd
- exit 0 ;;
+ exit ;;
9000/8??:4.3bsd:*:*)
echo hppa1.0-hp-bsd
- exit 0 ;;
+ exit ;;
*9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
echo hppa1.0-hp-mpeix
- exit 0 ;;
+ exit ;;
hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
echo hppa1.1-hp-osf
- exit 0 ;;
+ exit ;;
hp8??:OSF1:*:*)
echo hppa1.0-hp-osf
- exit 0 ;;
+ exit ;;
i*86:OSF1:*:*)
if [ -x /usr/sbin/sysversion ] ; then
echo ${UNAME_MACHINE}-unknown-osf1mk
else
echo ${UNAME_MACHINE}-unknown-osf1
fi
- exit 0 ;;
+ exit ;;
parisc*:Lites*:*:*)
echo hppa1.1-hp-lites
- exit 0 ;;
+ exit ;;
C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
CRAY*Y-MP:*:*:*)
echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*[A-Z]90:*:*:*)
echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*TS:*:*:*)
echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*T3E:*:*:*)
echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
CRAY*SV1:*:*:*)
echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ exit ;;
*:UNICOS/mp:*:*)
- echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
- exit 0 ;;
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit ;;
F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
5000:UNIX_System_V:4.*:*)
FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
- exit 0 ;;
+ exit ;;
i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
sparc*:BSD/OS:*:*)
echo sparc-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:BSD/OS:*:*)
echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:FreeBSD:*:*)
- # Determine whether the default compiler uses glibc.
- eval $set_cc_for_build
- sed 's/^ //' << EOF >$dummy.c
- #include <features.h>
- #if __GLIBC__ >= 2
- LIBC=gnu
- #else
- LIBC=
- #endif
-EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- # GNU/KFreeBSD systems have a "k" prefix to indicate we are using
- # FreeBSD's kernel, but not the complete OS.
- case ${LIBC} in gnu) kernel_only='k' ;; esac
- echo ${UNAME_MACHINE}-unknown-${kernel_only}freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC}
- exit 0 ;;
+ case ${UNAME_MACHINE} in
+ pc98)
+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ *)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ esac
+ exit ;;
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
- exit 0 ;;
+ exit ;;
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
- exit 0 ;;
+ exit ;;
+ i*:windows32*:*)
+ # uname -m includes "-pc" on this system.
+ echo ${UNAME_MACHINE}-mingw32
+ exit ;;
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
- exit 0 ;;
- x86:Interix*:[34]*)
- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
- exit 0 ;;
+ exit ;;
+ x86:Interix*:[3456]*)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T:Interix*:[3456]*)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
- exit 0 ;;
+ exit ;;
i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
# How do we know it's Interix rather than the generic POSIX subsystem?
# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
# UNAME_MACHINE based on the output of uname instead of i386?
echo i586-pc-interix
- exit 0 ;;
+ exit ;;
i*:UWIN*:*)
echo ${UNAME_MACHINE}-pc-uwin
- exit 0 ;;
+ exit ;;
+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit ;;
p*:CYGWIN*:*)
echo powerpcle-unknown-cygwin
- exit 0 ;;
+ exit ;;
prep*:SunOS:5.*:*)
echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
- exit 0 ;;
+ exit ;;
*:GNU:*:*)
# the GNU system
echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
- exit 0 ;;
+ exit ;;
*:GNU/*:*:*)
# other systems with GNU libc and userland
echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
- exit 0 ;;
+ exit ;;
i*86:Minix:*:*)
echo ${UNAME_MACHINE}-pc-minix
- exit 0 ;;
+ exit ;;
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
- exit 0 ;;
+ exit ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit ;;
ia64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
m68*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
mips:Linux:*:*)
eval $set_cc_for_build
sed 's/^ //' << EOF >$dummy.c
@@ -851,8 +868,12 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
mips64:Linux:*:*)
eval $set_cc_for_build
@@ -870,15 +891,22 @@
#endif
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
- test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^CPU/{
+ s: ::g
+ p
+ }'`"
+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
;;
+ or32:Linux:*:*)
+ echo or32-unknown-linux-gnu
+ exit ;;
ppc:Linux:*:*)
echo powerpc-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
ppc64:Linux:*:*)
echo powerpc64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
alpha:Linux:*:*)
case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
EV5) UNAME_MACHINE=alphaev5 ;;
@@ -892,7 +920,7 @@
objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
- exit 0 ;;
+ exit ;;
parisc:Linux:*:* | hppa:Linux:*:*)
# Look for CPU level
case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
@@ -900,25 +928,28 @@
PA8*) echo hppa2.0-unknown-linux-gnu ;;
*) echo hppa-unknown-linux-gnu ;;
esac
- exit 0 ;;
+ exit ;;
parisc64:Linux:*:* | hppa64:Linux:*:*)
echo hppa64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
s390:Linux:*:* | s390x:Linux:*:*)
echo ${UNAME_MACHINE}-ibm-linux
- exit 0 ;;
+ exit ;;
sh64*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sh*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
sparc:Linux:*:* | sparc64:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
+ vax:Linux:*:*)
+ echo ${UNAME_MACHINE}-dec-linux-gnu
+ exit ;;
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
- exit 0 ;;
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -936,15 +967,15 @@
;;
a.out-i386-linux)
echo "${UNAME_MACHINE}-pc-linux-gnuaout"
- exit 0 ;;
+ exit ;;
coff-i386)
echo "${UNAME_MACHINE}-pc-linux-gnucoff"
- exit 0 ;;
+ exit ;;
"")
# Either a pre-BFD a.out linker (linux-gnuoldld) or
# one that does not give us useful --help.
echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
- exit 0 ;;
+ exit ;;
esac
# Determine whether the default compiler is a.out or elf
eval $set_cc_for_build
@@ -961,7 +992,7 @@
LIBC=gnulibc1
# endif
#else
- #ifdef __INTEL_COMPILER
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
@@ -971,16 +1002,23 @@
LIBC=dietlibc
#endif
EOF
- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
- test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
- test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+ /^LIBC/{
+ s: ::g
+ p
+ }'`"
+ test x"${LIBC}" != x && {
+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
+ exit
+ }
+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
;;
i*86:DYNIX/ptx:4*:*)
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
# earlier versions are messed up and put the nodename in both
# sysname and nodename.
echo i386-sequent-sysv4
- exit 0 ;;
+ exit ;;
i*86:UNIX_SV:4.2MP:2.*)
# Unixware is an offshoot of SVR4, but it has its own version
# number series starting with 2...
@@ -988,27 +1026,27 @@
# I just have to hope. -- rms.
# Use sysv4.2uw... so that sysv4* matches it.
echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:OS/2:*:*)
# If we were able to find `uname', then EMX Unix compatibility
# is probably installed.
echo ${UNAME_MACHINE}-pc-os2-emx
- exit 0 ;;
+ exit ;;
i*86:XTS-300:*:STOP)
echo ${UNAME_MACHINE}-unknown-stop
- exit 0 ;;
+ exit ;;
i*86:atheos:*:*)
echo ${UNAME_MACHINE}-unknown-atheos
- exit 0 ;;
- i*86:syllable:*:*)
+ exit ;;
+ i*86:syllable:*:*)
echo ${UNAME_MACHINE}-pc-syllable
- exit 0 ;;
+ exit ;;
i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
echo i386-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
i*86:*DOS:*:*)
echo ${UNAME_MACHINE}-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
@@ -1016,15 +1054,16 @@
else
echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
fi
- exit 0 ;;
- i*86:*:5:[78]*)
+ exit ;;
+ i*86:*:5:[678]*)
+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
case `/bin/uname -X | grep "^Machine"` in
*486*) UNAME_MACHINE=i486 ;;
*Pentium) UNAME_MACHINE=i586 ;;
*Pent*|*Celeron) UNAME_MACHINE=i686 ;;
esac
echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
- exit 0 ;;
+ exit ;;
i*86:*:3.2:*)
if test -f /usr/options/cb.name; then
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
@@ -1042,73 +1081,73 @@
else
echo ${UNAME_MACHINE}-pc-sysv32
fi
- exit 0 ;;
+ exit ;;
pc:*:*:*)
# Left here for compatibility:
# uname -m prints for DJGPP always 'pc', but it prints nothing about
# the processor, so we play safe by assuming i386.
echo i386-pc-msdosdjgpp
- exit 0 ;;
+ exit ;;
Intel:Mach:3*:*)
echo i386-pc-mach3
- exit 0 ;;
+ exit ;;
paragon:*:*:*)
echo i860-intel-osf1
- exit 0 ;;
+ exit ;;
i860:*:4.*:*) # i860-SVR4
if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
else # Add other i860-SVR4 vendors below as they are discovered.
echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
fi
- exit 0 ;;
+ exit ;;
mini*:CTIX:SYS*5:*)
# "miniframe"
echo m68010-convergent-sysv
- exit 0 ;;
+ exit ;;
mc68k:UNIX:SYSTEM5:3.51m)
echo m68k-convergent-sysv
- exit 0 ;;
+ exit ;;
M680?0:D-NIX:5.3:*)
echo m68k-diab-dnix
- exit 0 ;;
- M68*:*:R3V[567]*:*)
- test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
- 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0)
+ exit ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
OS_REL=''
test -r /etc/.relid \
&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
- && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
- && echo i486-ncr-sysv4 && exit 0 ;;
+ && { echo i486-ncr-sysv4; exit; } ;;
m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
echo m68k-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
mc68030:UNIX_System_V:4.*:*)
echo m68k-atari-sysv4
- exit 0 ;;
+ exit ;;
TSUNAMI:LynxOS:2.*:*)
echo sparc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
rs6000:LynxOS:2.*:*)
echo rs6000-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
echo powerpc-unknown-lynxos${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SM[BE]S:UNIX_SV:*:*)
echo mips-dde-sysv${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
RM*:ReliantUNIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
RM*:SINIX-*:*:*)
echo mips-sni-sysv4
- exit 0 ;;
+ exit ;;
*:SINIX-*:*:*)
if uname -p 2>/dev/null >/dev/null ; then
UNAME_MACHINE=`(uname -p) 2>/dev/null`
@@ -1116,68 +1155,72 @@
else
echo ns32k-sni-sysv
fi
- exit 0 ;;
+ exit ;;
PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
# says <Richard.M.Bartel at ccMail.Census.GOV>
echo i586-unisys-sysv4
- exit 0 ;;
+ exit ;;
*:UNIX_System_V:4*:FTX*)
# From Gerald Hewes <hewes at openmarket.com>.
# How about differentiating between stratus architectures? -djm
echo hppa1.1-stratus-sysv4
- exit 0 ;;
+ exit ;;
*:*:*:FTX*)
# From seanf at swdc.stratus.com.
echo i860-stratus-sysv4
- exit 0 ;;
+ exit ;;
+ i*86:VOS:*:*)
+ # From Paul.Green at stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit ;;
*:VOS:*:*)
# From Paul.Green at stratus.com.
echo hppa1.1-stratus-vos
- exit 0 ;;
+ exit ;;
mc68*:A/UX:*:*)
echo m68k-apple-aux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
news*:NEWS-OS:6*:*)
echo mips-sony-newsos6
- exit 0 ;;
+ exit ;;
R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
if [ -d /usr/nec ]; then
echo mips-nec-sysv${UNAME_RELEASE}
else
echo mips-unknown-sysv${UNAME_RELEASE}
fi
- exit 0 ;;
+ exit ;;
BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
echo powerpc-be-beos
- exit 0 ;;
+ exit ;;
BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
echo powerpc-apple-beos
- exit 0 ;;
+ exit ;;
BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
echo i586-pc-beos
- exit 0 ;;
+ exit ;;
SX-4:SUPER-UX:*:*)
echo sx4-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-5:SUPER-UX:*:*)
echo sx5-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Rhapsody:*:*)
echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Darwin:*:*)
- case `uname -p` in
- *86) UNAME_PROCESSOR=i686 ;;
- powerpc) UNAME_PROCESSOR=powerpc ;;
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ unknown) UNAME_PROCESSOR=powerpc ;;
esac
echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:procnto*:*:* | *:QNX:[0123456789]*:*)
UNAME_PROCESSOR=`uname -p`
if test "$UNAME_PROCESSOR" = "x86"; then
@@ -1185,22 +1228,25 @@
UNAME_MACHINE=pc
fi
echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:QNX:*:4*)
echo i386-pc-qnx
- exit 0 ;;
+ exit ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit ;;
NSR-?:NONSTOP_KERNEL:*:*)
echo nsr-tandem-nsk${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:NonStop-UX:*:*)
echo mips-compaq-nonstopux
- exit 0 ;;
+ exit ;;
BS2000:POSIX*:*:*)
echo bs2000-siemens-sysv
- exit 0 ;;
+ exit ;;
DS/*:UNIX_System_V:*:*)
echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:Plan9:*:*)
# "uname -m" is not consistent, so use $cputype instead. 386
# is converted to i386 for consistency with other x86
@@ -1211,31 +1257,47 @@
UNAME_MACHINE="$cputype"
fi
echo ${UNAME_MACHINE}-unknown-plan9
- exit 0 ;;
+ exit ;;
*:TOPS-10:*:*)
echo pdp10-unknown-tops10
- exit 0 ;;
+ exit ;;
*:TENEX:*:*)
echo pdp10-unknown-tenex
- exit 0 ;;
+ exit ;;
KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
echo pdp10-dec-tops20
- exit 0 ;;
+ exit ;;
XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
echo pdp10-xkl-tops20
- exit 0 ;;
+ exit ;;
*:TOPS-20:*:*)
echo pdp10-unknown-tops20
- exit 0 ;;
+ exit ;;
*:ITS:*:*)
echo pdp10-unknown-its
- exit 0 ;;
+ exit ;;
SEI:*:*:SEIUX)
echo mips-sei-seiux${UNAME_RELEASE}
- exit 0 ;;
+ exit ;;
*:DragonFly:*:*)
echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
- exit 0 ;;
+ exit ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms ; exit ;;
+ I*) echo ia64-dec-vms ; exit ;;
+ V*) echo vax-dec-vms ; exit ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit ;;
+ i*86:skyos:*:*)
+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+ exit ;;
+ i*86:rdos:*:*)
+ echo ${UNAME_MACHINE}-pc-rdos
+ exit ;;
esac
#echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1267,7 +1329,7 @@
#endif
#if defined (__arm) && defined (__acorn) && defined (__unix)
- printf ("arm-acorn-riscix"); exit (0);
+ printf ("arm-acorn-riscix\n"); exit (0);
#endif
#if defined (hp300) && !defined (hpux)
@@ -1356,11 +1418,12 @@
}
EOF
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+ { echo "$SYSTEM_NAME"; exit; }
# Apollos put the system type in the environment.
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
# Convex versions that predate uname can use getsysinfo(1)
@@ -1369,22 +1432,22 @@
case `getsysinfo -f cpu_type` in
c1*)
echo c1-convex-bsd
- exit 0 ;;
+ exit ;;
c2*)
if getsysinfo -f scalar_acc
then echo c32-convex-bsd
else echo c2-convex-bsd
fi
- exit 0 ;;
+ exit ;;
c34*)
echo c34-convex-bsd
- exit 0 ;;
+ exit ;;
c38*)
echo c38-convex-bsd
- exit 0 ;;
+ exit ;;
c4*)
echo c4-convex-bsd
- exit 0 ;;
+ exit ;;
esac
fi
@@ -1395,7 +1458,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- ftp://ftp.gnu.org/pub/gnu/config/
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
Modified: silc-toolkit/trunk/config.sub
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/config.sub?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/config.sub (original)
+++ silc-toolkit/trunk/config.sub Wed May 23 14:37:30 2007
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
-
-timestamp='2004-01-05'
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
+
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -21,13 +22,14 @@
#
# 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.
-
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+# 02110-1301, USA.
+#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
# configuration script generated by Autoconf, you may include it under
# the same distribution terms that you use for the rest of that program.
+
# Please send patches to <config-patches at gnu.org>. Submit a context
# diff and a properly formatted ChangeLog entry.
@@ -70,7 +72,7 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
@@ -83,11 +85,11 @@
while test $# -gt 0 ; do
case $1 in
--time-stamp | --time* | -t )
- echo "$timestamp" ; exit 0 ;;
+ echo "$timestamp" ; exit ;;
--version | -v )
- echo "$version" ; exit 0 ;;
+ echo "$version" ; exit ;;
--help | --h* | -h )
- echo "$usage"; exit 0 ;;
+ echo "$usage"; exit ;;
-- ) # Stop option processing
shift; break ;;
- ) # Use stdin as input.
@@ -99,7 +101,7 @@
*local*)
# First pass through any local machine types.
echo $1
- exit 0;;
+ exit ;;
* )
break ;;
@@ -118,8 +120,9 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
case $maybe_os in
- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+ uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+ storm-chaos* | os2-emx* | rtmk-nova*)
os=-$maybe_os
basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
;;
@@ -145,7 +148,7 @@
-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
- -apple | -axis)
+ -apple | -axis | -knuth | -cray)
os=
basic_machine=$1
;;
@@ -170,6 +173,10 @@
-hiux*)
os=-hiuxwe2
;;
+ -sco6)
+ os=-sco5v6
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
-sco5)
os=-sco3.2v5
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -183,6 +190,10 @@
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
-sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco5v6*)
# Don't forget version if it is 3.2v4 or newer.
basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
;;
@@ -230,14 +241,16 @@
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+ | bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
| fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m68000 | m68k | m88k | mcore \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -246,6 +259,7 @@
| mips64vr4100 | mips64vr4100el \
| mips64vr4300 | mips64vr4300el \
| mips64vr5000 | mips64vr5000el \
+ | mips64vr5900 | mips64vr5900el \
| mipsisa32 | mipsisa32el \
| mipsisa32r2 | mipsisa32r2el \
| mipsisa64 | mipsisa64el \
@@ -254,20 +268,24 @@
| mipsisa64sr71k | mipsisa64sr71kel \
| mipstx39 | mipstx39el \
| mn10200 | mn10300 \
+ | mt \
| msp430 \
+ | nios | nios2 \
| ns16k | ns32k \
- | openrisc | or32 \
+ | or32 \
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -277,6 +295,9 @@
os=-none
;;
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+ ms1)
+ basic_machine=mt-unknown
;;
# We use `pc' rather than `unknown'
@@ -297,10 +318,10 @@
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
- | bs2000-* \
+ | avr-* | avr32-* \
+ | bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
- | clipper-* | cydra-* \
+ | clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
@@ -308,9 +329,9 @@
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
- | m88110-* | m88k-* | mcore-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
| mips16-* \
| mips64-* | mips64el-* \
@@ -319,6 +340,7 @@
| mips64vr4100-* | mips64vr4100el-* \
| mips64vr4300-* | mips64vr4300el-* \
| mips64vr5000-* | mips64vr5000el-* \
+ | mips64vr5900-* | mips64vr5900el-* \
| mipsisa32-* | mipsisa32el-* \
| mipsisa32r2-* | mipsisa32r2el-* \
| mipsisa64-* | mipsisa64el-* \
@@ -326,24 +348,28 @@
| mipsisa64sb1-* | mipsisa64sb1el-* \
| mipsisa64sr71k-* | mipsisa64sr71kel-* \
| mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | mt-* \
| msp430-* \
- | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \
+ | nios-* | nios2-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
| orion-* \
| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \
- | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \
- | xtensa-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
@@ -363,6 +389,9 @@
basic_machine=a29k-amd
os=-udi
;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
adobe68k)
basic_machine=m68010-adobe
os=-scout
@@ -442,11 +471,26 @@
basic_machine=j90-cray
os=-unicos
;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
crds | unos)
basic_machine=m68k-crds
;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
cris | cris-* | etrax*)
basic_machine=cris-axis
+ ;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
;;
da30 | da30-*)
basic_machine=m68k-da30
@@ -469,6 +513,10 @@
delta88)
basic_machine=m88k-motorola
os=-sysv3
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
;;
dpx20 | dpx20-*)
basic_machine=rs6000-bull
@@ -648,10 +696,6 @@
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
@@ -663,6 +707,9 @@
msdos)
basic_machine=i386-pc
os=-msdos
+ ;;
+ ms1-*)
+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
;;
mvs)
basic_machine=i370-ibm
@@ -732,10 +779,6 @@
np1)
basic_machine=np1-gould
;;
- nv1)
- basic_machine=nv1-cray
- os=-unicosmp
- ;;
nsr-tandem)
basic_machine=nsr-tandem
;;
@@ -743,9 +786,8 @@
basic_machine=hppa1.1-oki
os=-proelf
;;
- or32 | or32-*)
+ openrisc | openrisc-*)
basic_machine=or32-unknown
- os=-coff
;;
os400)
basic_machine=powerpc-ibm
@@ -776,6 +818,12 @@
pc532 | pc532-*)
basic_machine=ns32k-pc532
;;
+ pc98)
+ basic_machine=i386-pc
+ ;;
+ pc98-*)
+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
pentium | p5 | k5 | k6 | nexgen | viac3)
basic_machine=i586-pc
;;
@@ -832,6 +880,10 @@
basic_machine=i586-unknown
os=-pw32
;;
+ rdos)
+ basic_machine=i386-pc
+ os=-rdos
+ ;;
rom68k)
basic_machine=m68k-rom68k
os=-coff
@@ -858,6 +910,10 @@
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1017,6 +1073,10 @@
w89k-*)
basic_machine=hppa1.1-winbond
os=-proelf
+ ;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
;;
xps | xps100)
basic_machine=xps100-honeywell
@@ -1048,6 +1108,9 @@
romp)
basic_machine=romp-ibm
;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
rs6000)
basic_machine=rs6000-ibm
;;
@@ -1064,13 +1127,10 @@
we32k)
basic_machine=we32k-att
;;
- sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sh64)
- basic_machine=sh64-unknown
- ;;
- sparc | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1143,19 +1203,23 @@
| -aos* \
| -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
| -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -knetbsd* | -netbsd* | -openbsd* | -kfreebsd* | -freebsd* | -riscix* \
- | -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+ | -openbsd* | -solidbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
| -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
| -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
| -chorusos* | -chorusrdb* \
| -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+ | -uxpv* | -beos* | -mpeix* | -udk* \
| -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
| -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
| -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
- | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1173,7 +1237,7 @@
os=`echo $os | sed -e 's|nto|nto-qnx|'`
;;
-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
- | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
| -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
;;
-mac*)
@@ -1281,6 +1345,9 @@
;;
-kaos*)
os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
;;
-none)
;;
@@ -1304,6 +1371,12 @@
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1313,9 +1386,9 @@
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
@@ -1359,8 +1432,14 @@
*-be)
os=-beos
;;
+ *-haiku)
+ os=-haiku
+ ;;
*-ibm)
os=-aix
+ ;;
+ *-knuth)
+ os=-mmixware
;;
*-wec)
os=-proelf
@@ -1527,7 +1606,7 @@
esac
echo $basic_machine$os
-exit 0
+exit
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
Added: silc-toolkit/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/README.Debian?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/README.Debian (added)
+++ silc-toolkit/trunk/debian/README.Debian Wed May 23 14:37:30 2007
@@ -1,0 +1,6 @@
+libsilc for Debian
+------------------
+
+Please check for more at http://silcnet.org/
+
+ -- Tamas SZERB <toma at rulez.org>, Wed, 7 Jan 2004 15:56:35 +0100
Added: silc-toolkit/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/changelog?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/changelog (added)
+++ silc-toolkit/trunk/debian/changelog Wed May 23 14:37:30 2007
@@ -1,0 +1,86 @@
+silc-toolkit (0.9.12-6) unstable; urgency=high
+
+ * debian/copyright: Mention new license of SILC draft RFCs.
+ + Urgency high due to RC bug (Closes: #393412)
+
+ -- Michael C. Schultheiss <schultmc at debian.org> Mon, 16 Oct 2006 16:32:22 +0000
+
+silc-toolkit (0.9.12-5) unstable; urgency=low
+
+ * New Maintainer (Closes: #370794)
+ + debian/control{,.sh}: Update maintainer address, update Standards
+ version
+ * Incorporate NMUs
+
+ -- Michael C. Schultheiss <schultmc at debian.org> Thu, 24 Aug 2006 20:40:12 +0000
+
+silc-toolkit (0.9.12-4.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move libsilc.so and libsilcclient.so to the -dev package (Closes:
+ #379800).
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org> Wed, 26 Jul 2006 13:42:57 +0200
+
+silc-toolkit (0.9.12-4.3) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Fix empty packages (Closes: #331630)
+ * Bump standards version
+
+ -- Julien Danjou <acid at debian.org> Tue, 25 Jul 2006 17:50:00 +0200
+
+silc-toolkit (0.9.12-4.2) unstable; urgency=low
+
+ * 0-day NMU to fix an RC bug.
+ * Explicitly execute debian/control.sh with sh as suggested by Andreas
+ Jochens (closes: bug#328924).
+
+ -- Aurelien Jarno <aurel32 at debian.org> Mon, 6 Feb 2006 20:24:24 +0100
+
+silc-toolkit (0.9.12-4.1) unstable; urgency=low
+
+ * This is an NMU, I don't know why Tamas didn't want to fix this.
+ rebuild control file whenever shared library's soname
+ changes, to satisfy debian policy requirements for
+ shared package names. (closes: 323035) See section 8.1
+ for more details.
+ http://www.debian.org/doc/debian-policy/ch-sharedlibs.html
+ Though policy doesn't mention it, the point is to provide a migration
+ path when for other packages when changes to the lib require changes
+ to the soname.
+
+ -- Raul Miller <moth at debian.org> Sat, 10 Sep 2005 13:04:57 -0400
+
+silc-toolkit (0.9.12-4) unstable; urgency=low
+
+ * RC5 removed (closes: #279146)
+ * check the list archive, I asked for some problems,
+ nobody answered it (closes: #273871)
+
+ -- Tamas SZERB <toma at rulez.org> Sun, 7 Nov 2004 17:06:53 +0100
+
+silc-toolkit (0.9.12-3) unstable; urgency=low
+
+ * beat me, Randall Donald <ftpmaster at debian.org> noticed
+ that I messed up the license file pointer to the copyright
+ file, it is fixed now.
+
+ -- Tamas SZERB <toma at rulez.org> Tue, 17 Aug 2004 12:21:38 +0200
+
+silc-toolkit (0.9.12-2) unstable; urgency=low
+
+ * according the email of Randall Donald <ftpmaster at debian.org>
+ on Mon, 16 Aug 2004 02:42:14 -0400
+ file pointer to the full GPL text in base-files applied into
+ the copyright file and
+ * the -dev packaged moved from devel to libdevel
+
+ -- Tamas SZERB <toma at rulez.org> Mon, 16 Aug 2004 12:30:17 +0200
+
+silc-toolkit (0.9.12-1) unstable; urgency=low
+
+ * Initial Release. (closes: #118202, #246148)
+
+ -- Tamas SZERB <toma at rulez.org> Wed, 7 Jan 2004 15:56:35 +0100
+
Added: silc-toolkit/trunk/debian/compat
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/compat?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/compat (added)
+++ silc-toolkit/trunk/debian/compat Wed May 23 14:37:30 2007
@@ -1,0 +1,1 @@
+4
Added: silc-toolkit/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/control?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/control (added)
+++ silc-toolkit/trunk/debian/control Wed May 23 14:37:30 2007
@@ -1,0 +1,35 @@
+Source: silc-toolkit
+Priority: optional
+Maintainer: Michael C. Schultheiss <schultmc at debian.org>
+Section: devel
+Build-Depends: debhelper (>= 4.0.0), autotools-dev
+Standards-Version: 3.7.2
+
+Package: libsilc-1.0-2-dev
+Section: libdevel
+Architecture: any
+Depends: libsilc-1.0-2 (= ${Source-Version})
+Provides: libsilc-dev
+Replaces: libsilc-dev
+Conflicts: libsilc-dev
+Description: developer files for SILC library (silc-toolkit)
+ silc-toolkit developer files
+ .
+ SILC Project develops the Secure Internet Live Conferencing protocol (SILC),
+ which is designed to provide most rich featured conferencing services and
+ high security.
+
+Package: libsilc-1.0-2
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Provides: libsilc
+Replaces: libsilc
+Conflicts: libsilc
+Description: SILC library (silc-toolkit)
+ silc-toolkit library files
+ .
+ SILC Project develops the Secure Internet Live Conferencing protocol (SILC),
+ which is designed to provide most rich featured conferencing services and
+ high security.
+
Added: silc-toolkit/trunk/debian/control.sh
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/control.sh?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/control.sh (added)
+++ silc-toolkit/trunk/debian/control.sh Wed May 23 14:37:30 2007
@@ -1,0 +1,59 @@
+#!/bin/sh
+#
+# bring debian/control up to date with the current library soname
+
+# Note: libsilc should always consist of a single word
+# if it's something else, something has been drastically
+# changed and it's time to re-think this script
+libsilc=$(
+ objdump -p $2/lib*so* |
+ awk '/SONAME/{print $2}' |
+ sed -e 's/\([0-9]\)\.so\./\1-/; s/\.so\.//; s/client//' |
+ sort -u
+)
+
+cat <<___ >$1.tmp
+Source: silc-toolkit
+Priority: optional
+Maintainer: Michael C. Schultheiss <schultmc at debian.org>
+Section: devel
+Build-Depends: debhelper (>= 4.0.0), autotools-dev
+Standards-Version: 3.7.2
+
+Package: $libsilc-dev
+Section: libdevel
+Architecture: any
+Depends: $libsilc (= \${Source-Version})
+Provides: libsilc-dev
+Replaces: libsilc-dev
+Conflicts: libsilc-dev
+Description: developer files for SILC library (silc-toolkit)
+ silc-toolkit developer files
+ .
+ SILC Project develops the Secure Internet Live Conferencing protocol (SILC),
+ which is designed to provide most rich featured conferencing services and
+ high security.
+
+Package: $libsilc
+Section: libs
+Architecture: any
+Depends: \${shlibs:Depends}, \${misc:Depends}
+Provides: libsilc
+Replaces: libsilc
+Conflicts: libsilc
+Description: SILC library (silc-toolkit)
+ silc-toolkit library files
+ .
+ SILC Project develops the Secure Internet Live Conferencing protocol (SILC),
+ which is designed to provide most rich featured conferencing services and
+ high security.
+
+___
+
+if diff $1.tmp $1; then
+ # preserve file modification timestamp on control
+ rm $1.tmp
+else
+ # update control with recent changes
+ mv $1.tmp $1
+fi
Added: silc-toolkit/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/copyright?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/copyright (added)
+++ silc-toolkit/trunk/debian/copyright Wed May 23 14:37:30 2007
@@ -1,0 +1,65 @@
+This package was debianized by Tamas SZERB <toma at rulez.org> on
+Wed, 7 Jan 2004 15:56:35 +0100.
+
+It was downloaded from http://silcnet.org/
+
+Upstream Authors: see CREDITS file!
+
+Copyright: GNU GENERAL PUBLIC LICENSE Version 2
+see: /usr/share/common-licenses/GPL-2
+
+The draft SILC RFCs (draft-riikonen-presence-attrs-03.txt,
+draft-riikonen-silc-commands-06.txt,
+draft-riikonen-silc-flags-payloads-04.txt,
+draft-riikonen-silc-ke-auth-08.txt, draft-riikonen-silc-pp-09.txt,
+draft-riikonen-silc-spec-08.txt) have the following license (per
+Message-ID: <Pine.NEB.4.64.0610161755240.9865 at otaku.Xtrmntr.org>, quoted
+below):
+
+: Because the authors of contributions to the IETF standards retain most
+: intellectual property rights with respect to such contributions under
+: IETF policies in effect during the development of the draft SILC RFCs,
+: and because you are an author of said documents, the Debian community
+: hereby requests that you kindly agree to release your contributions in
+: the draft SILC RFCs under the license below, for inclusion in Debian.
+:
+: I agree to grant third parties the irrevocable
+: right to copy, use and distribute the work, with
+: or without modification, in any medium, without royalty,
+: provided that, unless separate permission is granted,
+: redistributed modified works:
+:
+: (a) do not contain misleading author, version, name
+: of work, or endorsement information, and
+:
+: (b) do not claim endorsement of the modified work by
+: the Contributor, or any organization the
+: Contributor belongs to, the Internet Engineering
+: Task Force (IETF), Internet Research Task Force
+: (IRTF), Internet Engineering Steering Group
+: (IESG), Internet Architecture Board (IAB),
+: Internet Assigned Numbers Authority (IANA),
+: Internet Society (ISOC), Request For Comments
+: (RFC) Editor, or any combination or variation of
+: such terms (including without limitation the
+: IETF "4 diamonds" logo), or any terms that are
+: confusingly similar thereto, and
+:
+: (c) remove any claims of status as an Internet
+: Standard, including without limitation removing
+: the RFC boilerplate.
+:
+: The IETF suggests that any citation or excerpt of
+: unmodified text reference the RFC or other document from
+: which the text is derived.
+:
+: To indicate that you agree to these terms, please reply to this e-mail
+: and quote the license above and indicate that you agree to this.
+:
+I agree.
+
+ Pekka
+________________________________________________________________________
+ Pekka Riikonen priikone at silcnet.org
+ Secure Internet Live Conferencing (SILC) http://silcnet.org/
+
Added: silc-toolkit/trunk/debian/ctest
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/ctest?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/ctest (added)
+++ silc-toolkit/trunk/debian/ctest Wed May 23 14:37:30 2007
@@ -1,0 +1,29 @@
+Source: silc-toolkit FOO
+Priority: optional
+Maintainer: Tamas SZERB <toma at rulez.org>
+Section: devel
+Build-Depends: debhelper (>= 4.0.0), autotools-dev
+Standards-Version: 3.6.0
+
+Package: libsilc-dev
+Section: libdevel
+Architecture: any
+Depends: libsilc (= ${Source-Version})
+Description: developer files for SILC library (silc-toolkit)
+ silc-toolkit developer files
+ .
+ SILC Project develops the Secure Internet Live Conferencing protocol (SILC),
+ which is designed to provide most rich featured conferencing services and
+ high security.
+
+Package: libsilc
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: SILC library (silc-toolkit)
+ silc-toolkit library files
+ .
+ SILC Project develops the Secure Internet Live Conferencing protocol (SILC),
+ which is designed to provide most rich featured conferencing services and
+ high security.
+
Added: silc-toolkit/trunk/debian/docs
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/docs?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/docs (added)
+++ silc-toolkit/trunk/debian/docs Wed May 23 14:37:30 2007
@@ -1,0 +1,4 @@
+README
+README.CVS
+TODO
+CREDITS
Added: silc-toolkit/trunk/debian/libpackagename
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/libpackagename?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/libpackagename (added)
+++ silc-toolkit/trunk/debian/libpackagename Wed May 23 14:37:30 2007
@@ -1,0 +1,27 @@
+#!/bin/sh
+libdir=$1/usr/lib
+
+usage() {
+ >&2 cat <___
+Usage: $0 pkgdir
+
+pkgdir is a directory holding the contents of what will
+become a debian package. This package directory should
+repersent a single shared library -- when this is the
+case, $0 will emit a single package name.
+___
+ exit 1
+}
+
+if ! [ -d $libdir ]; then
+ >&2 "Can't find package image directory $1"
+ usage
+fi
+
+for f in $libdir/*[0-9]; do
+ objdump -p $f
+done |
+ awk '/SONAME/{print $2}' |
+ sed -e 's/\([0-9]\)\.so\./\1-/; s/\.so\.//' |
+ sort -u
+
Added: silc-toolkit/trunk/debian/libsilc-1.0-2-dev.install
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/libsilc-1.0-2-dev.install?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/libsilc-1.0-2-dev.install (added)
+++ silc-toolkit/trunk/debian/libsilc-1.0-2-dev.install Wed May 23 14:37:30 2007
@@ -1,0 +1,6 @@
+usr/include/silc/*.h
+usr/lib/lib*.so
+usr/lib/*.a
+usr/lib/*.la
+usr/lib/pkgconfig/*.pc
+usr/share/doc/libsilc-dev/toolkit
Added: silc-toolkit/trunk/debian/libsilc-1.0-2.install
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/libsilc-1.0-2.install?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/libsilc-1.0-2.install (added)
+++ silc-toolkit/trunk/debian/libsilc-1.0-2.install Wed May 23 14:37:30 2007
@@ -1,0 +1,2 @@
+usr/lib/*.so.*
+usr/lib/silc/*.so*
Added: silc-toolkit/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/rules?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/rules (added)
+++ silc-toolkit/trunk/debian/rules Wed May 23 14:37:30 2007
@@ -1,0 +1,162 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+#name ?= $(shell cat debian/NAME)
+#lib_package=libsilc-${name}
+#dev_package=libsilc-${name}-dev
+#doc_package=libsilc-${name}-dev #FIXME, just testing purpose
+
+lib_package=libsilc
+dev_package=libsilc-dev
+doc_package=libsilc-dev #FIXME, just testing purpose
+
+perl_lib=/usr/lib/perl5
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+
+CFLAGS =-Wall -g
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+# shared library versions, option 1
+#version=2.0.5
+#major=2
+# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
+#version=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
+#major=`ls src/.libs/lib*.so.* | \
+# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
+
+config.status: configure
+ #sh debian/substitute.sh
+
+ dh_testdir
+ # Add here commands to configure the package.
+ CFLAGS="$(CFLAGS)" ./configure \
+ --without-irssi --without-silcd \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --prefix=/usr --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info \
+ \
+ --disable-threads \
+ --enable-debug \
+ --enable-shared \
+ --enable-static \
+ --enable-ipv6 \
+ --with-perl-lib=${perl_lib} \
+ --libdir=\$${prefix}/lib \
+ --with-simdir=\$${libdir}/silc/${name} \
+ --includedir=\$${prefix}/include/silc/${name} \
+ --with-docdir=\$${prefix}/share/doc/${doc_package} \
+ --without-libtoolfix
+
+build: build-stamp
+build-stamp: config.status
+ dh_testdir
+
+ # Add here commands to compile the package.
+ $(MAKE)
+
+ # get proper name for shlib package
+ sh $(CURDIR)/debian/control.sh $(CURDIR)/debian/control $(CURDIR)/lib/.libs
+
+ touch build-stamp
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-stamp
+
+ # Add here commands to clean up after the build process.
+ -$(MAKE) distclean
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+ cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+ cp -f /usr/share/misc/config.guess config.guess
+endif
+
+ dh_clean
+
+ #sh debian/unsubstitute.sh
+
+install: build
+ dh_testdir
+ dh_testroot
+ dh_clean -k
+ dh_installdirs
+
+ # Add here commands to install the package into debian/tmp
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+ # some cleanup, which are not necessary:
+ rm -Rf $(CURDIR)/debian/tmp/usr/etc \
+ $(CURDIR)/debian/tmp/usr/help \
+ $(CURDIR)/debian/tmp/usr/logs \
+ $(CURDIR)/debian/tmp/usr/share/man \
+ $(CURDIR)/debian/tmp/usr/share/doc/${doc_package}/examples \
+ $(CURDIR)/debian/tmp/usr/share/doc/${doc_package}/*.conf
+
+ #pkg-config .pc install:
+ install -d $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+ install -m 644 debian/*.pc $(CURDIR)/debian/tmp/usr/lib/pkgconfig
+ #rm -f $(CURDIR)/debian/tmp/usr/lib/pkgconfig/SUBSTITUTE.*
+
+ #toolkit documentation install:
+ install -d $(CURDIR)/debian/tmp/usr/share/doc/libsilc-dev/toolkit
+ install -m 644 doc/toolkit/* $(CURDIR)/debian/tmp/usr/share/doc/libsilc-dev/toolkit
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs CHANGES
+ dh_installdocs
+ dh_installexamples
+ dh_install --autodest --sourcedir=debian/tmp
+# dh_installmenu
+# dh_installdebconf
+# dh_installlogrotate
+# dh_installemacsen
+# dh_installpam
+# dh_installmime
+# dh_installinit
+# dh_installcron
+# dh_installinfo
+ dh_installman
+ dh_link
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_perl
+# dh_python
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install
Propchange: silc-toolkit/trunk/debian/rules
------------------------------------------------------------------------------
svn:executable = *
Added: silc-toolkit/trunk/debian/silc.pc
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/silc.pc?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/silc.pc (added)
+++ silc-toolkit/trunk/debian/silc.pc Wed May 23 14:37:30 2007
@@ -1,0 +1,14 @@
+#name=NAME
+
+prefix=/usr
+exec_prefix=/usr
+libdir=/usr/lib
+#includedir=/usr/include/silc/${name}
+includedir=/usr/include/silc
+
+Name: silc
+#LIB_BASE_VERSION:
+Version: 1.0
+Description: SILC library.
+Libs: -L${libdir} -lsilcclient -lsilc
+Cflags: -I${includedir}
Added: silc-toolkit/trunk/debian/unused/NAME
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/unused/NAME?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/unused/NAME (added)
+++ silc-toolkit/trunk/debian/unused/NAME Wed May 23 14:37:30 2007
@@ -1,0 +1,1 @@
+1.0-2
Added: silc-toolkit/trunk/debian/unused/control
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/unused/control?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/unused/control (added)
+++ silc-toolkit/trunk/debian/unused/control Wed May 23 14:37:30 2007
@@ -1,0 +1,3 @@
+for versioned pkg needs: maybe in the future
+Provides: libsilc-dev
+Conflicts: libsilc-dev
Added: silc-toolkit/trunk/debian/unused/substitute.sh
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/unused/substitute.sh?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/unused/substitute.sh (added)
+++ silc-toolkit/trunk/debian/unused/substitute.sh Wed May 23 14:37:30 2007
@@ -1,0 +1,33 @@
+#!/bin/sh
+
+EXCLUDE="$0" #itself
+SUBSTITUTE="SUBSTITUTE."
+
+#the real scripts begins here:
+
+#substitute.sh [dir]
+#if dir omitted, then the current one will be used
+if [ -z "$1" ]; then
+ DIR="debian"
+else
+ DIR="$1"
+fi
+
+NAME=`cat $DIR/NAME`
+echo "substituting from NAME to $NAME .."
+UNSUBSTITUTE="$DIR/unsubstitute.sh"
+
+echo -n > "$UNSUBSTITUTE"
+for i in $(find "$DIR" -name "$SUBSTITUTE*" -type f); do
+ if ! echo "$i"|grep "$EXCLUDE" >/dev/null; then
+ j=$(echo "$i" | \
+ sed s/NAME/$NAME/g | \
+ sed s/$SUBSTITUTE//g )
+ echo "$i" - "$j"
+ cat "$i" | \
+ sed s/NAME/$NAME/g \
+ > "$j"
+ echo "rm -f $j" >> "$UNSUBSTITUTE"
+ fi
+done
+echo "rm -f $DIR/unsubstitute.sh" >> "$UNSUBSTITUTE"
Added: silc-toolkit/trunk/debian/unused/unsubstitute.sh
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/debian/unused/unsubstitute.sh?rev=4&op=file
==============================================================================
--- silc-toolkit/trunk/debian/unused/unsubstitute.sh (added)
+++ silc-toolkit/trunk/debian/unused/unsubstitute.sh Wed May 23 14:37:30 2007
@@ -1,0 +1,1 @@
+rm -f debian/unsubstitute.sh
Modified: silc-toolkit/trunk/lib/silccore/tests/Makefile
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccore/tests/Makefile?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccore/tests/Makefile (original)
+++ silc-toolkit/trunk/lib/silccore/tests/Makefile Wed May 23 14:37:30 2007
@@ -91,9 +91,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = test_silcargument$(EXEEXT)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.defines.in
@@ -128,43 +128,43 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/priikone/silc1/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/priikone/silc1/missing --run tar
+AMTAR = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/priikone/silc1/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/priikone/silc1/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/priikone/silc1/missing --run automake-1.8
-AWK = gawk
-CC = gcc
+AUTOCONF = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run automake-1.8
+AWK = mawk
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -finline-functions -D_REENTRANT
-CPP = gcc -E
+CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-DOCDIR = /usr/local/silc/doc
+DOCDIR = ${prefix}/share/doc/libsilc-dev
ECHO = echo
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = grep -E
-ETCDIR = /usr/local/silc/etc
+ETCDIR = /usr/etc
EXEEXT =
-F77 = g77
-FFLAGS = -g -O2
+F77 =
+FFLAGS =
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
HAVE_GETOPT_LONG_TRUE =
HAVE_REGEX_FALSE = #
HAVE_REGEX_TRUE =
-HELPDIR = /usr/local/silc/help
+HELPDIR = /usr/help
INCLUDE_DEFINES_INT = include $(top_srcdir)/Makefile.defines_int
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -182,10 +182,10 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIB_BASE_VERSION = 1.0
LN_S = ln -s
-LOGSDIR = /usr/local/silc/logs
+LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/priikone/silc1/missing --run makeinfo
-MODULESDIR = /usr/local/silc/modules
+MAKEINFO = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run makeinfo
+MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
PACKAGE_BUGREPORT =
@@ -194,7 +194,7 @@
PACKAGE_TARNAME =
PACKAGE_VERSION =
PATH_SEPARATOR = :
-PIDFILE = /usr/local/silc/var/silcd.pid
+PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
SHELL = /bin/sh
@@ -204,15 +204,15 @@
SILC_DIST_CLIENT_TRUE = #
SILC_DIST_SERVER_FALSE =
SILC_DIST_SERVER_TRUE = #
-SILC_DIST_SUBDIRS = lib irssi silc silcd doc includes win32
+SILC_DIST_SUBDIRS = lib silc doc includes win32
SILC_DIST_TOOLKIT_FALSE = #
SILC_DIST_TOOLKIT_TRUE =
SILC_DIST_WIN32DLL_FALSE =
SILC_DIST_WIN32DLL_TRUE = #
SILC_EPOC_FALSE =
SILC_EPOC_TRUE = #
-SILC_LIBTOOLFIX_FALSE = #
-SILC_LIBTOOLFIX_TRUE =
+SILC_LIBTOOLFIX_FALSE =
+SILC_LIBTOOLFIX_TRUE = #
SILC_MP_GMP_FALSE =
SILC_MP_GMP_TRUE = #
SILC_MP_NSS_MPI_FALSE = #
@@ -223,21 +223,21 @@
SILC_SIM_TRUE =
SILC_SIZEOF_CHAR = 1
SILC_SIZEOF_INT = 4
-SILC_SIZEOF_LONG = 8
+SILC_SIZEOF_LONG = 4
SILC_SIZEOF_LONG_LONG = 8
SILC_SIZEOF_SHORT = 2
-SILC_SIZEOF_VOID_P = 8
+SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /home/priikone/silc1
+SILC_TOP_SRCDIR = /scratch/libsilc/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
VERSION = 0.9.12
ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip
am__fastdepCC_FALSE = #
@@ -248,39 +248,39 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
-host_vendor = unknown
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/priikone/silc1/install-sh
-libdir = ${exec_prefix}/lib
+host_vendor = pc
+includedir = ${prefix}/include/silc/
+infodir = ${prefix}/share/info
+install_sh = /scratch/libsilc/silc-toolkit-0.9.12/install-sh
+libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${prefix}/share/man
mkdir_p = mkdir -m 0755 -p --
oldincludedir = /usr/include
-prefix = /usr/local/silc
+prefix = /usr
program_transform_name = s,x,x,
sbindir = ${exec_prefix}/sbin
sedpath = /bin/sed
sharedstatedir = ${prefix}/com
-subdirs = irssi lib/silcmath/mpi
+subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i486
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
test_silcargument_SOURCES = test_silcargument.c
LDADD = -L.. -L../.. -lsilc
Modified: silc-toolkit/trunk/lib/silccrypt/Makefile.am
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccrypt/Makefile.am?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccrypt/Makefile.am (original)
+++ silc-toolkit/trunk/lib/silccrypt/Makefile.am Wed May 23 14:37:30 2007
@@ -21,7 +21,6 @@
libsilccrypt_la_SOURCES = \
none.c \
- rc5.c \
md5.c \
aes.c \
rsa.c \
@@ -54,7 +53,6 @@
ciphers.h \
md5.h \
none.h \
- rc5.h \
rsa.h \
sha1.h \
silccipher.h \
Modified: silc-toolkit/trunk/lib/silccrypt/Makefile.in
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccrypt/Makefile.in?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccrypt/Makefile.in (original)
+++ silc-toolkit/trunk/lib/silccrypt/Makefile.in Wed May 23 14:37:30 2007
@@ -107,7 +107,7 @@
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libsilccrypt_la_LIBADD =
-am_libsilccrypt_la_OBJECTS = none.lo rc5.lo md5.lo aes.lo rsa.lo \
+am_libsilccrypt_la_OBJECTS = none.lo md5.lo aes.lo rsa.lo \
sha1.lo twofish.lo blowfish.lo cast.lo silccipher.lo \
silchash.lo silchmac.lo silcrng.lo silcpkcs.lo silcpkcs1.lo
libsilccrypt_la_OBJECTS = $(am_libsilccrypt_la_OBJECTS)
@@ -287,7 +287,6 @@
noinst_LTLIBRARIES = libsilccrypt.la
libsilccrypt_la_SOURCES = \
none.c \
- rc5.c \
md5.c \
aes.c \
rsa.c \
@@ -314,7 +313,6 @@
@SILC_DIST_TOOLKIT_TRUE@ ciphers.h \
@SILC_DIST_TOOLKIT_TRUE@ md5.h \
@SILC_DIST_TOOLKIT_TRUE@ none.h \
- at SILC_DIST_TOOLKIT_TRUE@ rc5.h \
@SILC_DIST_TOOLKIT_TRUE@ rsa.h \
@SILC_DIST_TOOLKIT_TRUE@ sha1.h \
@SILC_DIST_TOOLKIT_TRUE@ silccipher.h \
Modified: silc-toolkit/trunk/lib/silccrypt/ciphers.h
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccrypt/ciphers.h?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccrypt/ciphers.h (original)
+++ silc-toolkit/trunk/lib/silccrypt/ciphers.h Wed May 23 14:37:30 2007
@@ -22,7 +22,6 @@
#define CIPHERS_H
#include "none.h"
-#include "rc5.h"
#include "twofish.h"
#include "aes.h"
#include "blowfish.h"
Modified: silc-toolkit/trunk/lib/silccrypt/tests/Makefile
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silccrypt/tests/Makefile?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silccrypt/tests/Makefile (original)
+++ silc-toolkit/trunk/lib/silccrypt/tests/Makefile Wed May 23 14:37:30 2007
@@ -91,9 +91,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = test_sha1$(EXEEXT) test_md5$(EXEEXT) \
test_hmacsha1$(EXEEXT) test_hmacmd5$(EXEEXT) test_aes$(EXEEXT) \
test_twofish$(EXEEXT) test_silcpkcs$(EXEEXT)
@@ -160,43 +160,43 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/priikone/silc1/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/priikone/silc1/missing --run tar
+AMTAR = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/priikone/silc1/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/priikone/silc1/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/priikone/silc1/missing --run automake-1.8
-AWK = gawk
-CC = gcc
+AUTOCONF = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run automake-1.8
+AWK = mawk
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -finline-functions -D_REENTRANT
-CPP = gcc -E
+CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-DOCDIR = /usr/local/silc/doc
+DOCDIR = ${prefix}/share/doc/libsilc-dev
ECHO = echo
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = grep -E
-ETCDIR = /usr/local/silc/etc
+ETCDIR = /usr/etc
EXEEXT =
-F77 = g77
-FFLAGS = -g -O2
+F77 =
+FFLAGS =
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
HAVE_GETOPT_LONG_TRUE =
HAVE_REGEX_FALSE = #
HAVE_REGEX_TRUE =
-HELPDIR = /usr/local/silc/help
+HELPDIR = /usr/help
INCLUDE_DEFINES_INT = include $(top_srcdir)/Makefile.defines_int
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -214,10 +214,10 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIB_BASE_VERSION = 1.0
LN_S = ln -s
-LOGSDIR = /usr/local/silc/logs
+LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/priikone/silc1/missing --run makeinfo
-MODULESDIR = /usr/local/silc/modules
+MAKEINFO = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run makeinfo
+MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
PACKAGE_BUGREPORT =
@@ -226,7 +226,7 @@
PACKAGE_TARNAME =
PACKAGE_VERSION =
PATH_SEPARATOR = :
-PIDFILE = /usr/local/silc/var/silcd.pid
+PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
SHELL = /bin/sh
@@ -236,15 +236,15 @@
SILC_DIST_CLIENT_TRUE = #
SILC_DIST_SERVER_FALSE =
SILC_DIST_SERVER_TRUE = #
-SILC_DIST_SUBDIRS = lib irssi silc silcd doc includes win32
+SILC_DIST_SUBDIRS = lib silc doc includes win32
SILC_DIST_TOOLKIT_FALSE = #
SILC_DIST_TOOLKIT_TRUE =
SILC_DIST_WIN32DLL_FALSE =
SILC_DIST_WIN32DLL_TRUE = #
SILC_EPOC_FALSE =
SILC_EPOC_TRUE = #
-SILC_LIBTOOLFIX_FALSE = #
-SILC_LIBTOOLFIX_TRUE =
+SILC_LIBTOOLFIX_FALSE =
+SILC_LIBTOOLFIX_TRUE = #
SILC_MP_GMP_FALSE =
SILC_MP_GMP_TRUE = #
SILC_MP_NSS_MPI_FALSE = #
@@ -255,21 +255,21 @@
SILC_SIM_TRUE =
SILC_SIZEOF_CHAR = 1
SILC_SIZEOF_INT = 4
-SILC_SIZEOF_LONG = 8
+SILC_SIZEOF_LONG = 4
SILC_SIZEOF_LONG_LONG = 8
SILC_SIZEOF_SHORT = 2
-SILC_SIZEOF_VOID_P = 8
+SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /home/priikone/silc1
+SILC_TOP_SRCDIR = /scratch/libsilc/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
VERSION = 0.9.12
ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip
am__fastdepCC_FALSE = #
@@ -280,39 +280,39 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
-host_vendor = unknown
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/priikone/silc1/install-sh
-libdir = ${exec_prefix}/lib
+host_vendor = pc
+includedir = ${prefix}/include/silc/
+infodir = ${prefix}/share/info
+install_sh = /scratch/libsilc/silc-toolkit-0.9.12/install-sh
+libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${prefix}/share/man
mkdir_p = mkdir -m 0755 -p --
oldincludedir = /usr/include
-prefix = /usr/local/silc
+prefix = /usr
program_transform_name = s,x,x,
sbindir = ${exec_prefix}/sbin
sedpath = /bin/sed
sharedstatedir = ${prefix}/com
-subdirs = irssi lib/silcmath/mpi
+subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i486
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
test_sha1_SOURCES = test_sha1.c
test_md5_SOURCES = test_md5.c
Modified: silc-toolkit/trunk/lib/silcsftp/tests/Makefile
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcsftp/tests/Makefile?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcsftp/tests/Makefile (original)
+++ silc-toolkit/trunk/lib/silcsftp/tests/Makefile Wed May 23 14:37:30 2007
@@ -92,9 +92,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = sftp_server$(EXEEXT) sftp_client$(EXEEXT)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.defines.in
@@ -133,43 +133,43 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/priikone/silc1/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/priikone/silc1/missing --run tar
+AMTAR = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/priikone/silc1/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/priikone/silc1/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/priikone/silc1/missing --run automake-1.8
-AWK = gawk
-CC = gcc
+AUTOCONF = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run automake-1.8
+AWK = mawk
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -finline-functions -D_REENTRANT
-CPP = gcc -E
+CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-DOCDIR = /usr/local/silc/doc
+DOCDIR = ${prefix}/share/doc/libsilc-dev
ECHO = echo
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = grep -E
-ETCDIR = /usr/local/silc/etc
+ETCDIR = /usr/etc
EXEEXT =
-F77 = g77
-FFLAGS = -g -O2
+F77 =
+FFLAGS =
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
HAVE_GETOPT_LONG_TRUE =
HAVE_REGEX_FALSE = #
HAVE_REGEX_TRUE =
-HELPDIR = /usr/local/silc/help
+HELPDIR = /usr/help
INCLUDE_DEFINES_INT = include $(top_srcdir)/Makefile.defines_int
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -187,10 +187,10 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIB_BASE_VERSION = 1.0
LN_S = ln -s
-LOGSDIR = /usr/local/silc/logs
+LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/priikone/silc1/missing --run makeinfo
-MODULESDIR = /usr/local/silc/modules
+MAKEINFO = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run makeinfo
+MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
PACKAGE_BUGREPORT =
@@ -199,7 +199,7 @@
PACKAGE_TARNAME =
PACKAGE_VERSION =
PATH_SEPARATOR = :
-PIDFILE = /usr/local/silc/var/silcd.pid
+PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
SHELL = /bin/sh
@@ -209,15 +209,15 @@
SILC_DIST_CLIENT_TRUE = #
SILC_DIST_SERVER_FALSE =
SILC_DIST_SERVER_TRUE = #
-SILC_DIST_SUBDIRS = lib irssi silc silcd doc includes win32
+SILC_DIST_SUBDIRS = lib silc doc includes win32
SILC_DIST_TOOLKIT_FALSE = #
SILC_DIST_TOOLKIT_TRUE =
SILC_DIST_WIN32DLL_FALSE =
SILC_DIST_WIN32DLL_TRUE = #
SILC_EPOC_FALSE =
SILC_EPOC_TRUE = #
-SILC_LIBTOOLFIX_FALSE = #
-SILC_LIBTOOLFIX_TRUE =
+SILC_LIBTOOLFIX_FALSE =
+SILC_LIBTOOLFIX_TRUE = #
SILC_MP_GMP_FALSE =
SILC_MP_GMP_TRUE = #
SILC_MP_NSS_MPI_FALSE = #
@@ -228,21 +228,21 @@
SILC_SIM_TRUE =
SILC_SIZEOF_CHAR = 1
SILC_SIZEOF_INT = 4
-SILC_SIZEOF_LONG = 8
+SILC_SIZEOF_LONG = 4
SILC_SIZEOF_LONG_LONG = 8
SILC_SIZEOF_SHORT = 2
-SILC_SIZEOF_VOID_P = 8
+SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /home/priikone/silc1
+SILC_TOP_SRCDIR = /scratch/libsilc/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
VERSION = 0.9.12
ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip
am__fastdepCC_FALSE = #
@@ -253,39 +253,39 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
-host_vendor = unknown
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/priikone/silc1/install-sh
-libdir = ${exec_prefix}/lib
+host_vendor = pc
+includedir = ${prefix}/include/silc/
+infodir = ${prefix}/share/info
+install_sh = /scratch/libsilc/silc-toolkit-0.9.12/install-sh
+libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${prefix}/share/man
mkdir_p = mkdir -m 0755 -p --
oldincludedir = /usr/include
-prefix = /usr/local/silc
+prefix = /usr
program_transform_name = s,x,x,
sbindir = ${exec_prefix}/sbin
sedpath = /bin/sed
sharedstatedir = ${prefix}/com
-subdirs = irssi lib/silcmath/mpi
+subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i486
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
sftp_server_SOURCES = sftp_server.c
sftp_client_SOURCES = sftp_client.c
Modified: silc-toolkit/trunk/lib/silcutil/tests/Makefile
URL: http://svn.debian.org/wsvn/pkg-silc/silc-toolkit/trunk/lib/silcutil/tests/Makefile?rev=4&op=diff
==============================================================================
--- silc-toolkit/trunk/lib/silcutil/tests/Makefile (original)
+++ silc-toolkit/trunk/lib/silcutil/tests/Makefile Wed May 23 14:37:30 2007
@@ -91,9 +91,9 @@
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
-build_triplet = x86_64-unknown-linux-gnu
-host_triplet = x86_64-unknown-linux-gnu
-target_triplet = x86_64-unknown-linux-gnu
+build_triplet = i486-pc-linux-gnu
+host_triplet = i486-pc-linux-gnu
+target_triplet = i486-pc-linux-gnu
bin_PROGRAMS = test_silcstrutil$(EXEEXT)
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
$(top_srcdir)/Makefile.defines.in
@@ -128,43 +128,43 @@
ETAGS = etags
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /home/priikone/silc1/missing --run aclocal-1.8
+ACLOCAL = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run aclocal-1.8
AMDEP_FALSE = #
AMDEP_TRUE =
-AMTAR = ${SHELL} /home/priikone/silc1/missing --run tar
+AMTAR = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run tar
AR = ar
-AUTOCONF = ${SHELL} /home/priikone/silc1/missing --run autoconf
-AUTOHEADER = ${SHELL} /home/priikone/silc1/missing --run autoheader
-AUTOMAKE = ${SHELL} /home/priikone/silc1/missing --run automake-1.8
-AWK = gawk
-CC = gcc
+AUTOCONF = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoconf
+AUTOHEADER = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run autoheader
+AUTOMAKE = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run automake-1.8
+AWK = mawk
+CC = i486-linux-gnu-gcc
CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -finline-functions -D_REENTRANT
-CPP = gcc -E
+CFLAGS = -g -O -Wall -finline-functions -D_REENTRANT
+CPP = i486-linux-gnu-gcc -E
CPPFLAGS =
-CXX = g++
-CXXCPP = g++ -E
+CXX = i486-linux-gnu-g++
+CXXCPP = i486-linux-gnu-g++ -E
CXXDEPMODE = depmode=gcc3
CXXFLAGS = -g -O2
CYGPATH_W = echo
DEFS = -DHAVE_CONFIG_H
DEPDIR = .deps
-DOCDIR = /usr/local/silc/doc
+DOCDIR = ${prefix}/share/doc/libsilc-dev
ECHO = echo
ECHO_C =
ECHO_N = -n
ECHO_T =
EGREP = grep -E
-ETCDIR = /usr/local/silc/etc
+ETCDIR = /usr/etc
EXEEXT =
-F77 = g77
-FFLAGS = -g -O2
+F77 =
+FFLAGS =
FIX_SHA1 = #
HAVE_GETOPT_LONG_FALSE = #
HAVE_GETOPT_LONG_TRUE =
HAVE_REGEX_FALSE = #
HAVE_REGEX_TRUE =
-HELPDIR = /usr/local/silc/help
+HELPDIR = /usr/help
INCLUDE_DEFINES_INT = include $(top_srcdir)/Makefile.defines_int
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
@@ -182,10 +182,10 @@
LIBTOOL = $(SHELL) $(top_builddir)/libtool
LIB_BASE_VERSION = 1.0
LN_S = ln -s
-LOGSDIR = /usr/local/silc/logs
+LOGSDIR = /usr/logs
LTLIBOBJS =
-MAKEINFO = ${SHELL} /home/priikone/silc1/missing --run makeinfo
-MODULESDIR = /usr/local/silc/modules
+MAKEINFO = ${SHELL} /scratch/libsilc/silc-toolkit-0.9.12/missing --run makeinfo
+MODULESDIR = ${libdir}/silc/
OBJEXT = o
PACKAGE = silc-toolkit
PACKAGE_BUGREPORT =
@@ -194,7 +194,7 @@
PACKAGE_TARNAME =
PACKAGE_VERSION =
PATH_SEPARATOR = :
-PIDFILE = /usr/local/silc/var/silcd.pid
+PIDFILE = /usr/var/silcd.pid
RANLIB = ranlib
SET_MAKE =
SHELL = /bin/sh
@@ -204,15 +204,15 @@
SILC_DIST_CLIENT_TRUE = #
SILC_DIST_SERVER_FALSE =
SILC_DIST_SERVER_TRUE = #
-SILC_DIST_SUBDIRS = lib irssi silc silcd doc includes win32
+SILC_DIST_SUBDIRS = lib silc doc includes win32
SILC_DIST_TOOLKIT_FALSE = #
SILC_DIST_TOOLKIT_TRUE =
SILC_DIST_WIN32DLL_FALSE =
SILC_DIST_WIN32DLL_TRUE = #
SILC_EPOC_FALSE =
SILC_EPOC_TRUE = #
-SILC_LIBTOOLFIX_FALSE = #
-SILC_LIBTOOLFIX_TRUE =
+SILC_LIBTOOLFIX_FALSE =
+SILC_LIBTOOLFIX_TRUE = #
SILC_MP_GMP_FALSE =
SILC_MP_GMP_TRUE = #
SILC_MP_NSS_MPI_FALSE = #
@@ -223,21 +223,21 @@
SILC_SIM_TRUE =
SILC_SIZEOF_CHAR = 1
SILC_SIZEOF_INT = 4
-SILC_SIZEOF_LONG = 8
+SILC_SIZEOF_LONG = 4
SILC_SIZEOF_LONG_LONG = 8
SILC_SIZEOF_SHORT = 2
-SILC_SIZEOF_VOID_P = 8
+SILC_SIZEOF_VOID_P = 4
SILC_THREADS_FALSE = #
SILC_THREADS_TRUE =
-SILC_TOP_SRCDIR = /home/priikone/silc1
+SILC_TOP_SRCDIR = /scratch/libsilc/silc-toolkit-0.9.12
SILC_WIN32_FALSE =
SILC_WIN32_TRUE = #
STRIP = strip
VERSION = 0.9.12
ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = g77
+ac_ct_CC =
+ac_ct_CXX =
+ac_ct_F77 =
ac_ct_RANLIB = ranlib
ac_ct_STRIP = strip
am__fastdepCC_FALSE = #
@@ -248,39 +248,39 @@
am__leading_dot = .
am__quote =
bindir = ${exec_prefix}/bin
-build = x86_64-unknown-linux-gnu
-build_alias =
-build_cpu = x86_64
+build = i486-pc-linux-gnu
+build_alias = i486-linux-gnu
+build_cpu = i486
build_os = linux-gnu
-build_vendor = unknown
+build_vendor = pc
datadir = ${prefix}/share
exec_prefix = ${prefix}
-host = x86_64-unknown-linux-gnu
-host_alias =
-host_cpu = x86_64
+host = i486-pc-linux-gnu
+host_alias = i486-linux-gnu
+host_cpu = i486
host_os = linux-gnu
-host_vendor = unknown
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /home/priikone/silc1/install-sh
-libdir = ${exec_prefix}/lib
+host_vendor = pc
+includedir = ${prefix}/include/silc/
+infodir = ${prefix}/share/info
+install_sh = /scratch/libsilc/silc-toolkit-0.9.12/install-sh
+libdir = ${prefix}/lib
libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
-mandir = ${prefix}/man
+mandir = ${prefix}/share/man
mkdir_p = mkdir -m 0755 -p --
oldincludedir = /usr/include
-prefix = /usr/local/silc
+prefix = /usr
program_transform_name = s,x,x,
sbindir = ${exec_prefix}/sbin
sedpath = /bin/sed
sharedstatedir = ${prefix}/com
-subdirs = irssi lib/silcmath/mpi
+subdirs = lib/silcmath/mpi
sysconfdir = ${prefix}/etc
-target = x86_64-unknown-linux-gnu
+target = i486-pc-linux-gnu
target_alias =
-target_cpu = x86_64
+target_cpu = i486
target_os = linux-gnu
-target_vendor = unknown
+target_vendor = pc
AUTOMAKE_OPTIONS = 1.0 no-dependencies foreign
test_silcstrutil_SOURCES = test_silcstrutil.c
LDADD = -L.. -L../.. -lsilc
More information about the Pkg-silc-commits
mailing list