diff options
| author | Paul Eggert | 2015-04-19 14:40:51 -0700 |
|---|---|---|
| committer | Paul Eggert | 2015-04-19 14:44:50 -0700 |
| commit | 9099d45df734f63145d414a0e1205245973c9efb (patch) | |
| tree | 45d131ea09c07024f85bb27c1ada901e40a45331 | |
| parent | 62e170072e6000b30c37792227dc34e71a31d797 (diff) | |
| download | emacs-9099d45df734f63145d414a0e1205245973c9efb.tar.gz emacs-9099d45df734f63145d414a0e1205245973c9efb.zip | |
Quote 'like this' in top-level files
* CONTRIBUTE, INSTALL, Makefile.in, README, configure.ac, make-dist:
Prefer to single-quote 'like this' (instead of the older style
`like this').
* configure.ac: Fix some space-before-tab problems that 'git commit'
complained about.
| -rw-r--r-- | CONTRIBUTE | 4 | ||||
| -rw-r--r-- | INSTALL | 302 | ||||
| -rw-r--r-- | Makefile.in | 58 | ||||
| -rw-r--r-- | README | 56 | ||||
| -rw-r--r-- | configure.ac | 150 | ||||
| -rwxr-xr-x | make-dist | 82 |
6 files changed, 326 insertions, 326 deletions
diff --git a/CONTRIBUTE b/CONTRIBUTE index 4205bc3990a..d0e3750dc9d 100644 --- a/CONTRIBUTE +++ b/CONTRIBUTE | |||
| @@ -146,7 +146,7 @@ The general format is as follows. | |||
| 146 | a top-level ChangeLog file manually, and update it with 'C-x 4 a' as | 146 | a top-level ChangeLog file manually, and update it with 'C-x 4 a' as |
| 147 | usual. Do not register the ChangeLog file under git; instead, use | 147 | usual. Do not register the ChangeLog file under git; instead, use |
| 148 | 'C-c C-a' to insert its contents into into your *vc-log* buffer. | 148 | 'C-c C-a' to insert its contents into into your *vc-log* buffer. |
| 149 | Or if `log-edit-hook' includes `log-edit-insert-changelog' (which it | 149 | Or if 'log-edit-hook' includes 'log-edit-insert-changelog' (which it |
| 150 | does by default), they will be filled in for you automatically. | 150 | does by default), they will be filled in for you automatically. |
| 151 | 151 | ||
| 152 | - Alternatively, you can use the vc-dwim command to maintain commit | 152 | - Alternatively, you can use the vc-dwim command to maintain commit |
| @@ -236,7 +236,7 @@ the entry with "+++". Otherwise do not mark it. | |||
| 236 | 236 | ||
| 237 | Please see (info "(elisp)Documentation Tips") or | 237 | Please see (info "(elisp)Documentation Tips") or |
| 238 | https://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html | 238 | https://www.gnu.org/software/emacs/manual/html_node/elisp/Documentation-Tips.html |
| 239 | for more specific tips on Emacs's doc style. Use `checkdoc' to check | 239 | for more specific tips on Emacs's doc style. Use 'checkdoc' to check |
| 240 | for documentation errors before submitting a patch. | 240 | for documentation errors before submitting a patch. |
| 241 | 241 | ||
| 242 | ** Test your changes. | 242 | ** Test your changes. |
| @@ -13,21 +13,21 @@ msdos/INSTALL. For information about building from a repository checkout | |||
| 13 | 13 | ||
| 14 | BASIC INSTALLATION | 14 | BASIC INSTALLATION |
| 15 | 15 | ||
| 16 | On most Unix systems, you build Emacs by first running the `configure' | 16 | On most Unix systems, you build Emacs by first running the 'configure' |
| 17 | shell script. This attempts to deduce the correct values for | 17 | shell script. This attempts to deduce the correct values for |
| 18 | various system-dependent variables and features, and find the | 18 | various system-dependent variables and features, and find the |
| 19 | directories where certain system headers and libraries are kept. | 19 | directories where certain system headers and libraries are kept. |
| 20 | In a few cases, you may need to explicitly tell configure where to | 20 | In a few cases, you may need to explicitly tell configure where to |
| 21 | find some things, or what options to use. | 21 | find some things, or what options to use. |
| 22 | 22 | ||
| 23 | `configure' creates a `Makefile' in several subdirectories, and a | 23 | 'configure' creates a 'Makefile' in several subdirectories, and a |
| 24 | `src/config.h' file containing system-dependent definitions. | 24 | 'src/config.h' file containing system-dependent definitions. |
| 25 | Running the `make' utility then builds the package for your system. | 25 | Running the 'make' utility then builds the package for your system. |
| 26 | 26 | ||
| 27 | Building Emacs requires GNU make, <http://www.gnu.org/software/make/>. | 27 | Building Emacs requires GNU make, <http://www.gnu.org/software/make/>. |
| 28 | On most systems that Emacs supports, this is the default `make' program. | 28 | On most systems that Emacs supports, this is the default 'make' program. |
| 29 | 29 | ||
| 30 | Here's the procedure to build Emacs using `configure' on systems which | 30 | Here's the procedure to build Emacs using 'configure' on systems which |
| 31 | are supported by it. In some cases, if the simplified procedure fails, | 31 | are supported by it. In some cases, if the simplified procedure fails, |
| 32 | you might need to use various non-default options, and maybe perform | 32 | you might need to use various non-default options, and maybe perform |
| 33 | some of the steps manually. The more detailed description in the other | 33 | some of the steps manually. The more detailed description in the other |
| @@ -40,48 +40,48 @@ sections if you need to. | |||
| 40 | This includes the space-saving that comes from automatically | 40 | This includes the space-saving that comes from automatically |
| 41 | compressing the Lisp source files on installation. | 41 | compressing the Lisp source files on installation. |
| 42 | 42 | ||
| 43 | 2a. `cd' to the directory where you unpacked Emacs and invoke the | 43 | 2a. 'cd' to the directory where you unpacked Emacs and invoke the |
| 44 | `configure' script: | 44 | 'configure' script: |
| 45 | 45 | ||
| 46 | ./configure | 46 | ./configure |
| 47 | 47 | ||
| 48 | 2b. Alternatively, create a separate directory, outside the source | 48 | 2b. Alternatively, create a separate directory, outside the source |
| 49 | directory, where you want to build Emacs, and invoke `configure' | 49 | directory, where you want to build Emacs, and invoke 'configure' |
| 50 | from there: | 50 | from there: |
| 51 | 51 | ||
| 52 | SOURCE-DIR/configure | 52 | SOURCE-DIR/configure |
| 53 | 53 | ||
| 54 | where SOURCE-DIR is the top-level Emacs source directory. | 54 | where SOURCE-DIR is the top-level Emacs source directory. |
| 55 | 55 | ||
| 56 | 3. When `configure' finishes, it prints several lines of details | 56 | 3. When 'configure' finishes, it prints several lines of details |
| 57 | about the system configuration. Read those details carefully | 57 | about the system configuration. Read those details carefully |
| 58 | looking for anything suspicious, such as wrong CPU and operating | 58 | looking for anything suspicious, such as wrong CPU and operating |
| 59 | system names, wrong places for headers or libraries, missing | 59 | system names, wrong places for headers or libraries, missing |
| 60 | libraries that you know are installed on your system, etc. | 60 | libraries that you know are installed on your system, etc. |
| 61 | 61 | ||
| 62 | If you find anything wrong, you may have to pass to `configure' | 62 | If you find anything wrong, you may have to pass to 'configure' |
| 63 | one or more options specifying the explicit machine configuration | 63 | one or more options specifying the explicit machine configuration |
| 64 | name, where to find various headers and libraries, etc. | 64 | name, where to find various headers and libraries, etc. |
| 65 | Refer to the section DETAILED BUILDING AND INSTALLATION below. | 65 | Refer to the section DETAILED BUILDING AND INSTALLATION below. |
| 66 | 66 | ||
| 67 | If `configure' didn't find some image support libraries, such as | 67 | If 'configure' didn't find some image support libraries, such as |
| 68 | Xpm and jpeg, refer to "Image support libraries" below. | 68 | Xpm and jpeg, refer to "Image support libraries" below. |
| 69 | 69 | ||
| 70 | If the details printed by `configure' don't make any sense to | 70 | If the details printed by 'configure' don't make any sense to |
| 71 | you, but there are no obvious errors, assume that `configure' did | 71 | you, but there are no obvious errors, assume that 'configure' did |
| 72 | its job and proceed. | 72 | its job and proceed. |
| 73 | 73 | ||
| 74 | 4. Invoke the `make' program: | 74 | 4. Invoke the 'make' program: |
| 75 | 75 | ||
| 76 | make | 76 | make |
| 77 | 77 | ||
| 78 | 5. If `make' succeeds, it will build an executable program `emacs' | 78 | 5. If 'make' succeeds, it will build an executable program 'emacs' |
| 79 | in the `src' directory. You can try this program, to make sure | 79 | in the 'src' directory. You can try this program, to make sure |
| 80 | it works: | 80 | it works: |
| 81 | 81 | ||
| 82 | src/emacs -Q | 82 | src/emacs -Q |
| 83 | 83 | ||
| 84 | 6. Assuming that the program `src/emacs' starts and displays its | 84 | 6. Assuming that the program 'src/emacs' starts and displays its |
| 85 | opening screen, you can install the program and its auxiliary | 85 | opening screen, you can install the program and its auxiliary |
| 86 | files into their installation directories: | 86 | files into their installation directories: |
| 87 | 87 | ||
| @@ -101,7 +101,7 @@ sections if you need to. | |||
| 101 | make distclean | 101 | make distclean |
| 102 | 102 | ||
| 103 | Note that the install automatically saves space by compressing | 103 | Note that the install automatically saves space by compressing |
| 104 | (provided you have the `gzip' program) those installed Lisp source (.el) | 104 | (provided you have the 'gzip' program) those installed Lisp source (.el) |
| 105 | files that have corresponding .elc versions, as well as the Info files. | 105 | files that have corresponding .elc versions, as well as the Info files. |
| 106 | 106 | ||
| 107 | 107 | ||
| @@ -114,7 +114,7 @@ On GNU and Unix systems, Emacs needs the optional libraries "m17n-db", | |||
| 114 | Indic and Khmer, and also for scripts that require Arabic shaping | 114 | Indic and Khmer, and also for scripts that require Arabic shaping |
| 115 | support (Arabic and Farsi). On some systems, particularly GNU/Linux, | 115 | support (Arabic and Farsi). On some systems, particularly GNU/Linux, |
| 116 | these libraries may be already present or available as additional | 116 | these libraries may be already present or available as additional |
| 117 | packages. Note that if there is a separate `dev' or `devel' package, | 117 | packages. Note that if there is a separate 'dev' or 'devel' package, |
| 118 | for use at compilation time rather than run time, you will need that | 118 | for use at compilation time rather than run time, you will need that |
| 119 | as well as the corresponding run time package; typically the dev | 119 | as well as the corresponding run time package; typically the dev |
| 120 | package will contain header files and a library archive. Otherwise, | 120 | package will contain header files and a library archive. Otherwise, |
| @@ -148,7 +148,7 @@ XBM images whose support is built-in. | |||
| 148 | 148 | ||
| 149 | On some systems, particularly on GNU/Linux, these libraries may | 149 | On some systems, particularly on GNU/Linux, these libraries may |
| 150 | already be present or available as additional packages. If | 150 | already be present or available as additional packages. If |
| 151 | there is a separate `dev' or `devel' package, for use at compilation | 151 | there is a separate 'dev' or 'devel' package, for use at compilation |
| 152 | time rather than run time, you will need that as well as the | 152 | time rather than run time, you will need that as well as the |
| 153 | corresponding run time package; typically the dev package will | 153 | corresponding run time package; typically the dev package will |
| 154 | contain header files and a library archive. Otherwise, you can | 154 | contain header files and a library archive. Otherwise, you can |
| @@ -195,15 +195,15 @@ number of free Unicode fonts. | |||
| 195 | Many GNU/Linux systems do not come with development packages by default; | 195 | Many GNU/Linux systems do not come with development packages by default; |
| 196 | they include the files that you need to run Emacs, but not those you | 196 | they include the files that you need to run Emacs, but not those you |
| 197 | need to compile it. For example, to compile Emacs with support for X | 197 | need to compile it. For example, to compile Emacs with support for X |
| 198 | and graphics libraries, you may need to install the `X development' | 198 | and graphics libraries, you may need to install the X development |
| 199 | package(s), and development versions of the jpeg, png, etc. packages. | 199 | package(s), and development versions of the jpeg, png, etc. packages. |
| 200 | 200 | ||
| 201 | The names of the packages that you need varies according to the | 201 | The names of the packages that you need varies according to the |
| 202 | GNU/Linux distribution that you use, and the options that you want to | 202 | GNU/Linux distribution that you use, and the options that you want to |
| 203 | configure Emacs with. On Debian-based systems, you can install all the | 203 | configure Emacs with. On Debian-based systems, you can install all the |
| 204 | packages needed to build the installed version of Emacs with a command | 204 | packages needed to build the installed version of Emacs with a command |
| 205 | like `apt-get build-dep emacs24'. On Red Hat systems, the | 205 | like 'apt-get build-dep emacs24'. On Red Hat systems, the |
| 206 | corresponding command is `yum-builddep emacs'. | 206 | corresponding command is 'yum-builddep emacs'. |
| 207 | 207 | ||
| 208 | 208 | ||
| 209 | DETAILED BUILDING AND INSTALLATION: | 209 | DETAILED BUILDING AND INSTALLATION: |
| @@ -214,37 +214,37 @@ the file nt/INSTALL. For MS-DOS and MS Windows 3.X, see msdos/INSTALL.) | |||
| 214 | 214 | ||
| 215 | 1) See the basic installation summary above for the disk space requirements. | 215 | 1) See the basic installation summary above for the disk space requirements. |
| 216 | 216 | ||
| 217 | 2) In the unlikely event that `configure' does not detect your system | 217 | 2) In the unlikely event that 'configure' does not detect your system |
| 218 | type correctly, consult `./etc/MACHINES' to see what --host, --build | 218 | type correctly, consult './etc/MACHINES' to see what --host, --build |
| 219 | options you should pass to `configure'. That file also offers hints | 219 | options you should pass to 'configure'. That file also offers hints |
| 220 | for getting around some possible installation problems. | 220 | for getting around some possible installation problems. |
| 221 | 221 | ||
| 222 | 3) You can build Emacs in the top-level Emacs source directory | 222 | 3) You can build Emacs in the top-level Emacs source directory |
| 223 | or in a separate directory. | 223 | or in a separate directory. |
| 224 | 224 | ||
| 225 | 3a) To build in the top-level Emacs source directory, go to that | 225 | 3a) To build in the top-level Emacs source directory, go to that |
| 226 | directory and run the program `configure' as follows: | 226 | directory and run the program 'configure' as follows: |
| 227 | 227 | ||
| 228 | ./configure [--OPTION[=VALUE]] ... | 228 | ./configure [--OPTION[=VALUE]] ... |
| 229 | 229 | ||
| 230 | If `configure' cannot determine your system type, try again | 230 | If 'configure' cannot determine your system type, try again |
| 231 | specifying the proper --build, --host options explicitly. | 231 | specifying the proper --build, --host options explicitly. |
| 232 | 232 | ||
| 233 | If you don't want X support, specify `--with-x=no'. If you omit this | 233 | If you don't want X support, specify '--with-x=no'. If you omit this |
| 234 | option, `configure' will try to figure out for itself whether your | 234 | option, 'configure' will try to figure out for itself whether your |
| 235 | system has X, and arrange to use it if present. | 235 | system has X, and arrange to use it if present. |
| 236 | 236 | ||
| 237 | The `--x-includes=DIR' and `--x-libraries=DIR' options tell the build | 237 | The '--x-includes=DIR' and '--x-libraries=DIR' options tell the build |
| 238 | process where the compiler should look for the include files and | 238 | process where the compiler should look for the include files and |
| 239 | object libraries used with the X Window System. Normally, `configure' | 239 | object libraries used with the X Window System. Normally, 'configure' |
| 240 | is able to find them; these options are necessary if you have your X | 240 | is able to find them; these options are necessary if you have your X |
| 241 | Window System files installed in unusual places. These options also | 241 | Window System files installed in unusual places. These options also |
| 242 | accept a list of directories, separated with colons. | 242 | accept a list of directories, separated with colons. |
| 243 | 243 | ||
| 244 | To get more attractive menus, you can specify an X toolkit when you | 244 | To get more attractive menus, you can specify an X toolkit when you |
| 245 | configure Emacs; use the option `--with-x-toolkit=TOOLKIT', where | 245 | configure Emacs; use the option '--with-x-toolkit=TOOLKIT', where |
| 246 | TOOLKIT is `gtk' (the default), `athena', or `motif' (`yes' and | 246 | TOOLKIT is 'gtk' (the default), 'athena', or 'motif' ('yes' and |
| 247 | `lucid' are synonyms for `athena'). Compiling with Motif causes a | 247 | 'lucid' are synonyms for 'athena'). Compiling with Motif causes a |
| 248 | standard File Selection Dialog to pop up when you invoke file commands | 248 | standard File Selection Dialog to pop up when you invoke file commands |
| 249 | with the mouse. You can get fancy 3D-style scroll bars, even without | 249 | with the mouse. You can get fancy 3D-style scroll bars, even without |
| 250 | Gtk or Motif, if you have the Xaw3d library installed (see | 250 | Gtk or Motif, if you have the Xaw3d library installed (see |
| @@ -257,12 +257,12 @@ Emacs will autolaunch a D-Bus session bus, when the environment | |||
| 257 | variable DISPLAY is set, but no session bus is running. This might be | 257 | variable DISPLAY is set, but no session bus is running. This might be |
| 258 | inconvenient for Emacs when running as daemon or running via a remote | 258 | inconvenient for Emacs when running as daemon or running via a remote |
| 259 | ssh connection. In order to completely prevent the use of D-Bus, configure | 259 | ssh connection. In order to completely prevent the use of D-Bus, configure |
| 260 | Emacs with the options `--without-dbus --without-gconf --without-gsettings'. | 260 | Emacs with the options '--without-dbus --without-gconf --without-gsettings'. |
| 261 | 261 | ||
| 262 | The Emacs mail reader RMAIL is configured to be able to read mail from | 262 | The Emacs mail reader RMAIL is configured to be able to read mail from |
| 263 | a POP3 server by default. Versions of the POP protocol older than | 263 | a POP3 server by default. Versions of the POP protocol older than |
| 264 | POP3 are not supported. For Kerberos-authenticated POP add | 264 | POP3 are not supported. For Kerberos-authenticated POP add |
| 265 | `--with-kerberos', for Hesiod support add `--with-hesiod'. While POP3 | 265 | '--with-kerberos', for Hesiod support add '--with-hesiod'. While POP3 |
| 266 | is always enabled, whether Emacs actually uses POP is controlled by | 266 | is always enabled, whether Emacs actually uses POP is controlled by |
| 267 | individual users--see the Rmail chapter of the Emacs manual. | 267 | individual users--see the Rmail chapter of the Emacs manual. |
| 268 | 268 | ||
| @@ -322,28 +322,28 @@ that goes awry. 'make V=1' also enables the extra chatter. | |||
| 322 | 322 | ||
| 323 | Use --enable-link-time-optimization to enable link-time optimizer. If | 323 | Use --enable-link-time-optimization to enable link-time optimizer. If |
| 324 | you're using GNU compiler, this feature is supported since version 4.5.0. | 324 | you're using GNU compiler, this feature is supported since version 4.5.0. |
| 325 | If `configure' can determine number of online CPUS on your system, final | 325 | If 'configure' can determine number of online CPUS on your system, final |
| 326 | link-time optimization and code generation is executed in parallel using | 326 | link-time optimization and code generation is executed in parallel using |
| 327 | one job per each available online CPU. | 327 | one job per each available online CPU. |
| 328 | 328 | ||
| 329 | This option is also supported for clang. You should have GNU binutils | 329 | This option is also supported for clang. You should have GNU binutils |
| 330 | with `gold' linker and plugin support, and clang with LLVMgold.so plugin. | 330 | with 'gold' linker and plugin support, and clang with LLVMgold.so plugin. |
| 331 | Read http://llvm.org/docs/GoldPlugin.html for details. Also note that | 331 | Read http://llvm.org/docs/GoldPlugin.html for details. Also note that |
| 332 | this feature is still experimental, so prepare to build binutils and | 332 | this feature is still experimental, so prepare to build binutils and |
| 333 | clang from the corresponding source code repositories. | 333 | clang from the corresponding source code repositories. |
| 334 | 334 | ||
| 335 | The `--prefix=PREFIXDIR' option specifies where the installation process | 335 | The '--prefix=PREFIXDIR' option specifies where the installation process |
| 336 | should put emacs and its data files. This defaults to `/usr/local'. | 336 | should put emacs and its data files. This defaults to '/usr/local'. |
| 337 | - Emacs (and the other utilities users run) go in PREFIXDIR/bin | 337 | - Emacs (and the other utilities users run) go in PREFIXDIR/bin |
| 338 | (unless the `--exec-prefix' option says otherwise). | 338 | (unless the '--exec-prefix' option says otherwise). |
| 339 | - The architecture-independent files go in PREFIXDIR/share/emacs/VERSION | 339 | - The architecture-independent files go in PREFIXDIR/share/emacs/VERSION |
| 340 | (where VERSION is the version number of Emacs, like `23.2'). | 340 | (where VERSION is the version number of Emacs, like '23.2'). |
| 341 | - The architecture-dependent files go in | 341 | - The architecture-dependent files go in |
| 342 | PREFIXDIR/libexec/emacs/VERSION/CONFIGURATION | 342 | PREFIXDIR/libexec/emacs/VERSION/CONFIGURATION |
| 343 | (where CONFIGURATION is the configuration name, like | 343 | (where CONFIGURATION is the configuration name, like |
| 344 | i686-pc-linux-gnu), unless the `--exec-prefix' option says otherwise. | 344 | i686-pc-linux-gnu), unless the '--exec-prefix' option says otherwise. |
| 345 | 345 | ||
| 346 | The `--exec-prefix=EXECDIR' option allows you to specify a separate | 346 | The '--exec-prefix=EXECDIR' option allows you to specify a separate |
| 347 | portion of the directory tree for installing architecture-specific | 347 | portion of the directory tree for installing architecture-specific |
| 348 | files, like executables and utility programs. If specified, | 348 | files, like executables and utility programs. If specified, |
| 349 | - Emacs (and the other utilities users run) go in EXECDIR/bin, and | 349 | - Emacs (and the other utilities users run) go in EXECDIR/bin, and |
| @@ -358,26 +358,26 @@ For example, the command | |||
| 358 | configures Emacs to build for a 32-bit GNU/Linux distribution, | 358 | configures Emacs to build for a 32-bit GNU/Linux distribution, |
| 359 | without sound support. | 359 | without sound support. |
| 360 | 360 | ||
| 361 | `configure' doesn't do any compilation or installation itself. | 361 | 'configure' doesn't do any compilation or installation itself. |
| 362 | It just creates the files that influence those things: | 362 | It just creates the files that influence those things: |
| 363 | `./Makefile' in the top-level directory and several subdirectories; | 363 | './Makefile' in the top-level directory and several subdirectories; |
| 364 | and `./src/config.h'. | 364 | and './src/config.h'. |
| 365 | 365 | ||
| 366 | When it is done, `configure' prints a description of what it did and | 366 | When it is done, 'configure' prints a description of what it did and |
| 367 | creates a shell script `config.status' which, when run, recreates the | 367 | creates a shell script 'config.status' which, when run, recreates the |
| 368 | same configuration. If `configure' exits with an error after | 368 | same configuration. If 'configure' exits with an error after |
| 369 | disturbing the status quo, it removes `config.status'. `configure' | 369 | disturbing the status quo, it removes 'config.status'. 'configure' |
| 370 | also creates a file `config.cache' that saves the results of its tests | 370 | also creates a file 'config.cache' that saves the results of its tests |
| 371 | to make reconfiguring faster, and a file `config.log' containing compiler | 371 | to make reconfiguring faster, and a file 'config.log' containing compiler |
| 372 | output (useful mainly for debugging `configure'). You can give | 372 | output (useful mainly for debugging 'configure'). You can give |
| 373 | `configure' the option `--cache-file=FILE' to use the results of the | 373 | 'configure' the option '--cache-file=FILE' to use the results of the |
| 374 | tests in FILE instead of `config.cache'. Set FILE to `/dev/null' to | 374 | tests in FILE instead of 'config.cache'. Set FILE to '/dev/null' to |
| 375 | disable caching, for debugging `configure'. | 375 | disable caching, for debugging 'configure'. |
| 376 | 376 | ||
| 377 | If the description of the system configuration printed by `configure' | 377 | If the description of the system configuration printed by 'configure' |
| 378 | is not right, or if it claims some of the features or libraries are not | 378 | is not right, or if it claims some of the features or libraries are not |
| 379 | available when you know they are, look at the `config.log' file for | 379 | available when you know they are, look at the 'config.log' file for |
| 380 | the trace of the failed tests performed by `configure' to check | 380 | the trace of the failed tests performed by 'configure' to check |
| 381 | whether these features are supported. Typically, some test fails | 381 | whether these features are supported. Typically, some test fails |
| 382 | because the compiler cannot find some function in the system | 382 | because the compiler cannot find some function in the system |
| 383 | libraries, or some macro-processor definition in the system headers. | 383 | libraries, or some macro-processor definition in the system headers. |
| @@ -385,29 +385,29 @@ libraries, or some macro-processor definition in the system headers. | |||
| 385 | Some tests might fail because the compiler should look in special | 385 | Some tests might fail because the compiler should look in special |
| 386 | directories for some header files, or link against optional | 386 | directories for some header files, or link against optional |
| 387 | libraries, or use special compilation options. You can force | 387 | libraries, or use special compilation options. You can force |
| 388 | `configure' and the build process which follows it to do that by | 388 | 'configure' and the build process which follows it to do that by |
| 389 | setting the variables CPPFLAGS, CFLAGS, LDFLAGS, LIBS, CPP and CC | 389 | setting the variables CPPFLAGS, CFLAGS, LDFLAGS, LIBS, CPP and CC |
| 390 | before running `configure'. CPP is the command which invokes the | 390 | before running 'configure'. CPP is the command which invokes the |
| 391 | preprocessor, CPPFLAGS lists the options passed to it, CFLAGS are | 391 | preprocessor, CPPFLAGS lists the options passed to it, CFLAGS are |
| 392 | compilation options, LDFLAGS are options used when linking, LIBS are | 392 | compilation options, LDFLAGS are options used when linking, LIBS are |
| 393 | libraries to link against, and CC is the command which invokes the | 393 | libraries to link against, and CC is the command which invokes the |
| 394 | compiler. By default, gcc is used if available. | 394 | compiler. By default, gcc is used if available. |
| 395 | 395 | ||
| 396 | Here's an example of a `configure' invocation, assuming a Bourne-like | 396 | Here's an example of a 'configure' invocation, assuming a Bourne-like |
| 397 | shell such as Bash, which uses these variables: | 397 | shell such as Bash, which uses these variables: |
| 398 | 398 | ||
| 399 | ./configure \ | 399 | ./configure \ |
| 400 | CPPFLAGS='-I/foo/myinclude' LDFLAGS='-L/bar/mylib' \ | 400 | CPPFLAGS='-I/foo/myinclude' LDFLAGS='-L/bar/mylib' \ |
| 401 | CFLAGS='-O3' LIBS='-lfoo -lbar' | 401 | CFLAGS='-O3' LIBS='-lfoo -lbar' |
| 402 | 402 | ||
| 403 | (this is all one shell command). This tells `configure' to instruct the | 403 | (this is all one shell command). This tells 'configure' to instruct the |
| 404 | preprocessor to look in the `/foo/myinclude' directory for header | 404 | preprocessor to look in the '/foo/myinclude' directory for header |
| 405 | files (in addition to the standard directories), instruct the linker | 405 | files (in addition to the standard directories), instruct the linker |
| 406 | to look in `/bar/mylib' for libraries, pass the -O3 optimization | 406 | to look in '/bar/mylib' for libraries, pass the -O3 optimization |
| 407 | switch to the compiler, and link against libfoo and libbar | 407 | switch to the compiler, and link against libfoo and libbar |
| 408 | libraries in addition to the standard ones. | 408 | libraries in addition to the standard ones. |
| 409 | 409 | ||
| 410 | For some libraries, like Gtk+, fontconfig and ALSA, `configure' uses | 410 | For some libraries, like Gtk+, fontconfig and ALSA, 'configure' uses |
| 411 | pkg-config to find where those libraries are installed. | 411 | pkg-config to find where those libraries are installed. |
| 412 | If you want pkg-config to look in special directories, you have to set | 412 | If you want pkg-config to look in special directories, you have to set |
| 413 | PKG_CONFIG_PATH to point to the directories where the .pc-files for | 413 | PKG_CONFIG_PATH to point to the directories where the .pc-files for |
| @@ -417,27 +417,27 @@ those libraries are. For example: | |||
| 417 | PKG_CONFIG_PATH='/usr/local/alsa/lib/pkgconfig:/opt/gtk+-2.8/lib/pkgconfig' | 417 | PKG_CONFIG_PATH='/usr/local/alsa/lib/pkgconfig:/opt/gtk+-2.8/lib/pkgconfig' |
| 418 | 418 | ||
| 419 | 3b) To build in a separate directory, go to that directory | 419 | 3b) To build in a separate directory, go to that directory |
| 420 | and run the program `configure' as follows: | 420 | and run the program 'configure' as follows: |
| 421 | 421 | ||
| 422 | SOURCE-DIR/configure CONFIGURATION-NAME [--OPTION[=VALUE]] ... | 422 | SOURCE-DIR/configure CONFIGURATION-NAME [--OPTION[=VALUE]] ... |
| 423 | 423 | ||
| 424 | SOURCE-DIR refers to the top-level Emacs source directory which is | 424 | SOURCE-DIR refers to the top-level Emacs source directory which is |
| 425 | where Emacs's configure script is located. `configure' looks for the | 425 | where Emacs's configure script is located. 'configure' looks for the |
| 426 | Emacs source code in the directory that `configure' is in. | 426 | Emacs source code in the directory that 'configure' is in. |
| 427 | 427 | ||
| 428 | 4) Put into `./lisp/site-init.el' or `./lisp/site-load.el' any Emacs | 428 | 4) Put into './lisp/site-init.el' or './lisp/site-load.el' any Emacs |
| 429 | Lisp code you want Emacs to load before it is dumped out. Use | 429 | Lisp code you want Emacs to load before it is dumped out. Use |
| 430 | site-load.el for additional libraries if you arrange for their | 430 | site-load.el for additional libraries if you arrange for their |
| 431 | documentation strings to be in the etc/DOC file (see | 431 | documentation strings to be in the etc/DOC file (see |
| 432 | src/Makefile.in if you wish to figure out how to do that). For all | 432 | src/Makefile.in if you wish to figure out how to do that). For all |
| 433 | else, use site-init.el. Do not load byte-compiled code which | 433 | else, use site-init.el. Do not load byte-compiled code which |
| 434 | was built with a non-nil value of `byte-compile-dynamic'. | 434 | was built with a non-nil value of 'byte-compile-dynamic'. |
| 435 | 435 | ||
| 436 | It is not a good idea to edit the normal .el files that come with Emacs. | 436 | It is not a good idea to edit the normal .el files that come with Emacs. |
| 437 | Instead, use a file like site-init.el to change settings. | 437 | Instead, use a file like site-init.el to change settings. |
| 438 | 438 | ||
| 439 | To change the value of a variable that is already defined in Emacs, | 439 | To change the value of a variable that is already defined in Emacs, |
| 440 | you should use the Lisp function `setq', not `defvar'. For example, | 440 | you should use the Lisp function 'setq', not 'defvar'. For example, |
| 441 | 441 | ||
| 442 | (setq news-inews-program "/usr/bin/inews") | 442 | (setq news-inews-program "/usr/bin/inews") |
| 443 | 443 | ||
| @@ -449,46 +449,46 @@ variable gets by default! Make sure you know what kind of value the | |||
| 449 | variable should have. If you don't pay attention to what you are | 449 | variable should have. If you don't pay attention to what you are |
| 450 | doing, you'll make a mistake. | 450 | doing, you'll make a mistake. |
| 451 | 451 | ||
| 452 | The `site-*.el' files are nonexistent in the distribution. You do not | 452 | The 'site-*.el' files are nonexistent in the distribution. You do not |
| 453 | need to create them if you have nothing to put in them. | 453 | need to create them if you have nothing to put in them. |
| 454 | 454 | ||
| 455 | 5) Refer to the file `./etc/TERMS' for information on fields you may | 455 | 5) Refer to the file './etc/TERMS' for information on fields you may |
| 456 | wish to add to various termcap entries. (This is unlikely to be necessary.) | 456 | wish to add to various termcap entries. (This is unlikely to be necessary.) |
| 457 | 457 | ||
| 458 | 6) Run `make' in the top directory of the Emacs distribution to finish | 458 | 6) Run 'make' in the top directory of the Emacs distribution to finish |
| 459 | building Emacs in the standard way. The final executable file is | 459 | building Emacs in the standard way. The final executable file is |
| 460 | named `src/emacs'. You can execute this file "in place" without | 460 | named 'src/emacs'. You can execute this file "in place" without |
| 461 | copying it, if you wish; then it automatically uses the sibling | 461 | copying it, if you wish; then it automatically uses the sibling |
| 462 | directories ../lisp, ../lib-src, ../info. | 462 | directories ../lisp, ../lib-src, ../info. |
| 463 | 463 | ||
| 464 | Or you can "install" the executable and the other files into their | 464 | Or you can "install" the executable and the other files into their |
| 465 | installed locations, with `make install'. By default, Emacs's files | 465 | installed locations, with 'make install'. By default, Emacs's files |
| 466 | are installed in the following directories: | 466 | are installed in the following directories: |
| 467 | 467 | ||
| 468 | `/usr/local/bin' holds the executable programs users normally run - | 468 | '/usr/local/bin' holds the executable programs users normally run - |
| 469 | `emacs', `etags', `ctags', `emacsclient'. | 469 | 'emacs', 'etags', 'ctags', 'emacsclient'. |
| 470 | 470 | ||
| 471 | `/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library; | 471 | '/usr/local/share/emacs/VERSION/lisp' holds the Emacs Lisp library; |
| 472 | `VERSION' stands for the number of the Emacs version | 472 | 'VERSION' stands for the number of the Emacs version |
| 473 | you are installing, like `23.1' or `23.2'. Since the | 473 | you are installing, like '23.1' or '23.2'. Since the |
| 474 | Lisp library changes from one version of Emacs to | 474 | Lisp library changes from one version of Emacs to |
| 475 | another, including the version number in the path | 475 | another, including the version number in the path |
| 476 | allows you to have several versions of Emacs installed | 476 | allows you to have several versions of Emacs installed |
| 477 | at the same time; in particular, you don't have to | 477 | at the same time; in particular, you don't have to |
| 478 | make Emacs unavailable while installing a new version. | 478 | make Emacs unavailable while installing a new version. |
| 479 | 479 | ||
| 480 | `/usr/local/share/emacs/VERSION/etc' holds the Emacs tutorial, the DOC | 480 | '/usr/local/share/emacs/VERSION/etc' holds the Emacs tutorial, the DOC |
| 481 | file, and other architecture-independent files Emacs | 481 | file, and other architecture-independent files Emacs |
| 482 | might need while running. | 482 | might need while running. |
| 483 | 483 | ||
| 484 | `/usr/local/libexec/emacs/VERSION/CONFIGURATION-NAME' contains executable | 484 | '/usr/local/libexec/emacs/VERSION/CONFIGURATION-NAME' contains executable |
| 485 | programs used by Emacs that users are not expected to | 485 | programs used by Emacs that users are not expected to |
| 486 | run themselves. | 486 | run themselves. |
| 487 | `VERSION' is the number of the Emacs version you are | 487 | 'VERSION' is the number of the Emacs version you are |
| 488 | installing, and `CONFIGURATION-NAME' is the value | 488 | installing, and 'CONFIGURATION-NAME' is the value |
| 489 | deduced by the `configure' program to identify the | 489 | deduced by the 'configure' program to identify the |
| 490 | architecture and operating system of your machine, | 490 | architecture and operating system of your machine, |
| 491 | like `i686-pc-linux-gnu' or `sparc-sun-sunos'. Since | 491 | like 'i686-pc-linux-gnu' or 'sparc-sun-sunos'. Since |
| 492 | these files are specific to the version of Emacs, | 492 | these files are specific to the version of Emacs, |
| 493 | operating system, and architecture in use, including | 493 | operating system, and architecture in use, including |
| 494 | the configuration name in the path allows you to have | 494 | the configuration name in the path allows you to have |
| @@ -497,35 +497,35 @@ are installed in the following directories: | |||
| 497 | useful for sites at which different kinds of machines | 497 | useful for sites at which different kinds of machines |
| 498 | share the file system Emacs is installed on. | 498 | share the file system Emacs is installed on. |
| 499 | 499 | ||
| 500 | `/usr/local/share/info' holds the on-line documentation for Emacs, | 500 | '/usr/local/share/info' holds the on-line documentation for Emacs, |
| 501 | known as "info files". Many other GNU programs are | 501 | known as "info files". Many other GNU programs are |
| 502 | documented using info files as well, so this directory | 502 | documented using info files as well, so this directory |
| 503 | stands apart from the other, Emacs-specific directories. | 503 | stands apart from the other, Emacs-specific directories. |
| 504 | 504 | ||
| 505 | `/usr/local/share/man/man1' holds the man pages for the programs installed | 505 | '/usr/local/share/man/man1' holds the man pages for the programs installed |
| 506 | in `/usr/local/bin'. | 506 | in '/usr/local/bin'. |
| 507 | 507 | ||
| 508 | Any version of Emacs, whether installed or not, also looks for Lisp | 508 | Any version of Emacs, whether installed or not, also looks for Lisp |
| 509 | files in these directories. | 509 | files in these directories. |
| 510 | 510 | ||
| 511 | `/usr/local/share/emacs/VERSION/site-lisp' holds the local Emacs Lisp | 511 | '/usr/local/share/emacs/VERSION/site-lisp' holds the local Emacs Lisp |
| 512 | files installed for Emacs version VERSION only. | 512 | files installed for Emacs version VERSION only. |
| 513 | 513 | ||
| 514 | `/usr/local/share/emacs/site-lisp' holds the local Emacs Lisp | 514 | '/usr/local/share/emacs/site-lisp' holds the local Emacs Lisp |
| 515 | files installed for all Emacs versions. | 515 | files installed for all Emacs versions. |
| 516 | 516 | ||
| 517 | When Emacs is installed, it searches for its Lisp files | 517 | When Emacs is installed, it searches for its Lisp files |
| 518 | in `/usr/local/share/emacs/VERSION/site-lisp', then in | 518 | in '/usr/local/share/emacs/VERSION/site-lisp', then in |
| 519 | `/usr/local/share/emacs/site-lisp', and finally in | 519 | '/usr/local/share/emacs/site-lisp', and finally in |
| 520 | `/usr/local/share/emacs/VERSION/lisp'. | 520 | '/usr/local/share/emacs/VERSION/lisp'. |
| 521 | 521 | ||
| 522 | If these directories are not what you want, you can specify where to | 522 | If these directories are not what you want, you can specify where to |
| 523 | install Emacs's libraries and data files or where Emacs should search | 523 | install Emacs's libraries and data files or where Emacs should search |
| 524 | for its Lisp files by giving values for `make' variables as part of | 524 | for its Lisp files by giving values for 'make' variables as part of |
| 525 | the command. See the section below called `MAKE VARIABLES' for more | 525 | the command. See the section below called 'MAKE VARIABLES' for more |
| 526 | information on this. | 526 | information on this. |
| 527 | 527 | ||
| 528 | 7) Check the file `dir' in your site's info directory (usually | 528 | 7) Check the file 'dir' in your site's info directory (usually |
| 529 | /usr/local/share/info) to make sure that it has a menu entry for the | 529 | /usr/local/share/info) to make sure that it has a menu entry for the |
| 530 | Emacs info files. | 530 | Emacs info files. |
| 531 | 531 | ||
| @@ -534,51 +534,51 @@ then you might need to make the movemail program setuid or setgid | |||
| 534 | to enable it to write the lock files. We believe this is safe. | 534 | to enable it to write the lock files. We believe this is safe. |
| 535 | 535 | ||
| 536 | 9) You are done! You can remove executables and object files from | 536 | 9) You are done! You can remove executables and object files from |
| 537 | the build directory by typing `make clean'. To also remove the files | 537 | the build directory by typing 'make clean'. To also remove the files |
| 538 | that `configure' created (so you can compile Emacs for a different | 538 | that 'configure' created (so you can compile Emacs for a different |
| 539 | configuration), type `make distclean'. | 539 | configuration), type 'make distclean'. |
| 540 | 540 | ||
| 541 | 541 | ||
| 542 | MAKE VARIABLES | 542 | MAKE VARIABLES |
| 543 | 543 | ||
| 544 | You can change where the build process installs Emacs and its data | 544 | You can change where the build process installs Emacs and its data |
| 545 | files by specifying values for `make' variables as part of the `make' | 545 | files by specifying values for 'make' variables as part of the 'make' |
| 546 | command line. For example, if you type | 546 | command line. For example, if you type |
| 547 | 547 | ||
| 548 | make install bindir=/usr/local/gnubin | 548 | make install bindir=/usr/local/gnubin |
| 549 | 549 | ||
| 550 | the `bindir=/usr/local/gnubin' argument indicates that the Emacs | 550 | the 'bindir=/usr/local/gnubin' argument indicates that the Emacs |
| 551 | executable files should go in `/usr/local/gnubin', not | 551 | executable files should go in '/usr/local/gnubin', not |
| 552 | `/usr/local/bin'. | 552 | '/usr/local/bin'. |
| 553 | 553 | ||
| 554 | Here is a complete list of the variables you may want to set. | 554 | Here is a complete list of the variables you may want to set. |
| 555 | 555 | ||
| 556 | `bindir' indicates where to put executable programs that users can | 556 | 'bindir' indicates where to put executable programs that users can |
| 557 | run. This defaults to /usr/local/bin. | 557 | run. This defaults to /usr/local/bin. |
| 558 | 558 | ||
| 559 | `datadir' indicates where to put the architecture-independent | 559 | 'datadir' indicates where to put the architecture-independent |
| 560 | read-only data files that Emacs refers to while it runs; it | 560 | read-only data files that Emacs refers to while it runs; it |
| 561 | defaults to /usr/local/share. We create the following | 561 | defaults to /usr/local/share. We create the following |
| 562 | subdirectories under `datadir': | 562 | subdirectories under 'datadir': |
| 563 | - `emacs/VERSION/lisp', containing the Emacs Lisp library, and | 563 | - 'emacs/VERSION/lisp', containing the Emacs Lisp library, and |
| 564 | - `emacs/VERSION/etc', containing the tutorials, DOC file, etc. | 564 | - 'emacs/VERSION/etc', containing the tutorials, DOC file, etc. |
| 565 | `VERSION' is the number of the Emacs version you are installing, | 565 | 'VERSION' is the number of the Emacs version you are installing, |
| 566 | like `23.1' or `23.2'. Since these files vary from one version | 566 | like '23.1' or '23.2'. Since these files vary from one version |
| 567 | of Emacs to another, including the version number in the path | 567 | of Emacs to another, including the version number in the path |
| 568 | allows you to have several versions of Emacs installed at the | 568 | allows you to have several versions of Emacs installed at the |
| 569 | same time; this means that you don't have to make Emacs | 569 | same time; this means that you don't have to make Emacs |
| 570 | unavailable while installing a new version. | 570 | unavailable while installing a new version. |
| 571 | 571 | ||
| 572 | `libexecdir' indicates where to put architecture-specific data files that | 572 | 'libexecdir' indicates where to put architecture-specific data files that |
| 573 | Emacs refers to as it runs; it defaults to `/usr/local/libexec'. | 573 | Emacs refers to as it runs; it defaults to '/usr/local/libexec'. |
| 574 | We create the following subdirectories under `libexecdir': | 574 | We create the following subdirectories under 'libexecdir': |
| 575 | - `emacs/VERSION/CONFIGURATION-NAME', containing executable | 575 | - 'emacs/VERSION/CONFIGURATION-NAME', containing executable |
| 576 | programs used by Emacs that users are not expected to run | 576 | programs used by Emacs that users are not expected to run |
| 577 | themselves. | 577 | themselves. |
| 578 | `VERSION' is the number of the Emacs version you are installing, | 578 | 'VERSION' is the number of the Emacs version you are installing, |
| 579 | and `CONFIGURATION-NAME' is the value deduced by the | 579 | and 'CONFIGURATION-NAME' is the value deduced by the |
| 580 | `configure' program to identify the architecture and operating | 580 | 'configure' program to identify the architecture and operating |
| 581 | system of your machine, like `i686-pc-linux-gnu' or `sparc-sun-sunos'. | 581 | system of your machine, like 'i686-pc-linux-gnu' or 'sparc-sun-sunos'. |
| 582 | Since these files are specific to the version of Emacs, | 582 | Since these files are specific to the version of Emacs, |
| 583 | operating system, and architecture in use, including the | 583 | operating system, and architecture in use, including the |
| 584 | configuration name in the path allows you to have several | 584 | configuration name in the path allows you to have several |
| @@ -587,57 +587,57 @@ Here is a complete list of the variables you may want to set. | |||
| 587 | at which different kinds of machines share the file system | 587 | at which different kinds of machines share the file system |
| 588 | Emacs is installed on. | 588 | Emacs is installed on. |
| 589 | 589 | ||
| 590 | `infodir' indicates where to put the info files distributed with | 590 | 'infodir' indicates where to put the info files distributed with |
| 591 | Emacs; it defaults to `/usr/local/share/info'. | 591 | Emacs; it defaults to '/usr/local/share/info'. |
| 592 | 592 | ||
| 593 | `mandir' indicates where to put the man pages for Emacs and its | 593 | 'mandir' indicates where to put the man pages for Emacs and its |
| 594 | utilities (like `etags'); it defaults to | 594 | utilities (like 'etags'); it defaults to |
| 595 | `/usr/local/share/man/man1'. | 595 | '/usr/local/share/man/man1'. |
| 596 | 596 | ||
| 597 | `prefix' doesn't give a path for any specific part of Emacs; instead, | 597 | 'prefix' doesn't give a path for any specific part of Emacs; instead, |
| 598 | its value is used to determine the defaults for all the | 598 | its value is used to determine the defaults for all the |
| 599 | architecture-independent path variables - `datadir', | 599 | architecture-independent path variables - 'datadir', |
| 600 | `sharedstatedir', `infodir', and `mandir'. Its default value is | 600 | 'sharedstatedir', 'infodir', and 'mandir'. Its default value is |
| 601 | `/usr/local'; the other variables add on `lib' or `man' to it | 601 | '/usr/local'; the other variables add on 'lib' or 'man' to it |
| 602 | by default. | 602 | by default. |
| 603 | 603 | ||
| 604 | For example, suppose your site generally places GNU software | 604 | For example, suppose your site generally places GNU software |
| 605 | under `/usr/users/software/gnusoft' instead of `/usr/local'. | 605 | under '/usr/users/software/gnusoft' instead of '/usr/local'. |
| 606 | By including | 606 | By including |
| 607 | `prefix=/usr/users/software/gnusoft' | 607 | 'prefix=/usr/users/software/gnusoft' |
| 608 | in the arguments to `make', you can instruct the build process | 608 | in the arguments to 'make', you can instruct the build process |
| 609 | to place all of the Emacs data files in the appropriate | 609 | to place all of the Emacs data files in the appropriate |
| 610 | directories under that path. | 610 | directories under that path. |
| 611 | 611 | ||
| 612 | `exec_prefix' serves the same purpose as `prefix', but instead | 612 | 'exec_prefix' serves the same purpose as 'prefix', but instead |
| 613 | determines the default values for the architecture-dependent | 613 | determines the default values for the architecture-dependent |
| 614 | path variables - `bindir' and `libexecdir'. | 614 | path variables - 'bindir' and 'libexecdir'. |
| 615 | 615 | ||
| 616 | The above variables serve analogous purposes in the makefiles for all | 616 | The above variables serve analogous purposes in the makefiles for all |
| 617 | GNU software; the following variables are specific to Emacs. | 617 | GNU software; the following variables are specific to Emacs. |
| 618 | 618 | ||
| 619 | `archlibdir' indicates where Emacs installs and expects the executable | 619 | 'archlibdir' indicates where Emacs installs and expects the executable |
| 620 | files and other architecture-dependent data it uses while | 620 | files and other architecture-dependent data it uses while |
| 621 | running. Its default value, based on `libexecdir' (which | 621 | running. Its default value, based on 'libexecdir' (which |
| 622 | see), is `/usr/local/libexec/emacs/VERSION/CONFIGURATION-NAME' | 622 | see), is '/usr/local/libexec/emacs/VERSION/CONFIGURATION-NAME' |
| 623 | (where VERSION and CONFIGURATION-NAME are as described above). | 623 | (where VERSION and CONFIGURATION-NAME are as described above). |
| 624 | 624 | ||
| 625 | `GZIP_PROG' is the name of the executable that compresses installed info, | 625 | 'GZIP_PROG' is the name of the executable that compresses installed info, |
| 626 | manual, and .el files. It defaults to gzip. Setting it to | 626 | manual, and .el files. It defaults to gzip. Setting it to |
| 627 | the empty string suppresses compression. | 627 | the empty string suppresses compression. |
| 628 | 628 | ||
| 629 | Remember that you must specify any variable values you need each time | 629 | Remember that you must specify any variable values you need each time |
| 630 | you run `make' in the top directory. If you run `make' once to build | 630 | you run 'make' in the top directory. If you run 'make' once to build |
| 631 | emacs, test it, and then run `make' again to install the files, you | 631 | emacs, test it, and then run 'make' again to install the files, you |
| 632 | must provide the same variable settings each time. To make the | 632 | must provide the same variable settings each time. To make the |
| 633 | settings persist, you can edit them into the `Makefile' in the top | 633 | settings persist, you can edit them into the 'Makefile' in the top |
| 634 | directory, but be aware that running the `configure' program erases | 634 | directory, but be aware that running the 'configure' program erases |
| 635 | `Makefile' and rebuilds it from `Makefile.in'. | 635 | 'Makefile' and rebuilds it from 'Makefile.in'. |
| 636 | 636 | ||
| 637 | The path for finding Lisp files is specified in src/epaths.h, | 637 | The path for finding Lisp files is specified in src/epaths.h, |
| 638 | a file which is generated by running configure. To change the path, | 638 | a file which is generated by running configure. To change the path, |
| 639 | you can edit the definition of PATH_LOADSEARCH in that file | 639 | you can edit the definition of PATH_LOADSEARCH in that file |
| 640 | before you run `make'. | 640 | before you run 'make'. |
| 641 | 641 | ||
| 642 | The top-level Makefile stores the variable settings it used in the | 642 | The top-level Makefile stores the variable settings it used in the |
| 643 | Makefiles for the subdirectories, so you don't have to specify them | 643 | Makefiles for the subdirectories, so you don't have to specify them |
| @@ -646,7 +646,7 @@ when running make in the subdirectories. | |||
| 646 | 646 | ||
| 647 | PROBLEMS | 647 | PROBLEMS |
| 648 | 648 | ||
| 649 | See the file `./etc/PROBLEMS' for a list of various problems sometimes | 649 | See the file './etc/PROBLEMS' for a list of various problems sometimes |
| 650 | encountered, and what to do about them. | 650 | encountered, and what to do about them. |
| 651 | 651 | ||
| 652 | This file is part of GNU Emacs. | 652 | This file is part of GNU Emacs. |
diff --git a/Makefile.in b/Makefile.in index f065cd34771..ff8dbf3011c 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -30,13 +30,13 @@ | |||
| 30 | # by building, but normally aren't because the distribution comes | 30 | # by building, but normally aren't because the distribution comes |
| 31 | # with them. | 31 | # with them. |
| 32 | # | 32 | # |
| 33 | # Delete `.dvi' files here if they are not part of the distribution. | 33 | # Delete '.dvi' files here if they are not part of the distribution. |
| 34 | # | 34 | # |
| 35 | # make distclean | 35 | # make distclean |
| 36 | # Delete all files from the current directory that are created by | 36 | # Delete all files from the current directory that are created by |
| 37 | # configuring or building the program. If you have unpacked the | 37 | # configuring or building the program. If you have unpacked the |
| 38 | # source and built the program without creating any other files, | 38 | # source and built the program without creating any other files, |
| 39 | # `make distclean' should leave only the files that were in the | 39 | # 'make distclean' should leave only the files that were in the |
| 40 | # distribution. | 40 | # distribution. |
| 41 | # | 41 | # |
| 42 | # make maintainer-clean | 42 | # make maintainer-clean |
| @@ -67,7 +67,7 @@ CDPATH= | |||
| 67 | # If Make doesn't predefine MAKE, set it here. | 67 | # If Make doesn't predefine MAKE, set it here. |
| 68 | @SET_MAKE@ | 68 | @SET_MAKE@ |
| 69 | 69 | ||
| 70 | # ==================== Things `configure' Might Edit ==================== | 70 | # ==================== Things 'configure' Might Edit ==================== |
| 71 | 71 | ||
| 72 | cache_file = @cache_file@ | 72 | cache_file = @cache_file@ |
| 73 | CONFIGURE_FLAGS = --cache-file=$(cache_file) | 73 | CONFIGURE_FLAGS = --cache-file=$(cache_file) |
| @@ -84,11 +84,11 @@ EXEEXT=@EXEEXT@ | |||
| 84 | ### to install files in. | 84 | ### to install files in. |
| 85 | 85 | ||
| 86 | ### This should be the number of the Emacs version we're building, | 86 | ### This should be the number of the Emacs version we're building, |
| 87 | ### like `18.59' or `19.0'. | 87 | ### like '24.5' or '25.0.50'. |
| 88 | version=@version@ | 88 | version=@version@ |
| 89 | 89 | ||
| 90 | ### This should be the name of the configuration we're building Emacs | 90 | ### This should be the name of the configuration we're building Emacs |
| 91 | ### for, like `mips-dec-ultrix' or `sparc-sun-sunos'. | 91 | ### for, like 'x86_64-unknown-linux-gnu' or 'powerpc-ibm-aix7.1.2.0'. |
| 92 | configuration=@configuration@ | 92 | configuration=@configuration@ |
| 93 | 93 | ||
| 94 | ### The nt/ subdirectory gets built only for MinGW | 94 | ### The nt/ subdirectory gets built only for MinGW |
| @@ -122,7 +122,7 @@ ns_self_contained=@ns_self_contained@ | |||
| 122 | # not need to change them. This defaults to /usr/local. | 122 | # not need to change them. This defaults to /usr/local. |
| 123 | prefix=@prefix@ | 123 | prefix=@prefix@ |
| 124 | 124 | ||
| 125 | # Like `prefix', but used for architecture-specific files. | 125 | # Like 'prefix', but used for architecture-specific files. |
| 126 | exec_prefix=@exec_prefix@ | 126 | exec_prefix=@exec_prefix@ |
| 127 | 127 | ||
| 128 | # Where to install Emacs and other binaries that people will want to | 128 | # Where to install Emacs and other binaries that people will want to |
| @@ -171,7 +171,7 @@ bitmapdir=@bitmapdir@ | |||
| 171 | # Where to find the source code. The source code for Emacs's C kernel is | 171 | # Where to find the source code. The source code for Emacs's C kernel is |
| 172 | # expected to be in ${srcdir}/src, and the source code for Emacs's | 172 | # expected to be in ${srcdir}/src, and the source code for Emacs's |
| 173 | # utility programs is expected to be in ${srcdir}/lib-src. This is | 173 | # utility programs is expected to be in ${srcdir}/lib-src. This is |
| 174 | # set by the configure script's `--srcdir' option. | 174 | # set by the configure script's '--srcdir' option. |
| 175 | 175 | ||
| 176 | # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. | 176 | # We use $(srcdir) explicitly in dependencies so as not to depend on VPATH. |
| 177 | srcdir=@srcdir@ | 177 | srcdir=@srcdir@ |
| @@ -316,7 +316,7 @@ etc-emacsver: | |||
| 316 | 316 | ||
| 317 | removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' | 317 | removenullpaths=sed -e 's/^:*//' -e 's/:*$$//g' -e 's/::*/:/g' |
| 318 | 318 | ||
| 319 | # Generate epaths.h from epaths.in. This target is invoked by `configure'. | 319 | # Generate epaths.h from epaths.in. This target is invoked by 'configure'. |
| 320 | # See comments in configure.ac for why it is done this way, as opposed | 320 | # See comments in configure.ac for why it is done this way, as opposed |
| 321 | # to just letting configure generate epaths.h from epaths.in in a | 321 | # to just letting configure generate epaths.h from epaths.in in a |
| 322 | # similar way to how Makefile is made from Makefile.in. | 322 | # similar way to how Makefile is made from Makefile.in. |
| @@ -350,7 +350,7 @@ epaths-force: | |||
| 350 | # The w32 build needs a slightly different editing, and it uses | 350 | # The w32 build needs a slightly different editing, and it uses |
| 351 | # nt/epaths.nt as the template. | 351 | # nt/epaths.nt as the template. |
| 352 | # | 352 | # |
| 353 | # Use the value of ${locallisppath} supplied by `configure', | 353 | # Use the value of ${locallisppath} supplied by 'configure', |
| 354 | # to support the --enable-locallisppath argument. | 354 | # to support the --enable-locallisppath argument. |
| 355 | # | 355 | # |
| 356 | # In this case, the paths written to 'src/epaths.h' must be in native | 356 | # In this case, the paths written to 'src/epaths.h' must be in native |
| @@ -377,10 +377,10 @@ lib-src src: $(NTDIR) lib | |||
| 377 | 377 | ||
| 378 | src: lib-src | 378 | src: lib-src |
| 379 | 379 | ||
| 380 | # We need to build `emacs' in `src' to compile the *.elc files in `lisp'. | 380 | # We need to build 'emacs' in 'src' to compile the *.elc files in 'lisp'. |
| 381 | lisp: src | 381 | lisp: src |
| 382 | 382 | ||
| 383 | # These targets should be "${SUBDIR} without `src'". | 383 | # These targets should be "${SUBDIR} without 'src'". |
| 384 | lib lib-src lisp nt: Makefile | 384 | lib lib-src lisp nt: Makefile |
| 385 | $(MAKE) -C $@ all | 385 | $(MAKE) -C $@ all |
| 386 | 386 | ||
| @@ -733,8 +733,8 @@ install-etc: | |||
| 733 | install-strip: | 733 | install-strip: |
| 734 | $(MAKE) INSTALL_STRIP=-s install | 734 | $(MAKE) INSTALL_STRIP=-s install |
| 735 | 735 | ||
| 736 | ### Delete all the installed files that the `install' target would | 736 | ### Delete all the installed files that the 'install' target would |
| 737 | ### create (but not the noninstalled files such as `make all' would create). | 737 | ### create (but not the noninstalled files such as 'make all' would create). |
| 738 | ### | 738 | ### |
| 739 | ### Don't delete the lisp and etc directories if they're in the source tree. | 739 | ### Don't delete the lisp and etc directories if they're in the source tree. |
| 740 | uninstall: uninstall-$(NTDIR) uninstall-doc | 740 | uninstall: uninstall-$(NTDIR) uninstall-doc |
| @@ -803,10 +803,10 @@ $(1)_$(2): | |||
| 803 | $$(MAKE) -C $(1) $(2) | 803 | $$(MAKE) -C $(1) $(2) |
| 804 | endef | 804 | endef |
| 805 | 805 | ||
| 806 | ### `mostlyclean' | 806 | ### 'mostlyclean' |
| 807 | ### Like `clean', but may refrain from deleting a few files that people | 807 | ### Like 'clean', but may refrain from deleting a few files that people |
| 808 | ### normally don't want to recompile. For example, the `mostlyclean' | 808 | ### normally don't want to recompile. For example, the 'mostlyclean' |
| 809 | ### target for GCC does not delete `libgcc.a', because recompiling it | 809 | ### target for GCC does not delete 'libgcc.a', because recompiling it |
| 810 | ### is rarely necessary and takes a lot of time. | 810 | ### is rarely necessary and takes a lot of time. |
| 811 | mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \ | 811 | mostlyclean_dirs = src oldXMenu lwlib lib lib-src nt doc/emacs doc/misc \ |
| 812 | doc/lispref doc/lispintro | 812 | doc/lispref doc/lispintro |
| @@ -818,14 +818,14 @@ mostlyclean: $(mostlyclean_dirs:=_mostlyclean) | |||
| 818 | [ ! -d $$dir ] || $(MAKE) -C $$dir mostlyclean; \ | 818 | [ ! -d $$dir ] || $(MAKE) -C $$dir mostlyclean; \ |
| 819 | done | 819 | done |
| 820 | 820 | ||
| 821 | ### `clean' | 821 | ### 'clean' |
| 822 | ### Delete all files from the current directory that are normally | 822 | ### Delete all files from the current directory that are normally |
| 823 | ### created by building the program. Don't delete the files that | 823 | ### created by building the program. Don't delete the files that |
| 824 | ### record the configuration. Also preserve files that could be made | 824 | ### record the configuration. Also preserve files that could be made |
| 825 | ### by building, but normally aren't because the distribution comes | 825 | ### by building, but normally aren't because the distribution comes |
| 826 | ### with them. | 826 | ### with them. |
| 827 | ### | 827 | ### |
| 828 | ### Delete `.dvi' files here if they are not part of the distribution. | 828 | ### Delete '.dvi' files here if they are not part of the distribution. |
| 829 | clean_dirs = $(mostlyclean_dirs) nextstep | 829 | clean_dirs = $(mostlyclean_dirs) nextstep |
| 830 | 830 | ||
| 831 | $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean))) | 831 | $(foreach dir,$(clean_dirs),$(eval $(call submake_template,$(dir),clean))) |
| @@ -837,16 +837,16 @@ clean: $(clean_dirs:=_clean) | |||
| 837 | -rm -f *.tmp etc/*.tmp* | 837 | -rm -f *.tmp etc/*.tmp* |
| 838 | -rm -rf info-dir.* | 838 | -rm -rf info-dir.* |
| 839 | 839 | ||
| 840 | ### `bootclean' | 840 | ### 'bootclean' |
| 841 | ### Delete all files that need to be remade for a clean bootstrap. | 841 | ### Delete all files that need to be remade for a clean bootstrap. |
| 842 | top_bootclean=\ | 842 | top_bootclean=\ |
| 843 | rm -f config.cache config.log ${srcdir}/doc/man/emacs.1 | 843 | rm -f config.cache config.log ${srcdir}/doc/man/emacs.1 |
| 844 | 844 | ||
| 845 | ### `distclean' | 845 | ### 'distclean' |
| 846 | ### Delete all files from the current directory that are created by | 846 | ### Delete all files from the current directory that are created by |
| 847 | ### configuring or building the program. If you have unpacked the | 847 | ### configuring or building the program. If you have unpacked the |
| 848 | ### source and built the program without creating any other files, | 848 | ### source and built the program without creating any other files, |
| 849 | ### `make distclean' should leave only the files that were in the | 849 | ### 'make distclean' should leave only the files that were in the |
| 850 | ### distribution. | 850 | ### distribution. |
| 851 | top_distclean=\ | 851 | top_distclean=\ |
| 852 | ${top_bootclean}; \ | 852 | ${top_bootclean}; \ |
| @@ -862,8 +862,8 @@ distclean: $(distclean_dirs:=_distclean) | |||
| 862 | done | 862 | done |
| 863 | ${top_distclean} | 863 | ${top_distclean} |
| 864 | 864 | ||
| 865 | ### `bootstrap-clean' | 865 | ### 'bootstrap-clean' |
| 866 | ### Delete everything that can be reconstructed by `make' and that | 866 | ### Delete everything that can be reconstructed by 'make' and that |
| 867 | ### needs to be deleted in order to force a bootstrap from a clean state. | 867 | ### needs to be deleted in order to force a bootstrap from a clean state. |
| 868 | $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean))) | 868 | $(foreach dir,$(distclean_dirs),$(eval $(call submake_template,$(dir),bootstrap-clean))) |
| 869 | 869 | ||
| @@ -876,16 +876,16 @@ bootstrap-clean: $(distclean_dirs:=_bootstrap-clean) | |||
| 876 | rm -f ${srcdir}/etc/refcards/emacsver.tex | 876 | rm -f ${srcdir}/etc/refcards/emacsver.tex |
| 877 | ${top_bootclean} | 877 | ${top_bootclean} |
| 878 | 878 | ||
| 879 | ### `maintainer-clean' | 879 | ### 'maintainer-clean' |
| 880 | ### Delete everything from the current directory that can be | 880 | ### Delete everything from the current directory that can be |
| 881 | ### reconstructed with this Makefile. This typically includes | 881 | ### reconstructed with this Makefile. This typically includes |
| 882 | ### everything deleted by distclean, plus more: C source files | 882 | ### everything deleted by distclean, plus more: C source files |
| 883 | ### produced by Bison, tags tables, info files, and so on. | 883 | ### produced by Bison, tags tables, info files, and so on. |
| 884 | ### | 884 | ### |
| 885 | ### One exception, however: `make maintainer-clean' should not delete | 885 | ### One exception, however: 'make maintainer-clean' should not delete |
| 886 | ### `configure' even if `configure' can be remade using a rule in the | 886 | ### 'configure' even if 'configure' can be remade using a rule in the |
| 887 | ### Makefile. More generally, `make maintainer-clean' should not delete | 887 | ### Makefile. More generally, 'make maintainer-clean' should not delete |
| 888 | ### anything that needs to exist in order to run `configure' and then | 888 | ### anything that needs to exist in order to run 'configure' and then |
| 889 | ### begin to build the program. | 889 | ### begin to build the program. |
| 890 | top_maintainer_clean=\ | 890 | top_maintainer_clean=\ |
| 891 | ${top_distclean}; \ | 891 | ${top_distclean}; \ |
| @@ -22,71 +22,71 @@ in code we don't use often. Please send bug reports to the mailing | |||
| 22 | list bug-gnu-emacs@gnu.org. If possible, use M-x report-emacs-bug. | 22 | list bug-gnu-emacs@gnu.org. If possible, use M-x report-emacs-bug. |
| 23 | 23 | ||
| 24 | See the "Bugs" section of the Emacs manual for more information on how | 24 | See the "Bugs" section of the Emacs manual for more information on how |
| 25 | to report bugs. (The file `BUGS' in this directory explains how you | 25 | to report bugs. (The file 'BUGS' in this directory explains how you |
| 26 | can find and read that section using the Info files that come with | 26 | can find and read that section using the Info files that come with |
| 27 | Emacs.) For a list of mailing lists related to Emacs, see | 27 | Emacs.) For a list of mailing lists related to Emacs, see |
| 28 | <http://savannah.gnu.org/mail/?group=emacs>. For the complete | 28 | <http://savannah.gnu.org/mail/?group=emacs>. For the complete |
| 29 | list of GNU mailing lists, see <http://lists.gnu.org/>. | 29 | list of GNU mailing lists, see <http://lists.gnu.org/>. |
| 30 | 30 | ||
| 31 | The `etc' subdirectory contains several other files, named in capital | 31 | The 'etc' subdirectory contains several other files, named in capital |
| 32 | letters, which you might consider looking at when installing GNU | 32 | letters, which you might consider looking at when installing GNU |
| 33 | Emacs. | 33 | Emacs. |
| 34 | 34 | ||
| 35 | The file `configure' is a shell script to acclimate Emacs to the | 35 | The file 'configure' is a shell script to acclimate Emacs to the |
| 36 | oddities of your processor and operating system. It creates the file | 36 | oddities of your processor and operating system. It creates the file |
| 37 | `Makefile' (a script for the `make' program), which automates the | 37 | 'Makefile' (a script for the 'make' program), which automates the |
| 38 | process of building and installing Emacs. See INSTALL for more | 38 | process of building and installing Emacs. See INSTALL for more |
| 39 | detailed information. | 39 | detailed information. |
| 40 | 40 | ||
| 41 | The file `configure.ac' is the input used by the autoconf program to | 41 | The file 'configure.ac' is the input used by the autoconf program to |
| 42 | construct the `configure' script. | 42 | construct the 'configure' script. |
| 43 | 43 | ||
| 44 | The shell script `autogen.sh' generates 'configure' and other files by | 44 | The shell script 'autogen.sh' generates 'configure' and other files by |
| 45 | running the GNU build tools autoconf and automake, which in turn use | 45 | running the GNU build tools autoconf and automake, which in turn use |
| 46 | GNU m4 and Perl. If you want to use it, you will need to install | 46 | GNU m4 and Perl. If you want to use it, you will need to install |
| 47 | recent versions of these build tools. This should be needed only if | 47 | recent versions of these build tools. This should be needed only if |
| 48 | you edit files like `configure.ac' that specify Emacs's autobuild | 48 | you edit files like 'configure.ac' that specify Emacs's autobuild |
| 49 | procedure. | 49 | procedure. |
| 50 | 50 | ||
| 51 | The file `Makefile.in' is a template used by `configure' to create | 51 | The file 'Makefile.in' is a template used by 'configure' to create |
| 52 | `Makefile'. | 52 | 'Makefile'. |
| 53 | 53 | ||
| 54 | The file `make-dist' is a shell script to build a distribution tar | 54 | The file 'make-dist' is a shell script to build a distribution tar |
| 55 | file from the current Emacs tree, containing only those files | 55 | file from the current Emacs tree, containing only those files |
| 56 | appropriate for distribution. If you make extensive changes to Emacs, | 56 | appropriate for distribution. If you make extensive changes to Emacs, |
| 57 | this script will help you distribute your version to others. | 57 | this script will help you distribute your version to others. |
| 58 | 58 | ||
| 59 | There are several subdirectories: | 59 | There are several subdirectories: |
| 60 | 60 | ||
| 61 | `src' holds the C code for Emacs (the Emacs Lisp interpreter and | 61 | 'src' holds the C code for Emacs (the Emacs Lisp interpreter and |
| 62 | its primitives, the redisplay code, and some basic editing | 62 | its primitives, the redisplay code, and some basic editing |
| 63 | functions). | 63 | functions). |
| 64 | `lisp' holds the Emacs Lisp code for Emacs (most everything else). | 64 | 'lisp' holds the Emacs Lisp code for Emacs (most everything else). |
| 65 | `leim' holds the original source files for the generated files | 65 | 'leim' holds the original source files for the generated files |
| 66 | in lisp/leim. These form the library of Emacs input methods, | 66 | in lisp/leim. These form the library of Emacs input methods, |
| 67 | required to type international characters that can't be | 67 | required to type international characters that can't be |
| 68 | directly produced by your keyboard. | 68 | directly produced by your keyboard. |
| 69 | `lib' holds source code for libraries used by Emacs and its utilities | 69 | 'lib' holds source code for libraries used by Emacs and its utilities |
| 70 | `lib-src' holds the source code for some utility programs for use by or | 70 | 'lib-src' holds the source code for some utility programs for use by or |
| 71 | with Emacs, like movemail and etags. | 71 | with Emacs, like movemail and etags. |
| 72 | `etc' holds miscellaneous architecture-independent data files Emacs | 72 | 'etc' holds miscellaneous architecture-independent data files Emacs |
| 73 | uses, like the tutorial text and tool bar images. | 73 | uses, like the tutorial text and tool bar images. |
| 74 | The contents of the `lisp', `leim', `info', and `doc' | 74 | The contents of the 'lisp', 'leim', 'info', and 'doc' |
| 75 | subdirectories are architecture-independent too. | 75 | subdirectories are architecture-independent too. |
| 76 | `info' holds the Info documentation tree for Emacs. | 76 | 'info' holds the Info documentation tree for Emacs. |
| 77 | `doc/emacs' holds the source code for the Emacs Manual. If you modify the | 77 | 'doc/emacs' holds the source code for the Emacs Manual. If you modify the |
| 78 | manual sources, you will need the `makeinfo' program to produce | 78 | manual sources, you will need the 'makeinfo' program to produce |
| 79 | an updated manual. `makeinfo' is part of the GNU Texinfo | 79 | an updated manual. 'makeinfo' is part of the GNU Texinfo |
| 80 | package; you need a suitably recent version of Texinfo. | 80 | package; you need a suitably recent version of Texinfo. |
| 81 | `doc/lispref' holds the source code for the Emacs Lisp reference manual. | 81 | 'doc/lispref' holds the source code for the Emacs Lisp reference manual. |
| 82 | `doc/lispintro' holds the source code for the Introduction to Programming | 82 | 'doc/lispintro' holds the source code for the Introduction to Programming |
| 83 | in Emacs Lisp manual. | 83 | in Emacs Lisp manual. |
| 84 | `msdos' holds configuration files for compiling Emacs under MS-DOS. | 84 | 'msdos' holds configuration files for compiling Emacs under MS-DOS. |
| 85 | `nextstep' holds instructions and some other files for compiling the | 85 | 'nextstep' holds instructions and some other files for compiling the |
| 86 | Nextstep port of Emacs, for GNUstep and Mac OS X Cocoa. | 86 | Nextstep port of Emacs, for GNUstep and Mac OS X Cocoa. |
| 87 | `nt' holds various command files and documentation files that pertain | 87 | 'nt' holds various command files and documentation files that pertain |
| 88 | to building and running Emacs on Windows 9X/ME/NT/2000/XP. | 88 | to building and running Emacs on Windows 9X/ME/NT/2000/XP. |
| 89 | `test' holds tests for various aspects of Emacs's functionality. | 89 | 'test' holds tests for various aspects of Emacs's functionality. |
| 90 | 90 | ||
| 91 | Building Emacs on non-Posix platforms requires tools that aren't part | 91 | Building Emacs on non-Posix platforms requires tools that aren't part |
| 92 | of the standard distribution of the OS. The platform-specific README | 92 | of the standard distribution of the OS. The platform-specific README |
diff --git a/configure.ac b/configure.ac index 4cb3c354da5..d2f21eeddae 100644 --- a/configure.ac +++ b/configure.ac | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | dnl Autoconf script for GNU Emacs | 1 | dnl Autoconf script for GNU Emacs |
| 2 | dnl To rebuild the `configure' script from this, execute the command | 2 | dnl To rebuild the 'configure' script from this, execute the command |
| 3 | dnl autoconf | 3 | dnl autoconf |
| 4 | dnl in the directory containing this script. | 4 | dnl in the directory containing this script. |
| 5 | dnl If you changed any AC_DEFINES, also run autoheader. | 5 | dnl If you changed any AC_DEFINES, also run autoheader. |
| 6 | dnl | 6 | dnl |
| @@ -283,8 +283,8 @@ AC_ARG_WITH([sound],[AS_HELP_STRING([--with-sound=VALUE], | |||
| 283 | default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW, Cygwin.])], | 283 | default yes). Only for GNU/Linux, FreeBSD, NetBSD, MinGW, Cygwin.])], |
| 284 | [ case "${withval}" in | 284 | [ case "${withval}" in |
| 285 | yes|no|alsa|oss|bsd-ossaudio) val=$withval ;; | 285 | yes|no|alsa|oss|bsd-ossaudio) val=$withval ;; |
| 286 | *) AC_MSG_ERROR([`--with-sound=$withval' is invalid; | 286 | *) AC_MSG_ERROR(['--with-sound=$withval' is invalid; |
| 287 | this option's value should be `yes', `no', `alsa', `oss', or `bsd-ossaudio'.]) | 287 | this option's value should be 'yes', 'no', 'alsa', 'oss', or 'bsd-ossaudio'.]) |
| 288 | ;; | 288 | ;; |
| 289 | esac | 289 | esac |
| 290 | with_sound=$val | 290 | with_sound=$val |
| @@ -307,10 +307,10 @@ AC_ARG_WITH([x-toolkit],[AS_HELP_STRING([--with-x-toolkit=KIT], | |||
| 307 | gtk2 ) val=gtk2 ;; | 307 | gtk2 ) val=gtk2 ;; |
| 308 | gtk3 ) val=gtk3 ;; | 308 | gtk3 ) val=gtk3 ;; |
| 309 | * ) | 309 | * ) |
| 310 | AC_MSG_ERROR([`--with-x-toolkit=$withval' is invalid; | 310 | AC_MSG_ERROR(['--with-x-toolkit=$withval' is invalid; |
| 311 | this option's value should be `yes', `no', `lucid', `athena', `motif', `gtk', | 311 | this option's value should be 'yes', 'no', 'lucid', 'athena', 'motif', 'gtk', |
| 312 | `gtk2' or `gtk3'. `yes' and `gtk' are synonyms. | 312 | 'gtk2' or 'gtk3'. 'yes' and 'gtk' are synonyms. |
| 313 | `athena' and `lucid' are synonyms.]) | 313 | 'athena' and 'lucid' are synonyms.]) |
| 314 | ;; | 314 | ;; |
| 315 | esac | 315 | esac |
| 316 | with_x_toolkit=$val | 316 | with_x_toolkit=$val |
| @@ -359,10 +359,10 @@ AC_ARG_WITH([file-notification],[AS_HELP_STRING([--with-file-notification=LIB], | |||
| 359 | g | gf | gfi | gfil | gfile ) val=gfile ;; | 359 | g | gf | gfi | gfil | gfile ) val=gfile ;; |
| 360 | i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;; | 360 | i | in | ino | inot | inoti | inotif | inotify ) val=inotify ;; |
| 361 | w | w3 | w32 ) val=w32 ;; | 361 | w | w3 | w32 ) val=w32 ;; |
| 362 | * ) AC_MSG_ERROR([`--with-file-notification=$withval' is invalid; | 362 | * ) AC_MSG_ERROR(['--with-file-notification=$withval' is invalid; |
| 363 | this option's value should be `yes', `no', `gfile', `inotify' or `w32'. | 363 | this option's value should be 'yes', 'no', 'gfile', 'inotify' or 'w32'. |
| 364 | `yes' is a synonym for `w32' on MS-Windows, for `no' on Nextstep, | 364 | 'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep, |
| 365 | otherwise for the first of `gfile' or `inotify' that is usable.]) | 365 | otherwise for the first of 'gfile' or 'inotify' that is usable.]) |
| 366 | ;; | 366 | ;; |
| 367 | esac | 367 | esac |
| 368 | with_file_notification=$val | 368 | with_file_notification=$val |
| @@ -458,8 +458,8 @@ do | |||
| 458 | ac_gc_check_cons_list=1 ; | 458 | ac_gc_check_cons_list=1 ; |
| 459 | ac_glyphs_debug=1 ;; | 459 | ac_glyphs_debug=1 ;; |
| 460 | # these enable particular checks | 460 | # these enable particular checks |
| 461 | stringbytes) ac_gc_check_stringbytes=1 ;; | 461 | stringbytes) ac_gc_check_stringbytes=1 ;; |
| 462 | stringoverrun) ac_gc_check_string_overrun=1 ;; | 462 | stringoverrun) ac_gc_check_string_overrun=1 ;; |
| 463 | stringfreelist) ac_gc_check_string_free_list=1 ;; | 463 | stringfreelist) ac_gc_check_string_free_list=1 ;; |
| 464 | xmallocoverrun) ac_xmalloc_overrun=1 ;; | 464 | xmallocoverrun) ac_xmalloc_overrun=1 ;; |
| 465 | conslist) ac_gc_check_cons_list=1 ;; | 465 | conslist) ac_gc_check_cons_list=1 ;; |
| @@ -530,7 +530,7 @@ AC_SUBST(PROFILING_CFLAGS) | |||
| 530 | AC_ARG_ENABLE(autodepend, | 530 | AC_ARG_ENABLE(autodepend, |
| 531 | [AS_HELP_STRING([--enable-autodepend], | 531 | [AS_HELP_STRING([--enable-autodepend], |
| 532 | [automatically generate dependencies to .h-files. | 532 | [automatically generate dependencies to .h-files. |
| 533 | Requires gcc, enabled if found.])], | 533 | Requires gcc, enabled if found.])], |
| 534 | [ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes]) | 534 | [ac_enable_autodepend="${enableval}"],[ac_enable_autodepend=yes]) |
| 535 | 535 | ||
| 536 | AC_ARG_ENABLE(gtk-deprecation-warnings, | 536 | AC_ARG_ENABLE(gtk-deprecation-warnings, |
| @@ -538,7 +538,7 @@ AC_ARG_ENABLE(gtk-deprecation-warnings, | |||
| 538 | [Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])], | 538 | [Show Gtk+/Gdk deprecation warnings for Gtk+ >= 3.0])], |
| 539 | [ac_enable_gtk_deprecation_warnings="${enableval}"],[]) | 539 | [ac_enable_gtk_deprecation_warnings="${enableval}"],[]) |
| 540 | 540 | ||
| 541 | dnl This used to use changequote, but, apart from `changequote is evil' | 541 | dnl This used to use changequote, but, apart from 'changequote is evil' |
| 542 | dnl per the autoconf manual, we can speed up autoconf somewhat by quoting | 542 | dnl per the autoconf manual, we can speed up autoconf somewhat by quoting |
| 543 | dnl the great gob of text. Thus it's not processed for possible expansion. | 543 | dnl the great gob of text. Thus it's not processed for possible expansion. |
| 544 | dnl Just make sure the brackets remain balanced. | 544 | dnl Just make sure the brackets remain balanced. |
| @@ -645,7 +645,7 @@ case "${canonical}" in | |||
| 645 | mips-sgi-irix6.5 ) | 645 | mips-sgi-irix6.5 ) |
| 646 | opsys=irix6-5 | 646 | opsys=irix6-5 |
| 647 | # Without defining _LANGUAGE_C, things get masked out in the headers | 647 | # Without defining _LANGUAGE_C, things get masked out in the headers |
| 648 | # so that, for instance, grepping for `free' in stdlib.h fails and | 648 | # so that, for instance, grepping for 'free' in stdlib.h fails and |
| 649 | # AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m). | 649 | # AC_HEADER_STD_C fails. (MIPSPro 7.2.1.2m compilers, Irix 6.5.3m). |
| 650 | NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" | 650 | NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C" |
| 651 | ;; | 651 | ;; |
| @@ -699,9 +699,9 @@ case "${canonical}" in | |||
| 699 | # MinGW overrides and adds some system headers in nt/inc. | 699 | # MinGW overrides and adds some system headers in nt/inc. |
| 700 | GCC_TEST_OPTIONS="-I $srcdir/nt/inc" | 700 | GCC_TEST_OPTIONS="-I $srcdir/nt/inc" |
| 701 | ;; | 701 | ;; |
| 702 | *-sysv4.2uw* ) opsys=unixware ;; | 702 | *-sysv4.2uw* ) opsys=unixware ;; |
| 703 | *-sysv5uw* ) opsys=unixware ;; | 703 | *-sysv5uw* ) opsys=unixware ;; |
| 704 | *-sysv5OpenUNIX* ) opsys=unixware ;; | 704 | *-sysv5OpenUNIX* ) opsys=unixware ;; |
| 705 | ## Otherwise, we'll fall through to the generic opsys code at the bottom. | 705 | ## Otherwise, we'll fall through to the generic opsys code at the bottom. |
| 706 | esac | 706 | esac |
| 707 | ;; | 707 | ;; |
| @@ -742,9 +742,9 @@ fi | |||
| 742 | dnl quotation ends | 742 | dnl quotation ends |
| 743 | 743 | ||
| 744 | if test $unported = yes; then | 744 | if test $unported = yes; then |
| 745 | AC_MSG_ERROR([Emacs does not support `${canonical}' systems. | 745 | AC_MSG_ERROR([Emacs does not support '${canonical}' systems. |
| 746 | If you think it should, please send a report to ${PACKAGE_BUGREPORT}. | 746 | If you think it should, please send a report to ${PACKAGE_BUGREPORT}. |
| 747 | Check `etc/MACHINES' for recognized configuration names.]) | 747 | Check 'etc/MACHINES' for recognized configuration names.]) |
| 748 | fi | 748 | fi |
| 749 | 749 | ||
| 750 | #### Choose a compiler. | 750 | #### Choose a compiler. |
| @@ -1190,9 +1190,9 @@ if test "$MAKEINFO" = "no"; then | |||
| 1190 | HAVE_MAKEINFO=no | 1190 | HAVE_MAKEINFO=no |
| 1191 | elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then | 1191 | elif test ! -e "$srcdir/info/emacs" && test ! -e "$srcdir/info/emacs.info"; then |
| 1192 | AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your | 1192 | AC_MSG_ERROR( [You do not seem to have makeinfo >= 4.7, and your |
| 1193 | source tree does not seem to have pre-built manuals in the `info' directory. | 1193 | source tree does not seem to have pre-built manuals in the 'info' directory. |
| 1194 | Either install a suitable version of makeinfo, or re-run configure | 1194 | Either install a suitable version of makeinfo, or re-run configure |
| 1195 | with the `--without-makeinfo' option to build without the manuals.] ) | 1195 | with the '--without-makeinfo' option to build without the manuals.] ) |
| 1196 | fi | 1196 | fi |
| 1197 | fi | 1197 | fi |
| 1198 | AC_SUBST(HAVE_MAKEINFO) | 1198 | AC_SUBST(HAVE_MAKEINFO) |
| @@ -1216,8 +1216,8 @@ fi | |||
| 1216 | 1216 | ||
| 1217 | dnl We need -znocombreloc if we're using a relatively recent GNU ld. | 1217 | dnl We need -znocombreloc if we're using a relatively recent GNU ld. |
| 1218 | dnl If we can link with the flag, it shouldn't do any harm anyhow. | 1218 | dnl If we can link with the flag, it shouldn't do any harm anyhow. |
| 1219 | dnl (Don't use `-z nocombreloc' as -z takes no arg on Irix.) | 1219 | dnl (Don't use '-z nocombreloc' as -z takes no arg on Irix.) |
| 1220 | dnl Treat GCC specially since it just gives a non-fatal `unrecognized option' | 1220 | dnl Treat GCC specially since it just gives a non-fatal 'unrecognized option' |
| 1221 | dnl if not built to support GNU ld. | 1221 | dnl if not built to support GNU ld. |
| 1222 | 1222 | ||
| 1223 | dnl For a long time, -znocombreloc was added to LDFLAGS rather than | 1223 | dnl For a long time, -znocombreloc was added to LDFLAGS rather than |
| @@ -1313,7 +1313,7 @@ esac | |||
| 1313 | LD_SWITCH_SYSTEM= | 1313 | LD_SWITCH_SYSTEM= |
| 1314 | case "$opsys" in | 1314 | case "$opsys" in |
| 1315 | freebsd|dragonfly) | 1315 | freebsd|dragonfly) |
| 1316 | ## Let `ld' find image libs and similar things in /usr/local/lib. | 1316 | ## Let 'ld' find image libs and similar things in /usr/local/lib. |
| 1317 | ## The system compiler, GCC, has apparently been modified to not | 1317 | ## The system compiler, GCC, has apparently been modified to not |
| 1318 | ## look there, contrary to what a stock GCC would do. | 1318 | ## look there, contrary to what a stock GCC would do. |
| 1319 | ### It's not our place to do this. See bug#10313#17. | 1319 | ### It's not our place to do this. See bug#10313#17. |
| @@ -1481,7 +1481,7 @@ esac | |||
| 1481 | 1481 | ||
| 1482 | AC_SUBST(LIB_MATH) | 1482 | AC_SUBST(LIB_MATH) |
| 1483 | AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE", | 1483 | AC_DEFINE_UNQUOTED(SYSTEM_TYPE, "$SYSTEM_TYPE", |
| 1484 | [The type of system you are compiling for; sets `system-type'.]) | 1484 | [The type of system you are compiling for; sets 'system-type'.]) |
| 1485 | 1485 | ||
| 1486 | 1486 | ||
| 1487 | pre_PKG_CONFIG_CFLAGS=$CFLAGS | 1487 | pre_PKG_CONFIG_CFLAGS=$CFLAGS |
| @@ -1536,12 +1536,12 @@ if test "${with_sound}" != "no"; then | |||
| 1536 | LIBS="$ALSA_LIBS $LIBS" | 1536 | LIBS="$ALSA_LIBS $LIBS" |
| 1537 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])], | 1537 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <asoundlib.h>]], [[snd_lib_error_set_handler (0);]])], |
| 1538 | emacs_alsa_normal=yes, | 1538 | emacs_alsa_normal=yes, |
| 1539 | emacs_alsa_normal=no) | 1539 | emacs_alsa_normal=no) |
| 1540 | if test "$emacs_alsa_normal" != yes; then | 1540 | if test "$emacs_alsa_normal" != yes; then |
| 1541 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]], | 1541 | AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <alsa/asoundlib.h>]], |
| 1542 | [[snd_lib_error_set_handler (0);]])], | 1542 | [[snd_lib_error_set_handler (0);]])], |
| 1543 | emacs_alsa_subdir=yes, | 1543 | emacs_alsa_subdir=yes, |
| 1544 | emacs_alsa_subdir=no) | 1544 | emacs_alsa_subdir=no) |
| 1545 | if test "$emacs_alsa_subdir" != yes; then | 1545 | if test "$emacs_alsa_subdir" != yes; then |
| 1546 | AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.]) | 1546 | AC_MSG_ERROR([pkg-config found alsa, but it does not compile. See config.log for error messages.]) |
| 1547 | fi | 1547 | fi |
| @@ -1617,7 +1617,7 @@ if test "$ac_cv_header_sys_sysinfo_h" = yes; then | |||
| 1617 | fi | 1617 | fi |
| 1618 | 1618 | ||
| 1619 | dnl On Solaris 8 there's a compilation warning for term.h because | 1619 | dnl On Solaris 8 there's a compilation warning for term.h because |
| 1620 | dnl it doesn't define `bool'. | 1620 | dnl it doesn't define 'bool'. |
| 1621 | AC_CHECK_HEADERS(term.h, , , -) | 1621 | AC_CHECK_HEADERS(term.h, , , -) |
| 1622 | AC_HEADER_TIME | 1622 | AC_HEADER_TIME |
| 1623 | AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h> | 1623 | AC_CHECK_DECLS([sys_siglist], [], [], [[#include <signal.h> |
| @@ -1831,7 +1831,7 @@ fail; | |||
| 1831 | CFLAGS="$CFLAGS $GNU_OBJC_CFLAGS" | 1831 | CFLAGS="$CFLAGS $GNU_OBJC_CFLAGS" |
| 1832 | 1832 | ||
| 1833 | AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], | 1833 | AC_CHECK_HEADER([AppKit/AppKit.h], [HAVE_NS=yes], |
| 1834 | [AC_MSG_ERROR([`--with-ns' was specified, but the include | 1834 | [AC_MSG_ERROR(['--with-ns' was specified, but the include |
| 1835 | files are missing or cannot be compiled.])]) | 1835 | files are missing or cannot be compiled.])]) |
| 1836 | 1836 | ||
| 1837 | macfont_file="" | 1837 | macfont_file="" |
| @@ -1852,7 +1852,7 @@ fail; | |||
| 1852 | AC_MSG_RESULT([$ns_osx_have_106]) | 1852 | AC_MSG_RESULT([$ns_osx_have_106]) |
| 1853 | 1853 | ||
| 1854 | if test $ns_osx_have_106 = no; then | 1854 | if test $ns_osx_have_106 = no; then |
| 1855 | AC_MSG_ERROR([`OSX 10.6 or newer is required']); | 1855 | AC_MSG_ERROR([OSX 10.6 or newer is required]); |
| 1856 | fi | 1856 | fi |
| 1857 | fi | 1857 | fi |
| 1858 | fi | 1858 | fi |
| @@ -1910,7 +1910,7 @@ if test "${with_w32}" != no; then | |||
| 1910 | case "${opsys}" in | 1910 | case "${opsys}" in |
| 1911 | cygwin) | 1911 | cygwin) |
| 1912 | AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], | 1912 | AC_CHECK_HEADER([windows.h], [HAVE_W32=yes], |
| 1913 | [AC_MSG_ERROR([`--with-w32' was specified, but windows.h | 1913 | [AC_MSG_ERROR(['--with-w32' was specified, but windows.h |
| 1914 | cannot be found.])]) | 1914 | cannot be found.])]) |
| 1915 | ;; | 1915 | ;; |
| 1916 | mingw32) | 1916 | mingw32) |
| @@ -2356,7 +2356,7 @@ fail; | |||
| 2356 | fi | 2356 | fi |
| 2357 | 2357 | ||
| 2358 | 2358 | ||
| 2359 | ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. | 2359 | ### Use -lrsvg-2 if available, unless '--with-rsvg=no' is specified. |
| 2360 | HAVE_RSVG=no | 2360 | HAVE_RSVG=no |
| 2361 | if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then | 2361 | if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = "mingw32"; then |
| 2362 | if test "${with_rsvg}" != "no"; then | 2362 | if test "${with_rsvg}" != "no"; then |
| @@ -2372,7 +2372,7 @@ if test "${HAVE_X11}" = "yes" || test "${HAVE_NS}" = "yes" || test "${opsys}" = | |||
| 2372 | CFLAGS="$CFLAGS $RSVG_CFLAGS" | 2372 | CFLAGS="$CFLAGS $RSVG_CFLAGS" |
| 2373 | # Windows loads librsvg dynamically | 2373 | # Windows loads librsvg dynamically |
| 2374 | if test "${opsys}" = "mingw32"; then | 2374 | if test "${opsys}" = "mingw32"; then |
| 2375 | RSVG_LIBS= | 2375 | RSVG_LIBS= |
| 2376 | fi | 2376 | fi |
| 2377 | fi | 2377 | fi |
| 2378 | fi | 2378 | fi |
| @@ -2601,21 +2601,21 @@ if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then | |||
| 2601 | AC_MSG_CHECKING([whether GSettings is in gio]) | 2601 | AC_MSG_CHECKING([whether GSettings is in gio]) |
| 2602 | AC_LINK_IFELSE( | 2602 | AC_LINK_IFELSE( |
| 2603 | [AC_LANG_PROGRAM( | 2603 | [AC_LANG_PROGRAM( |
| 2604 | [[/* Check that gsettings really is present. */ | 2604 | [[/* Check that gsettings really is present. */ |
| 2605 | #include <glib-object.h> | 2605 | #include <glib-object.h> |
| 2606 | #include <gio/gio.h> | 2606 | #include <gio/gio.h> |
| 2607 | ]], | 2607 | ]], |
| 2608 | [[ | 2608 | [[ |
| 2609 | GSettings *settings; | 2609 | GSettings *settings; |
| 2610 | GVariant *val = g_settings_get_value (settings, ""); | 2610 | GVariant *val = g_settings_get_value (settings, ""); |
| 2611 | ]])], | 2611 | ]])], |
| 2612 | [], HAVE_GSETTINGS=no) | 2612 | [], HAVE_GSETTINGS=no) |
| 2613 | AC_MSG_RESULT([$HAVE_GSETTINGS]) | 2613 | AC_MSG_RESULT([$HAVE_GSETTINGS]) |
| 2614 | 2614 | ||
| 2615 | if test "$HAVE_GSETTINGS" = "yes"; then | 2615 | if test "$HAVE_GSETTINGS" = "yes"; then |
| 2616 | AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) | 2616 | AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.]) |
| 2617 | SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" | 2617 | SETTINGS_CFLAGS="$GSETTINGS_CFLAGS" |
| 2618 | SETTINGS_LIBS="$GSETTINGS_LIBS" | 2618 | SETTINGS_LIBS="$GSETTINGS_LIBS" |
| 2619 | fi | 2619 | fi |
| 2620 | CFLAGS=$old_CFLAGS | 2620 | CFLAGS=$old_CFLAGS |
| 2621 | LIBS=$old_LIBS | 2621 | LIBS=$old_LIBS |
| @@ -2695,7 +2695,7 @@ fi | |||
| 2695 | dnl MS Windows native file monitor is available for mingw32 only. | 2695 | dnl MS Windows native file monitor is available for mingw32 only. |
| 2696 | case $with_file_notification,$opsys in | 2696 | case $with_file_notification,$opsys in |
| 2697 | w32,cygwin) | 2697 | w32,cygwin) |
| 2698 | AC_MSG_ERROR([`--with-file-notification=w32' was specified, but | 2698 | AC_MSG_ERROR(['--with-file-notification=w32' was specified, but |
| 2699 | this is only supported on MS-Windows native and MinGW32 builds. | 2699 | this is only supported on MS-Windows native and MinGW32 builds. |
| 2700 | Consider using gfile instead.]) | 2700 | Consider using gfile instead.]) |
| 2701 | ;; | 2701 | ;; |
| @@ -2739,7 +2739,7 @@ esac | |||
| 2739 | 2739 | ||
| 2740 | case $with_file_notification,$NOTIFY_OBJ in | 2740 | case $with_file_notification,$NOTIFY_OBJ in |
| 2741 | yes,* | no,* | *,?*) ;; | 2741 | yes,* | no,* | *,?*) ;; |
| 2742 | *) AC_MSG_ERROR([File notification `$with_file_notification' requested but requirements not found.]) ;; | 2742 | *) AC_MSG_ERROR([File notification '$with_file_notification' requested but requirements not found.]) ;; |
| 2743 | esac | 2743 | esac |
| 2744 | 2744 | ||
| 2745 | if test -n "$NOTIFY_OBJ"; then | 2745 | if test -n "$NOTIFY_OBJ"; then |
| @@ -2941,7 +2941,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ | |||
| 2941 | AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])], | 2941 | AC_DEFINE(HAVE_XIM, 1, [Define to 1 if XIM is available])], |
| 2942 | HAVE_XIM=no) | 2942 | HAVE_XIM=no) |
| 2943 | 2943 | ||
| 2944 | dnl `--with-xim' now controls only the initial value of use_xim at run time. | 2944 | dnl '--with-xim' now controls only the initial value of use_xim at run time. |
| 2945 | 2945 | ||
| 2946 | if test "${with_xim}" != "no"; then | 2946 | if test "${with_xim}" != "no"; then |
| 2947 | AC_DEFINE(USE_XIM, 1, | 2947 | AC_DEFINE(USE_XIM, 1, |
| @@ -2989,7 +2989,7 @@ fi | |||
| 2989 | 2989 | ||
| 2990 | ### Start of font-backend (under X11) section. | 2990 | ### Start of font-backend (under X11) section. |
| 2991 | if test "${HAVE_X11}" = "yes"; then | 2991 | if test "${HAVE_X11}" = "yes"; then |
| 2992 | ## Use -lXft if available, unless `--with-xft=no'. | 2992 | ## Use -lXft if available, unless '--with-xft=no'. |
| 2993 | HAVE_XFT=maybe | 2993 | HAVE_XFT=maybe |
| 2994 | if test "x${with_x}" = "xno"; then | 2994 | if test "x${with_x}" = "xno"; then |
| 2995 | with_xft="no"; | 2995 | with_xft="no"; |
| @@ -3094,7 +3094,7 @@ AC_SUBST(LIBOTF_LIBS) | |||
| 3094 | AC_SUBST(M17N_FLT_CFLAGS) | 3094 | AC_SUBST(M17N_FLT_CFLAGS) |
| 3095 | AC_SUBST(M17N_FLT_LIBS) | 3095 | AC_SUBST(M17N_FLT_LIBS) |
| 3096 | 3096 | ||
| 3097 | ### Use -lXpm if available, unless `--with-xpm=no'. | 3097 | ### Use -lXpm if available, unless '--with-xpm=no'. |
| 3098 | ### mingw32 doesn't use -lXpm, since it loads the library dynamically. | 3098 | ### mingw32 doesn't use -lXpm, since it loads the library dynamically. |
| 3099 | ### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h | 3099 | ### In the Cygwin-w32 build, we need to use /usr/include/noX/X11/xpm.h |
| 3100 | ### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and | 3100 | ### rather than /usr/include/X11/xpm.h, so we set CPPFLAGS (and |
| @@ -3185,7 +3185,7 @@ fi | |||
| 3185 | 3185 | ||
| 3186 | AC_SUBST(LIBXPM) | 3186 | AC_SUBST(LIBXPM) |
| 3187 | 3187 | ||
| 3188 | ### Use -ljpeg if available, unless `--with-jpeg=no'. | 3188 | ### Use -ljpeg if available, unless '--with-jpeg=no'. |
| 3189 | HAVE_JPEG=no | 3189 | HAVE_JPEG=no |
| 3190 | LIBJPEG= | 3190 | LIBJPEG= |
| 3191 | if test "${with_jpeg}" != "no"; then | 3191 | if test "${with_jpeg}" != "no"; then |
| @@ -3249,7 +3249,7 @@ if test "${HAVE_ZLIB}" = "yes"; then | |||
| 3249 | fi | 3249 | fi |
| 3250 | AC_SUBST(LIBZ) | 3250 | AC_SUBST(LIBZ) |
| 3251 | 3251 | ||
| 3252 | ### Use -lpng if available, unless `--with-png=no'. | 3252 | ### Use -lpng if available, unless '--with-png=no'. |
| 3253 | HAVE_PNG=no | 3253 | HAVE_PNG=no |
| 3254 | LIBPNG= | 3254 | LIBPNG= |
| 3255 | PNG_CFLAGS= | 3255 | PNG_CFLAGS= |
| @@ -3313,7 +3313,7 @@ fi | |||
| 3313 | AC_SUBST(LIBPNG) | 3313 | AC_SUBST(LIBPNG) |
| 3314 | AC_SUBST(PNG_CFLAGS) | 3314 | AC_SUBST(PNG_CFLAGS) |
| 3315 | 3315 | ||
| 3316 | ### Use -ltiff if available, unless `--with-tiff=no'. | 3316 | ### Use -ltiff if available, unless '--with-tiff=no'. |
| 3317 | ### mingw32 doesn't use -ltiff, since it loads the library dynamically. | 3317 | ### mingw32 doesn't use -ltiff, since it loads the library dynamically. |
| 3318 | HAVE_TIFF=no | 3318 | HAVE_TIFF=no |
| 3319 | LIBTIFF= | 3319 | LIBTIFF= |
| @@ -3341,7 +3341,7 @@ elif test "${HAVE_X11}" = "yes" || test "${HAVE_W32}" = "yes"; then | |||
| 3341 | fi | 3341 | fi |
| 3342 | AC_SUBST(LIBTIFF) | 3342 | AC_SUBST(LIBTIFF) |
| 3343 | 3343 | ||
| 3344 | ### Use -lgif or -lungif if available, unless `--with-gif=no'. | 3344 | ### Use -lgif or -lungif if available, unless '--with-gif=no'. |
| 3345 | ### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. | 3345 | ### mingw32 doesn't use -lgif/-lungif, since it loads the library dynamically. |
| 3346 | HAVE_GIF=no | 3346 | HAVE_GIF=no |
| 3347 | LIBGIF= | 3347 | LIBGIF= |
| @@ -3399,7 +3399,7 @@ as options to configure]) | |||
| 3399 | fi | 3399 | fi |
| 3400 | fi | 3400 | fi |
| 3401 | 3401 | ||
| 3402 | ### Use -lgpm if available, unless `--with-gpm=no'. | 3402 | ### Use -lgpm if available, unless '--with-gpm=no'. |
| 3403 | HAVE_GPM=no | 3403 | HAVE_GPM=no |
| 3404 | LIBGPM= | 3404 | LIBGPM= |
| 3405 | if test "${with_gpm}" != "no"; then | 3405 | if test "${with_gpm}" != "no"; then |
| @@ -3537,7 +3537,7 @@ if test "${with_xml2}" != "no"; then | |||
| 3537 | CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2" | 3537 | CPPFLAGS="$CPPFLAGS -I$xcsdkdir/usr/include/libxml2" |
| 3538 | AC_CHECK_HEADER(libxml/HTMLparser.h, | 3538 | AC_CHECK_HEADER(libxml/HTMLparser.h, |
| 3539 | [AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, , | 3539 | [AC_CHECK_DECL(HTML_PARSE_RECOVER, HAVE_LIBXML2=yes, , |
| 3540 | [#include <libxml/HTMLparser.h>])]) | 3540 | [#include <libxml/HTMLparser.h>])]) |
| 3541 | CPPFLAGS="$SAVE_CPPFLAGS" | 3541 | CPPFLAGS="$SAVE_CPPFLAGS" |
| 3542 | if test "${HAVE_LIBXML2}" = "yes"; then | 3542 | if test "${HAVE_LIBXML2}" = "yes"; then |
| 3543 | LIBXML2_CFLAGS="-I'$xcsdkdir/usr/include/libxml2'" | 3543 | LIBXML2_CFLAGS="-I'$xcsdkdir/usr/include/libxml2'" |
| @@ -3581,7 +3581,7 @@ fi | |||
| 3581 | AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no) | 3581 | AC_CHECK_LIB(mail, maillock, have_mail=yes, have_mail=no) |
| 3582 | if test $have_mail = yes; then | 3582 | if test $have_mail = yes; then |
| 3583 | LIBS_MAIL=-lmail | 3583 | LIBS_MAIL=-lmail |
| 3584 | AC_DEFINE(HAVE_LIBMAIL, 1, [Define to 1 if you have the `mail' library (-lmail).]) | 3584 | AC_DEFINE(HAVE_LIBMAIL, 1, [Define to 1 if you have the 'mail' library (-lmail).]) |
| 3585 | 3585 | ||
| 3586 | OLD_LIBS=$LIBS | 3586 | OLD_LIBS=$LIBS |
| 3587 | LIBS="$LIBS_MAIL $LIBS" | 3587 | LIBS="$LIBS_MAIL $LIBS" |
| @@ -3594,7 +3594,7 @@ dnl Debian, at least: | |||
| 3594 | AC_CHECK_LIB(lockfile, maillock, have_lockfile=yes, have_lockfile=no) | 3594 | AC_CHECK_LIB(lockfile, maillock, have_lockfile=yes, have_lockfile=no) |
| 3595 | if test $have_lockfile = yes; then | 3595 | if test $have_lockfile = yes; then |
| 3596 | LIBS_MAIL=-llockfile | 3596 | LIBS_MAIL=-llockfile |
| 3597 | AC_DEFINE(HAVE_LIBLOCKFILE, 1, [Define to 1 if you have the `lockfile' library (-llockfile).]) | 3597 | AC_DEFINE(HAVE_LIBLOCKFILE, 1, [Define to 1 if you have the 'lockfile' library (-llockfile).]) |
| 3598 | else | 3598 | else |
| 3599 | # If we have the shared liblockfile, assume we must use it for mail | 3599 | # If we have the shared liblockfile, assume we must use it for mail |
| 3600 | # locking (e.g. Debian). If we couldn't link against liblockfile | 3600 | # locking (e.g. Debian). If we couldn't link against liblockfile |
| @@ -3606,7 +3606,7 @@ else | |||
| 3606 | if test $ac_cv_prog_liblockfile = yes; then | 3606 | if test $ac_cv_prog_liblockfile = yes; then |
| 3607 | AC_MSG_ERROR([Shared liblockfile found but can't link against it. | 3607 | AC_MSG_ERROR([Shared liblockfile found but can't link against it. |
| 3608 | This probably means that movemail could lose mail. | 3608 | This probably means that movemail could lose mail. |
| 3609 | There may be a `development' package to install containing liblockfile.]) | 3609 | There may be a 'development' package to install containing liblockfile.]) |
| 3610 | fi | 3610 | fi |
| 3611 | fi | 3611 | fi |
| 3612 | AC_CHECK_HEADERS_ONCE(maillock.h) | 3612 | AC_CHECK_HEADERS_ONCE(maillock.h) |
| @@ -3624,12 +3624,12 @@ case "$opsys" in | |||
| 3624 | ## On GNU/Linux systems, both methods are used by various mail programs. | 3624 | ## On GNU/Linux systems, both methods are used by various mail programs. |
| 3625 | ## I assume most people are using newer mailers that have heard of flock. | 3625 | ## I assume most people are using newer mailers that have heard of flock. |
| 3626 | ## Change this if you need to. | 3626 | ## Change this if you need to. |
| 3627 | ## Debian contains a patch which says: ``On Debian/GNU/Linux systems, | 3627 | ## Debian contains a patch which says: "On Debian/GNU/Linux systems, |
| 3628 | ## configure gets the right answers, and that means *NOT* using flock. | 3628 | ## configure gets the right answers, and that means *NOT* using flock. |
| 3629 | ## Using flock is guaranteed to be the wrong thing. See Debian Policy | 3629 | ## Using flock is guaranteed to be the wrong thing. See Debian Policy |
| 3630 | ## for details.'' and then uses `#ifdef DEBIAN'. Unfortunately the | 3630 | ## for details." and then uses '#ifdef DEBIAN'. Unfortunately the |
| 3631 | ## Debian maintainer hasn't provided a clean fix for Emacs. | 3631 | ## Debian maintainer hasn't provided a clean fix for Emacs. |
| 3632 | ## movemail.c will use `maillock' when MAILDIR, HAVE_LIBMAIL and | 3632 | ## movemail.c will use 'maillock' when MAILDIR, HAVE_LIBMAIL and |
| 3633 | ## HAVE_MAILLOCK_H are defined, so the following appears to be the | 3633 | ## HAVE_MAILLOCK_H are defined, so the following appears to be the |
| 3634 | ## correct logic. -- fx | 3634 | ## correct logic. -- fx |
| 3635 | ## We must check for HAVE_LIBLOCKFILE too, as movemail does. | 3635 | ## We must check for HAVE_LIBLOCKFILE too, as movemail does. |
| @@ -3689,7 +3689,7 @@ AC_CACHE_CHECK([for __builtin_unwind_init], | |||
| 3689 | emacs_cv_func___builtin_unwind_init=no)]) | 3689 | emacs_cv_func___builtin_unwind_init=no)]) |
| 3690 | if test $emacs_cv_func___builtin_unwind_init = yes; then | 3690 | if test $emacs_cv_func___builtin_unwind_init = yes; then |
| 3691 | AC_DEFINE(HAVE___BUILTIN_UNWIND_INIT, 1, | 3691 | AC_DEFINE(HAVE___BUILTIN_UNWIND_INIT, 1, |
| 3692 | [Define to 1 if you have the `__builtin_unwind_init' function.]) | 3692 | [Define to 1 if you have the '__builtin_unwind_init' function.]) |
| 3693 | fi | 3693 | fi |
| 3694 | 3694 | ||
| 3695 | AC_CHECK_HEADERS_ONCE(sys/un.h) | 3695 | AC_CHECK_HEADERS_ONCE(sys/un.h) |
| @@ -3748,7 +3748,7 @@ else | |||
| 3748 | fi | 3748 | fi |
| 3749 | AC_MSG_RESULT([$msg]) | 3749 | AC_MSG_RESULT([$msg]) |
| 3750 | if test "X$msg" = Xno; then | 3750 | if test "X$msg" = Xno; then |
| 3751 | AC_MSG_ERROR([The required function `tputs' was not found in any library. | 3751 | AC_MSG_ERROR([The required function 'tputs' was not found in any library. |
| 3752 | The following libraries were tried (in order): | 3752 | The following libraries were tried (in order): |
| 3753 | libtinfo, libncurses, libterminfo, libtermcap, libcurses | 3753 | libtinfo, libncurses, libterminfo, libtermcap, libcurses |
| 3754 | Please try installing whichever of these libraries is most appropriate | 3754 | Please try installing whichever of these libraries is most appropriate |
| @@ -4033,7 +4033,7 @@ LIBS="$LIBS $GFILENOTIFY_LIBS" | |||
| 4033 | AC_MSG_CHECKING([whether GLib is linked in]) | 4033 | AC_MSG_CHECKING([whether GLib is linked in]) |
| 4034 | AC_LINK_IFELSE([AC_LANG_PROGRAM( | 4034 | AC_LINK_IFELSE([AC_LANG_PROGRAM( |
| 4035 | [[#include <glib.h> | 4035 | [[#include <glib.h> |
| 4036 | ]], | 4036 | ]], |
| 4037 | [[g_print ("Hello world");]])], | 4037 | [[g_print ("Hello world");]])], |
| 4038 | [links_glib=yes], | 4038 | [links_glib=yes], |
| 4039 | [links_glib=no]) | 4039 | [links_glib=no]) |
| @@ -4284,15 +4284,15 @@ case $opsys in | |||
| 4284 | esac | 4284 | esac |
| 4285 | 4285 | ||
| 4286 | 4286 | ||
| 4287 | dnl If the system's imake configuration file defines `NeedWidePrototypes' | 4287 | dnl If the system's imake configuration file defines 'NeedWidePrototypes' |
| 4288 | dnl as `NO', we must define NARROWPROTO manually. Such a define is | 4288 | dnl as 'NO', we must define NARROWPROTO manually. Such a define is |
| 4289 | dnl generated in the Makefile generated by `xmkmf'. If we don't define | 4289 | dnl generated in the Makefile generated by 'xmkmf'. If we don't define |
| 4290 | dnl NARROWPROTO, we will see the wrong function prototypes for X functions | 4290 | dnl NARROWPROTO, we will see the wrong function prototypes for X functions |
| 4291 | dnl taking float or double parameters. | 4291 | dnl taking float or double parameters. |
| 4292 | case $opsys in | 4292 | case $opsys in |
| 4293 | cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd) | 4293 | cygwin|gnu|gnu-linux|gnu-kfreebsd|irix6-5|freebsd|netbsd|openbsd) |
| 4294 | AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration | 4294 | AC_DEFINE(NARROWPROTO, 1, [Define if system's imake configuration |
| 4295 | file defines `NeedWidePrototypes' as `NO'.]) | 4295 | file defines 'NeedWidePrototypes' as 'NO'.]) |
| 4296 | ;; | 4296 | ;; |
| 4297 | esac | 4297 | esac |
| 4298 | 4298 | ||
| @@ -4877,8 +4877,8 @@ AC_CACHE_CHECK([for struct alignment], | |||
| 4877 | [emacs_cv_struct_alignment], | 4877 | [emacs_cv_struct_alignment], |
| 4878 | [AC_COMPILE_IFELSE( | 4878 | [AC_COMPILE_IFELSE( |
| 4879 | [AC_LANG_PROGRAM([[#include <stddef.h> | 4879 | [AC_LANG_PROGRAM([[#include <stddef.h> |
| 4880 | struct __attribute__ ((aligned (8))) s { char c; }; | 4880 | struct __attribute__ ((aligned (8))) s { char c; }; |
| 4881 | struct t { char c; struct s s; }; | 4881 | struct t { char c; struct s s; }; |
| 4882 | char verify[offsetof (struct t, s) == 8 ? 1 : -1]; | 4882 | char verify[offsetof (struct t, s) == 8 ? 1 : -1]; |
| 4883 | ]])], | 4883 | ]])], |
| 4884 | [emacs_cv_struct_alignment=yes], | 4884 | [emacs_cv_struct_alignment=yes], |
| @@ -5116,7 +5116,7 @@ else | |||
| 5116 | fi | 5116 | fi |
| 5117 | 5117 | ||
| 5118 | echo " | 5118 | echo " |
| 5119 | Configured for \`${canonical}'. | 5119 | Configured for '${canonical}'. |
| 5120 | 5120 | ||
| 5121 | Where should the build process find the source code? ${srcdir} | 5121 | Where should the build process find the source code? ${srcdir} |
| 5122 | What compiler should emacs be built with? ${CC} ${CFLAGS} | 5122 | What compiler should emacs be built with? ${CC} ${CFLAGS} |
| @@ -5241,7 +5241,7 @@ AC_CONFIG_FILES([$srcdir/doc/man/emacs.1]) | |||
| 5241 | dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES. | 5241 | dnl Obviously there is duplication here wrt $SUBDIR_MAKEFILES. |
| 5242 | dnl You _can_ use that variable in AC_CONFIG_FILES, so long as any directory | 5242 | dnl You _can_ use that variable in AC_CONFIG_FILES, so long as any directory |
| 5243 | dnl using automake (ie lib/) is explicitly listed and not "hidden" in a variable | 5243 | dnl using automake (ie lib/) is explicitly listed and not "hidden" in a variable |
| 5244 | dnl (else you get "no `Makefile.am' found for any configure output"). | 5244 | dnl (else you get "no 'Makefile.am' found for any configure output"). |
| 5245 | dnl This will work, but you get a config.status that is not quite right | 5245 | dnl This will work, but you get a config.status that is not quite right |
| 5246 | dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). | 5246 | dnl (see http://lists.gnu.org/archive/html/bug-autoconf/2008-08/msg00028.html). |
| 5247 | dnl That doesn't have any obvious consequences for Emacs, but on the whole | 5247 | dnl That doesn't have any obvious consequences for Emacs, but on the whole |
| @@ -5281,9 +5281,9 @@ dnl rather than just letting configure generate it from epaths.in. | |||
| 5281 | dnl One reason is that the various paths are not fully expanded (see above); | 5281 | dnl One reason is that the various paths are not fully expanded (see above); |
| 5282 | dnl eg gamedir=${prefix}/var/games/emacs. | 5282 | dnl eg gamedir=${prefix}/var/games/emacs. |
| 5283 | dnl Secondly, the GNU Coding standards require that one should be able | 5283 | dnl Secondly, the GNU Coding standards require that one should be able |
| 5284 | dnl to run `make prefix=/some/where/else' and override the values set | 5284 | dnl to run 'make prefix=/some/where/else' and override the values set |
| 5285 | dnl by configure. This also explains the `move-if-change' test and | 5285 | dnl by configure. This also explains the 'move-if-change' test and |
| 5286 | dnl the use of force in the `epaths-force' rule in Makefile.in. | 5286 | dnl the use of force in the 'epaths-force' rule in Makefile.in. |
| 5287 | AC_CONFIG_COMMANDS([src/epaths.h], [ | 5287 | AC_CONFIG_COMMANDS([src/epaths.h], [ |
| 5288 | if test "${opsys}" = "mingw32"; then | 5288 | if test "${opsys}" = "mingw32"; then |
| 5289 | ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 | 5289 | ${MAKE-make} MAKEFILE_NAME=do-not-make-Makefile epaths-force-w32 |
| @@ -80,7 +80,7 @@ while [ $# -gt 0 ]; do | |||
| 80 | new_extension=".new" | 80 | new_extension=".new" |
| 81 | shift | 81 | shift |
| 82 | ;; | 82 | ;; |
| 83 | ## This option tells make-dist to use `bzip2' instead of gzip. | 83 | ## This option tells make-dist to use 'bzip2' instead of gzip. |
| 84 | "--bzip2") | 84 | "--bzip2") |
| 85 | default_gzip="bzip2" | 85 | default_gzip="bzip2" |
| 86 | ;; | 86 | ;; |
| @@ -132,7 +132,7 @@ done | |||
| 132 | 132 | ||
| 133 | ### Make sure we're running in the right place. | 133 | ### Make sure we're running in the right place. |
| 134 | if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then | 134 | if [ ! -d src -o ! -f src/lisp.h -o ! -d lisp -o ! -f lisp/subr.el ]; then |
| 135 | echo "${progname}: Can't find \`src/lisp.h' and \`lisp/subr.el'." >&2 | 135 | echo "${progname}: Can't find 'src/lisp.h' and 'lisp/subr.el'." >&2 |
| 136 | echo "${progname} must be run in the top directory of the Emacs" >&2 | 136 | echo "${progname} must be run in the top directory of the Emacs" >&2 |
| 137 | echo "distribution tree. cd to that directory and try again." >&2 | 137 | echo "distribution tree. cd to that directory and try again." >&2 |
| 138 | exit 1 | 138 | exit 1 |
| @@ -163,7 +163,7 @@ version=` | |||
| 163 | sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' <configure.ac | 163 | sed -n 's/^AC_INIT(GNU Emacs,[ ]*\([^ ,)]*\).*/\1/p' <configure.ac |
| 164 | ` || version= | 164 | ` || version= |
| 165 | if [ ! "${version}" ]; then | 165 | if [ ! "${version}" ]; then |
| 166 | echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2 | 166 | echo "${progname}: can't find current Emacs version in './src/emacs.c'" >&2 |
| 167 | exit 1 | 167 | exit 1 |
| 168 | fi | 168 | fi |
| 169 | 169 | ||
| @@ -190,10 +190,10 @@ fi | |||
| 190 | ### Make sure the subdirectory is available. | 190 | ### Make sure the subdirectory is available. |
| 191 | tempparent="make-dist.tmp.$$" | 191 | tempparent="make-dist.tmp.$$" |
| 192 | if [ -d ${tempparent} ]; then | 192 | if [ -d ${tempparent} ]; then |
| 193 | echo "${progname}: staging directory \`${tempparent}' already exists. | 193 | echo "${progname}: staging directory '${tempparent}' already exists. |
| 194 | Perhaps a previous invocation of \`${progname}' failed to clean up after | 194 | Perhaps a previous invocation of '${progname}' failed to clean up after |
| 195 | itself. Check that directories whose names are of the form | 195 | itself. Check that directories whose names are of the form |
| 196 | \`make-dist.tmp.NNNNN' don't contain any important information, remove | 196 | 'make-dist.tmp.NNNNN' don't contain any important information, remove |
| 197 | them, and try again." >&2 | 197 | them, and try again." >&2 |
| 198 | exit 1 | 198 | exit 1 |
| 199 | fi | 199 | fi |
| @@ -210,7 +210,7 @@ if [ $check = yes ]; then | |||
| 210 | ## Check for .elc files with no corresponding .el file. | 210 | ## Check for .elc files with no corresponding .el file. |
| 211 | sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc | 211 | sed 's/\.el$/.elc/' /tmp/el > /tmp/elelc |
| 212 | 212 | ||
| 213 | bogosities="`comm -13 /tmp/elelc /tmp/elc`" | 213 | bogosities=`comm -13 /tmp/elelc /tmp/elc` |
| 214 | if [ x"${bogosities}" != x"" ]; then | 214 | if [ x"${bogosities}" != x"" ]; then |
| 215 | echo "The following .elc files have no corresponding .el files:" | 215 | echo "The following .elc files have no corresponding .el files:" |
| 216 | echo "${bogosities}" | 216 | echo "${bogosities}" |
| @@ -218,7 +218,7 @@ if [ $check = yes ]; then | |||
| 218 | 218 | ||
| 219 | ### Check for .el files with no corresponding .elc file. | 219 | ### Check for .el files with no corresponding .elc file. |
| 220 | sed 's/\.elc$/.el/' /tmp/elc > /tmp/elcel | 220 | sed 's/\.elc$/.el/' /tmp/elc > /tmp/elcel |
| 221 | losers="`comm -23 /tmp/el /tmp/elcel`" | 221 | losers=`comm -23 /tmp/el /tmp/elcel` |
| 222 | 222 | ||
| 223 | rm -f /tmp/el /tmp/elc /tmp/elcel /tmp/elelc | 223 | rm -f /tmp/el /tmp/elc /tmp/elcel /tmp/elelc |
| 224 | 224 | ||
| @@ -263,7 +263,7 @@ if [ $update = yes ]; then | |||
| 263 | $EMACS -batch -f batch-byte-recompile-directory lisp | 263 | $EMACS -batch -f batch-byte-recompile-directory lisp |
| 264 | fi # $update = yes | 264 | fi # $update = yes |
| 265 | 265 | ||
| 266 | echo "Creating staging directory: \`${tempparent}'" | 266 | echo "Creating staging directory: '${tempparent}'" |
| 267 | 267 | ||
| 268 | mkdir ${tempparent} | 268 | mkdir ${tempparent} |
| 269 | tempdir="${tempparent}/${emacsname}" | 269 | tempdir="${tempparent}/${emacsname}" |
| @@ -274,7 +274,7 @@ if [ "${clean_up}" = yes ]; then | |||
| 274 | trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT | 274 | trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT |
| 275 | fi | 275 | fi |
| 276 | 276 | ||
| 277 | echo "Creating top directory: \`${tempdir}'" | 277 | echo "Creating top directory: '${tempdir}'" |
| 278 | mkdir ${tempdir} | 278 | mkdir ${tempdir} |
| 279 | 279 | ||
| 280 | if test -d .git; then | 280 | if test -d .git; then |
| @@ -325,7 +325,7 @@ do | |||
| 325 | mkdir ${tempdir}/${subdir} | 325 | mkdir ${tempdir}/${subdir} |
| 326 | done | 326 | done |
| 327 | 327 | ||
| 328 | echo "Making links to \`lisp' and its subdirectories" | 328 | echo "Making links to 'lisp' and its subdirectories" |
| 329 | files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \ | 329 | files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \ |
| 330 | -o -name 'README' \)` | 330 | -o -name 'README' \)` |
| 331 | 331 | ||
| @@ -337,7 +337,7 @@ for file in lisp/Makefile.in lisp/makefile.w32-in $files; do | |||
| 337 | ln $file $tempdir/$file | 337 | ln $file $tempdir/$file |
| 338 | done | 338 | done |
| 339 | 339 | ||
| 340 | echo "Making links to \`leim' and its subdirectories" | 340 | echo "Making links to 'leim' and its subdirectories" |
| 341 | (cd leim | 341 | (cd leim |
| 342 | ln makefile.w32-in ../${tempdir}/leim | 342 | ln makefile.w32-in ../${tempdir}/leim |
| 343 | ln ChangeLog.*[0-9] README ../${tempdir}/leim | 343 | ln ChangeLog.*[0-9] README ../${tempdir}/leim |
| @@ -348,7 +348,7 @@ echo "Making links to \`leim' and its subdirectories" | |||
| 348 | ln leim-ext.el ../${tempdir}/leim/leim-ext.el) | 348 | ln leim-ext.el ../${tempdir}/leim/leim-ext.el) |
| 349 | 349 | ||
| 350 | ## FIXME Can we not just use the "find -type f" method for this one? | 350 | ## FIXME Can we not just use the "find -type f" method for this one? |
| 351 | echo "Making links to \`build-aux'" | 351 | echo "Making links to 'build-aux'" |
| 352 | (cd build-aux | 352 | (cd build-aux |
| 353 | ln compile config.guess config.sub depcomp msys-to-w32 ../${tempdir}/build-aux | 353 | ln compile config.guess config.sub depcomp msys-to-w32 ../${tempdir}/build-aux |
| 354 | ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux | 354 | ln gitlog-to-changelog gitlog-to-emacslog ../${tempdir}/build-aux |
| @@ -356,11 +356,11 @@ echo "Making links to \`build-aux'" | |||
| 356 | ln update-copyright update-subdirs ../${tempdir}/build-aux | 356 | ln update-copyright update-subdirs ../${tempdir}/build-aux |
| 357 | ln dir_top make-info-dir ../${tempdir}/build-aux) | 357 | ln dir_top make-info-dir ../${tempdir}/build-aux) |
| 358 | 358 | ||
| 359 | echo "Making links to \`build-aux/snippet'" | 359 | echo "Making links to 'build-aux/snippet'" |
| 360 | (cd build-aux/snippet | 360 | (cd build-aux/snippet |
| 361 | ln *.h ../../${tempdir}/build-aux/snippet) | 361 | ln *.h ../../${tempdir}/build-aux/snippet) |
| 362 | 362 | ||
| 363 | echo "Making links to \`src'" | 363 | echo "Making links to 'src'" |
| 364 | ### Don't distribute the configured versions of | 364 | ### Don't distribute the configured versions of |
| 365 | ### config.in, paths.in, buildobj.h, or Makefile.in. | 365 | ### config.in, paths.in, buildobj.h, or Makefile.in. |
| 366 | (cd src | 366 | (cd src |
| @@ -374,11 +374,11 @@ echo "Making links to \`src'" | |||
| 374 | cd ../${tempdir}/src | 374 | cd ../${tempdir}/src |
| 375 | rm -f globals.h config.h epaths.h Makefile buildobj.h) | 375 | rm -f globals.h config.h epaths.h Makefile buildobj.h) |
| 376 | 376 | ||
| 377 | echo "Making links to \`src/bitmaps'" | 377 | echo "Making links to 'src/bitmaps'" |
| 378 | (cd src/bitmaps | 378 | (cd src/bitmaps |
| 379 | ln README *.xbm ../../${tempdir}/src/bitmaps) | 379 | ln README *.xbm ../../${tempdir}/src/bitmaps) |
| 380 | 380 | ||
| 381 | echo "Making links to \`lib'" | 381 | echo "Making links to 'lib'" |
| 382 | (snippet_h=`(cd build-aux/snippet && ls *.h)` | 382 | (snippet_h=`(cd build-aux/snippet && ls *.h)` |
| 383 | cd lib | 383 | cd lib |
| 384 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib | 384 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib |
| @@ -387,7 +387,7 @@ echo "Making links to \`lib'" | |||
| 387 | script='/[*]/d; s/\.in\.h$/.h/' | 387 | script='/[*]/d; s/\.in\.h$/.h/' |
| 388 | rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) | 388 | rm -f `(echo "$snippet_h"; ls *.in.h) | sed "$script"`) |
| 389 | 389 | ||
| 390 | echo "Making links to \`lib-src'" | 390 | echo "Making links to 'lib-src'" |
| 391 | (cd lib-src | 391 | (cd lib-src |
| 392 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src | 392 | ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src |
| 393 | ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src | 393 | ln ChangeLog.*[0-9] Makefile.in README ../${tempdir}/lib-src |
| @@ -395,11 +395,11 @@ echo "Making links to \`lib-src'" | |||
| 395 | ln makefile.w32-in ../${tempdir}/lib-src | 395 | ln makefile.w32-in ../${tempdir}/lib-src |
| 396 | ln update-game-score.exe.manifest ../${tempdir}/lib-src) | 396 | ln update-game-score.exe.manifest ../${tempdir}/lib-src) |
| 397 | 397 | ||
| 398 | echo "Making links to \`m4'" | 398 | echo "Making links to 'm4'" |
| 399 | (cd m4 | 399 | (cd m4 |
| 400 | ln *.m4 ../${tempdir}/m4) | 400 | ln *.m4 ../${tempdir}/m4) |
| 401 | 401 | ||
| 402 | echo "Making links to \`nt'" | 402 | echo "Making links to 'nt'" |
| 403 | (cd nt | 403 | (cd nt |
| 404 | ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt | 404 | ln emacs-x86.manifest emacs-x64.manifest ../${tempdir}/nt |
| 405 | ln config.nt emacs-src.tags ../${tempdir}/nt | 405 | ln config.nt emacs-src.tags ../${tempdir}/nt |
| @@ -408,55 +408,55 @@ echo "Making links to \`nt'" | |||
| 408 | ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt | 408 | ln mingw-cfg.site epaths.nt INSTALL.OLD ../${tempdir}/nt |
| 409 | ln ChangeLog.*[0-9] INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) | 409 | ln ChangeLog.*[0-9] INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) |
| 410 | 410 | ||
| 411 | echo "Making links to \`nt/inc' and its subdirectories" | 411 | echo "Making links to 'nt/inc' and its subdirectories" |
| 412 | for f in `find nt/inc -type f -name '[a-z]*.h'`; do | 412 | for f in `find nt/inc -type f -name '[a-z]*.h'`; do |
| 413 | ln $f $tempdir/$f | 413 | ln $f $tempdir/$f |
| 414 | done | 414 | done |
| 415 | 415 | ||
| 416 | echo "Making links to \`nt/icons'" | 416 | echo "Making links to 'nt/icons'" |
| 417 | (cd nt/icons | 417 | (cd nt/icons |
| 418 | ln README [a-z]*.ico ../../${tempdir}/nt/icons | 418 | ln README [a-z]*.ico ../../${tempdir}/nt/icons |
| 419 | ln [a-z]*.cur ../../${tempdir}/nt/icons) | 419 | ln [a-z]*.cur ../../${tempdir}/nt/icons) |
| 420 | 420 | ||
| 421 | echo "Making links to \`msdos'" | 421 | echo "Making links to 'msdos'" |
| 422 | (cd msdos | 422 | (cd msdos |
| 423 | ln ChangeLog.*[0-9] INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos | 423 | ln ChangeLog.*[0-9] INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos |
| 424 | ln depfiles.bat inttypes.h ../${tempdir}/msdos | 424 | ln depfiles.bat inttypes.h ../${tempdir}/msdos |
| 425 | ln mainmake.v2 sed*.inp ../${tempdir}/msdos) | 425 | ln mainmake.v2 sed*.inp ../${tempdir}/msdos) |
| 426 | 426 | ||
| 427 | echo "Making links to \`nextstep'" | 427 | echo "Making links to 'nextstep'" |
| 428 | (cd nextstep | 428 | (cd nextstep |
| 429 | ln ChangeLog.*[0-9] README INSTALL Makefile.in ../${tempdir}/nextstep) | 429 | ln ChangeLog.*[0-9] README INSTALL Makefile.in ../${tempdir}/nextstep) |
| 430 | 430 | ||
| 431 | echo "Making links to \`nextstep/templates'" | 431 | echo "Making links to 'nextstep/templates'" |
| 432 | (cd nextstep/templates | 432 | (cd nextstep/templates |
| 433 | ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in ../../${tempdir}/nextstep/templates) | 433 | ln Emacs.desktop.in Info-gnustep.plist.in Info.plist.in InfoPlist.strings.in ../../${tempdir}/nextstep/templates) |
| 434 | 434 | ||
| 435 | echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents'" | 435 | echo "Making links to 'nextstep/Cocoa/Emacs.base/Contents'" |
| 436 | (cd nextstep/Cocoa/Emacs.base/Contents | 436 | (cd nextstep/Cocoa/Emacs.base/Contents |
| 437 | ln PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents) | 437 | ln PkgInfo ../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents) |
| 438 | 438 | ||
| 439 | echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents/Resources'" | 439 | echo "Making links to 'nextstep/Cocoa/Emacs.base/Contents/Resources'" |
| 440 | (cd nextstep/Cocoa/Emacs.base/Contents/Resources | 440 | (cd nextstep/Cocoa/Emacs.base/Contents/Resources |
| 441 | ln Credits.html *.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources) | 441 | ln Credits.html *.icns ../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources) |
| 442 | 442 | ||
| 443 | echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" | 443 | echo "Making links to 'nextstep/GNUstep/Emacs.base/Resources'" |
| 444 | (cd nextstep/GNUstep/Emacs.base/Resources | 444 | (cd nextstep/GNUstep/Emacs.base/Resources |
| 445 | ln README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources ) | 445 | ln README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources ) |
| 446 | 446 | ||
| 447 | echo "Making links to \`oldXMenu'" | 447 | echo "Making links to 'oldXMenu'" |
| 448 | (cd oldXMenu | 448 | (cd oldXMenu |
| 449 | ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu | 449 | ln *.[ch] *.in *.mk ../${tempdir}/oldXMenu |
| 450 | ln README ChangeLog.*[0-9] ../${tempdir}/oldXMenu) | 450 | ln README ChangeLog.*[0-9] ../${tempdir}/oldXMenu) |
| 451 | 451 | ||
| 452 | echo "Making links to \`lwlib'" | 452 | echo "Making links to 'lwlib'" |
| 453 | (cd lwlib | 453 | (cd lwlib |
| 454 | ln *.[ch] *.in *.mk ../${tempdir}/lwlib | 454 | ln *.[ch] *.in *.mk ../${tempdir}/lwlib |
| 455 | ln README ChangeLog.*[0-9] ../${tempdir}/lwlib) | 455 | ln README ChangeLog.*[0-9] ../${tempdir}/lwlib) |
| 456 | 456 | ||
| 457 | ## It is important to distribute admin/ because it contains sources | 457 | ## It is important to distribute admin/ because it contains sources |
| 458 | ## for generated lisp/international/uni-*.el files. | 458 | ## for generated lisp/international/uni-*.el files. |
| 459 | echo "Making links to \`admin' and its subdirectories" | 459 | echo "Making links to 'admin' and its subdirectories" |
| 460 | for f in `find admin -type f`; do | 460 | for f in `find admin -type f`; do |
| 461 | case $f in | 461 | case $f in |
| 462 | */Makefile) [ -f $f.in ] && continue ;; | 462 | */Makefile) [ -f $f.in ] && continue ;; |
| @@ -465,7 +465,7 @@ for f in `find admin -type f`; do | |||
| 465 | done | 465 | done |
| 466 | 466 | ||
| 467 | if [ "$with_tests" = "yes" ]; then | 467 | if [ "$with_tests" = "yes" ]; then |
| 468 | echo "Making links to \`test' and its subdirectories" | 468 | echo "Making links to 'test' and its subdirectories" |
| 469 | for f in `find test -type f`; do | 469 | for f in `find test -type f`; do |
| 470 | case $f in | 470 | case $f in |
| 471 | test/automated/*.log) continue ;; | 471 | test/automated/*.log) continue ;; |
| @@ -476,7 +476,7 @@ if [ "$with_tests" = "yes" ]; then | |||
| 476 | done | 476 | done |
| 477 | fi | 477 | fi |
| 478 | 478 | ||
| 479 | echo "Making links to \`etc' and its subdirectories" | 479 | echo "Making links to 'etc' and its subdirectories" |
| 480 | for f in `find etc -type f`; do | 480 | for f in `find etc -type f`; do |
| 481 | case $f in | 481 | case $f in |
| 482 | etc/DOC*|etc/*.pyc) continue ;; | 482 | etc/DOC*|etc/*.pyc) continue ;; |
| @@ -487,32 +487,32 @@ for f in `find etc -type f`; do | |||
| 487 | ln $f $tempdir/$f | 487 | ln $f $tempdir/$f |
| 488 | done | 488 | done |
| 489 | 489 | ||
| 490 | echo "Making links to \`info'" | 490 | echo "Making links to 'info'" |
| 491 | ln `find info -type f -print` ${tempdir}/info | 491 | ln `find info -type f -print` ${tempdir}/info |
| 492 | 492 | ||
| 493 | echo "Making links to \`doc/emacs'" | 493 | echo "Making links to 'doc/emacs'" |
| 494 | (cd doc/emacs | 494 | (cd doc/emacs |
| 495 | ln *.texi *.in makefile.w32-in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs) | 495 | ln *.texi *.in makefile.w32-in ChangeLog.*[0-9] ../../${tempdir}/doc/emacs) |
| 496 | 496 | ||
| 497 | echo "Making links to \`doc/misc'" | 497 | echo "Making links to 'doc/misc'" |
| 498 | (cd doc/misc | 498 | (cd doc/misc |
| 499 | ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog.*[0-9] \ | 499 | ln *.texi *.tex *.in makefile.w32-in gnus-news.el ChangeLog.*[0-9] \ |
| 500 | ../../${tempdir}/doc/misc) | 500 | ../../${tempdir}/doc/misc) |
| 501 | 501 | ||
| 502 | echo "Making links to \`doc/lispref'" | 502 | echo "Making links to 'doc/lispref'" |
| 503 | (cd doc/lispref | 503 | (cd doc/lispref |
| 504 | ln *.texi *.in makefile.w32-in README ChangeLog.*[0-9] \ | 504 | ln *.texi *.in makefile.w32-in README ChangeLog.*[0-9] \ |
| 505 | ../../${tempdir}/doc/lispref | 505 | ../../${tempdir}/doc/lispref |
| 506 | ln spellfile ../../${tempdir}/doc/lispref | 506 | ln spellfile ../../${tempdir}/doc/lispref |
| 507 | ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref) | 507 | ln two-volume.make two-volume-cross-refs.txt ../../${tempdir}/doc/lispref) |
| 508 | 508 | ||
| 509 | echo "Making links to \`doc/lispintro'" | 509 | echo "Making links to 'doc/lispintro'" |
| 510 | (cd doc/lispintro | 510 | (cd doc/lispintro |
| 511 | ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro | 511 | ln *.texi *.in makefile.w32-in *.eps *.pdf ../../${tempdir}/doc/lispintro |
| 512 | ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro | 512 | ln README ChangeLog.*[0-9] ../../${tempdir}/doc/lispintro |
| 513 | cd ../../${tempdir}/doc/lispintro) | 513 | cd ../../${tempdir}/doc/lispintro) |
| 514 | 514 | ||
| 515 | echo "Making links to \`doc/man'" | 515 | echo "Making links to 'doc/man'" |
| 516 | (cd doc/man | 516 | (cd doc/man |
| 517 | ln *.*[0-9] *.in ../../${tempdir}/doc/man | 517 | ln *.*[0-9] *.in ../../${tempdir}/doc/man |
| 518 | cd ../../${tempdir}/doc/man | 518 | cd ../../${tempdir}/doc/man |
| @@ -520,7 +520,7 @@ echo "Making links to \`doc/man'" | |||
| 520 | 520 | ||
| 521 | ### It would be nice if they could all be symlinks to top-level copy, but | 521 | ### It would be nice if they could all be symlinks to top-level copy, but |
| 522 | ### you're not supposed to have any symlinks in distribution tar files. | 522 | ### you're not supposed to have any symlinks in distribution tar files. |
| 523 | echo "Making sure copying notices are all copies of \`COPYING'" | 523 | echo "Making sure copying notices are all copies of 'COPYING'" |
| 524 | for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do | 524 | for subdir in . etc leim lib lib-src lisp lwlib msdos nt src; do |
| 525 | rm -f ${tempdir}/${subdir}/COPYING | 525 | rm -f ${tempdir}/${subdir}/COPYING |
| 526 | cp COPYING ${tempdir}/${subdir} | 526 | cp COPYING ${tempdir}/${subdir} |
| @@ -548,7 +548,7 @@ if [ "${make_tar}" = yes ]; then | |||
| 548 | found=1; break | 548 | found=1; break |
| 549 | done | 549 | done |
| 550 | if [ "$found" = "0" ]; then | 550 | if [ "$found" = "0" ]; then |
| 551 | echo "WARNING: \`$default_gzip' not found, will not compress" >&2 | 551 | echo "WARNING: '$default_gzip' not found, will not compress" >&2 |
| 552 | default_gzip=cat | 552 | default_gzip=cat |
| 553 | fi | 553 | fi |
| 554 | case "${default_gzip}" in | 554 | case "${default_gzip}" in |