Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24942 Modified Files: BUGS COPYING ChangeLog INSTALL Makefile.am NEWS README autotools configure.in Added Files: .cvsignore Removed Files: acconfig.h config.h.in Log Message: merge 2.5.0 branch into the head Index: BUGS =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/BUGS,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** BUGS 20 Aug 2001 21:03:47 -0000 1.1 --- BUGS 1 Jan 2008 00:14:49 -0000 1.2 *************** *** 1,6 **** ! Known bugs and restrictions in version 0.56 ! =========================================== - - some recently discovered message sequences crash ilmid - ENI driver: closing an AAL0 socket while data is arriving at a high rate hangs in the close system call --- 1,5 ---- ! Known bugs and restrictions in version 2.5.0 ! ============================================ - ENI driver: closing an AAL0 socket while data is arriving at a high rate hangs in the close system call Index: COPYING =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/COPYING,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** COPYING 20 Aug 2001 21:03:47 -0000 1.1 --- COPYING 1 Jan 2008 00:14:49 -0000 1.2 *************** *** 1,6 **** Program code, documentation and auxiliary programs, except for the parts ! listen below, are ! Copyright 1995-2000 EPFL-LRC/ICA ! All rights reserved. This package is free software; you can redistribute it and/or modify --- 1,7 ---- Program code, documentation and auxiliary programs, except for the parts ! listen below, are: ! ! Copyright 1995-2000 EPFL-LRC/ICA ! All rights reserved. This package is free software; you can redistribute it and/or modify *************** *** 18,23 **** in the top-level directory of the kernel (i.e. the GPL, version 2). ! The libraries libatm, libatmd, libarequipa (in atm/lib/), libsaal (in ! atm/saal/), and qlib (in atm/qgen/) are covered by the more permissive Library General Public License. See the file COPYING.LGPL for details. --- 19,24 ---- in the top-level directory of the kernel (i.e. the GPL, version 2). ! The libraries libatm, libatmd, libarequipa (in src/lib/), libsaal (in ! src/saal/), and qlib (in src/qgen/) are covered by the more permissive Library General Public License. See the file COPYING.LGPL for details. *************** *** 32,40 **** Some of the files used by ilmid are Copyright (C) 1992 Michael Sample and the University of British Columbia ! See asn1/*.[ch] for copying terms. The LAN Emulation code is Copyright by Tampere University of Technology ! - Telecommunications Laboratory. See lane/COPYRIGHT.TUT and ! led/COPYRIGHT.TUT for copying terms. The Multi-Protocol Over ATM (MPOA) code was developed at Tampere --- 33,41 ---- Some of the files used by ilmid are Copyright (C) 1992 Michael Sample and the University of British Columbia ! See src/ilmid/asn1/*.[ch] for copying terms. The LAN Emulation code is Copyright by Tampere University of Technology ! - Telecommunications Laboratory. See src/lane/COPYRIGHT.TUT and ! src/led/COPYRIGHT.TUT for copying terms. The Multi-Protocol Over ATM (MPOA) code was developed at Tampere Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ChangeLog 15 Oct 2001 21:14:58 -0000 1.3 --- ChangeLog 1 Jan 2008 00:14:49 -0000 1.4 *************** *** 1,2 **** --- 1,37 ---- + Version 2.4.1 to 2.5.0 (30-DEC-2007) + ====================== + + Bug fixes + --------- + + - building outside the source tree should now work properly + - TimeTicks (in ilmid) should be unsigned + - fix zeppelin's handling of LE_ARP REMOTE_ADDRESS flag + + New features + ------------ + + - zeppelin now has a -b option (run in background) + - zeppelin creates /var/run/lec[itf].pid at startup + - ilmid updates from ek...@cm... + - atmswitch from ele...@in... + - point to multipoint signalling support + - routed br2684 support from ek...@cm... + + Other changes + ------------- + + - updated to support later versions of autoconf + + + Version 2.4.0 to 2.4.1 (25-APR-2003) + ===================== + + Bug fixes + --------- + + - vsprintf's changed to vsnprintf's to prevent possible stack overflows + + Version 0.79 to 2.4.0 (18-OCT-2001) ===================== Index: INSTALL =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/INSTALL,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** INSTALL 17 Oct 2001 19:27:21 -0000 1.1 --- INSTALL 1 Jan 2008 00:14:49 -0000 1.2 *************** *** 1,6 **** Basic Installation ================== ! These are generic installation instructions. The `configure' shell script attempts to guess correct values for --- 1,18 ---- + Installation Instructions + ************************* + + Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, + 2006 Free Software Foundation, Inc. + + This file is free documentation; the Free Software Foundation gives + unlimited permission to copy, distribute and modify it. + Basic Installation ================== ! Briefly, the shell commands `./configure; make; make install' should ! configure, build, and install this package. The following ! more-detailed instructions are generic; see the `README' file for ! instructions specific to this package. The `configure' shell script attempts to guess correct values for *************** *** 9,37 **** It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that ! you can run in the future to recreate the current configuration, a file ! `config.cache' that saves the results of its tests to speed up ! reconfiguring, and a file `config.log' containing compiler output ! (useful mainly for debugging `configure'). If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can ! be considered for the next release. If at some point `config.cache' ! contains results you don't want to keep, you may remove or edit it. ! The file `configure.in' is used to create `configure' by a program ! called `autoconf'. You only need `configure.in' if you want to change ! it or regenerate `configure' using a newer version of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type ! `./configure' to configure the package for your system. If you're ! using `csh' on an old version of System V, you might need to type ! `sh ./configure' instead to prevent `csh' from trying to execute ! `configure' itself. ! Running `configure' takes awhile. While running, it prints some ! messages telling which features it is checking for. 2. Type `make' to compile the package. --- 21,53 ---- It may also create one or more `.h' files containing system-dependent definitions. Finally, it creates a shell script `config.status' that ! you can run in the future to recreate the current configuration, and a ! file `config.log' containing compiler output (useful mainly for ! debugging `configure'). ! ! It can also use an optional file (typically called `config.cache' ! and enabled with `--cache-file=config.cache' or simply `-C') that saves ! the results of its tests to speed up reconfiguring. Caching is ! disabled by default to prevent problems with accidental use of stale ! cache files. If you need to do unusual things to compile the package, please try to figure out how `configure' could check whether to do them, and mail diffs or instructions to the address given in the `README' so they can ! be considered for the next release. If you are using the cache, and at ! some point `config.cache' contains results you don't want to keep, you ! may remove or edit it. ! The file `configure.ac' (or `configure.in') is used to create ! `configure' by a program called `autoconf'. You need `configure.ac' if ! you want to change it or regenerate `configure' using a newer version ! of `autoconf'. The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type ! `./configure' to configure the package for your system. ! Running `configure' might take a while. While running, it prints ! some messages telling which features it is checking for. 2. Type `make' to compile the package. *************** *** 55,101 **** ===================== ! Some systems require unusual options for compilation or linking that ! the `configure' script does not know about. You can give `configure' ! initial values for variables by setting them in the environment. Using ! a Bourne-compatible shell, you can do that on the command line like ! this: ! CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure ! Or on systems that have the `env' program, you can do it like this: ! env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure Compiling For Multiple Architectures ==================================== ! You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their ! own directory. To do this, you must use a version of `make' that ! supports the `VPATH' variable, such as GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. ! If you have to use a `make' that does not supports the `VPATH' ! variable, you have to compile the package for one architecture at a time ! in the source code directory. After you have installed the package for ! one architecture, use `make distclean' before reconfiguring for another ! architecture. Installation Names ================== ! By default, `make install' will install the package's files in ! `/usr/local/bin', `/usr/local/man', etc. You can specify an ! installation prefix other than `/usr/local' by giving `configure' the ! option `--prefix=PATH'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! give `configure' the option `--exec-prefix=PATH', the package will use ! PATH as the prefix for installing programs and libraries. ! Documentation and other data files will still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=PATH' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. --- 71,117 ---- ===================== ! Some systems require unusual options for compilation or linking that the ! `configure' script does not know about. Run `./configure --help' for ! details on some of the pertinent environment variables. ! You can give `configure' initial values for configuration parameters ! by setting variables in the command line or in the environment. Here ! is an example: ! ! ./configure CC=c99 CFLAGS=-g LIBS=-lposix ! ! *Note Defining Variables::, for more details. Compiling For Multiple Architectures ==================================== ! You can compile the package for more than one kind of computer at the same time, by placing the object files for each architecture in their ! own directory. To do this, you can use GNU `make'. `cd' to the directory where you want the object files and executables to go and run the `configure' script. `configure' automatically checks for the source code in the directory that `configure' is in and in `..'. ! With a non-GNU `make', it is safer to compile the package for one ! architecture at a time in the source code directory. After you have ! installed the package for one architecture, use `make distclean' before ! reconfiguring for another architecture. Installation Names ================== ! By default, `make install' installs the package's commands under ! `/usr/local/bin', include files under `/usr/local/include', etc. You ! can specify an installation prefix other than `/usr/local' by giving ! `configure' the option `--prefix=PREFIX'. You can specify separate installation prefixes for architecture-specific files and architecture-independent files. If you ! pass the option `--exec-prefix=PREFIX' to `configure', the package uses ! PREFIX as the prefix for installing programs and libraries. ! Documentation and other data files still use the regular prefix. In addition, if you use an unusual directory layout you can give ! options like `--bindir=DIR' to specify different values for particular kinds of files. Run `configure --help' for a list of the directories you can set and what kinds of files go in them. *************** *** 108,112 **** ================= ! Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE --- 124,128 ---- ================= ! Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. They may also pay attention to `--with-PACKAGE' options, where PACKAGE *************** *** 123,149 **** ========================== ! There may be some features `configure' can not figure out ! automatically, but needs to determine by the type of host the package ! will run on. Usually `configure' can figure that out, but if it prints ! a message saying it can not guess the host type, give it the ! `--host=TYPE' option. TYPE can either be a short name for the system ! type, such as `sun4', or a canonical name with three fields: CPU-COMPANY-SYSTEM ! See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't ! need to know the host type. ! If you are building compiler tools for cross-compiling, you can also ! use the `--target=TYPE' option to select the type of system they will ! produce code for and the `--build=TYPE' option to select the type of ! system on which you are compiling the package. Sharing Defaults ================ ! If you want to set default values for `configure' scripts to share, ! you can create a site shell script called `config.site' that gives ! default values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the --- 139,175 ---- ========================== ! There may be some features `configure' cannot figure out automatically, ! but needs to determine by the type of machine the package will run on. ! Usually, assuming the package is built to be run on the _same_ ! architectures, `configure' can figure that out, but if it prints a ! message saying it cannot guess the machine type, give it the ! `--build=TYPE' option. TYPE can either be a short name for the system ! type, such as `sun4', or a canonical name which has the form: ! CPU-COMPANY-SYSTEM ! where SYSTEM can have one of these forms: ! ! OS KERNEL-OS ! ! See the file `config.sub' for the possible values of each field. If `config.sub' isn't included in this package, then this package doesn't ! need to know the machine type. ! If you are _building_ compiler tools for cross-compiling, you should ! use the option `--target=TYPE' to select the type of system they will ! produce code for. ! ! If you want to _use_ a cross compiler, that generates code for a ! platform different from the build platform, you should specify the ! "host" platform (i.e., that on which the generated programs will ! eventually be run) with `--host=TYPE'. Sharing Defaults ================ ! If you want to set default values for `configure' scripts to share, you ! can create a site shell script called `config.site' that gives default ! values for variables like `CC', `cache_file', and `prefix'. `configure' looks for `PREFIX/share/config.site' if it exists, then `PREFIX/etc/config.site' if it exists. Or, you can set the *************** *** 151,168 **** A warning: not all `configure' scripts look for a site script. ! Operation Controls ================== ! `configure' recognizes the following options to control how it ! operates. ! `--cache-file=FILE' ! Use and save the results of the tests in FILE instead of ! `./config.cache'. Set FILE to `/dev/null' to disable caching, for ! debugging `configure'. `--help' Print a summary of the options to `configure', and exit. `--quiet' `--silent' --- 177,222 ---- A warning: not all `configure' scripts look for a site script. ! Defining Variables ================== ! Variables not defined in a site shell script can be set in the ! environment passed to `configure'. However, some packages may run ! configure again during the build, and the customized values of these ! variables may be lost. In order to avoid this problem, you should set ! them in the `configure' command line, using `VAR=value'. For example: ! ./configure CC=/usr/local2/bin/gcc ! ! causes the specified `gcc' to be used as the C compiler (unless it is ! overridden in the site shell script). ! ! Unfortunately, this technique does not work for `CONFIG_SHELL' due to ! an Autoconf bug. Until the bug is fixed you can use this workaround: ! ! CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash ! ! `configure' Invocation ! ====================== ! ! `configure' recognizes the following options to control how it operates. `--help' + `-h' Print a summary of the options to `configure', and exit. + `--version' + `-V' + Print the version of Autoconf used to generate the `configure' + script, and exit. + + `--cache-file=FILE' + Enable the cache: use and save the results of the tests in FILE, + traditionally `config.cache'. FILE defaults to `/dev/null' to + disable caching. + + `--config-cache' + `-C' + Alias for `--cache-file=config.cache'. + `--quiet' `--silent' *************** *** 176,204 **** `configure' can determine that directory automatically. ! `--version' ! Print the version of Autoconf used to generate the `configure' ! script, and exit. ! ! `configure' also accepts some other, not widely useful, options. ! ! Additional Build Targets ! ======================== ! ! The following additional build targets can be passed to make: ! ! `uninstall' ! Uninstall the binaries, libraries, configuration files, and man pages ! which were installed with the 'install' target. ! ! `dist' ! Create a gzipped distribution tarball. It will be placed in the current ! directory. ! ! `rpm' ! Create a binary RPM of the distribution. The RPM will be placed in the ! src/extra/RPMS/`arch'/ directory where arch is the target platform. ! (This will also make a gzipped distribution tarball.) ! ! `cscope' ! Create `cscope.out' cross-reference file for cscope tags. --- 230,234 ---- `configure' can determine that directory automatically. ! `configure' also accepts some other, not widely useful, options. Run ! `configure --help' for more details. Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/Makefile.am,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Makefile.am 17 Oct 2001 19:37:52 -0000 1.4 --- Makefile.am 1 Jan 2008 00:14:49 -0000 1.5 *************** *** 6,10 **** -mkdir -p src/extra/RPMS -mkdir -p src/extra/SRPMS ! rpm -ba src/extra/linux-atm.spec rpm: rpms --- 6,10 ---- -mkdir -p src/extra/RPMS -mkdir -p src/extra/SRPMS ! rpmbuild -ba src/extra/linux-atm.spec rpm: rpms Index: NEWS =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/NEWS,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** NEWS 9 Oct 2001 22:33:01 -0000 1.2 --- NEWS 1 Jan 2008 00:14:49 -0000 1.3 *************** *** 1,2 **** --- 1,4 ---- + December 30, 2007 Version 2.5.0 is released. + April 30, 2003 Version 2.4.1 is released. October 18, 2001 Version 2.4.0 is released. August 15, 2001 Version 0.79 is released. Index: README =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** README 15 Oct 2001 21:14:59 -0000 1.3 --- README 1 Jan 2008 00:14:49 -0000 1.4 *************** *** 1,8 **** ! ATM on Linux, release 2.4.0 (beta) ! ================================= Werner Almesberger, EPFL ICA <wa...@al...> Mitchell Blank Jr., <mi...@sf...> Paul B Schroeder, <pa...@us...> -------------------------------------- --- 1,9 ---- ! ATM on Linux, release 2.5.0 ! =========================== Werner Almesberger, EPFL ICA <wa...@al...> Mitchell Blank Jr., <mi...@sf...> Paul B Schroeder, <pa...@us...> + Chas Williams, <ch...@cm...> -------------------------------------- *************** *** 11,24 **** still change every once in a while. Use at your own risk. ! Please see http://linux-atm.sourceforge.net/ for a list of ! features supported by ATM on Linux. ! If you're just looking for the device drivers: you may find what you're looking ! for under src/extra/drivers. Most are already in the mainstream kernel or, for ! those which are not integrated, visit http://linux-atm.sourceforge.net/info.php ! For usage and installation instructions, please read the "ATM on Linux HOWTO" ! in the doc/ directory. The README in that directory explains how to generate ! alternative document types of the documentation. For known restrictions and bugs, please read the file BUGS. --- 12,26 ---- still change every once in a while. Use at your own risk. ! Please see http://linux-atm.sourceforge.net/ for a list of features ! supported by ATM on Linux. ! If you're just looking for the device drivers: you may find what ! you're looking for under src/extra/drivers. Most are already in ! the mainstream kernel or, for those which are not integrated, visit ! http://linux-atm.sourceforge.net/info.php ! For usage and installation instructions, please read the "ATM on Linux ! HOWTO" in the doc/ directory. The README in that directory explains ! how to generate alternative document types of the documentation. For known restrictions and bugs, please read the file BUGS. Index: autotools =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/autotools,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** autotools 9 Oct 2001 22:33:01 -0000 1.2 --- autotools 1 Jan 2008 00:14:49 -0000 1.3 *************** *** 7,10 **** --- 7,12 ---- fi + echo "Running libtoolize..." + libtoolize --force --copy echo "Running aclocal..." aclocal $VERBOSE *************** *** 14,18 **** autoheader echo "Running automake..." ! automake --add-missing $VERBOSE echo "Finished... Now run './configure' and 'make'..." --- 16,20 ---- autoheader echo "Running automake..." ! automake --force-missing --add-missing --copy $VERBOSE echo "Finished... Now run './configure' and 'make'..." Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure.in 15 Oct 2001 21:15:00 -0000 1.3 --- configure.in 1 Jan 2008 00:14:49 -0000 1.4 *************** *** 12,16 **** AC_CANONICAL_SYSTEM ! AM_INIT_AUTOMAKE(linux-atm,2.4.0) LIBVER_CURRENT="1" --- 12,16 ---- AC_CANONICAL_SYSTEM ! AM_INIT_AUTOMAKE(linux-atm,2.5.0) LIBVER_CURRENT="1" *************** *** 26,29 **** --- 26,37 ---- AC_PROG_YACC AC_PROG_INSTALL + if test "x$cross_compiling" = "xyes"; then + AC_MSG_CHECKING(cc for build) + AC_CHECK_PROGS(CC_FOR_BUILD, gcc) + AC_MSG_RESULT($CC_FOR_BUILD) + else + CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" + fi + AC_SUBST(CC_FOR_BUILD) dnl libtool defs *************** *** 60,64 **** dnl For yacc compiles... ! AC_DEFINE(YY_USE_CONST) dnl Config files --- 68,72 ---- dnl For yacc compiles... ! AC_DEFINE(YY_USE_CONST, [], [ ]) dnl Config files *************** *** 66,70 **** test "x$prefix" = xNONE && prefix=${exec_prefix} eval echo "$sysconfdir"` ! AC_DEFINE_UNQUOTED(ATMSIGD_CONF,"$atmsigd_conf_dir/atmsigd.conf") dnl Do our ./configure arguments here --- 74,78 ---- test "x$prefix" = xNONE && prefix=${exec_prefix} eval echo "$sysconfdir"` ! AC_DEFINE_UNQUOTED(ATMSIGD_CONF, "$atmsigd_conf_dir/atmsigd.conf", [Default config file location for atmsigd]) dnl Do our ./configure arguments here *************** *** 73,84 **** [ case "$with_uni" in ! "3.0" ) AC_DEFINE(UNI30) ;; ! "3.1" ) AC_DEFINE(UNI31) ;; ! "4.0" ) AC_DEFINE(UNI40) ;; *) ! AC_DEFINE(DYNAMIC_UNI) AC_MSG_WARN([*** UNI version not specified correctly. Defaulting to dynamic UNI.]) esac --- 81,95 ---- [ case "$with_uni" in ! "3.0" ) AC_DEFINE(UNI30, [], [ ]) ;; ! "3.1" ) AC_DEFINE(UNI31, [], [Note: some UNI 3.0 switches will show really strange behaviour if confronted ! with using 3.1 signaling, so be sure to test your network *very* ! carefully before permanently configuring machines to use UNI 3.1.]) ;; ! "4.0" ) AC_DEFINE(UNI40, [], [Some partial support for UNI 4.0 can be enabled by using UNI40]) ;; *) ! AC_DEFINE(DYNAMIC_UNI, [], [The UNI version can be configured at run time. Dynamic is the default. Use the ! explicit version selections only in case of problems.]) AC_MSG_WARN([*** UNI version not specified correctly. Defaulting to dynamic UNI.]) esac *************** *** 91,95 **** [ if test "$with_uni" = "3.1" ; then ! AC_DEFINE(ALLOW_UNI30) else AC_MSG_WARN([*** Allow UNI 3.0 was not enabled. It is only valid when UNI 3.1 is specified as the default via --with-uni.]) --- 102,106 ---- [ if test "$with_uni" = "3.1" ; then ! AC_DEFINE(ALLOW_UNI30, [], [Allow UNI 3.0 backwards-compatible extensions (if using UNI 3.1)]) else AC_MSG_WARN([*** Allow UNI 3.0 was not enabled. It is only valid when UNI 3.1 is specified as the default via --with-uni.]) *************** *** 102,106 **** [ if test "$with_uni" = "4.0" ; then ! AC_DEFINE(Q2963_1) else AC_MSG_WARN([*** Q.2963.1 was not enabled. It is only valid when UNI 4.0 is specified as the default via --with-uni.]) --- 113,118 ---- [ if test "$with_uni" = "4.0" ; then ! AC_DEFINE(Q2963_1, [], [If using UNI40, you can also enable peak cell rate modification as ! specified in Q.2963.1]) else AC_MSG_WARN([*** Q.2963.1 was not enabled. It is only valid when UNI 4.0 is specified as the default via --with-uni.]) *************** *** 111,129 **** AC_ARG_ENABLE(cisco, [ --enable-cisco Enable work around for point-to-multipoint signaling bug in Cisco LS100 or LS7010 switches], ! AC_DEFINE(CISCO) ) AC_ARG_ENABLE(thomflex, [ --enable-thomflex Some versions of the Thomson Thomflex 5000 won't do any signaling before they get a RESTART. Enable sending of a RESTART whenever SAAL comes up.], ! AC_DEFINE(THOMFLEX) ) dnl Use select() instead of poll() with MPOA dnl Do we still need this?? Make it selectable?? ! AC_DEFINE(BROKEN_POLL) AC_ARG_ENABLE(mpoa_1_1, [ --enable-mpoa_1_1 Enable proposed MPOA 1.1 features], ! AC_DEFINE(MPOA_1_1) ) --- 123,148 ---- AC_ARG_ENABLE(cisco, [ --enable-cisco Enable work around for point-to-multipoint signaling bug in Cisco LS100 or LS7010 switches], ! AC_DEFINE(CISCO, [], [If you're using a Cisco LS100 or LS7010 switch, you should add the following ! line to work around a bug in their point-to-multipoint signaling (it got ! confused when receiving a CALL PROCEEDING, so we don't send it, which of ! course makes our clearing procedure slightly non-conformant):]) ) AC_ARG_ENABLE(thomflex, [ --enable-thomflex Some versions of the Thomson Thomflex 5000 won't do any signaling before they get a RESTART. Enable sending of a RESTART whenever SAAL comes up.], ! AC_DEFINE(THOMFLEX, [], [Some versions of the Thomson Thomflex 5000 won't do any signaling before they ! get a RESTART. Uncomment the next line to enable sending of a RESTART ! whenever SAAL comes up. Note that the RESTART ACKNOWLEDGE sent in response to ! the RESTART will yield a warning, because we don't implement the full RESTART ! state machine.]) ) dnl Use select() instead of poll() with MPOA dnl Do we still need this?? Make it selectable?? ! AC_DEFINE(BROKEN_POLL, [], [Use select() instead of poll() with MPOA]) AC_ARG_ENABLE(mpoa_1_1, [ --enable-mpoa_1_1 Enable proposed MPOA 1.1 features], ! AC_DEFINE(MPOA_1_1, [], [Use proposed MPOA 1.1 features]) ) *************** *** 143,146 **** --- 162,204 ---- ) + AC_ARG_WITH(kernel-headers, + [ --with-kernel-headers=path use the kernel headers found at path] + ) + if test "x$with_kernel_headers" != "x"; then + CFLAGS="-I$with_kernel_headers/include $CFLAGS" + fi + + dnl AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[],[]) + pmp_send="" + AC_SUBST(pmp_send) + AC_ARG_ENABLE(multipoint, + [ --enable-multipoint Enable point to multipoint signalling], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT + #include <stdint.h> + #include <linux/atmdev.h> + ], + [[ int fd; + struct atm_iobuf buf; + + ioctl(fd, ATM_ADDPARTY, &buf); + ]])], + [AC_DEFINE(MULTIPOINT, [], [Point to multipoint signalling support for atmsigd.]) + pmp_send="pmp_send"], + [AC_MSG_WARN([*** Multipoint signalling was not enabled. Missing kernel support?])])] + ) + + atmoamd="" + AC_SUBST(atmoamd) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT + #include <stdint.h> + #include <linux/atmoam.h> + ], + [[ int fd; + + ioctl(fd, ATMOAMD_CTRL, 0); + ]])], + [atmoamd="atmoamd"], + [AC_MSG_WARN([*** atmoamd will not be built. Missing kernel support?])]) + dnl Xsed="sed -e s/^X//" dnl LTLIBOBJS=`echo X"$LIBOBJS" | \$Xsed -e "s,\. [^.]* ,.lo,g;s,\.[^.]*$,.lo,"` *************** *** 167,179 **** src/lane/Makefile \ src/mpoad/Makefile \ src/switch/Makefile \ src/switch/debug/Makefile \ src/switch/tcp/Makefile \ src/config/Makefile \ - src/config/init-redhat/Makefile \ src/extra/Makefile \ ! src/extra/linux-atm.spec \ ! src/extra/ANS/Makefile \ ! src/extra/drivers/Makefile ) - --- 225,235 ---- src/lane/Makefile \ src/mpoad/Makefile \ + src/oamd/Makefile \ src/switch/Makefile \ src/switch/debug/Makefile \ src/switch/tcp/Makefile \ + src/br2684/Makefile \ src/config/Makefile \ src/extra/Makefile \ ! src/extra/linux-atm.spec ) --- acconfig.h DELETED --- --- config.h.in DELETED --- |