From: Steven S. <sm...@us...> - 2013-10-27 15:16:25
|
Update of /cvsroot/mjpeg/mjpeg_play In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15570 Modified Files: INSTALL configure.ac Log Message: Increase the version number slightly (to 2.1.1) to avoid confusion with the 2.1.0 release version Index: configure.ac =================================================================== RCS file: /cvsroot/mjpeg/mjpeg_play/configure.ac,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** configure.ac 27 Oct 2013 13:01:05 -0000 1.74 --- configure.ac 27 Oct 2013 15:16:22 -0000 1.75 *************** *** 1,4 **** dnl Process this file with autoconf to produce a configure script. ! AC_INIT([mjpegtools],[2.1.0],[mjp...@li...]) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([lavtools/lav_io.c]) --- 1,4 ---- dnl Process this file with autoconf to produce a configure script. ! AC_INIT([mjpegtools],[2.1.1],[mjp...@li...]) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([lavtools/lav_io.c]) Index: INSTALL =================================================================== RCS file: /cvsroot/mjpeg/mjpeg_play/INSTALL,v retrieving revision 1.96 retrieving revision 1.97 diff -C2 -d -r1.96 -r1.97 *** INSTALL 21 Sep 2013 12:19:40 -0000 1.96 --- INSTALL 27 Oct 2013 15:16:22 -0000 1.97 *************** *** 2,12 **** ************************* ! Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, ! Inc. ! Copying and distribution of this file, with or without modification, ! are permitted in any medium without royalty provided the copyright ! notice and this notice are preserved. This file is offered as-is, ! without warranty of any kind. Basic Installation --- 2,10 ---- ************************* ! 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. Basic Installation *************** *** 16,24 **** configure, build, and install this package. The following more-detailed instructions are generic; see the `README' file for ! instructions specific to this package. Some packages provide this ! `INSTALL' file but do not implement all of the features documented ! below. The lack of an optional feature in a given package is not ! necessarily a bug. More recommendations for GNU packages can be found ! in *note Makefile Conventions: (standards)Makefile Conventions. The `configure' shell script attempts to guess correct values for --- 14,18 ---- 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 *************** *** 49,53 **** of `autoconf'. ! The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type --- 43,47 ---- of `autoconf'. ! The simplest way to compile this package is: 1. `cd' to the directory containing the package's source code and type *************** *** 60,79 **** 3. Optionally, type `make check' to run any self-tests that come with ! the package, generally using the just-built uninstalled binaries. 4. Type `make install' to install the programs and any data files and ! documentation. When installing into a prefix owned by root, it is ! recommended that the package be configured and built as a regular ! user, and only the `make install' phase executed with root ! privileges. ! ! 5. Optionally, type `make installcheck' to repeat any self-tests, but ! this time using the binaries in their final installed location. ! This target does not install anything. Running this target as a ! regular user, particularly if the prior `make install' required ! root privileges, verifies that the installation completed ! correctly. ! 6. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for --- 54,63 ---- 3. Optionally, type `make check' to run any self-tests that come with ! the package. 4. Type `make install' to install the programs and any data files and ! documentation. ! 5. You can remove the program binaries and object files from the source code directory by typing `make clean'. To also remove the files that `configure' created (so you can compile the package for *************** *** 84,96 **** with the distribution. ! 7. Often, you can also type `make uninstall' to remove the installed ! files again. In practice, not all packages have tested that ! uninstallation works correctly, even though it is required by the ! GNU Coding Standards. ! ! 8. Some packages, particularly those that use Automake, provide `make ! distcheck', which can by used by developers to test that all other ! targets like `make install' and `make uninstall' work correctly. ! This target is generally not run by end users. Compilers and Options --- 68,73 ---- with the distribution. ! 6. Often, you can also type `make uninstall' to remove the installed ! files again. Compilers and Options *************** *** 117,122 **** 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 `..'. This ! is known as a "VPATH" build. With a non-GNU `make', it is safer to compile the package for one --- 94,98 ---- 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 *************** *** 145,150 **** `/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', where PREFIX must be an ! absolute file name. You can specify separate installation prefixes for --- 121,125 ---- `/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 *************** *** 157,195 **** 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. In general, the ! default for these options is expressed in terms of `${prefix}', so that ! specifying just `--prefix' will affect all of the other directory ! specifications that were not explicitly provided. ! ! The most portable way to affect installation locations is to pass the ! correct locations to `configure'; however, many packages provide one or ! both of the following shortcuts of passing variable assignments to the ! `make install' command line to change installation locations without ! having to reconfigure or recompile. ! ! The first method involves providing an override variable for each ! affected directory. For example, `make install ! prefix=/alternate/directory' will choose an alternate location for all ! directory configuration variables that were expressed in terms of ! `${prefix}'. Any directories that were specified during `configure', ! but not in terms of `${prefix}', must each be overridden at install ! time for the entire installation to be relocated. The approach of ! makefile variable overrides for each directory variable is required by ! the GNU Coding Standards, and ideally causes no recompilation. ! However, some platforms have known limitations with the semantics of ! shared libraries that end up requiring recompilation when using this ! method, particularly noticeable in packages that use GNU Libtool. ! ! The second method involves providing the `DESTDIR' variable. For ! example, `make install DESTDIR=/alternate/directory' will prepend ! `/alternate/directory' before all installation names. The approach of ! `DESTDIR' overrides is not required by the GNU Coding Standards, and ! does not work on platforms that have drive letters. On the other hand, ! it does better at avoiding recompilation issues, and works well even ! when some directory options were not specified in terms of `${prefix}' ! at `configure' time. ! ! Optional Features ! ================= If the package supports it, you can cause programs to be installed --- 132,136 ---- 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. If the package supports it, you can cause programs to be installed *************** *** 197,200 **** --- 138,144 ---- option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. + Optional Features + ================= + Some packages pay attention to `--enable-FEATURE' options to `configure', where FEATURE indicates an optional part of the package. *************** *** 209,219 **** `--x-libraries=DIR' to specify their locations. - Some packages offer the ability to configure how verbose the - execution of `make' will be. For these packages, running `./configure - --enable-silent-rules' sets the default to minimal output, which can be - overridden with `make V=1'; while running `./configure - --disable-silent-rules' sets the default to verbose, which can be - overridden with `make V=0'. - Particular systems ================== --- 153,156 ---- *************** *** 227,235 **** and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX `make' updates targets which have the same time stamps as - their prerequisites, which makes it generally unusable when shipped - generated files such as `configure' are involved. Use GNU `make' - instead. - 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 --- 164,167 ---- *************** *** 310,317 **** Unfortunately, this technique does not work for `CONFIG_SHELL' due to ! an Autoconf limitation. Until the limitation is lifted, you can use ! this workaround: ! CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash `configure' Invocation --- 242,248 ---- 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 *************** *** 358,362 **** `--prefix=DIR' ! Use DIR as the installation prefix. *note Installation Names:: for more details, including other options available for fine-tuning the installation locations. --- 289,293 ---- `--prefix=DIR' ! Use DIR as the installation prefix. *Note Installation Names:: for more details, including other options available for fine-tuning the installation locations. *************** *** 369,370 **** --- 300,302 ---- `configure' also accepts some other, not widely useful, options. Run `configure --help' for more details. + |