From: chas w. <ch...@us...> - 2004-02-26 01:26:06
|
Update of /cvsroot/linux-atm/linux-atm In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23246 Modified Files: Tag: V2_5_0 ChangeLog autotools configure.in Removed Files: Tag: V2_5_0 acconfig.h config.h.in Log Message: updated configure bits so that later versions of autoconf work properly Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/ChangeLog,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** ChangeLog 19 Jul 2003 21:20:43 -0000 1.2.2.3 --- ChangeLog 26 Feb 2004 01:10:37 -0000 1.2.2.4 *************** *** 14,21 **** --- 14,24 ---- - zeppelin creates /var/run/lec[itf].pid at startup - ilmid updates from ek...@cm... + - atmswitch from ele...@in... Other changes ------------- + - updated to support later versions of autoconf + Version 2.4.0 to 2.4.1 (25-APR-2003) Index: autotools =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/autotools,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** autotools 9 Oct 2001 22:33:01 -0000 1.2 --- autotools 26 Feb 2004 01:10:37 -0000 1.2.2.1 *************** *** 7,10 **** --- 7,12 ---- fi + echo "Running libtoolize..." + libtoolize --force echo "Running aclocal..." aclocal $VERBOSE Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.2.2.4 retrieving revision 1.2.2.5 diff -C2 -d -r1.2.2.4 -r1.2.2.5 *** configure.in 21 Feb 2004 15:31:40 -0000 1.2.2.4 --- configure.in 26 Feb 2004 01:10:37 -0000 1.2.2.5 *************** *** 60,64 **** dnl For yacc compiles... ! AC_DEFINE(YY_USE_CONST) dnl Config files --- 60,64 ---- 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 --- 66,70 ---- 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 --- 73,87 ---- [ 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.]) --- 94,98 ---- [ 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.]) --- 105,110 ---- [ 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) ) --- 115,140 ---- 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]) ) --- acconfig.h DELETED --- --- config.h.in DELETED --- |