From: chas w. <ch...@us...> - 2009-11-30 16:57:05
|
Update of /cvsroot/linux-atm/linux-atm In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv18795 Modified Files: ChangeLog INSTALL Makefile.am README configure.in Log Message: merge 2.5.1 branch into HEAD Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 1 Jan 2008 00:14:49 -0000 1.4 --- ChangeLog 30 Nov 2009 16:56:51 -0000 1.5 *************** *** 1,2 **** --- 1,19 ---- + Version 2.5.0 to 2.5.1 (30-NOV-2009) + + Bug fixes + --------- + + - split qgen into qgen and q2931 to make cross compiling easier + - bug 782731 Segfault in SAAL layer + - bug 798565 atmarp -a writes to STDIN + + New features + ------------ + + + Other changes + ------------- + + Version 2.4.1 to 2.5.0 (30-DEC-2007) ====================== Index: INSTALL =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/INSTALL,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** INSTALL 1 Jan 2008 00:14:49 -0000 1.2 --- INSTALL 30 Nov 2009 16:56:51 -0000 1.3 *************** *** 3,9 **** 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. --- 3,9 ---- Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, ! 2006, 2007, 2008, 2009 Free Software Foundation, Inc. ! This file is free documentation; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. *************** *** 11,15 **** ================== ! 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 --- 11,15 ---- ================== ! 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 *************** *** 68,77 **** with the distribution. Compilers and Options ===================== ! 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 --- 68,80 ---- with the distribution. + 6. Often, you can also type `make uninstall' to remove the installed + files again. + Compilers and Options ===================== ! 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 *************** *** 86,90 **** ==================================== ! 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 --- 89,93 ---- ==================================== ! 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 *************** *** 98,105 **** 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 --- 101,122 ---- reconfiguring for another architecture. + On MacOS X 10.5 and later systems, you can create libraries and + executables that work on multiple system types--known as "fat" or + "universal" binaries--by specifying multiple `-arch' options to the + compiler but only a single `-arch' option to the preprocessor. Like + this: + + ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \ + CPP="gcc -E" CXXCPP="g++ -E" + + This is not guaranteed to produce working output in all cases, you + may have to build one architecture at a time and combine the results + using the `lipo' tool if you have problems. + 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 *************** *** 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 --- 141,145 ---- ================= ! 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 *************** *** 136,147 **** `--x-libraries=DIR' to specify their locations. Specifying the System Type ========================== ! 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: --- 153,196 ---- `--x-libraries=DIR' to specify their locations. + Particular systems + ================== + + On HP-UX, the default C compiler is not ANSI C compatible. If GNU + CC is not installed, it is recommended to use the following options in + order to use an ANSI C compiler: + + ./configure CC="cc -Ae -D_XOPEN_SOURCE=500" + + and if that doesn't work, install pre-built binaries of GCC for HP-UX. + + On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot + parse its `<wchar.h>' header file. The option `-nodtk' can be used as + a workaround. If GNU CC is not installed, it is therefore recommended + to try + + ./configure CC="cc" + + and if that doesn't work, try + + ./configure CC="cc -nodtk" + + On Solaris, don't put `/usr/ucb' early in your `PATH'. This + directory contains several dysfunctional programs; working variants of + these programs are available in `/usr/bin'. So, if you need `/usr/ucb' + in your `PATH', put it _after_ `/usr/bin'. + + On Haiku, software installed for all users goes in `/boot/common', + not `/usr/local'. It is recommended to use the following options: + + ./configure --prefix=/boot/common + Specifying the System Type ========================== ! 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: *************** *** 151,155 **** where SYSTEM can have one of these forms: ! OS KERNEL-OS See the file `config.sub' for the possible values of each field. If --- 200,205 ---- where SYSTEM can have one of these forms: ! OS ! KERNEL-OS See the file `config.sub' for the possible values of each field. If *************** *** 169,175 **** ================ ! 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 --- 219,225 ---- ================ ! 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 *************** *** 180,184 **** ================== ! 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 --- 230,234 ---- ================== ! 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 *************** *** 199,207 **** ====================== ! `configure' recognizes the following options to control how it operates. `--help' `-h' ! Print a summary of the options to `configure', and exit. `--version' --- 249,265 ---- ====================== ! `configure' recognizes the following options to control how it ! operates. `--help' `-h' ! Print a summary of all of the options to `configure', and exit. ! ! `--help=short' ! `--help=recursive' ! Print a summary of the options unique to this package's ! `configure', and exit. The `short' variant lists options used ! only in the top level, while the `recursive' variant lists options ! also present in any nested packages. `--version' *************** *** 230,233 **** --- 288,301 ---- `configure' can determine that directory automatically. + `--prefix=DIR' + Use DIR as the installation prefix. *Note Installation Names:: + for more details, including other options available for fine-tuning + the installation locations. + + `--no-create' + `-n' + Run the configure checks, but stop before creating any output + files. + `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.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Makefile.am 1 Jan 2008 00:14:49 -0000 1.5 --- Makefile.am 30 Nov 2009 16:56:51 -0000 1.6 *************** *** 1,3 **** ! SUBDIRS = m4 src doc EXTRA_DIST = COPYING.GPL COPYING.LGPL BUGS --- 1,3 ---- ! SUBDIRS = src doc EXTRA_DIST = COPYING.GPL COPYING.LGPL BUGS Index: README =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README 1 Jan 2008 00:14:49 -0000 1.4 --- README 30 Nov 2009 16:56:51 -0000 1.5 *************** *** 1,3 **** ! ATM on Linux, release 2.5.0 =========================== --- 1,3 ---- ! ATM on Linux, release 2.5.1 =========================== Index: configure.in =================================================================== RCS file: /cvsroot/linux-atm/linux-atm/configure.in,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** configure.in 1 Jan 2008 00:14:49 -0000 1.4 --- configure.in 30 Nov 2009 16:56:51 -0000 1.5 *************** *** 12,16 **** AC_CANONICAL_SYSTEM ! AM_INIT_AUTOMAKE(linux-atm,2.5.0) LIBVER_CURRENT="1" --- 12,16 ---- AC_CANONICAL_SYSTEM ! AM_INIT_AUTOMAKE(linux-atm,2.5.1) LIBVER_CURRENT="1" *************** *** 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 --- 26,29 ---- *************** *** 64,67 **** --- 56,70 ---- INCLUDES="-I\$(top_srcdir)/src/include" CFLAGS="$INCLUDES $CFLAGS -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes" + 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) + CFLAGS_FOR_BUILD="$INCLUDES $CFLAGS_FOR_BUILD -Wall -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes" + else + CC_FOR_BUILD="${CC_FOR_BUILD-$CC}" + CFLAGS_FOR_BUILD="${CFLAGS_FOR_BUILD-$CFLAGS}" + fi + AC_SUBST(CC_FOR_BUILD) + AC_SUBST(CFLAGS_FOR_BUILD) dnl Add -d flag to bison/yacc to create intermediate .h files YACC="$YACC -d" *************** *** 208,212 **** AC_OUTPUT( Makefile \ doc/Makefile \ - m4/Makefile \ src/Makefile \ src/include/Makefile \ --- 211,214 ---- *************** *** 216,219 **** --- 218,222 ---- src/qgen/Makefile \ src/saal/Makefile \ + src/q2931/Makefile \ src/sigd/Makefile \ src/maint/Makefile \ |