Changeset 8318


Ignore:
Timestamp:
01/26/21 02:22:56 (3 months ago)
Author:
quintiliani
Message:

Update nmxptool to version 2.1.5.
Some fixes to compile nowdays. Particularly, add necessary pthread option for some compilers.

Location:
trunk
Files:
29 edited

Legend:

Unmodified
Added
Removed
  • trunk/release_notes.working

    r8304 r8318  
    6060Matteo Quintiliani 2020-12-17 
    6161 
     62nmxptool  
     63Update to version 2.1.5 
     64Some fixes to compile nowdays. Particularly, add necessary pthread option for some compilers. 
     65Matteo Quintiliani 2021-01-26 
     66 
    6267 
    6368CHANGES TO CONFIGURATION FILES and DESCRIPTOR FILES: 
  • trunk/src/data_sources/nmxptool/HISTORY

    r6894 r8318  
    22nmxptool Release History 
    33######################### 
     4 
     5* Release 2.1.5    (2021/01/26) 
     6    - Some fixes to compile nowdays. Particularly, add pthread option for some compilers. 
    47 
    58* Release 2.1.4    (2017/01/04) 
  • trunk/src/data_sources/nmxptool/INSTALL

    r6803 r8318  
    22************************* 
    33 
    4 Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, 
    5 Inc. 
     4   Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software 
     5Foundation, Inc. 
    66 
    77   Copying and distribution of this file, with or without modification, 
     
    1313================== 
    1414 
    15    Briefly, the shell command `./configure && make && make install' 
     15   Briefly, the shell command './configure && make && make install' 
    1616should configure, build, and install this package.  The following 
    17 more-detailed instructions are generic; see the `README' file for 
     17more-detailed instructions are generic; see the 'README' file for 
    1818instructions specific to this package.  Some packages provide this 
    19 `INSTALL' file but do not implement all of the features documented 
     19'INSTALL' file but do not implement all of the features documented 
    2020below.  The lack of an optional feature in a given package is not 
    2121necessarily a bug.  More recommendations for GNU packages can be found 
    2222in *note Makefile Conventions: (standards)Makefile Conventions. 
    2323 
    24    The `configure' shell script attempts to guess correct values for 
     24   The 'configure' shell script attempts to guess correct values for 
    2525various system-dependent variables used during compilation.  It uses 
    26 those values to create a `Makefile' in each directory of the package. 
    27 It may also create one or more `.h' files containing system-dependent 
    28 definitions.  Finally, it creates a shell script `config.status' that 
     26those values to create a 'Makefile' in each directory of the package. 
     27It may also create one or more '.h' files containing system-dependent 
     28definitions.  Finally, it creates a shell script 'config.status' that 
    2929you can run in the future to recreate the current configuration, and a 
    30 file `config.log' containing compiler output (useful mainly for 
    31 debugging `configure'). 
    32  
    33    It can also use an optional file (typically called `config.cache' 
    34 and enabled with `--cache-file=config.cache' or simply `-C') that saves 
    35 the results of its tests to speed up reconfiguring.  Caching is 
    36 disabled by default to prevent problems with accidental use of stale 
    37 cache files. 
     30file 'config.log' containing compiler output (useful mainly for 
     31debugging 'configure'). 
     32 
     33   It can also use an optional file (typically called 'config.cache' and 
     34enabled with '--cache-file=config.cache' or simply '-C') that saves the 
     35results of its tests to speed up reconfiguring.  Caching is disabled by 
     36default to prevent problems with accidental use of stale cache files. 
    3837 
    3938   If you need to do unusual things to compile the package, please try 
    40 to figure out how `configure' could check whether to do them, and mail 
    41 diffs or instructions to the address given in the `README' so they can 
     39to figure out how 'configure' could check whether to do them, and mail 
     40diffs or instructions to the address given in the 'README' so they can 
    4241be considered for the next release.  If you are using the cache, and at 
    43 some point `config.cache' contains results you don't want to keep, you 
     42some point 'config.cache' contains results you don't want to keep, you 
    4443may remove or edit it. 
    4544 
    46    The file `configure.ac' (or `configure.in') is used to create 
    47 `configure' by a program called `autoconf'.  You need `configure.ac' if 
    48 you want to change it or regenerate `configure' using a newer version 
    49 of `autoconf'. 
     45   The file 'configure.ac' (or 'configure.in') is used to create 
     46'configure' by a program called 'autoconf'.  You need 'configure.ac' if 
     47you want to change it or regenerate 'configure' using a newer version of 
     48'autoconf'. 
    5049 
    5150   The simplest way to compile this package is: 
    5251 
    53   1. `cd' to the directory containing the package's source code and type 
    54      `./configure' to configure the package for your system. 
    55  
    56      Running `configure' might take a while.  While running, it prints 
     52  1. 'cd' to the directory containing the package's source code and type 
     53     './configure' to configure the package for your system. 
     54 
     55     Running 'configure' might take a while.  While running, it prints 
    5756     some messages telling which features it is checking for. 
    5857 
    59   2. Type `make' to compile the package. 
    60  
    61   3. Optionally, type `make check' to run any self-tests that come with 
     58  2. Type 'make' to compile the package. 
     59 
     60  3. Optionally, type 'make check' to run any self-tests that come with 
    6261     the package, generally using the just-built uninstalled binaries. 
    6362 
    64   4. Type `make install' to install the programs and any data files and 
     63  4. Type 'make install' to install the programs and any data files and 
    6564     documentation.  When installing into a prefix owned by root, it is 
    6665     recommended that the package be configured and built as a regular 
    67      user, and only the `make install' phase executed with root 
     66     user, and only the 'make install' phase executed with root 
    6867     privileges. 
    6968 
    70   5. Optionally, type `make installcheck' to repeat any self-tests, but 
     69  5. Optionally, type 'make installcheck' to repeat any self-tests, but 
    7170     this time using the binaries in their final installed location. 
    7271     This target does not install anything.  Running this target as a 
    73      regular user, particularly if the prior `make install' required 
     72     regular user, particularly if the prior 'make install' required 
    7473     root privileges, verifies that the installation completed 
    7574     correctly. 
    7675 
    7776  6. You can remove the program binaries and object files from the 
    78      source code directory by typing `make clean'.  To also remove the 
    79      files that `configure' created (so you can compile the package for 
    80      a different kind of computer), type `make distclean'.  There is 
    81      also a `make maintainer-clean' target, but that is intended mainly 
     77     source code directory by typing 'make clean'.  To also remove the 
     78     files that 'configure' created (so you can compile the package for 
     79     a different kind of computer), type 'make distclean'.  There is 
     80     also a 'make maintainer-clean' target, but that is intended mainly 
    8281     for the package's developers.  If you use it, you may have to get 
    8382     all sorts of other programs in order to regenerate files that came 
    8483     with the distribution. 
    8584 
    86   7. Often, you can also type `make uninstall' to remove the installed 
     85  7. Often, you can also type 'make uninstall' to remove the installed 
    8786     files again.  In practice, not all packages have tested that 
    8887     uninstallation works correctly, even though it is required by the 
    8988     GNU Coding Standards. 
    9089 
    91   8. Some packages, particularly those that use Automake, provide `make 
     90  8. Some packages, particularly those that use Automake, provide 'make 
    9291     distcheck', which can by used by developers to test that all other 
    93      targets like `make install' and `make uninstall' work correctly. 
     92     targets like 'make install' and 'make uninstall' work correctly. 
    9493     This target is generally not run by end users. 
    9594 
     
    9897 
    9998   Some systems require unusual options for compilation or linking that 
    100 the `configure' script does not know about.  Run `./configure --help' 
     99the 'configure' script does not know about.  Run './configure --help' 
    101100for details on some of the pertinent environment variables. 
    102101 
    103    You can give `configure' initial values for configuration parameters 
    104 by setting variables in the command line or in the environment.  Here 
    105 is an example: 
     102   You can give 'configure' initial values for configuration parameters 
     103by setting variables in the command line or in the environment.  Here is 
     104an example: 
    106105 
    107106     ./configure CC=c99 CFLAGS=-g LIBS=-lposix 
     
    114113   You can compile the package for more than one kind of computer at the 
    115114same time, by placing the object files for each architecture in their 
    116 own directory.  To do this, you can use GNU `make'.  `cd' to the 
     115own directory.  To do this, you can use GNU 'make'.  'cd' to the 
    117116directory where you want the object files and executables to go and run 
    118 the `configure' script.  `configure' automatically checks for the 
    119 source code in the directory that `configure' is in and in `..'.  This 
    120 is known as a "VPATH" build. 
    121  
    122    With a non-GNU `make', it is safer to compile the package for one 
     117the 'configure' script.  'configure' automatically checks for the source 
     118code in the directory that 'configure' is in and in '..'.  This is known 
     119as a "VPATH" build. 
     120 
     121   With a non-GNU 'make', it is safer to compile the package for one 
    123122architecture at a time in the source code directory.  After you have 
    124 installed the package for one architecture, use `make distclean' before 
     123installed the package for one architecture, use 'make distclean' before 
    125124reconfiguring for another architecture. 
    126125 
    127126   On MacOS X 10.5 and later systems, you can create libraries and 
    128127executables that work on multiple system types--known as "fat" or 
    129 "universal" binaries--by specifying multiple `-arch' options to the 
    130 compiler but only a single `-arch' option to the preprocessor.  Like 
     128"universal" binaries--by specifying multiple '-arch' options to the 
     129compiler but only a single '-arch' option to the preprocessor.  Like 
    131130this: 
    132131 
     
    137136   This is not guaranteed to produce working output in all cases, you 
    138137may have to build one architecture at a time and combine the results 
    139 using the `lipo' tool if you have problems. 
     138using the 'lipo' tool if you have problems. 
    140139 
    141140Installation Names 
    142141================== 
    143142 
    144    By default, `make install' installs the package's commands under 
    145 `/usr/local/bin', include files under `/usr/local/include', etc.  You 
    146 can specify an installation prefix other than `/usr/local' by giving 
    147 `configure' the option `--prefix=PREFIX', where PREFIX must be an 
     143   By default, 'make install' installs the package's commands under 
     144'/usr/local/bin', include files under '/usr/local/include', etc.  You 
     145can specify an installation prefix other than '/usr/local' by giving 
     146'configure' the option '--prefix=PREFIX', where PREFIX must be an 
    148147absolute file name. 
    149148 
    150149   You can specify separate installation prefixes for 
    151150architecture-specific files and architecture-independent files.  If you 
    152 pass the option `--exec-prefix=PREFIX' to `configure', the package uses 
     151pass the option '--exec-prefix=PREFIX' to 'configure', the package uses 
    153152PREFIX as the prefix for installing programs and libraries. 
    154153Documentation and other data files still use the regular prefix. 
    155154 
    156155   In addition, if you use an unusual directory layout you can give 
    157 options like `--bindir=DIR' to specify different values for particular 
    158 kinds of files.  Run `configure --help' for a list of the directories 
    159 you can set and what kinds of files go in them.  In general, the 
    160 default for these options is expressed in terms of `${prefix}', so that 
    161 specifying just `--prefix' will affect all of the other directory 
     156options like '--bindir=DIR' to specify different values for particular 
     157kinds of files.  Run 'configure --help' for a list of the directories 
     158you can set and what kinds of files go in them.  In general, the default 
     159for these options is expressed in terms of '${prefix}', so that 
     160specifying just '--prefix' will affect all of the other directory 
    162161specifications that were not explicitly provided. 
    163162 
    164163   The most portable way to affect installation locations is to pass the 
    165 correct locations to `configure'; however, many packages provide one or 
     164correct locations to 'configure'; however, many packages provide one or 
    166165both of the following shortcuts of passing variable assignments to the 
    167 `make install' command line to change installation locations without 
     166'make install' command line to change installation locations without 
    168167having to reconfigure or recompile. 
    169168 
    170169   The first method involves providing an override variable for each 
    171 affected directory.  For example, `make install 
     170affected directory.  For example, 'make install 
    172171prefix=/alternate/directory' will choose an alternate location for all 
    173172directory configuration variables that were expressed in terms of 
    174 `${prefix}'.  Any directories that were specified during `configure', 
    175 but not in terms of `${prefix}', must each be overridden at install 
    176 time for the entire installation to be relocated.  The approach of 
    177 makefile variable overrides for each directory variable is required by 
    178 the GNU Coding Standards, and ideally causes no recompilation. 
    179 However, some platforms have known limitations with the semantics of 
    180 shared libraries that end up requiring recompilation when using this 
    181 method, particularly noticeable in packages that use GNU Libtool. 
    182  
    183    The second method involves providing the `DESTDIR' variable.  For 
    184 example, `make install DESTDIR=/alternate/directory' will prepend 
    185 `/alternate/directory' before all installation names.  The approach of 
    186 `DESTDIR' overrides is not required by the GNU Coding Standards, and 
     173'${prefix}'.  Any directories that were specified during 'configure', 
     174but not in terms of '${prefix}', must each be overridden at install time 
     175for the entire installation to be relocated.  The approach of makefile 
     176variable overrides for each directory variable is required by the GNU 
     177Coding Standards, and ideally causes no recompilation.  However, some 
     178platforms have known limitations with the semantics of shared libraries 
     179that end up requiring recompilation when using this method, particularly 
     180noticeable in packages that use GNU Libtool. 
     181 
     182   The second method involves providing the 'DESTDIR' variable.  For 
     183example, 'make install DESTDIR=/alternate/directory' will prepend 
     184'/alternate/directory' before all installation names.  The approach of 
     185'DESTDIR' overrides is not required by the GNU Coding Standards, and 
    187186does not work on platforms that have drive letters.  On the other hand, 
    188187it does better at avoiding recompilation issues, and works well even 
    189 when some directory options were not specified in terms of `${prefix}' 
    190 at `configure' time. 
     188when some directory options were not specified in terms of '${prefix}' 
     189at 'configure' time. 
    191190 
    192191Optional Features 
     
    194193 
    195194   If the package supports it, you can cause programs to be installed 
    196 with an extra prefix or suffix on their names by giving `configure' the 
    197 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. 
    198  
    199    Some packages pay attention to `--enable-FEATURE' options to 
    200 `configure', where FEATURE indicates an optional part of the package. 
    201 They may also pay attention to `--with-PACKAGE' options, where PACKAGE 
    202 is something like `gnu-as' or `x' (for the X Window System).  The 
    203 `README' should mention any `--enable-' and `--with-' options that the 
     195with an extra prefix or suffix on their names by giving 'configure' the 
     196option '--program-prefix=PREFIX' or '--program-suffix=SUFFIX'. 
     197 
     198   Some packages pay attention to '--enable-FEATURE' options to 
     199'configure', where FEATURE indicates an optional part of the package. 
     200They may also pay attention to '--with-PACKAGE' options, where PACKAGE 
     201is something like 'gnu-as' or 'x' (for the X Window System).  The 
     202'README' should mention any '--enable-' and '--with-' options that the 
    204203package recognizes. 
    205204 
    206    For packages that use the X Window System, `configure' can usually 
     205   For packages that use the X Window System, 'configure' can usually 
    207206find the X include and library files automatically, but if it doesn't, 
    208 you can use the `configure' options `--x-includes=DIR' and 
    209 `--x-libraries=DIR' to specify their locations. 
     207you can use the 'configure' options '--x-includes=DIR' and 
     208'--x-libraries=DIR' to specify their locations. 
    210209 
    211210   Some packages offer the ability to configure how verbose the 
    212 execution of `make' will be.  For these packages, running `./configure 
     211execution of 'make' will be.  For these packages, running './configure 
    213212--enable-silent-rules' sets the default to minimal output, which can be 
    214 overridden with `make V=1'; while running `./configure 
     213overridden with 'make V=1'; while running './configure 
    215214--disable-silent-rules' sets the default to verbose, which can be 
    216 overridden with `make V=0'. 
     215overridden with 'make V=0'. 
    217216 
    218217Particular systems 
    219218================== 
    220219 
    221    On HP-UX, the default C compiler is not ANSI C compatible.  If GNU 
    222 CC is not installed, it is recommended to use the following options in 
     220   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU CC 
     221is not installed, it is recommended to use the following options in 
    223222order to use an ANSI C compiler: 
    224223 
     
    227226and if that doesn't work, install pre-built binaries of GCC for HP-UX. 
    228227 
    229    HP-UX `make' updates targets which have the same time stamps as 
    230 their prerequisites, which makes it generally unusable when shipped 
    231 generated files such as `configure' are involved.  Use GNU `make' 
    232 instead. 
     228   HP-UX 'make' updates targets which have the same time stamps as their 
     229prerequisites, which makes it generally unusable when shipped generated 
     230files such as 'configure' are involved.  Use GNU 'make' instead. 
    233231 
    234232   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot 
    235 parse its `<wchar.h>' header file.  The option `-nodtk' can be used as 
    236 a workaround.  If GNU CC is not installed, it is therefore recommended 
    237 to try 
     233parse its '<wchar.h>' header file.  The option '-nodtk' can be used as a 
     234workaround.  If GNU CC is not installed, it is therefore recommended to 
     235try 
    238236 
    239237     ./configure CC="cc" 
     
    243241     ./configure CC="cc -nodtk" 
    244242 
    245    On Solaris, don't put `/usr/ucb' early in your `PATH'.  This 
     243   On Solaris, don't put '/usr/ucb' early in your 'PATH'.  This 
    246244directory contains several dysfunctional programs; working variants of 
    247 these programs are available in `/usr/bin'.  So, if you need `/usr/ucb' 
    248 in your `PATH', put it _after_ `/usr/bin'. 
    249  
    250    On Haiku, software installed for all users goes in `/boot/common', 
    251 not `/usr/local'.  It is recommended to use the following options: 
     245these programs are available in '/usr/bin'.  So, if you need '/usr/ucb' 
     246in your 'PATH', put it _after_ '/usr/bin'. 
     247 
     248   On Haiku, software installed for all users goes in '/boot/common', 
     249not '/usr/local'.  It is recommended to use the following options: 
    252250 
    253251     ./configure --prefix=/boot/common 
     
    256254========================== 
    257255 
    258    There may be some features `configure' cannot figure out 
     256   There may be some features 'configure' cannot figure out 
    259257automatically, but needs to determine by the type of machine the package 
    260258will run on.  Usually, assuming the package is built to be run on the 
    261 _same_ architectures, `configure' can figure that out, but if it prints 
     259_same_ architectures, 'configure' can figure that out, but if it prints 
    262260a message saying it cannot guess the machine type, give it the 
    263 `--build=TYPE' option.  TYPE can either be a short name for the system 
    264 type, such as `sun4', or a canonical name which has the form: 
     261'--build=TYPE' option.  TYPE can either be a short name for the system 
     262type, such as 'sun4', or a canonical name which has the form: 
    265263 
    266264     CPU-COMPANY-SYSTEM 
     
    271269     KERNEL-OS 
    272270 
    273    See the file `config.sub' for the possible values of each field.  If 
    274 `config.sub' isn't included in this package, then this package doesn't 
     271   See the file 'config.sub' for the possible values of each field.  If 
     272'config.sub' isn't included in this package, then this package doesn't 
    275273need to know the machine type. 
    276274 
    277275   If you are _building_ compiler tools for cross-compiling, you should 
    278 use the option `--target=TYPE' to select the type of system they will 
     276use the option '--target=TYPE' to select the type of system they will 
    279277produce code for. 
    280278 
     
    282280platform different from the build platform, you should specify the 
    283281"host" platform (i.e., that on which the generated programs will 
    284 eventually be run) with `--host=TYPE'. 
     282eventually be run) with '--host=TYPE'. 
    285283 
    286284Sharing Defaults 
    287285================ 
    288286 
    289    If you want to set default values for `configure' scripts to share, 
    290 you can create a site shell script called `config.site' that gives 
    291 default values for variables like `CC', `cache_file', and `prefix'. 
    292 `configure' looks for `PREFIX/share/config.site' if it exists, then 
    293 `PREFIX/etc/config.site' if it exists.  Or, you can set the 
    294 `CONFIG_SITE' environment variable to the location of the site script. 
    295 A warning: not all `configure' scripts look for a site script. 
     287   If you want to set default values for 'configure' scripts to share, 
     288you can create a site shell script called 'config.site' that gives 
     289default values for variables like 'CC', 'cache_file', and 'prefix'. 
     290'configure' looks for 'PREFIX/share/config.site' if it exists, then 
     291'PREFIX/etc/config.site' if it exists.  Or, you can set the 
     292'CONFIG_SITE' environment variable to the location of the site script. 
     293A warning: not all 'configure' scripts look for a site script. 
    296294 
    297295Defining Variables 
     
    299297 
    300298   Variables not defined in a site shell script can be set in the 
    301 environment passed to `configure'.  However, some packages may run 
     299environment passed to 'configure'.  However, some packages may run 
    302300configure again during the build, and the customized values of these 
    303301variables may be lost.  In order to avoid this problem, you should set 
    304 them in the `configure' command line, using `VAR=value'.  For example: 
     302them in the 'configure' command line, using 'VAR=value'.  For example: 
    305303 
    306304     ./configure CC=/usr/local2/bin/gcc 
    307305 
    308 causes the specified `gcc' to be used as the C compiler (unless it is 
     306causes the specified 'gcc' to be used as the C compiler (unless it is 
    309307overridden in the site shell script). 
    310308 
    311 Unfortunately, this technique does not work for `CONFIG_SHELL' due to 
    312 an Autoconf limitation.  Until the limitation is lifted, you can use 
    313 this workaround: 
     309Unfortunately, this technique does not work for 'CONFIG_SHELL' due to an 
     310Autoconf limitation.  Until the limitation is lifted, you can use this 
     311workaround: 
    314312 
    315313     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash 
    316314 
    317 `configure' Invocation 
     315'configure' Invocation 
    318316====================== 
    319317 
    320    `configure' recognizes the following options to control how it 
     318   'configure' recognizes the following options to control how it 
    321319operates. 
    322320 
    323 `--help' 
    324 `-h' 
    325      Print a summary of all of the options to `configure', and exit. 
    326  
    327 `--help=short' 
    328 `--help=recursive' 
     321'--help' 
     322'-h' 
     323     Print a summary of all of the options to 'configure', and exit. 
     324 
     325'--help=short' 
     326'--help=recursive' 
    329327     Print a summary of the options unique to this package's 
    330      `configure', and exit.  The `short' variant lists options used 
    331      only in the top level, while the `recursive' variant lists options 
    332      also present in any nested packages. 
    333  
    334 `--version' 
    335 `-V' 
    336      Print the version of Autoconf used to generate the `configure' 
     328     'configure', and exit.  The 'short' variant lists options used only 
     329     in the top level, while the 'recursive' variant lists options also 
     330     present in any nested packages. 
     331 
     332'--version' 
     333'-V' 
     334     Print the version of Autoconf used to generate the 'configure' 
    337335     script, and exit. 
    338336 
    339 `--cache-file=FILE' 
     337'--cache-file=FILE' 
    340338     Enable the cache: use and save the results of the tests in FILE, 
    341      traditionally `config.cache'.  FILE defaults to `/dev/null' to 
     339     traditionally 'config.cache'.  FILE defaults to '/dev/null' to 
    342340     disable caching. 
    343341 
    344 `--config-cache' 
    345 `-C' 
    346      Alias for `--cache-file=config.cache'. 
    347  
    348 `--quiet' 
    349 `--silent' 
    350 `-q' 
     342'--config-cache' 
     343'-C' 
     344     Alias for '--cache-file=config.cache'. 
     345 
     346'--quiet' 
     347'--silent' 
     348'-q' 
    351349     Do not print messages saying which checks are being made.  To 
    352      suppress all normal output, redirect it to `/dev/null' (any error 
     350     suppress all normal output, redirect it to '/dev/null' (any error 
    353351     messages will still be shown). 
    354352 
    355 `--srcdir=DIR' 
     353'--srcdir=DIR' 
    356354     Look for the package's source code in directory DIR.  Usually 
    357      `configure' can determine that directory automatically. 
    358  
    359 `--prefix=DIR' 
    360      Use DIR as the installation prefix.  *note Installation Names:: 
    361      for more details, including other options available for fine-tuning 
    362      the installation locations. 
    363  
    364 `--no-create' 
    365 `-n' 
     355     'configure' can determine that directory automatically. 
     356 
     357'--prefix=DIR' 
     358     Use DIR as the installation prefix.  *note Installation Names:: for 
     359     more details, including other options available for fine-tuning the 
     360     installation locations. 
     361 
     362'--no-create' 
     363'-n' 
    366364     Run the configure checks, but stop before creating any output 
    367365     files. 
    368366 
    369 `configure' also accepts some other, not widely useful, options.  Run 
    370 `configure --help' for more details. 
     367'configure' also accepts some other, not widely useful, options.  Run 
     368'configure --help' for more details. 
  • trunk/src/data_sources/nmxptool/Makefile.am

    r7918 r8318  
    33 
    44SUBDIRS = lib src 
    5 dist_doc_DATA = BUGS HISTORY README earthworm seiscomp_templates makefile.unix doc/html doc/man 
     5dist_doc_DATA = BUGS HISTORY README earthworm/nmxptool_cmd.html earthworm/nmxptool_ovr.html 
    66 
    77EWMAKEFILEUX=earthworm/makefile.ux.nognu 
    88 
     9EXTRA_DIST = earthworm seiscomp_templates makefile.unix 
     10 
    911dist-hook: 
    1012        ln -f -s ${EWMAKEFILEUX} makefile.unix 
    11         rm -rf `find $(distdir)/earthworm -name CVS` 
    12         rm -rf `find $(distdir)/seiscomp_templates -name CVS` 
    13         rm -rf `find $(distdir)/earthworm -name .svn` 
    14         rm -rf `find $(distdir)/seiscomp_templates -name .svn` 
    15         rm -rf `find $(distdir)/doc -name CVS` 
    16         rm -rf `find $(distdir)/doc -name .svn` 
    1713 
    1814binary_distdir_FILES= \ 
    1915        AUTHORS \ 
    20         BUGS \ 
    21         COPYING \ 
    22         HISTORY  \ 
    23         INSTALL \ 
    24         README  \ 
    25         README_DISTBIN \ 
    26         bin/nmxptool${EXEEXT} \ 
    27         earthworm/nmxptool.d \ 
    28         earthworm/nmxptool.desc \ 
    29         earthworm/nmxptool.list.txt \ 
    30         earthworm/nmxptool_cmd.html \ 
    31         earthworm/nmxptool_ovr.html \ 
    32         seiscomp_templates 
     16        BUGS \ 
     17        COPYING \ 
     18        HISTORY  \ 
     19        INSTALL \ 
     20        README  \ 
     21        README_DISTBIN \ 
     22        bin/nmxptool${EXEEXT} \ 
     23                earthworm \ 
     24                seiscomp_templates 
    3325 
    3426if ENABLE_DLL_PTHREAD 
     
    10092 
    10193install-seiscomp-templates: 
    102         test -d "${SEISCOMPDIRTEMPLATES}" 
     94        test -d "${SEISCOMPDIRTEMPLATES}"  
    10395        test -d "${SEISCOMPDIRTEMPLATES}/135_nmxptool"  || ./install-sh -c -d '${SEISCOMPDIRTEMPLATES}/135_nmxptool' 
    10496        ${INSTALL_DATA} 'seiscomp_templates/135_nmxptool/chain_digiserv_station.tpl' '${SEISCOMPDIRTEMPLATES}/135_nmxptool/chain_digiserv_station.tpl' 
  • trunk/src/data_sources/nmxptool/Makefile.in

    r7918 r8318  
    1 # Makefile.in generated by automake 1.15 from Makefile.am. 
     1# Makefile.in generated by automake 1.16.1 from Makefile.am. 
    22# @configure_input@ 
    33 
    4 # Copyright (C) 1994-2014 Free Software Foundation, Inc. 
     4# Copyright (C) 1994-2018 Free Software Foundation, Inc. 
    55 
    66# This Makefile.in is free software; the Free Software Foundation 
     
    114114am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) 
    115115am__v_GEN_0 = @echo "  GEN     " $@; 
    116 am__v_GEN_1 = 
     116am__v_GEN_1 =  
    117117AM_V_at = $(am__v_at_@AM_V@) 
    118118am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 
    119119am__v_at_0 = @ 
    120 am__v_at_1 = 
     120am__v_at_1 =  
    121121SOURCES = 
    122122DIST_SOURCES = 
     
    170170  $(am__extra_recursive_targets) 
    171171AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ 
    172         cscope distdir dist dist-all distcheck 
     172        cscope distdir distdir-am dist dist-all distcheck 
    173173am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ 
    174174        $(LISP)config.h.in 
     
    288288LN_S = @LN_S@ 
    289289LTLIBOBJS = @LTLIBOBJS@ 
     290LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ 
    290291MAINT = @MAINT@ 
    291292MAKEINFO = @MAKEINFO@ 
     
    357358program_transform_name = @program_transform_name@ 
    358359psdir = @psdir@ 
     360runstatedir = @runstatedir@ 
    359361sbindir = @sbindir@ 
    360362sharedstatedir = @sharedstatedir@ 
     
    373375ACLOCAL_AMFLAGS = -I m4 
    374376SUBDIRS = lib src 
    375 dist_doc_DATA = BUGS HISTORY README earthworm seiscomp_templates makefile.unix doc/html doc/man 
     377dist_doc_DATA = BUGS HISTORY README earthworm/nmxptool_cmd.html earthworm/nmxptool_ovr.html 
    376378EWMAKEFILEUX = earthworm/makefile.ux.nognu 
     379EXTRA_DIST = earthworm seiscomp_templates makefile.unix 
    377380binary_distdir_FILES = AUTHORS BUGS COPYING HISTORY INSTALL README \ 
    378         README_DISTBIN bin/nmxptool${EXEEXT} earthworm/nmxptool.d \ 
    379         earthworm/nmxptool.desc earthworm/nmxptool.list.txt \ 
    380         earthworm/nmxptool_cmd.html earthworm/nmxptool_ovr.html \ 
     381        README_DISTBIN bin/nmxptool${EXEEXT} earthworm \ 
    381382        seiscomp_templates $(am__append_1) 
    382383binary_distdir_suffix = ${BINARY_DIST_NAME_SUFFIX} 
     
    415416            $(SHELL) ./config.status;; \ 
    416417          *) \ 
    417             echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ 
    418             cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ 
     418            echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ 
     419            cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ 
    419420        esac; 
    420421 
     
    435436        @rm -f stamp-h1 
    436437        cd $(top_builddir) && $(SHELL) ./config.status config.h 
    437 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
     438$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)  
    438439        ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) 
    439440        rm -f stamp-h1 
     
    579580        -rm -f cscope.out cscope.in.out cscope.po.out cscope.files 
    580581 
    581 distdir: $(DISTFILES) 
     582distdir: $(BUILT_SOURCES) 
     583        $(MAKE) $(AM_MAKEFLAGS) distdir-am 
     584 
     585distdir-am: $(DISTFILES) 
    582586        $(am__remove_distdir) 
    583587        test -d "$(distdir)" || mkdir "$(distdir)" 
     
    647651        || chmod -R a+r "$(distdir)" 
    648652dist-gzip: distdir 
    649         tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz 
     653        tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz 
    650654        $(am__post_remove_distdir) 
    651655 
     
    673677                       "deprecated." >&2 
    674678        @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 
    675         shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz 
     679        shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz 
    676680        $(am__post_remove_distdir) 
    677681 
     
    691695        case '$(DIST_ARCHIVES)' in \ 
    692696        *.tar.gz*) \ 
    693           GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ 
     697          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\ 
    694698        *.tar.bz2*) \ 
    695699          bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ 
     
    701705          uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ 
    702706        *.shar.gz*) \ 
    703           GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ 
     707          eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\ 
    704708        *.zip*) \ 
    705709          unzip $(distdir).zip ;;\ 
     
    903907dist-hook: 
    904908        ln -f -s ${EWMAKEFILEUX} makefile.unix 
    905         rm -rf `find $(distdir)/earthworm -name CVS` 
    906         rm -rf `find $(distdir)/seiscomp_templates -name CVS` 
    907         rm -rf `find $(distdir)/earthworm -name .svn` 
    908         rm -rf `find $(distdir)/seiscomp_templates -name .svn` 
    909         rm -rf `find $(distdir)/doc -name CVS` 
    910         rm -rf `find $(distdir)/doc -name .svn` 
    911909 
    912910dist-bin: 
     
    953951 
    954952@ENABLE_SEEDLINK_TRUE@install-seiscomp-templates: 
    955 @ENABLE_SEEDLINK_TRUE@  test -d "${SEISCOMPDIRTEMPLATES}" 
     953@ENABLE_SEEDLINK_TRUE@  test -d "${SEISCOMPDIRTEMPLATES}"  
    956954@ENABLE_SEEDLINK_TRUE@  test -d "${SEISCOMPDIRTEMPLATES}/135_nmxptool"  || ./install-sh -c -d '${SEISCOMPDIRTEMPLATES}/135_nmxptool' 
    957955@ENABLE_SEEDLINK_TRUE@  ${INSTALL_DATA} 'seiscomp_templates/135_nmxptool/chain_digiserv_station.tpl' '${SEISCOMPDIRTEMPLATES}/135_nmxptool/chain_digiserv_station.tpl' 
  • trunk/src/data_sources/nmxptool/aclocal.m4

    r6803 r8318  
    1 # generated automatically by aclocal 1.15 -*- Autoconf -*- 
    2  
    3 # Copyright (C) 1996-2014 Free Software Foundation, Inc. 
     1# generated automatically by aclocal 1.16.1 -*- Autoconf -*- 
     2 
     3# Copyright (C) 1996-2018 Free Software Foundation, Inc. 
    44 
    55# This file is free software; the Free Software Foundation 
     
    2121To do so, use the procedure documented by the package, typically 'autoreconf'.])]) 
    2222 
    23 # Copyright (C) 2002-2014 Free Software Foundation, Inc. 
     23# Copyright (C) 2002-2018 Free Software Foundation, Inc. 
    2424# 
    2525# This file is free software; the Free Software Foundation 
     
    3333# (This private macro should not be called outside this file.) 
    3434AC_DEFUN([AM_AUTOMAKE_VERSION], 
    35 [am__api_version='1.15' 
     35[am__api_version='1.16' 
    3636dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to 
    3737dnl require some minimum version.  Point them to the right macro. 
    38 m4_if([$1], [1.15], [], 
     38m4_if([$1], [1.16.1], [], 
    3939      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl 
    4040]) 
     
    5252# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. 
    5353AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], 
    54 [AM_AUTOMAKE_VERSION([1.15])dnl 
     54[AM_AUTOMAKE_VERSION([1.16.1])dnl 
    5555m4_ifndef([AC_AUTOCONF_VERSION], 
    5656  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl 
     
    5959# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*- 
    6060 
    61 # Copyright (C) 2001-2014 Free Software Foundation, Inc. 
     61# Copyright (C) 2001-2018 Free Software Foundation, Inc. 
    6262# 
    6363# This file is free software; the Free Software Foundation 
     
    111111# AM_CONDITIONAL                                            -*- Autoconf -*- 
    112112 
    113 # Copyright (C) 1997-2014 Free Software Foundation, Inc. 
     113# Copyright (C) 1997-2018 Free Software Foundation, Inc. 
    114114# 
    115115# This file is free software; the Free Software Foundation 
     
    142142fi])]) 
    143143 
    144 # Copyright (C) 1999-2014 Free Software Foundation, Inc. 
     144# Copyright (C) 1999-2018 Free Software Foundation, Inc. 
    145145# 
    146146# This file is free software; the Free Software Foundation 
     
    333333# Generate code to set up dependency tracking.              -*- Autoconf -*- 
    334334 
    335 # Copyright (C) 1999-2014 Free Software Foundation, Inc. 
    336 # 
    337 # This file is free software; the Free Software Foundation 
    338 # gives unlimited permission to copy and/or distribute it, 
    339 # with or without modifications, as long as this notice is preserved. 
    340  
     335# Copyright (C) 1999-2018 Free Software Foundation, Inc. 
     336# 
     337# This file is free software; the Free Software Foundation 
     338# gives unlimited permission to copy and/or distribute it, 
     339# with or without modifications, as long as this notice is preserved. 
    341340 
    342341# _AM_OUTPUT_DEPENDENCY_COMMANDS 
     
    347346  # are listed without --file.  Let's play safe and only enable the eval 
    348347  # if we detect the quoting. 
    349   case $CONFIG_FILES in 
    350   *\'*) eval set x "$CONFIG_FILES" ;; 
    351   *)   set x $CONFIG_FILES ;; 
    352   esac 
     348  # TODO: see whether this extra hack can be removed once we start 
     349  # requiring Autoconf 2.70 or later. 
     350  AS_CASE([$CONFIG_FILES], 
     351          [*\'*], [eval set x "$CONFIG_FILES"], 
     352          [*], [set x $CONFIG_FILES]) 
    353353  shift 
    354   for mf 
     354  # Used to flag and report bootstrapping failures. 
     355  am_rc=0 
     356  for am_mf 
    355357  do 
    356358    # Strip MF so we end up with the name of the file. 
    357     mf=`echo "$mf" | sed -e 's/:.*$//'` 
    358     # Check whether this is an Automake generated Makefile or not. 
    359     # We used to match only the files named 'Makefile.in', but 
    360     # some people rename them; so instead we look at the file content. 
    361     # Grep'ing the first line is not enough: some people post-process 
    362     # each Makefile.in and add a new line on top of each file to say so. 
    363     # Grep'ing the whole file is not good either: AIX grep has a line 
     359    am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` 
     360    # Check whether this is an Automake generated Makefile which includes 
     361    # dependency-tracking related rules and includes. 
     362    # Grep'ing the whole file directly is not great: AIX grep has a line 
    364363    # limit of 2048, but all sed's we know have understand at least 4000. 
    365     if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then 
    366       dirpart=`AS_DIRNAME("$mf")` 
    367     else 
    368       continue 
    369     fi 
    370     # Extract the definition of DEPDIR, am__include, and am__quote 
    371     # from the Makefile without running 'make'. 
    372     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 
    373     test -z "$DEPDIR" && continue 
    374     am__include=`sed -n 's/^am__include = //p' < "$mf"` 
    375     test -z "$am__include" && continue 
    376     am__quote=`sed -n 's/^am__quote = //p' < "$mf"` 
    377     # Find all dependency output files, they are included files with 
    378     # $(DEPDIR) in their names.  We invoke sed twice because it is the 
    379     # simplest approach to changing $(DEPDIR) to its actual value in the 
    380     # expansion. 
    381     for file in `sed -n " 
    382       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 
    383          sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do 
    384       # Make sure the directory exists. 
    385       test -f "$dirpart/$file" && continue 
    386       fdir=`AS_DIRNAME(["$file"])` 
    387       AS_MKDIR_P([$dirpart/$fdir]) 
    388       # echo "creating $dirpart/$file" 
    389       echo '# dummy' > "$dirpart/$file" 
    390     done 
     364    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ 
     365      || continue 
     366    am_dirpart=`AS_DIRNAME(["$am_mf"])` 
     367    am_filepart=`AS_BASENAME(["$am_mf"])` 
     368    AM_RUN_LOG([cd "$am_dirpart" \ 
     369      && sed -e '/# am--include-marker/d' "$am_filepart" \ 
     370        | $MAKE -f - am--depfiles]) || am_rc=$? 
    391371  done 
     372  if test $am_rc -ne 0; then 
     373    AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments 
     374    for automatic dependency tracking.  Try re-running configure with the 
     375    '--disable-dependency-tracking' option to at least be able to build 
     376    the package (albeit without support for automatic dependency tracking).]) 
     377  fi 
     378  AS_UNSET([am_dirpart]) 
     379  AS_UNSET([am_filepart]) 
     380  AS_UNSET([am_mf]) 
     381  AS_UNSET([am_rc]) 
     382  rm -f conftest-deps.mk 
    392383} 
    393384])# _AM_OUTPUT_DEPENDENCY_COMMANDS 
     
    398389# This macro should only be invoked once -- use via AC_REQUIRE. 
    399390# 
    400 # This code is only required when automatic dependency tracking 
    401 # is enabled.  FIXME.  This creates each '.P' file that we will 
    402 # need in order to bootstrap the dependency handling code. 
     391# This code is only required when automatic dependency tracking is enabled. 
     392# This creates each '.Po' and '.Plo' makefile fragment that we'll need in 
     393# order to bootstrap the dependency handling code. 
    403394AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], 
    404395[AC_CONFIG_COMMANDS([depfiles], 
    405396     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], 
    406      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) 
    407 ]) 
     397     [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) 
    408398 
    409399# Do all the work for Automake.                             -*- Autoconf -*- 
    410400 
    411 # Copyright (C) 1996-2014 Free Software Foundation, Inc. 
     401# Copyright (C) 1996-2018 Free Software Foundation, Inc. 
    412402# 
    413403# This file is free software; the Free Software Foundation 
     
    496486# For better backward compatibility.  To be removed once Automake 1.9.x 
    497487# dies out for good.  For more background, see: 
    498 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 
    499 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 
     488# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 
     489# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 
    500490AC_SUBST([mkdir_p], ['$(MKDIR_P)']) 
    501491# We need awk for the "check" target (and possibly the TAP driver).  The 
     
    564554 
    565555You can download and install GNU coreutils to get an 'rm' implementation 
    566 that behaves properly: <http://www.gnu.org/software/coreutils/>. 
     556that behaves properly: <https://www.gnu.org/software/coreutils/>. 
    567557 
    568558If you want to complete the configuration process using your problematic 
     
    606596echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) 
    607597 
    608 # Copyright (C) 2001-2014 Free Software Foundation, Inc. 
     598# Copyright (C) 2001-2018 Free Software Foundation, Inc. 
    609599# 
    610600# This file is free software; the Free Software Foundation 
     
    627617AC_SUBST([install_sh])]) 
    628618 
    629 # Copyright (C) 2003-2014 Free Software Foundation, Inc. 
     619# Copyright (C) 2003-2018 Free Software Foundation, Inc. 
    630620# 
    631621# This file is free software; the Free Software Foundation 
     
    649639# From Jim Meyering 
    650640 
    651 # Copyright (C) 1996-2014 Free Software Foundation, Inc. 
     641# Copyright (C) 1996-2018 Free Software Foundation, Inc. 
    652642# 
    653643# This file is free software; the Free Software Foundation 
     
    684674# Check to see how 'make' treats includes.                  -*- Autoconf -*- 
    685675 
    686 # Copyright (C) 2001-2014 Free Software Foundation, Inc. 
     676# Copyright (C) 2001-2018 Free Software Foundation, Inc. 
    687677# 
    688678# This file is free software; the Free Software Foundation 
     
    692682# AM_MAKE_INCLUDE() 
    693683# ----------------- 
    694 # Check to see how make treats includes. 
     684# Check whether make has an 'include' directive that can support all 
     685# the idioms we need for our automatic dependency tracking code. 
    695686AC_DEFUN([AM_MAKE_INCLUDE], 
    696 [am_make=${MAKE-make} 
    697 cat > confinc << 'END' 
     687[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) 
     688cat > confinc.mk << 'END' 
    698689am__doit: 
    699         @echo this is the am__doit target 
     690        @echo this is the am__doit target >confinc.out 
    700691.PHONY: am__doit 
    701692END 
    702 # If we don't find an include directive, just comment out the code. 
    703 AC_MSG_CHECKING([for style of include used by $am_make]) 
    704693am__include="#" 
    705694am__quote= 
    706 _am_result=none 
    707 # First try GNU make style include. 
    708 echo "include confinc" > confmf 
    709 # Ignore all kinds of additional output from 'make'. 
    710 case `$am_make -s -f confmf 2> /dev/null` in #( 
    711 *the\ am__doit\ target*) 
    712   am__include=include 
    713   am__quote= 
    714   _am_result=GNU 
    715   ;; 
    716 esac 
    717 # Now try BSD make style include. 
    718 if test "$am__include" = "#"; then 
    719    echo '.include "confinc"' > confmf 
    720    case `$am_make -s -f confmf 2> /dev/null` in #( 
    721    *the\ am__doit\ target*) 
    722      am__include=.include 
    723      am__quote="\"" 
    724      _am_result=BSD 
    725      ;; 
    726    esac 
    727 fi 
    728 AC_SUBST([am__include]) 
    729 AC_SUBST([am__quote]) 
    730 AC_MSG_RESULT([$_am_result]) 
    731 rm -f confinc confmf 
    732 ]) 
     695# BSD make does it like this. 
     696echo '.include "confinc.mk" # ignored' > confmf.BSD 
     697# Other make implementations (GNU, Solaris 10, AIX) do it like this. 
     698echo 'include confinc.mk # ignored' > confmf.GNU 
     699_am_result=no 
     700for s in GNU BSD; do 
     701  AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) 
     702  AS_CASE([$?:`cat confinc.out 2>/dev/null`], 
     703      ['0:this is the am__doit target'], 
     704      [AS_CASE([$s], 
     705          [BSD], [am__include='.include' am__quote='"'], 
     706          [am__include='include' am__quote=''])]) 
     707  if test "$am__include" != "#"; then 
     708    _am_result="yes ($s style)" 
     709    break 
     710  fi 
     711done 
     712rm -f confinc.* confmf.* 
     713AC_MSG_RESULT([${_am_result}]) 
     714AC_SUBST([am__include])]) 
     715AC_SUBST([am__quote])]) 
    733716 
    734717# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*- 
    735718 
    736 # Copyright (C) 1997-2014 Free Software Foundation, Inc. 
     719# Copyright (C) 1997-2018 Free Software Foundation, Inc. 
    737720# 
    738721# This file is free software; the Free Software Foundation 
     
    773756# Helper functions for option handling.                     -*- Autoconf -*- 
    774757 
    775 # Copyright (C) 2001-2014 Free Software Foundation, Inc. 
     758# Copyright (C) 2001-2018 Free Software Foundation, Inc. 
    776759# 
    777760# This file is free software; the Free Software Foundation 
     
    802785[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) 
    803786 
    804 # Copyright (C) 1999-2014 Free Software Foundation, Inc. 
     787# Copyright (C) 1999-2018 Free Software Foundation, Inc. 
    805788# 
    806789# This file is free software; the Free Software Foundation 
     
    849832AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) 
    850833 
    851 # Copyright (C) 2001-2014 Free Software Foundation, Inc. 
     834# Copyright (C) 2001-2018 Free Software Foundation, Inc. 
    852835# 
    853836# This file is free software; the Free Software Foundation 
     
    868851# Check to make sure that the build environment is sane.    -*- Autoconf -*- 
    869852 
    870 # Copyright (C) 1996-2014 Free Software Foundation, Inc. 
     853# Copyright (C) 1996-2018 Free Software Foundation, Inc. 
    871854# 
    872855# This file is free software; the Free Software Foundation 
     
    949932]) 
    950933 
    951 # Copyright (C) 2009-2014 Free Software Foundation, Inc. 
     934# Copyright (C) 2009-2018 Free Software Foundation, Inc. 
    952935# 
    953936# This file is free software; the Free Software Foundation 
     
    1009992]) 
    1010993 
    1011 # Copyright (C) 2001-2014 Free Software Foundation, Inc. 
     994# Copyright (C) 2001-2018 Free Software Foundation, Inc. 
    1012995# 
    1013996# This file is free software; the Free Software Foundation 
     
    10371020AC_SUBST([INSTALL_STRIP_PROGRAM])]) 
    10381021 
    1039 # Copyright (C) 2006-2014 Free Software Foundation, Inc. 
     1022# Copyright (C) 2006-2018 Free Software Foundation, Inc. 
    10401023# 
    10411024# This file is free software; the Free Software Foundation 
     
    10561039# Check how to create a tarball.                            -*- Autoconf -*- 
    10571040 
    1058 # Copyright (C) 2004-2014 Free Software Foundation, Inc. 
     1041# Copyright (C) 2004-2018 Free Software Foundation, Inc. 
    10591042# 
    10601043# This file is free software; the Free Software Foundation 
  • trunk/src/data_sources/nmxptool/compile

    r6803 r8318  
    22# Wrapper for compilers which do not understand '-c -o'. 
    33 
    4 scriptversion=2012-10-14.11; # UTC 
    5  
    6 # Copyright (C) 1999-2014 Free Software Foundation, Inc. 
     4scriptversion=2018-03-07.03; # UTC 
     5 
     6# Copyright (C) 1999-2018 Free Software Foundation, Inc. 
    77# Written by Tom Tromey <tromey@cygnus.com>. 
    88# 
     
    1818# 
    1919# You should have received a copy of the GNU General Public License 
    20 # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     20# along with this program.  If not, see <https://www.gnu.org/licenses/>. 
    2121 
    2222# As a special exception to the GNU General Public License, if you 
     
    256256    exit $? 
    257257    ;; 
    258   cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) 
     258  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ 
     259  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) 
    259260    func_cl_wrapper "$@"      # Doesn't return... 
    260261    ;; 
     
    340341# mode: shell-script 
    341342# sh-indentation: 2 
    342 # eval: (add-hook 'write-file-hooks 'time-stamp) 
     343# eval: (add-hook 'before-save-hook 'time-stamp) 
    343344# time-stamp-start: "scriptversion=" 
    344345# time-stamp-format: "%:y-%02m-%02d.%02H" 
    345 # time-stamp-time-zone: "UTC" 
     346# time-stamp-time-zone: "UTC0" 
    346347# time-stamp-end: "; # UTC" 
    347348# End: 
  • trunk/src/data_sources/nmxptool/config.guess

    r6803 r8318  
    11#! /bin/sh 
    22# Attempt to guess a canonical system name. 
    3 #   Copyright 1992-2014 Free Software Foundation, Inc. 
    4  
    5 timestamp='2014-11-04' 
     3#   Copyright 1992-2018 Free Software Foundation, Inc. 
     4 
     5timestamp='2018-02-24' 
    66 
    77# This file is free software; you can redistribute it and/or modify it 
     
    1616# 
    1717# You should have received a copy of the GNU General Public License 
    18 # along with this program; if not, see <http://www.gnu.org/licenses/>. 
     18# along with this program; if not, see <https://www.gnu.org/licenses/>. 
    1919# 
    2020# As a special exception to the GNU General Public License, if you 
     
    2828# 
    2929# You can get the latest version of this script from: 
    30 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 
     30# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess 
    3131# 
    3232# Please send patches to <config-patches@gnu.org>. 
     
    4040Output the configuration name of the system \`$me' is run on. 
    4141 
    42 Operation modes: 
     42Options: 
    4343  -h, --help         print this help, then exit 
    4444  -t, --time-stamp   print date of last modification, then exit 
     
    5151 
    5252Originally written by Per Bothner. 
    53 Copyright 1992-2014 Free Software Foundation, Inc. 
     53Copyright 1992-2018 Free Software Foundation, Inc. 
    5454 
    5555This is free software; see the source for copying conditions.  There is NO 
     
    108108tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; 
    109109case $CC_FOR_BUILD,$HOST_CC,$CC in 
    110  ,,)    echo "int x;" > $dummy.c ; 
     110 ,,)    echo "int x;" > "$dummy.c" ; 
    111111        for c in cc gcc c89 c99 ; do 
    112           if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then 
     112          if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then 
    113113             CC_FOR_BUILD="$c"; break ; 
    114114          fi ; 
     
    133133UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown 
    134134 
    135 case "${UNAME_SYSTEM}" in 
     135case "$UNAME_SYSTEM" in 
    136136Linux|GNU|GNU/*) 
    137137        # If the system lacks a compiler, then just pick glibc. 
     
    139139        LIBC=gnu 
    140140 
    141         eval $set_cc_for_build 
    142         cat <<-EOF > $dummy.c 
     141        eval "$set_cc_for_build" 
     142        cat <<-EOF > "$dummy.c" 
    143143        #include <features.h> 
    144144        #if defined(__UCLIBC__) 
     
    150150        #endif 
    151151        EOF 
    152         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` 
     152        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" 
     153 
     154        # If ldd exists, use it to detect musl libc. 
     155        if command -v ldd >/dev/null && \ 
     156                ldd --version 2>&1 | grep -q ^musl 
     157        then 
     158            LIBC=musl 
     159        fi 
    153160        ;; 
    154161esac 
     
    156163# Note: order is significant - the case branches are not exclusive. 
    157164 
    158 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in 
     165case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in 
    159166    *:NetBSD:*:*) 
    160167        # NetBSD (nbsd) targets should (where applicable) match one or 
     
    169176        # portion of the name.  We always set it to "unknown". 
    170177        sysctl="sysctl -n hw.machine_arch" 
    171         UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ 
    172             /usr/sbin/$sysctl 2>/dev/null || echo unknown)` 
    173         case "${UNAME_MACHINE_ARCH}" in 
     178        UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ 
     179            "/sbin/$sysctl" 2>/dev/null || \ 
     180            "/usr/sbin/$sysctl" 2>/dev/null || \ 
     181            echo unknown)` 
     182        case "$UNAME_MACHINE_ARCH" in 
    174183            armeb) machine=armeb-unknown ;; 
    175184            arm*) machine=arm-unknown ;; 
     
    177186            sh3eb) machine=sh-unknown ;; 
    178187            sh5el) machine=sh5le-unknown ;; 
    179             *) machine=${UNAME_MACHINE_ARCH}-unknown ;; 
     188            earmv*) 
     189                arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` 
     190                endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` 
     191                machine="${arch}${endian}"-unknown 
     192                ;; 
     193            *) machine="$UNAME_MACHINE_ARCH"-unknown ;; 
    180194        esac 
    181195        # The Operating System including object format, if it has switched 
    182         # to ELF recently, or will in the future. 
    183         case "${UNAME_MACHINE_ARCH}" in 
     196        # to ELF recently (or will in the future) and ABI. 
     197        case "$UNAME_MACHINE_ARCH" in 
     198            earm*) 
     199                os=netbsdelf 
     200                ;; 
    184201            arm*|i386|m68k|ns32k|sh3*|sparc|vax) 
    185                 eval $set_cc_for_build 
     202                eval "$set_cc_for_build" 
    186203                if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ 
    187204                        | grep -q __ELF__ 
     
    198215                ;; 
    199216        esac 
     217        # Determine ABI tags. 
     218        case "$UNAME_MACHINE_ARCH" in 
     219            earm*) 
     220                expr='s/^earmv[0-9]/-eabi/;s/eb$//' 
     221                abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` 
     222                ;; 
     223        esac 
    200224        # The OS release 
    201225        # Debian GNU/NetBSD machines have a different userland, and 
     
    203227        # kernel version information, so it can be replaced with a 
    204228        # suitable tag, in the style of linux-gnu. 
    205         case "${UNAME_VERSION}" in 
     229        case "$UNAME_VERSION" in 
    206230            Debian*) 
    207231                release='-gnu' 
    208232                ;; 
    209233            *) 
    210                 release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` 
     234                release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` 
    211235                ;; 
    212236        esac 
     
    214238        # contains redundant information, the shorter form: 
    215239        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. 
    216         echo "${machine}-${os}${release}" 
     240        echo "$machine-${os}${release}${abi}" 
    217241        exit ;; 
    218242    *:Bitrig:*:*) 
    219243        UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` 
    220         echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} 
     244        echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" 
    221245        exit ;; 
    222246    *:OpenBSD:*:*) 
    223247        UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` 
    224         echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} 
     248        echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" 
     249        exit ;; 
     250    *:LibertyBSD:*:*) 
     251        UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` 
     252        echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" 
     253        exit ;; 
     254    *:MidnightBSD:*:*) 
     255        echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" 
    225256        exit ;; 
    226257    *:ekkoBSD:*:*) 
    227         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 
     258        echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" 
    228259        exit ;; 
    229260    *:SolidBSD:*:*) 
    230         echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} 
     261        echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" 
    231262        exit ;; 
    232263    macppc:MirBSD:*:*) 
    233         echo powerpc-unknown-mirbsd${UNAME_RELEASE} 
     264        echo powerpc-unknown-mirbsd"$UNAME_RELEASE" 
    234265        exit ;; 
    235266    *:MirBSD:*:*) 
    236         echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} 
    237         exit ;; 
     267        echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" 
     268        exit ;; 
     269    *:Sortix:*:*) 
     270        echo "$UNAME_MACHINE"-unknown-sortix 
     271        exit ;; 
     272    *:Redox:*:*) 
     273        echo "$UNAME_MACHINE"-unknown-redox 
     274        exit ;; 
     275    mips:OSF1:*.*) 
     276        echo mips-dec-osf1 
     277        exit ;; 
    238278    alpha:OSF1:*:*) 
    239279        case $UNAME_RELEASE in 
     
    252292        case "$ALPHA_CPU_TYPE" in 
    253293            "EV4 (21064)") 
    254                 UNAME_MACHINE="alpha" ;; 
     294                UNAME_MACHINE=alpha ;; 
    255295            "EV4.5 (21064)") 
    256                 UNAME_MACHINE="alpha" ;; 
     296                UNAME_MACHINE=alpha ;; 
    257297            "LCA4 (21066/21068)") 
    258                 UNAME_MACHINE="alpha" ;; 
     298                UNAME_MACHINE=alpha ;; 
    259299            "EV5 (21164)") 
    260                 UNAME_MACHINE="alphaev5" ;; 
     300                UNAME_MACHINE=alphaev5 ;; 
    261301            "EV5.6 (21164A)") 
    262                 UNAME_MACHINE="alphaev56" ;; 
     302                UNAME_MACHINE=alphaev56 ;; 
    263303            "EV5.6 (21164PC)") 
    264                 UNAME_MACHINE="alphapca56" ;; 
     304                UNAME_MACHINE=alphapca56 ;; 
    265305            "EV5.7 (21164PC)") 
    266                 UNAME_MACHINE="alphapca57" ;; 
     306                UNAME_MACHINE=alphapca57 ;; 
    267307            "EV6 (21264)") 
    268                 UNAME_MACHINE="alphaev6" ;; 
     308                UNAME_MACHINE=alphaev6 ;; 
    269309            "EV6.7 (21264A)") 
    270                 UNAME_MACHINE="alphaev67" ;; 
     310                UNAME_MACHINE=alphaev67 ;; 
    271311            "EV6.8CB (21264C)") 
    272                 UNAME_MACHINE="alphaev68" ;; 
     312                UNAME_MACHINE=alphaev68 ;; 
    273313            "EV6.8AL (21264B)") 
    274                 UNAME_MACHINE="alphaev68" ;; 
     314                UNAME_MACHINE=alphaev68 ;; 
    275315            "EV6.8CX (21264D)") 
    276                 UNAME_MACHINE="alphaev68" ;; 
     316                UNAME_MACHINE=alphaev68 ;; 
    277317            "EV6.9A (21264/EV69A)") 
    278                 UNAME_MACHINE="alphaev69" ;; 
     318                UNAME_MACHINE=alphaev69 ;; 
    279319            "EV7 (21364)") 
    280                 UNAME_MACHINE="alphaev7" ;; 
     320                UNAME_MACHINE=alphaev7 ;; 
    281321            "EV7.9 (21364A)") 
    282                 UNAME_MACHINE="alphaev79" ;; 
     322                UNAME_MACHINE=alphaev79 ;; 
    283323        esac 
    284324        # A Pn.n version is a patched version. 
     
    287327        # A Xn.n version is an unreleased experimental baselevel. 
    288328        # 1.2 uses "1.2" for uname -r. 
    289         echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
     329        echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" 
    290330        # Reset EXIT trap before exiting to avoid spurious non-zero exit code. 
    291331        exitcode=$? 
    292332        trap '' 0 
    293333        exit $exitcode ;; 
    294     Alpha\ *:Windows_NT*:*) 
    295         # How do we know it's Interix rather than the generic POSIX subsystem? 
    296         # Should we change UNAME_MACHINE based on the output of uname instead 
    297         # of the specific Alpha model? 
    298         echo alpha-pc-interix 
    299         exit ;; 
    300     21064:Windows_NT:50:3) 
    301         echo alpha-dec-winnt3.5 
    302         exit ;; 
    303334    Amiga*:UNIX_System_V:4.0:*) 
    304335        echo m68k-unknown-sysv4 
    305336        exit ;; 
    306337    *:[Aa]miga[Oo][Ss]:*:*) 
    307         echo ${UNAME_MACHINE}-unknown-amigaos 
     338        echo "$UNAME_MACHINE"-unknown-amigaos 
    308339        exit ;; 
    309340    *:[Mm]orph[Oo][Ss]:*:*) 
    310         echo ${UNAME_MACHINE}-unknown-morphos 
     341        echo "$UNAME_MACHINE"-unknown-morphos 
    311342        exit ;; 
    312343    *:OS/390:*:*) 
     
    320351        exit ;; 
    321352    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) 
    322         echo arm-acorn-riscix${UNAME_RELEASE} 
     353        echo arm-acorn-riscix"$UNAME_RELEASE" 
    323354        exit ;; 
    324355    arm*:riscos:*:*|arm*:RISCOS:*:*) 
     
    347378        esac ;; 
    348379    s390x:SunOS:*:*) 
    349         echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 
     380        echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" 
    350381        exit ;; 
    351382    sun4H:SunOS:5.*:*) 
    352         echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 
     383        echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" 
    353384        exit ;; 
    354385    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) 
    355         echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 
     386        echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" 
    356387        exit ;; 
    357388    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) 
    358         echo i386-pc-auroraux${UNAME_RELEASE} 
     389        echo i386-pc-auroraux"$UNAME_RELEASE" 
    359390        exit ;; 
    360391    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) 
    361         eval $set_cc_for_build 
    362         SUN_ARCH="i386" 
     392        eval "$set_cc_for_build" 
     393        SUN_ARCH=i386 
    363394        # If there is a compiler, see if it is configured for 64-bit objects. 
    364395        # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. 
    365396        # This test works for both compilers. 
    366         if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 
     397        if [ "$CC_FOR_BUILD" != no_compiler_found ]; then 
    367398            if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ 
    368                 (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 
     399                (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ 
    369400                grep IS_64BIT_ARCH >/dev/null 
    370401            then 
    371                 SUN_ARCH="x86_64" 
     402                SUN_ARCH=x86_64 
    372403            fi 
    373404        fi 
    374         echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 
     405        echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" 
    375406        exit ;; 
    376407    sun4*:SunOS:6*:*) 
     
    378409        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but 
    379410        # it's likely to be more like Solaris than SunOS4. 
    380         echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 
     411        echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" 
    381412        exit ;; 
    382413    sun4*:SunOS:*:*) 
     
    387418        esac 
    388419        # Japanese Language versions have a version number like `4.1.3-JL'. 
    389         echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` 
     420        echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" 
    390421        exit ;; 
    391422    sun3*:SunOS:*:*) 
    392         echo m68k-sun-sunos${UNAME_RELEASE} 
     423        echo m68k-sun-sunos"$UNAME_RELEASE" 
    393424        exit ;; 
    394425    sun*:*:4.2BSD:*) 
    395426        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` 
    396         test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 
     427        test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 
    397428        case "`/bin/arch`" in 
    398429            sun3) 
    399                 echo m68k-sun-sunos${UNAME_RELEASE} 
     430                echo m68k-sun-sunos"$UNAME_RELEASE" 
    400431                ;; 
    401432            sun4) 
    402                 echo sparc-sun-sunos${UNAME_RELEASE} 
     433                echo sparc-sun-sunos"$UNAME_RELEASE" 
    403434                ;; 
    404435        esac 
    405436        exit ;; 
    406437    aushp:SunOS:*:*) 
    407         echo sparc-auspex-sunos${UNAME_RELEASE} 
     438        echo sparc-auspex-sunos"$UNAME_RELEASE" 
    408439        exit ;; 
    409440    # The situation for MiNT is a little confusing.  The machine name 
     
    416447    # be no problem. 
    417448    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) 
    418         echo m68k-atari-mint${UNAME_RELEASE} 
     449        echo m68k-atari-mint"$UNAME_RELEASE" 
    419450        exit ;; 
    420451    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) 
    421         echo m68k-atari-mint${UNAME_RELEASE} 
     452        echo m68k-atari-mint"$UNAME_RELEASE" 
    422453        exit ;; 
    423454    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) 
    424         echo m68k-atari-mint${UNAME_RELEASE} 
     455        echo m68k-atari-mint"$UNAME_RELEASE" 
    425456        exit ;; 
    426457    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) 
    427         echo m68k-milan-mint${UNAME_RELEASE} 
     458        echo m68k-milan-mint"$UNAME_RELEASE" 
    428459        exit ;; 
    429460    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) 
    430         echo m68k-hades-mint${UNAME_RELEASE} 
     461        echo m68k-hades-mint"$UNAME_RELEASE" 
    431462        exit ;; 
    432463    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) 
    433         echo m68k-unknown-mint${UNAME_RELEASE} 
     464        echo m68k-unknown-mint"$UNAME_RELEASE" 
    434465        exit ;; 
    435466    m68k:machten:*:*) 
    436         echo m68k-apple-machten${UNAME_RELEASE} 
     467        echo m68k-apple-machten"$UNAME_RELEASE" 
    437468        exit ;; 
    438469    powerpc:machten:*:*) 
    439         echo powerpc-apple-machten${UNAME_RELEASE} 
     470        echo powerpc-apple-machten"$UNAME_RELEASE" 
    440471        exit ;; 
    441472    RISC*:Mach:*:*) 
     
    443474        exit ;; 
    444475    RISC*:ULTRIX:*:*) 
    445         echo mips-dec-ultrix${UNAME_RELEASE} 
     476        echo mips-dec-ultrix"$UNAME_RELEASE" 
    446477        exit ;; 
    447478    VAX*:ULTRIX*:*:*) 
    448         echo vax-dec-ultrix${UNAME_RELEASE} 
     479        echo vax-dec-ultrix"$UNAME_RELEASE" 
    449480        exit ;; 
    450481    2020:CLIX:*:* | 2430:CLIX:*:*) 
    451         echo clipper-intergraph-clix${UNAME_RELEASE} 
     482        echo clipper-intergraph-clix"$UNAME_RELEASE" 
    452483        exit ;; 
    453484    mips:*:*:UMIPS | mips:*:*:RISCos) 
    454         eval $set_cc_for_build 
    455         sed 's/^        //' << EOF >$dummy.c 
     485        eval "$set_cc_for_build" 
     486        sed 's/^        //' << EOF > "$dummy.c" 
    456487#ifdef __cplusplus 
    457488#include <stdio.h>  /* for printf() prototype */ 
     
    462493        #if defined (host_mips) && defined (MIPSEB) 
    463494        #if defined (SYSTYPE_SYSV) 
    464           printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); 
     495          printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); 
    465496        #endif 
    466497        #if defined (SYSTYPE_SVR4) 
    467           printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); 
     498          printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); 
    468499        #endif 
    469500        #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) 
    470           printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); 
     501          printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); 
    471502        #endif 
    472503        #endif 
     
    474505        } 
    475506EOF 
    476         $CC_FOR_BUILD -o $dummy $dummy.c && 
    477           dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && 
    478           SYSTEM_NAME=`$dummy $dummyarg` && 
     507        $CC_FOR_BUILD -o "$dummy" "$dummy.c" && 
     508          dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && 
     509          SYSTEM_NAME=`"$dummy" "$dummyarg"` && 
    479510            { echo "$SYSTEM_NAME"; exit; } 
    480         echo mips-mips-riscos${UNAME_RELEASE} 
     511        echo mips-mips-riscos"$UNAME_RELEASE" 
    481512        exit ;; 
    482513    Motorola:PowerMAX_OS:*:*) 
     
    504535        # DG/UX returns AViiON for all architectures 
    505536        UNAME_PROCESSOR=`/usr/bin/uname -p` 
    506         if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] 
     537        if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] 
    507538        then 
    508             if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ 
    509                [ ${TARGET_BINARY_INTERFACE}x = x ] 
     539            if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ 
     540               [ "$TARGET_BINARY_INTERFACE"x = x ] 
    510541            then 
    511                 echo m88k-dg-dgux${UNAME_RELEASE} 
     542                echo m88k-dg-dgux"$UNAME_RELEASE" 
    512543            else 
    513                 echo m88k-dg-dguxbcs${UNAME_RELEASE} 
     544                echo m88k-dg-dguxbcs"$UNAME_RELEASE" 
    514545            fi 
    515546        else 
    516             echo i586-dg-dgux${UNAME_RELEASE} 
     547            echo i586-dg-dgux"$UNAME_RELEASE" 
    517548        fi 
    518549        exit ;; 
     
    531562        exit ;; 
    532563    *:IRIX*:*:*) 
    533         echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` 
     564        echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" 
    534565        exit ;; 
    535566    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. 
     
    543574                IBM_REV=`/usr/bin/oslevel` 
    544575        else 
    545                 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 
    546         fi 
    547         echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} 
     576                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" 
     577        fi 
     578        echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" 
    548579        exit ;; 
    549580    *:AIX:2:3) 
    550581        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then 
    551                 eval $set_cc_for_build 
    552                 sed 's/^                //' << EOF >$dummy.c 
     582                eval "$set_cc_for_build" 
     583                sed 's/^                //' << EOF > "$dummy.c" 
    553584                #include <sys/systemcfg.h> 
    554585 
     
    561592                        } 
    562593EOF 
    563                 if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` 
     594                if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` 
    564595                then 
    565596                        echo "$SYSTEM_NAME" 
     
    575606    *:AIX:*:[4567]) 
    576607        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` 
    577         if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then 
     608        if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then 
    578609                IBM_ARCH=rs6000 
    579610        else 
     
    584615                           awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` 
    585616        else 
    586                 IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} 
    587         fi 
    588         echo ${IBM_ARCH}-ibm-aix${IBM_REV} 
     617                IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" 
     618        fi 
     619        echo "$IBM_ARCH"-ibm-aix"$IBM_REV" 
    589620        exit ;; 
    590621    *:AIX:*:*) 
    591622        echo rs6000-ibm-aix 
    592623        exit ;; 
    593     ibmrt:4.4BSD:*|romp-ibm:BSD:*) 
     624    ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) 
    594625        echo romp-ibm-bsd4.4 
    595626        exit ;; 
    596627    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and 
    597         echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to 
     628        echo romp-ibm-bsd"$UNAME_RELEASE"   # 4.3 with uname added to 
    598629        exit ;;                             # report: romp-ibm BSD 4.3 
    599630    *:BOSX:*:*) 
     
    610641        exit ;; 
    611642    9000/[34678]??:HP-UX:*:*) 
    612         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 
    613         case "${UNAME_MACHINE}" in 
    614             9000/31? )            HP_ARCH=m68000 ;; 
    615             9000/[34]?? )         HP_ARCH=m68k ;; 
     643        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` 
     644        case "$UNAME_MACHINE" in 
     645            9000/31?)            HP_ARCH=m68000 ;; 
     646            9000/[34]??)         HP_ARCH=m68k ;; 
    616647            9000/[678][0-9][0-9]) 
    617648                if [ -x /usr/bin/getconf ]; then 
    618649                    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` 
    619650                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` 
    620                     case "${sc_cpu_version}" in 
    621                       523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 
    622                       528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 
     651                    case "$sc_cpu_version" in 
     652                      523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 
     653                      528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 
    623654                      532)                      # CPU_PA_RISC2_0 
    624                         case "${sc_kernel_bits}" in 
    625                           32) HP_ARCH="hppa2.0n" ;; 
    626                           64) HP_ARCH="hppa2.0w" ;; 
    627                           '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20 
     655                        case "$sc_kernel_bits" in 
     656                          32) HP_ARCH=hppa2.0n ;; 
     657                          64) HP_ARCH=hppa2.0w ;; 
     658                          '') HP_ARCH=hppa2.0 ;;   # HP-UX 10.20 
    628659                        esac ;; 
    629660                    esac 
    630661                fi 
    631                 if [ "${HP_ARCH}" = "" ]; then 
    632                     eval $set_cc_for_build 
    633                     sed 's/^            //' << EOF >$dummy.c 
     662                if [ "$HP_ARCH" = "" ]; then 
     663                    eval "$set_cc_for_build" 
     664                    sed 's/^            //' << EOF > "$dummy.c" 
    634665 
    635666                #define _HPUX_SOURCE 
     
    664695                } 
    665696EOF 
    666                     (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` 
     697                    (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` 
    667698                    test -z "$HP_ARCH" && HP_ARCH=hppa 
    668699                fi ;; 
    669700        esac 
    670         if [ ${HP_ARCH} = "hppa2.0w" ] 
     701        if [ "$HP_ARCH" = hppa2.0w ] 
    671702        then 
    672             eval $set_cc_for_build 
     703            eval "$set_cc_for_build" 
    673704 
    674705            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating 
     
    681712            # => hppa64-hp-hpux11.23 
    682713 
    683             if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | 
     714            if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | 
    684715                grep -q __LP64__ 
    685716            then 
    686                 HP_ARCH="hppa2.0w" 
     717                HP_ARCH=hppa2.0w 
    687718            else 
    688                 HP_ARCH="hppa64" 
     719                HP_ARCH=hppa64 
    689720            fi 
    690721        fi 
    691         echo ${HP_ARCH}-hp-hpux${HPUX_REV} 
     722        echo "$HP_ARCH"-hp-hpux"$HPUX_REV" 
    692723        exit ;; 
    693724    ia64:HP-UX:*:*) 
    694         HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` 
    695         echo ia64-hp-hpux${HPUX_REV} 
     725        HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` 
     726        echo ia64-hp-hpux"$HPUX_REV" 
    696727        exit ;; 
    697728    3050*:HI-UX:*:*) 
    698         eval $set_cc_for_build 
    699         sed 's/^        //' << EOF >$dummy.c 
     729        eval "$set_cc_for_build" 
     730        sed 's/^        //' << EOF > "$dummy.c" 
    700731        #include <unistd.h> 
    701732        int 
     
    722753        } 
    723754EOF 
    724         $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && 
     755        $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && 
    725756                { echo "$SYSTEM_NAME"; exit; } 
    726757        echo unknown-hitachi-hiuxwe2 
    727758        exit ;; 
    728     9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) 
     759    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) 
    729760        echo hppa1.1-hp-bsd 
    730761        exit ;; 
     
    735766        echo hppa1.0-hp-mpeix 
    736767        exit ;; 
    737     hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) 
     768    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) 
    738769        echo hppa1.1-hp-osf 
    739770        exit ;; 
     
    743774    i*86:OSF1:*:*) 
    744775        if [ -x /usr/sbin/sysversion ] ; then 
    745             echo ${UNAME_MACHINE}-unknown-osf1mk 
     776            echo "$UNAME_MACHINE"-unknown-osf1mk 
    746777        else 
    747             echo ${UNAME_MACHINE}-unknown-osf1 
     778            echo "$UNAME_MACHINE"-unknown-osf1 
    748779        fi 
    749780        exit ;; 
     
    770801        exit ;; 
    771802    CRAY*Y-MP:*:*:*) 
    772         echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
     803        echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' 
    773804        exit ;; 
    774805    CRAY*[A-Z]90:*:*:*) 
    775         echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ 
     806        echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ 
    776807        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ 
    777808              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ 
     
    779810        exit ;; 
    780811    CRAY*TS:*:*:*) 
    781         echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
     812        echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' 
    782813        exit ;; 
    783814    CRAY*T3E:*:*:*) 
    784         echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
     815        echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' 
    785816        exit ;; 
    786817    CRAY*SV1:*:*:*) 
    787         echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
     818        echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' 
    788819        exit ;; 
    789820    *:UNICOS/mp:*:*) 
    790         echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' 
     821        echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' 
    791822        exit ;; 
    792823    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) 
    793         FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` 
    794         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 
    795         FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` 
     824        FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` 
     825        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` 
     826        FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` 
    796827        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 
    797828        exit ;; 
    798829    5000:UNIX_System_V:4.*:*) 
    799         FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` 
    800         FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` 
     830        FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` 
     831        FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` 
    801832        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" 
    802833        exit ;; 
    803834    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) 
    804         echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} 
     835        echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" 
    805836        exit ;; 
    806837    sparc*:BSD/OS:*:*) 
    807         echo sparc-unknown-bsdi${UNAME_RELEASE} 
     838        echo sparc-unknown-bsdi"$UNAME_RELEASE" 
    808839        exit ;; 
    809840    *:BSD/OS:*:*) 
    810         echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} 
     841        echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" 
    811842        exit ;; 
    812843    *:FreeBSD:*:*) 
    813844        UNAME_PROCESSOR=`/usr/bin/uname -p` 
    814         case ${UNAME_PROCESSOR} in 
     845        case "$UNAME_PROCESSOR" in 
    815846            amd64) 
    816                 echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 
    817             *) 
    818                 echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 
     847                UNAME_PROCESSOR=x86_64 ;; 
     848            i386) 
     849                UNAME_PROCESSOR=i586 ;; 
    819850        esac 
     851        echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" 
    820852        exit ;; 
    821853    i*:CYGWIN*:*) 
    822         echo ${UNAME_MACHINE}-pc-cygwin 
     854        echo "$UNAME_MACHINE"-pc-cygwin 
    823855        exit ;; 
    824856    *:MINGW64*:*) 
    825         echo ${UNAME_MACHINE}-pc-mingw64 
     857        echo "$UNAME_MACHINE"-pc-mingw64 
    826858        exit ;; 
    827859    *:MINGW*:*) 
    828         echo ${UNAME_MACHINE}-pc-mingw32 
     860        echo "$UNAME_MACHINE"-pc-mingw32 
    829861        exit ;; 
    830862    *:MSYS*:*) 
    831         echo ${UNAME_MACHINE}-pc-msys 
    832         exit ;; 
    833     i*:windows32*:*) 
    834         # uname -m includes "-pc" on this system. 
    835         echo ${UNAME_MACHINE}-mingw32 
     863        echo "$UNAME_MACHINE"-pc-msys 
    836864        exit ;; 
    837865    i*:PW*:*) 
    838         echo ${UNAME_MACHINE}-pc-pw32 
     866        echo "$UNAME_MACHINE"-pc-pw32 
    839867        exit ;; 
    840868    *:Interix*:*) 
    841         case ${UNAME_MACHINE} in 
     869        case "$UNAME_MACHINE" in 
    842870            x86) 
    843                 echo i586-pc-interix${UNAME_RELEASE} 
     871                echo i586-pc-interix"$UNAME_RELEASE" 
    844872                exit ;; 
    845873            authenticamd | genuineintel | EM64T) 
    846                 echo x86_64-unknown-interix${UNAME_RELEASE} 
     874                echo x86_64-unknown-interix"$UNAME_RELEASE" 
    847875                exit ;; 
    848876            IA64) 
    849                 echo ia64-unknown-interix${UNAME_RELEASE} 
     877                echo ia64-unknown-interix"$UNAME_RELEASE" 
    850878                exit ;; 
    851879        esac ;; 
    852     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 
    853         echo i${UNAME_MACHINE}-pc-mks 
    854         exit ;; 
    855     8664:Windows_NT:*) 
    856         echo x86_64-pc-mks 
    857         exit ;; 
    858     i*:Windows_NT*:* | Pentium*:Windows_NT*:*) 
    859         # How do we know it's Interix rather than the generic POSIX subsystem? 
    860         # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we 
    861         # UNAME_MACHINE based on the output of uname instead of i386? 
    862         echo i586-pc-interix 
    863         exit ;; 
    864880    i*:UWIN*:*) 
    865         echo ${UNAME_MACHINE}-pc-uwin 
     881        echo "$UNAME_MACHINE"-pc-uwin 
    866882        exit ;; 
    867883    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) 
    868884        echo x86_64-unknown-cygwin 
    869885        exit ;; 
    870     p*:CYGWIN*:*) 
    871         echo powerpcle-unknown-cygwin 
    872         exit ;; 
    873886    prep*:SunOS:5.*:*) 
    874         echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` 
     887        echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" 
    875888        exit ;; 
    876889    *:GNU:*:*) 
    877890        # the GNU system 
    878         echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` 
     891        echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" 
    879892        exit ;; 
    880893    *:GNU/*:*:*) 
    881894        # other systems with GNU libc and userland 
    882         echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} 
     895        echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" 
    883896        exit ;; 
    884897    i*86:Minix:*:*) 
    885         echo ${UNAME_MACHINE}-pc-minix 
     898        echo "$UNAME_MACHINE"-pc-minix 
    886899        exit ;; 
    887900    aarch64:Linux:*:*) 
    888         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     901        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    889902        exit ;; 
    890903    aarch64_be:Linux:*:*) 
    891904        UNAME_MACHINE=aarch64_be 
    892         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     905        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    893906        exit ;; 
    894907    alpha:Linux:*:*) 
     
    903916        esac 
    904917        objdump --private-headers /bin/sh | grep -q ld.so.1 
    905         if test "$?" = 0 ; then LIBC="gnulibc1" ; fi 
    906         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     918        if test "$?" = 0 ; then LIBC=gnulibc1 ; fi 
     919        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    907920        exit ;; 
    908921    arc:Linux:*:* | arceb:Linux:*:*) 
    909         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     922        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    910923        exit ;; 
    911924    arm*:Linux:*:*) 
    912         eval $set_cc_for_build 
     925        eval "$set_cc_for_build" 
    913926        if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ 
    914927            | grep -q __ARM_EABI__ 
    915928        then 
    916             echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     929            echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    917930        else 
    918931            if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ 
    919932                | grep -q __ARM_PCS_VFP 
    920933            then 
    921                 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi 
     934                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi 
    922935            else 
    923                 echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf 
     936                echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf 
    924937            fi 
    925938        fi 
    926939        exit ;; 
    927940    avr32*:Linux:*:*) 
    928         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     941        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    929942        exit ;; 
    930943    cris:Linux:*:*) 
    931         echo ${UNAME_MACHINE}-axis-linux-${LIBC} 
     944        echo "$UNAME_MACHINE"-axis-linux-"$LIBC" 
    932945        exit ;; 
    933946    crisv32:Linux:*:*) 
    934         echo ${UNAME_MACHINE}-axis-linux-${LIBC} 
     947        echo "$UNAME_MACHINE"-axis-linux-"$LIBC" 
     948        exit ;; 
     949    e2k:Linux:*:*) 
     950        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    935951        exit ;; 
    936952    frv:Linux:*:*) 
    937         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     953        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    938954        exit ;; 
    939955    hexagon:Linux:*:*) 
    940         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     956        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    941957        exit ;; 
    942958    i*86:Linux:*:*) 
    943         echo ${UNAME_MACHINE}-pc-linux-${LIBC} 
     959        echo "$UNAME_MACHINE"-pc-linux-"$LIBC" 
    944960        exit ;; 
    945961    ia64:Linux:*:*) 
    946         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     962        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
     963        exit ;; 
     964    k1om:Linux:*:*) 
     965        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    947966        exit ;; 
    948967    m32r*:Linux:*:*) 
    949         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     968        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    950969        exit ;; 
    951970    m68*:Linux:*:*) 
    952         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     971        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    953972        exit ;; 
    954973    mips:Linux:*:* | mips64:Linux:*:*) 
    955         eval $set_cc_for_build 
    956         sed 's/^        //' << EOF >$dummy.c 
     974        eval "$set_cc_for_build" 
     975        sed 's/^        //' << EOF > "$dummy.c" 
    957976        #undef CPU 
    958977        #undef ${UNAME_MACHINE} 
     
    968987        #endif 
    969988EOF 
    970         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` 
    971         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } 
     989        eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" 
     990        test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } 
    972991        ;; 
     992    mips64el:Linux:*:*) 
     993        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
     994        exit ;; 
    973995    openrisc*:Linux:*:*) 
    974         echo or1k-unknown-linux-${LIBC} 
     996        echo or1k-unknown-linux-"$LIBC" 
    975997        exit ;; 
    976998    or32:Linux:*:* | or1k*:Linux:*:*) 
    977         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     999        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    9781000        exit ;; 
    9791001    padre:Linux:*:*) 
    980         echo sparc-unknown-linux-${LIBC} 
     1002        echo sparc-unknown-linux-"$LIBC" 
    9811003        exit ;; 
    9821004    parisc64:Linux:*:* | hppa64:Linux:*:*) 
    983         echo hppa64-unknown-linux-${LIBC} 
     1005        echo hppa64-unknown-linux-"$LIBC" 
    9841006        exit ;; 
    9851007    parisc:Linux:*:* | hppa:Linux:*:*) 
    9861008        # Look for CPU level 
    9871009        case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in 
    988           PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; 
    989           PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; 
    990           *)    echo hppa-unknown-linux-${LIBC} ;; 
     1010          PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; 
     1011          PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; 
     1012          *)    echo hppa-unknown-linux-"$LIBC" ;; 
    9911013        esac 
    9921014        exit ;; 
    9931015    ppc64:Linux:*:*) 
    994         echo powerpc64-unknown-linux-${LIBC} 
     1016        echo powerpc64-unknown-linux-"$LIBC" 
    9951017        exit ;; 
    9961018    ppc:Linux:*:*) 
    997         echo powerpc-unknown-linux-${LIBC} 
     1019        echo powerpc-unknown-linux-"$LIBC" 
    9981020        exit ;; 
    9991021    ppc64le:Linux:*:*) 
    1000         echo powerpc64le-unknown-linux-${LIBC} 
     1022        echo powerpc64le-unknown-linux-"$LIBC" 
    10011023        exit ;; 
    10021024    ppcle:Linux:*:*) 
    1003         echo powerpcle-unknown-linux-${LIBC} 
     1025        echo powerpcle-unknown-linux-"$LIBC" 
     1026        exit ;; 
     1027    riscv32:Linux:*:* | riscv64:Linux:*:*) 
     1028        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    10041029        exit ;; 
    10051030    s390:Linux:*:* | s390x:Linux:*:*) 
    1006         echo ${UNAME_MACHINE}-ibm-linux-${LIBC} 
     1031        echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" 
    10071032        exit ;; 
    10081033    sh64*:Linux:*:*) 
    1009         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     1034        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    10101035        exit ;; 
    10111036    sh*:Linux:*:*) 
    1012         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     1037        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    10131038        exit ;; 
    10141039    sparc:Linux:*:* | sparc64:Linux:*:*) 
    1015         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     1040        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    10161041        exit ;; 
    10171042    tile*:Linux:*:*) 
    1018         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     1043        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    10191044        exit ;; 
    10201045    vax:Linux:*:*) 
    1021         echo ${UNAME_MACHINE}-dec-linux-${LIBC} 
     1046        echo "$UNAME_MACHINE"-dec-linux-"$LIBC" 
    10221047        exit ;; 
    10231048    x86_64:Linux:*:*) 
    1024         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     1049        if objdump -f /bin/sh | grep -q elf32-x86-64; then 
     1050            echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 
     1051        else 
     1052            echo "$UNAME_MACHINE"-pc-linux-"$LIBC" 
     1053        fi 
    10251054        exit ;; 
    10261055    xtensa*:Linux:*:*) 
    1027         echo ${UNAME_MACHINE}-unknown-linux-${LIBC} 
     1056        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" 
    10281057        exit ;; 
    10291058    i*86:DYNIX/ptx:4*:*) 
     
    10391068        # I just have to hope.  -- rms. 
    10401069        # Use sysv4.2uw... so that sysv4* matches it. 
    1041         echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} 
     1070        echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" 
    10421071        exit ;; 
    10431072    i*86:OS/2:*:*) 
    10441073        # If we were able to find `uname', then EMX Unix compatibility 
    10451074        # is probably installed. 
    1046         echo ${UNAME_MACHINE}-pc-os2-emx 
     1075        echo "$UNAME_MACHINE"-pc-os2-emx 
    10471076        exit ;; 
    10481077    i*86:XTS-300:*:STOP) 
    1049         echo ${UNAME_MACHINE}-unknown-stop 
     1078        echo "$UNAME_MACHINE"-unknown-stop 
    10501079        exit ;; 
    10511080    i*86:atheos:*:*) 
    1052         echo ${UNAME_MACHINE}-unknown-atheos 
     1081        echo "$UNAME_MACHINE"-unknown-atheos 
    10531082        exit ;; 
    10541083    i*86:syllable:*:*) 
    1055         echo ${UNAME_MACHINE}-pc-syllable 
     1084        echo "$UNAME_MACHINE"-pc-syllable 
    10561085        exit ;; 
    10571086    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) 
    1058         echo i386-unknown-lynxos${UNAME_RELEASE} 
     1087        echo i386-unknown-lynxos"$UNAME_RELEASE" 
    10591088        exit ;; 
    10601089    i*86:*DOS:*:*) 
    1061         echo ${UNAME_MACHINE}-pc-msdosdjgpp 
    1062         exit ;; 
    1063     i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) 
    1064         UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` 
     1090        echo "$UNAME_MACHINE"-pc-msdosdjgpp 
     1091        exit ;; 
     1092    i*86:*:4.*:*) 
     1093        UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` 
    10651094        if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then 
    1066                 echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} 
     1095                echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" 
    10671096        else 
    1068                 echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} 
     1097                echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" 
    10691098        fi 
    10701099        exit ;; 
     
    10761105            *Pent*|*Celeron) UNAME_MACHINE=i686 ;; 
    10771106        esac 
    1078         echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} 
     1107        echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" 
    10791108        exit ;; 
    10801109    i*86:*:3.2:*) 
    10811110        if test -f /usr/options/cb.name; then 
    10821111                UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` 
    1083                 echo ${UNAME_MACHINE}-pc-isc$UNAME_REL 
     1112                echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" 
    10841113        elif /bin/uname -X 2>/dev/null >/dev/null ; then 
    10851114                UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` 
     
    10911120                (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ 
    10921121                        && UNAME_MACHINE=i686 
    1093                 echo ${UNAME_MACHINE}-pc-sco$UNAME_REL 
     1122                echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" 
    10941123        else 
    1095                 echo ${UNAME_MACHINE}-pc-sysv32 
     1124                echo "$UNAME_MACHINE"-pc-sysv32 
    10961125        fi 
    10971126        exit ;; 
     
    11011130        # the processor, so we play safe by assuming i586. 
    11021131        # Note: whatever this is, it MUST be the same as what config.sub 
    1103         # prints for the "djgpp" host, or else GDB configury will decide that 
     1132        # prints for the "djgpp" host, or else GDB configure will decide that 
    11041133        # this is a cross-build. 
    11051134        echo i586-pc-msdosdjgpp 
     
    11131142    i860:*:4.*:*) # i860-SVR4 
    11141143        if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then 
    1115           echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 
     1144          echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 
    11161145        else # Add other i860-SVR4 vendors below as they are discovered. 
    1117           echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4 
     1146          echo i860-unknown-sysv"$UNAME_RELEASE"  # Unknown i860-SVR4 
    11181147        fi 
    11191148        exit ;; 
     
    11351164        && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 
    11361165        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 
    1137           && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 
     1166          && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } 
    11381167        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 
    1139           && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 
     1168          && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 
    11401169    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) 
    11411170        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 
     
    11461175            && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` 
    11471176        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ 
    1148             && { echo i486-ncr-sysv4.3${OS_REL}; exit; } 
     1177            && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } 
    11491178        /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ 
    1150             && { echo i586-ncr-sysv4.3${OS_REL}; exit; } 
     1179            && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } 
    11511180        /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ 
    1152             && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; 
     1181            && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 
    11531182    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) 
    1154         echo m68k-unknown-lynxos${UNAME_RELEASE} 
     1183        echo m68k-unknown-lynxos"$UNAME_RELEASE" 
    11551184        exit ;; 
    11561185    mc68030:UNIX_System_V:4.*:*) 
     
    11581187        exit ;; 
    11591188    TSUNAMI:LynxOS:2.*:*) 
    1160         echo sparc-unknown-lynxos${UNAME_RELEASE} 
     1189        echo sparc-unknown-lynxos"$UNAME_RELEASE" 
    11611190        exit ;; 
    11621191    rs6000:LynxOS:2.*:*) 
    1163         echo rs6000-unknown-lynxos${UNAME_RELEASE} 
     1192        echo rs6000-unknown-lynxos"$UNAME_RELEASE" 
    11641193        exit ;; 
    11651194    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) 
    1166         echo powerpc-unknown-lynxos${UNAME_RELEASE} 
     1195        echo powerpc-unknown-lynxos"$UNAME_RELEASE" 
    11671196        exit ;; 
    11681197    SM[BE]S:UNIX_SV:*:*) 
    1169         echo mips-dde-sysv${UNAME_RELEASE} 
     1198        echo mips-dde-sysv"$UNAME_RELEASE" 
    11701199        exit ;; 
    11711200    RM*:ReliantUNIX-*:*:*) 
     
    11781207        if uname -p 2>/dev/null >/dev/null ; then 
    11791208                UNAME_MACHINE=`(uname -p) 2>/dev/null` 
    1180                 echo ${UNAME_MACHINE}-sni-sysv4 
     1209                echo "$UNAME_MACHINE"-sni-sysv4 
    11811210        else 
    11821211                echo ns32k-sni-sysv 
     
    11981227    i*86:VOS:*:*) 
    11991228        # From Paul.Green@stratus.com. 
    1200         echo ${UNAME_MACHINE}-stratus-vos 
     1229        echo "$UNAME_MACHINE"-stratus-vos 
    12011230        exit ;; 
    12021231    *:VOS:*:*) 
     
    12051234        exit ;; 
    12061235    mc68*:A/UX:*:*) 
    1207         echo m68k-apple-aux${UNAME_RELEASE} 
     1236        echo m68k-apple-aux"$UNAME_RELEASE" 
    12081237        exit ;; 
    12091238    news*:NEWS-OS:6*:*) 
     
    12121241    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) 
    12131242        if [ -d /usr/nec ]; then 
    1214                 echo mips-nec-sysv${UNAME_RELEASE} 
     1243                echo mips-nec-sysv"$UNAME_RELEASE" 
    12151244        else 
    1216                 echo mips-unknown-sysv${UNAME_RELEASE} 
     1245                echo mips-unknown-sysv"$UNAME_RELEASE" 
    12171246        fi 
    12181247        exit ;; 
     
    12331262        exit ;; 
    12341263    SX-4:SUPER-UX:*:*) 
    1235         echo sx4-nec-superux${UNAME_RELEASE} 
     1264        echo sx4-nec-superux"$UNAME_RELEASE" 
    12361265        exit ;; 
    12371266    SX-5:SUPER-UX:*:*) 
    1238         echo sx5-nec-superux${UNAME_RELEASE} 
     1267        echo sx5-nec-superux"$UNAME_RELEASE" 
    12391268        exit ;; 
    12401269    SX-6:SUPER-UX:*:*) 
    1241         echo sx6-nec-superux${UNAME_RELEASE} 
     1270        echo sx6-nec-superux"$UNAME_RELEASE" 
    12421271        exit ;; 
    12431272    SX-7:SUPER-UX:*:*) 
    1244         echo sx7-nec-superux${UNAME_RELEASE} 
     1273        echo sx7-nec-superux"$UNAME_RELEASE" 
    12451274        exit ;; 
    12461275    SX-8:SUPER-UX:*:*) 
    1247         echo sx8-nec-superux${UNAME_RELEASE} 
     1276        echo sx8-nec-superux"$UNAME_RELEASE" 
    12481277        exit ;; 
    12491278    SX-8R:SUPER-UX:*:*) 
    1250         echo sx8r-nec-superux${UNAME_RELEASE} 
     1279        echo sx8r-nec-superux"$UNAME_RELEASE" 
     1280        exit ;; 
     1281    SX-ACE:SUPER-UX:*:*) 
     1282        echo sxace-nec-superux"$UNAME_RELEASE" 
    12511283        exit ;; 
    12521284    Power*:Rhapsody:*:*) 
    1253         echo powerpc-apple-rhapsody${UNAME_RELEASE} 
     1285        echo powerpc-apple-rhapsody"$UNAME_RELEASE" 
    12541286        exit ;; 
    12551287    *:Rhapsody:*:*) 
    1256         echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} 
     1288        echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" 
    12571289        exit ;; 
    12581290    *:Darwin:*:*) 
    12591291        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 
    1260         eval $set_cc_for_build 
     1292        eval "$set_cc_for_build" 
    12611293        if test "$UNAME_PROCESSOR" = unknown ; then 
    12621294            UNAME_PROCESSOR=powerpc 
    12631295        fi 
    1264         if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then 
    1265             if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then 
     1296        if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then 
     1297            if [ "$CC_FOR_BUILD" != no_compiler_found ]; then 
    12661298                if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ 
    1267                     (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ 
    1268                     grep IS_64BIT_ARCH >/dev/null 
     1299                       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ 
     1300                       grep IS_64BIT_ARCH >/dev/null 
    12691301                then 
    12701302                    case $UNAME_PROCESSOR in 
     
    12721304                        powerpc) UNAME_PROCESSOR=powerpc64 ;; 
    12731305                    esac 
     1306                fi 
     1307                # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc 
     1308                if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ 
     1309                       (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ 
     1310                       grep IS_PPC >/dev/null 
     1311                then 
     1312                    UNAME_PROCESSOR=powerpc 
    12741313                fi 
    12751314            fi 
     
    12831322            UNAME_PROCESSOR=x86_64 
    12841323        fi 
    1285         echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} 
     1324        echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" 
    12861325        exit ;; 
    12871326    *:procnto*:*:* | *:QNX:[0123456789]*:*) 
    12881327        UNAME_PROCESSOR=`uname -p` 
    1289         if test "$UNAME_PROCESSOR" = "x86"; then 
     1328        if test "$UNAME_PROCESSOR" = x86; then 
    12901329                UNAME_PROCESSOR=i386 
    12911330                UNAME_MACHINE=pc 
    12921331        fi 
    1293         echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} 
     1332        echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" 
    12941333        exit ;; 
    12951334    *:QNX:*:4*) 
    12961335        echo i386-pc-qnx 
    12971336        exit ;; 
    1298     NEO-?:NONSTOP_KERNEL:*:*) 
    1299         echo neo-tandem-nsk${UNAME_RELEASE} 
     1337    NEO-*:NONSTOP_KERNEL:*:*) 
     1338        echo neo-tandem-nsk"$UNAME_RELEASE" 
    13001339        exit ;; 
    13011340    NSE-*:NONSTOP_KERNEL:*:*) 
    1302         echo nse-tandem-nsk${UNAME_RELEASE} 
    1303         exit ;; 
    1304     NSR-?:NONSTOP_KERNEL:*:*) 
    1305         echo nsr-tandem-nsk${UNAME_RELEASE} 
     1341        echo nse-tandem-nsk"$UNAME_RELEASE" 
     1342        exit ;; 
     1343    NSR-*:NONSTOP_KERNEL:*:*) 
     1344        echo nsr-tandem-nsk"$UNAME_RELEASE" 
     1345        exit ;; 
     1346    NSV-*:NONSTOP_KERNEL:*:*) 
     1347        echo nsv-tandem-nsk"$UNAME_RELEASE" 
     1348        exit ;; 
     1349    NSX-*:NONSTOP_KERNEL:*:*) 
     1350        echo nsx-tandem-nsk"$UNAME_RELEASE" 
    13061351        exit ;; 
    13071352    *:NonStop-UX:*:*) 
     
    13121357        exit ;; 
    13131358    DS/*:UNIX_System_V:*:*) 
    1314         echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} 
     1359        echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" 
    13151360        exit ;; 
    13161361    *:Plan9:*:*) 
     
    13181363        # is converted to i386 for consistency with other x86 
    13191364        # operating systems. 
    1320         if test "$cputype" = "386"; then 
     1365        if test "$cputype" = 386; then 
    13211366            UNAME_MACHINE=i386 
    13221367        else 
    13231368            UNAME_MACHINE="$cputype" 
    13241369        fi 
    1325         echo ${UNAME_MACHINE}-unknown-plan9 
     1370        echo "$UNAME_MACHINE"-unknown-plan9 
    13261371        exit ;; 
    13271372    *:TOPS-10:*:*) 
     
    13441389        exit ;; 
    13451390    SEI:*:*:SEIUX) 
    1346         echo mips-sei-seiux${UNAME_RELEASE} 
     1391        echo mips-sei-seiux"$UNAME_RELEASE" 
    13471392        exit ;; 
    13481393    *:DragonFly:*:*) 
    1349         echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 
     1394        echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" 
    13501395        exit ;; 
    13511396    *:*VMS:*:*) 
    13521397        UNAME_MACHINE=`(uname -p) 2>/dev/null` 
    1353         case "${UNAME_MACHINE}" in 
     1398        case "$UNAME_MACHINE" in 
    13541399            A*) echo alpha-dec-vms ; exit ;; 
    13551400            I*) echo ia64-dec-vms ; exit ;; 
     
    13601405        exit ;; 
    13611406    i*86:skyos:*:*) 
    1362         echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' 
     1407        echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" 
    13631408        exit ;; 
    13641409    i*86:rdos:*:*) 
    1365         echo ${UNAME_MACHINE}-pc-rdos 
     1410        echo "$UNAME_MACHINE"-pc-rdos 
    13661411        exit ;; 
    13671412    i*86:AROS:*:*) 
    1368         echo ${UNAME_MACHINE}-pc-aros 
     1413        echo "$UNAME_MACHINE"-pc-aros 
    13691414        exit ;; 
    13701415    x86_64:VMkernel:*:*) 
    1371         echo ${UNAME_MACHINE}-unknown-esx 
     1416        echo "$UNAME_MACHINE"-unknown-esx 
     1417        exit ;; 
     1418    amd64:Isilon\ OneFS:*:*) 
     1419        echo x86_64-unknown-onefs 
    13721420        exit ;; 
    13731421esac 
    13741422 
     1423echo "$0: unable to guess system type" >&2 
     1424 
     1425case "$UNAME_MACHINE:$UNAME_SYSTEM" in 
     1426    mips:Linux | mips64:Linux) 
     1427        # If we got here on MIPS GNU/Linux, output extra information. 
     1428        cat >&2 <<EOF 
     1429 
     1430NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize 
     1431the system type. Please install a C compiler and try again. 
     1432EOF 
     1433        ;; 
     1434esac 
     1435 
    13751436cat >&2 <<EOF 
    1376 $0: unable to guess system type 
    1377  
    1378 This script, last modified $timestamp, has failed to recognize 
    1379 the operating system you are using. It is advised that you 
    1380 download the most up to date version of the config scripts from 
    1381  
    1382   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD 
     1437 
     1438This script (version $timestamp), has failed to recognize the 
     1439operating system you are using. If your script is old, overwrite *all* 
     1440copies of config.guess and config.sub with the latest versions from: 
     1441 
     1442  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess 
    13831443and 
    1384   http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD 
    1385  
    1386 If the version you run ($0) is already up to date, please 
    1387 send the following data and any information you think might be 
    1388 pertinent to <config-patches@gnu.org> in order to provide the needed 
    1389 information to handle your system. 
     1444  https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub 
     1445 
     1446If $0 has already been updated, send the following data and any 
     1447information you think might be pertinent to config-patches@gnu.org to 
     1448provide the necessary information to handle your system. 
    13901449 
    13911450config.guess timestamp = $timestamp 
     
    14061465/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` 
    14071466 
    1408 UNAME_MACHINE = ${UNAME_MACHINE} 
    1409 UNAME_RELEASE = ${UNAME_RELEASE} 
    1410 UNAME_SYSTEM  = ${UNAME_SYSTEM} 
    1411 UNAME_VERSION = ${UNAME_VERSION} 
     1467UNAME_MACHINE = "$UNAME_MACHINE" 
     1468UNAME_RELEASE = "$UNAME_RELEASE" 
     1469UNAME_SYSTEM  = "$UNAME_SYSTEM" 
     1470UNAME_VERSION = "$UNAME_VERSION" 
    14121471EOF 
    14131472 
     
    14151474 
    14161475# Local variables: 
    1417 # eval: (add-hook 'write-file-hooks 'time-stamp) 
     1476# eval: (add-hook 'write-file-functions 'time-stamp) 
    14181477# time-stamp-start: "timestamp='" 
    14191478# time-stamp-format: "%:y-%02m-%02d" 
  • trunk/src/data_sources/nmxptool/config.sub

    r6803 r8318  
    11#! /bin/sh 
    22# Configuration validation subroutine script. 
    3 #   Copyright 1992-2014 Free Software Foundation, Inc. 
    4  
    5 timestamp='2014-12-03' 
     3#   Copyright 1992-2018 Free Software Foundation, Inc. 
     4 
     5timestamp='2018-02-22' 
    66 
    77# This file is free software; you can redistribute it and/or modify it 
     
    1616# 
    1717# You should have received a copy of the GNU General Public License 
    18 # along with this program; if not, see <http://www.gnu.org/licenses/>. 
     18# along with this program; if not, see <https://www.gnu.org/licenses/>. 
    1919# 
    2020# As a special exception to the GNU General Public License, if you 
     
    3434 
    3535# You can get the latest version of this script from: 
    36 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD 
     36# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub 
    3737 
    3838# This file is supposed to be the same for all GNU packages 
     
    5454 
    5555usage="\ 
    56 Usage: $0 [OPTION] CPU-MFR-OPSYS 
    57        $0 [OPTION] ALIAS 
     56Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS 
    5857 
    5958Canonicalize a configuration name. 
    6059 
    61 Operation modes: 
     60Options: 
    6261  -h, --help         print this help, then exit 
    6362  -t, --time-stamp   print date of last modification, then exit 
     
    6968GNU config.sub ($timestamp) 
    7069 
    71 Copyright 1992-2014 Free Software Foundation, Inc. 
     70Copyright 1992-2018 Free Software Foundation, Inc. 
    7271 
    7372This is free software; see the source for copying conditions.  There is NO 
     
    9695    *local*) 
    9796       # First pass through any local machine types. 
    98        echo $1 
     97       echo "$1" 
    9998       exit ;; 
    10099 
     
    114113# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). 
    115114# Here we must recognize all the valid KERNEL-OS combinations. 
    116 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 
     115maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 
    117116case $maybe_os in 
    118117  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ 
    119118  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ 
    120   knetbsd*-gnu* | netbsd*-gnu* | \ 
    121   kopensolaris*-gnu* | \ 
     119  knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ 
     120  kopensolaris*-gnu* | cloudabi*-eabi* | \ 
    122121  storm-chaos* | os2-emx* | rtmk-nova*) 
    123122    os=-$maybe_os 
    124     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 
     123    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 
    125124    ;; 
    126125  android-linux) 
    127126    os=-linux-android 
    128     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown 
     127    basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown 
    129128    ;; 
    130129  *) 
    131     basic_machine=`echo $1 | sed 's/-[^-]*$//'` 
    132     if [ $basic_machine != $1 ] 
    133     then os=`echo $1 | sed 's/.*-/-/'` 
     130    basic_machine=`echo "$1" | sed 's/-[^-]*$//'` 
     131    if [ "$basic_machine" != "$1" ] 
     132    then os=`echo "$1" | sed 's/.*-/-/'` 
    134133    else os=; fi 
    135134    ;; 
     
    180179        -sco6) 
    181180                os=-sco5v6 
    182                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     181                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    183182                ;; 
    184183        -sco5) 
    185184                os=-sco3.2v5 
    186                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     185                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    187186                ;; 
    188187        -sco4) 
    189188                os=-sco3.2v4 
    190                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     189                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    191190                ;; 
    192191        -sco3.2.[4-9]*) 
    193192                os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` 
    194                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     193                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    195194                ;; 
    196195        -sco3.2v[4-9]*) 
    197196                # Don't forget version if it is 3.2v4 or newer. 
    198                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     197                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    199198                ;; 
    200199        -sco5v6*) 
    201200                # Don't forget version if it is 3.2v4 or newer. 
    202                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     201                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    203202                ;; 
    204203        -sco*) 
    205204                os=-sco3.2v2 
    206                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     205                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    207206                ;; 
    208207        -udk*) 
    209                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     208                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    210209                ;; 
    211210        -isc) 
    212211                os=-isc2.2 
    213                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     212                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    214213                ;; 
    215214        -clix*) 
     
    217216                ;; 
    218217        -isc*) 
    219                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     218                basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` 
    220219                ;; 
    221220        -lynx*178) 
     
    229228                ;; 
    230229        -ptx*) 
    231                 basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` 
    232                 ;; 
    233         -windowsnt*) 
    234                 os=`echo $os | sed -e 's/windowsnt/winnt/'` 
     230                basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` 
    235231                ;; 
    236232        -psos*) 
     
    256252        | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ 
    257253        | avr | avr32 \ 
     254        | ba \ 
    258255        | be32 | be64 \ 
    259256        | bfin \ 
    260257        | c4x | c8051 | clipper \ 
    261258        | d10v | d30v | dlx | dsp16xx \ 
    262         | epiphany \ 
    263         | fido | fr30 | frv \ 
     259        | e2k | epiphany \ 
     260        | fido | fr30 | frv | ft32 \ 
    264261        | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ 
    265262        | hexagon \ 
    266         | i370 | i860 | i960 | ia64 \ 
     263        | i370 | i860 | i960 | ia16 | ia64 \ 
    267264        | ip2k | iq2000 \ 
    268265        | k1om \ 
     
    300297        | ns16k | ns32k \ 
    301298        | open8 | or1k | or1knd | or32 \ 
    302         | pdp10 | pdp11 | pj | pjl \ 
     299        | pdp10 | pj | pjl \ 
    303300        | powerpc | powerpc64 | powerpc64le | powerpcle \ 
     301        | pru \ 
    304302        | pyramid \ 
    305303        | riscv32 | riscv64 \ 
    306304        | rl78 | rx \ 
    307305        | score \ 
    308         | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 
     306        | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 
    309307        | sh64 | sh64le \ 
    310308        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 
     
    315313        | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ 
    316314        | visium \ 
    317         | we32k \ 
     315        | wasm32 \ 
    318316        | x86 | xc16x | xstormy16 | xtensa \ 
    319317        | z8k | z80) 
     
    336334                os=-none 
    337335                ;; 
    338         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) 
     336        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) 
    339337                ;; 
    340338        ms1) 
     
    365363        # Object if more than one company name word. 
    366364        *-*-*) 
    367                 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 
     365                echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 
    368366                exit 1 
    369367                ;; 
     
    377375        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \ 
    378376        | avr-* | avr32-* \ 
     377        | ba-* \ 
    379378        | be32-* | be64-* \ 
    380379        | bfin-* | bs2000-* \ 
     
    382381        | c8051-* | clipper-* | craynv-* | cydra-* \ 
    383382        | d10v-* | d30v-* | dlx-* \ 
    384         | elxsi-* \ 
     383        | e2k-* | elxsi-* \ 
    385384        | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ 
    386385        | h8300-* | h8500-* \ 
    387386        | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ 
    388387        | hexagon-* \ 
    389         | i*86-* | i860-* | i960-* | ia64-* \ 
     388        | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ 
    390389        | ip2k-* | iq2000-* \ 
    391390        | k1om-* \ 
     
    428427        | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ 
    429428        | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ 
     429        | pru-* \ 
    430430        | pyramid-* \ 
     431        | riscv32-* | riscv64-* \ 
    431432        | rl78-* | romp-* | rs6000-* | rx-* \ 
    432433        | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 
     
    434435        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 
    435436        | sparclite-* \ 
    436         | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ 
     437        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ 
    437438        | tahoe-* \ 
    438439        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 
     
    443444        | vax-* \ 
    444445        | visium-* \ 
     446        | wasm32-* \ 
    445447        | we32k-* \ 
    446448        | x86-* | x86_64-* | xc16x-* | xps100-* \ 
     
    456458        # for a CPU type and a company and sometimes even an OS. 
    457459        386bsd) 
    458                 basic_machine=i386-unknown 
     460                basic_machine=i386-pc 
    459461                os=-bsd 
    460462                ;; 
     
    490492                ;; 
    491493        amd64-*) 
    492                 basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` 
     494                basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    493495                ;; 
    494496        amdahl) 
     
    519521                os=-aros 
    520522                ;; 
     523        asmjs) 
     524                basic_machine=asmjs-unknown 
     525                ;; 
    521526        aux) 
    522527                basic_machine=m68k-apple 
     
    532537                ;; 
    533538        blackfin-*) 
    534                 basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` 
     539                basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    535540                os=-linux 
    536541                ;; 
     
    540545                ;; 
    541546        c54x-*) 
    542                 basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'` 
     547                basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    543548                ;; 
    544549        c55x-*) 
    545                 basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'` 
     550                basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    546551                ;; 
    547552        c6x-*) 
    548                 basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'` 
     553                basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    549554                ;; 
    550555        c90) 
     
    635640                os=-bosx 
    636641                ;; 
    637         dpx2* | dpx2*-bull) 
     642        dpx2*) 
    638643                basic_machine=m68k-bull 
    639644                os=-sysv3 
     645                ;; 
     646        e500v[12]) 
     647                basic_machine=powerpc-unknown 
     648                os=$os"spe" 
     649                ;; 
     650        e500v[12]-*) 
     651                basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
     652                os=$os"spe" 
    640653                ;; 
    641654        ebmon29k) 
     
    728741                basic_machine=hppa1.0-hp 
    729742                ;; 
    730         hppa-next) 
    731                 os=-nextstep3 
    732                 ;; 
    733743        hppaosf) 
    734744                basic_machine=hppa1.1-hp 
     
    743753                ;; 
    744754        i*86v32) 
    745                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 
     755                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 
    746756                os=-sysv32 
    747757                ;; 
    748758        i*86v4*) 
    749                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 
     759                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 
    750760                os=-sysv4 
    751761                ;; 
    752762        i*86v) 
    753                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 
     763                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 
    754764                os=-sysv 
    755765                ;; 
    756766        i*86sol2) 
    757                 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` 
     767                basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` 
    758768                os=-solaris2 
    759769                ;; 
     
    762772                os=-mach 
    763773                ;; 
    764         i386-vsta | vsta) 
     774        vsta) 
    765775                basic_machine=i386-unknown 
    766776                os=-vsta 
     
    781791                ;; 
    782792        leon-*|leon[3-9]-*) 
    783                 basic_machine=sparc-`echo $basic_machine | sed 's/-.*//'` 
     793                basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` 
    784794                ;; 
    785795        m68knommu) 
     
    788798                ;; 
    789799        m68knommu-*) 
    790                 basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` 
     800                basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    791801                os=-linux 
    792                 ;; 
    793         m88k-omron*) 
    794                 basic_machine=m88k-omron 
    795802                ;; 
    796803        magnum | m3230) 
     
    825832                ;; 
    826833        mips3*-*) 
    827                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` 
     834                basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` 
    828835                ;; 
    829836        mips3*) 
    830                 basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown 
     837                basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown 
    831838                ;; 
    832839        monitor) 
     
    847854                ;; 
    848855        ms1-*) 
    849                 basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` 
     856                basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` 
    850857                ;; 
    851858        msys) 
     
    889896                os=-sysv 
    890897                ;; 
    891         next | m*-next ) 
     898        next | m*-next) 
    892899                basic_machine=m68k-next 
    893900                case $os in 
     
    934941                basic_machine=nsr-tandem 
    935942                ;; 
     943        nsv-tandem) 
     944                basic_machine=nsv-tandem 
     945                ;; 
     946        nsx-tandem) 
     947                basic_machine=nsx-tandem 
     948                ;; 
    936949        op50n-* | op60c-*) 
    937950                basic_machine=hppa1.1-oki 
     
    966979                ;; 
    967980        parisc-*) 
    968                 basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` 
     981                basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    969982                os=-linux 
    970983                ;; 
     
    982995                ;; 
    983996        pc98-*) 
    984                 basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` 
     997                basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    985998                ;; 
    986999        pentium | p5 | k5 | k6 | nexgen | viac3) 
     
    9971010                ;; 
    9981011        pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) 
    999                 basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1012                basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    10001013                ;; 
    10011014        pentiumpro-* | p6-* | 6x86-* | athlon-*) 
    1002                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1015                basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    10031016                ;; 
    10041017        pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) 
    1005                 basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1018                basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    10061019                ;; 
    10071020        pentium4-*) 
    1008                 basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1021                basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    10091022                ;; 
    10101023        pn) 
     
    10161029                ;; 
    10171030        ppc-* | ppcbe-*) 
    1018                 basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` 
    1019                 ;; 
    1020         ppcle | powerpclittle | ppc-le | powerpc-little) 
     1031                basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
     1032                ;; 
     1033        ppcle | powerpclittle) 
    10211034                basic_machine=powerpcle-unknown 
    10221035                ;; 
    10231036        ppcle-* | powerpclittle-*) 
    1024                 basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1037                basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    10251038                ;; 
    10261039        ppc64)  basic_machine=powerpc64-unknown 
    10271040                ;; 
    1028         ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` 
    1029                 ;; 
    1030         ppc64le | powerpc64little | ppc64-le | powerpc64-little) 
     1041        ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
     1042                ;; 
     1043        ppc64le | powerpc64little) 
    10311044                basic_machine=powerpc64le-unknown 
    10321045                ;; 
    10331046        ppc64le-* | powerpc64little-*) 
    1034                 basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1047                basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    10351048                ;; 
    10361049        ps2) 
     
    10861099                basic_machine=i386-sequent 
    10871100                ;; 
    1088         sh) 
    1089                 basic_machine=sh-hitachi 
    1090                 os=-hms 
    1091                 ;; 
    10921101        sh5el) 
    10931102                basic_machine=sh5le-unknown 
    10941103                ;; 
    1095         sh64) 
    1096                 basic_machine=sh64-unknown 
    1097                 ;; 
    1098         sparclite-wrs | simso-wrs) 
     1104        simso-wrs) 
    10991105                basic_machine=sparclite-wrs 
    11001106                os=-vxworks 
     
    11151121                ;; 
    11161122        strongarm-* | thumb-*) 
    1117                 basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'` 
     1123                basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` 
    11181124                ;; 
    11191125        sun2) 
     
    12371243                os=-proelf 
    12381244                ;; 
     1245        x64) 
     1246                basic_machine=x86_64-pc 
     1247                ;; 
    12391248        xbox) 
    12401249                basic_machine=i686-pc 
     
    12451254                ;; 
    12461255        xscale-* | xscalee[bl]-*) 
    1247                 basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'` 
     1256                basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` 
    12481257                ;; 
    12491258        ymp) 
    12501259                basic_machine=ymp-cray 
    12511260                os=-unicos 
    1252                 ;; 
    1253         z8k-*-coff) 
    1254                 basic_machine=z8k-unknown 
    1255                 os=-sim 
    1256                 ;; 
    1257         z80-*-coff) 
    1258                 basic_machine=z80-unknown 
    1259                 os=-sim 
    12601261                ;; 
    12611262        none) 
     
    12871288                basic_machine=vax-dec 
    12881289                ;; 
    1289         pdp10) 
    1290                 # there are many clones, so DEC is not a safe bet 
    1291                 basic_machine=pdp10-unknown 
    1292                 ;; 
    12931290        pdp11) 
    12941291                basic_machine=pdp11-dec 
     
    13001297                basic_machine=sh-unknown 
    13011298                ;; 
    1302         sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) 
    1303                 basic_machine=sparc-sun 
    1304                 ;; 
    13051299        cydra) 
    13061300                basic_machine=cydra-cydrome 
     
    13221316                ;; 
    13231317        *) 
    1324                 echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 
     1318                echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 
    13251319                exit 1 
    13261320                ;; 
     
    13301324case $basic_machine in 
    13311325        *-digital*) 
    1332                 basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` 
     1326                basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` 
    13331327                ;; 
    13341328        *-commodore*) 
    1335                 basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` 
     1329                basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` 
    13361330                ;; 
    13371331        *) 
     
    13441338then 
    13451339case $os in 
    1346         # First match some system type aliases 
    1347         # that might get confused with valid system types. 
     1340        # First match some system type aliases that might get confused 
     1341        # with valid system types. 
    13481342        # -solaris* is a basic system type, with this one exception. 
    13491343        -auroraux) 
     
    13561350                os=-solaris2 
    13571351                ;; 
    1358         -svr4*) 
    1359                 os=-sysv4 
    1360                 ;; 
    13611352        -unixware*) 
    13621353                os=-sysv4.2uw 
     
    13651356                os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` 
    13661357                ;; 
    1367         # First accept the basic system types. 
     1358        # es1800 is here to avoid being matched by es* (a different OS) 
     1359        -es1800*) 
     1360                os=-ose 
     1361                ;; 
     1362        # Now accept the basic system types. 
    13681363        # The portable systems comes first. 
    1369         # Each alternative MUST END IN A *, to match a version number. 
     1364        # Each alternative MUST end in a * to match a version number. 
    13701365        # -sysv* is not here because it comes later, after sysvr4. 
    13711366        -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ 
     
    13741369              | -sym* | -kopensolaris* | -plan9* \ 
    13751370              | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ 
    1376               | -aos* | -aros* \ 
     1371              | -aos* | -aros* | -cloudabi* | -sortix* \ 
    13771372              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 
    13781373              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 
    1379               | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 
    1380               | -bitrig* | -openbsd* | -solidbsd* \ 
     1374              | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ 
     1375              | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ 
    13811376              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 
    13821377              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 
    13831378              | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ 
    13841379              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ 
    1385               | -chorusos* | -chorusrdb* | -cegcc* \ 
     1380              | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ 
    13861381              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 
    1387               | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ 
     1382              | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ 
    13881383              | -linux-newlib* | -linux-musl* | -linux-uclibc* \ 
    13891384              | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ 
    1390               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 
     1385              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ 
    13911386              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 
    13921387              | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ 
    13931388              | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ 
    1394               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 
     1389              | -morphos* | -superux* | -rtmk* | -windiss* \ 
    13951390              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 
    1396               | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) 
     1391              | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ 
     1392              | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ 
     1393              | -midnightbsd*) 
    13971394        # Remember, each alternative MUST END IN *, to match a version number. 
    13981395                ;; 
     
    14111408                os=`echo $os | sed -e 's|nto|nto-qnx|'` 
    14121409                ;; 
    1413         -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ 
    1414               | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ 
     1410        -sim | -xray | -os68k* | -v88r* \ 
     1411              | -windows* | -osx | -abug | -netware* | -os9* \ 
    14151412              | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) 
    14161413                ;; 
    14171414        -mac*) 
    1418                 os=`echo $os | sed -e 's|mac|macos|'` 
     1415                os=`echo "$os" | sed -e 's|mac|macos|'` 
    14191416                ;; 
    14201417        -linux-dietlibc) 
     
    14251422                ;; 
    14261423        -sunos5*) 
    1427                 os=`echo $os | sed -e 's|sunos5|solaris2|'` 
     1424                os=`echo "$os" | sed -e 's|sunos5|solaris2|'` 
    14281425                ;; 
    14291426        -sunos6*) 
    1430                 os=`echo $os | sed -e 's|sunos6|solaris3|'` 
     1427                os=`echo "$os" | sed -e 's|sunos6|solaris3|'` 
    14311428                ;; 
    14321429        -opened*) 
     
    14391436                os=-wince 
    14401437                ;; 
    1441         -osfrose*) 
    1442                 os=-osfrose 
    1443                 ;; 
    1444         -osf*) 
    1445                 os=-osf 
    1446                 ;; 
    14471438        -utek*) 
    14481439                os=-bsd 
     
    14691460                os=-rtmk-nova 
    14701461                ;; 
    1471         -ns2 ) 
     1462        -ns2) 
    14721463                os=-nextstep2 
    14731464                ;; 
     
    14911482                os=-sysv3 
    14921483                ;; 
    1493         -svr4) 
     1484        -svr4*) 
    14941485                os=-sysv4 
    14951486                ;; 
     
    15061497                os=-ose 
    15071498                ;; 
    1508         -es1800*) 
    1509                 os=-ose 
    1510                 ;; 
    1511         -xenix) 
    1512                 os=-xenix 
    1513                 ;; 
    15141499        -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) 
    15151500                os=-mint 
    15161501                ;; 
    1517         -aros*) 
    1518                 os=-aros 
    1519                 ;; 
    15201502        -zvmoe) 
    15211503                os=-zvmoe 
     
    15241506                os=-dicos 
    15251507                ;; 
     1508        -pikeos*) 
     1509                # Until real need of OS specific support for 
     1510                # particular features comes up, bare metal 
     1511                # configurations are quite functional. 
     1512                case $basic_machine in 
     1513                    arm*) 
     1514                        os=-eabi 
     1515                        ;; 
     1516                    *) 
     1517                        os=-elf 
     1518                        ;; 
     1519                esac 
     1520                ;; 
    15261521        -nacl*) 
     1522                ;; 
     1523        -ios) 
    15271524                ;; 
    15281525        -none) 
     
    15311528                # Get rid of the `-' at the beginning of $os. 
    15321529                os=`echo $os | sed 's/[^-]*-//'` 
    1533                 echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 
     1530                echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 
    15341531                exit 1 
    15351532                ;; 
     
    16211618                os=-sunos4.1.1 
    16221619                ;; 
     1620        pru-*) 
     1621                os=-elf 
     1622                ;; 
    16231623        *-be) 
    16241624                os=-beos 
    16251625                ;; 
    1626         *-haiku) 
    1627                 os=-haiku 
    1628                 ;; 
    16291626        *-ibm) 
    16301627                os=-aix 
     
    16661663                os=-luna 
    16671664                ;; 
    1668         *-next ) 
     1665        *-next) 
    16691666                os=-nextstep 
    16701667                ;; 
     
    16801677        i370-*) 
    16811678                os=-mvs 
    1682                 ;; 
    1683         *-next) 
    1684                 os=-nextstep3 
    16851679                ;; 
    16861680        *-gould) 
     
    17931787                                ;; 
    17941788                esac 
    1795                 basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` 
     1789                basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` 
    17961790                ;; 
    17971791esac 
    17981792 
    1799 echo $basic_machine$os 
     1793echo "$basic_machine$os" 
    18001794exit 
    18011795 
    18021796# Local variables: 
    1803 # eval: (add-hook 'write-file-hooks 'time-stamp) 
     1797# eval: (add-hook 'write-file-functions 'time-stamp) 
    18041798# time-stamp-start: "timestamp='" 
    18051799# time-stamp-format: "%:y-%02m-%02d" 
  • trunk/src/data_sources/nmxptool/configure

    r6894 r8318  
    11#! /bin/sh 
    22# Guess values for system-dependent variables and create Makefiles. 
    3 # Generated by GNU Autoconf 2.69 for nmxptool 2.1.4. 
     3# Generated by GNU Autoconf 2.69 for nmxptool 2.1.5. 
    44# 
    55# Report bugs to <matteo.quintiliani@ingv.it>. 
     
    591591PACKAGE_NAME='nmxptool' 
    592592PACKAGE_TARNAME='nmxptool' 
    593 PACKAGE_VERSION='2.1.4' 
    594 PACKAGE_STRING='nmxptool 2.1.4' 
     593PACKAGE_VERSION='2.1.5' 
     594PACKAGE_STRING='nmxptool 2.1.5' 
    595595PACKAGE_BUGREPORT='matteo.quintiliani@ingv.it' 
    596596PACKAGE_URL='' 
     
    666666ENABLE_WINSOURCES_TRUE 
    667667CPP 
     668LT_SYS_LIBRARY_PATH 
    668669OTOOL64 
    669670OTOOL 
     
    694695AMDEP_FALSE 
    695696AMDEP_TRUE 
    696 am__quote 
    697697am__include 
    698698DEPDIR 
     
    766766oldincludedir 
    767767includedir 
     768runstatedir 
    768769localstatedir 
    769770sharedstatedir 
     
    784785PACKAGE_NAME 
    785786PATH_SEPARATOR 
    786 SHELL' 
     787SHELL 
     788am__quote' 
    787789ac_subst_files='' 
    788790ac_user_opts=' 
     
    812814LIBS 
    813815CPPFLAGS 
     816LT_SYS_LIBRARY_PATH 
    814817CPP 
    815818DIR_PTHREAD 
     
    858861sharedstatedir='${prefix}/com' 
    859862localstatedir='${prefix}/var' 
     863runstatedir='${localstatedir}/run' 
    860864includedir='${prefix}/include' 
    861865oldincludedir='/usr/include' 
     
    11101114    silent=yes ;; 
    11111115 
     1116  -runstatedir | --runstatedir | --runstatedi | --runstated \ 
     1117  | --runstate | --runstat | --runsta | --runst | --runs \ 
     1118  | --run | --ru | --r) 
     1119    ac_prev=runstatedir ;; 
     1120  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ 
     1121  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ 
     1122  | --run=* | --ru=* | --r=*) 
     1123    runstatedir=$ac_optarg ;; 
     1124 
    11121125  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) 
    11131126    ac_prev=sbindir ;; 
     
    11521165    verbose=yes ;; 
    11531166 
    1154   -2.1.4 | --2.1.4 | --versio | --versi | --vers | -V) 
     1167  -2.1.5 | --2.1.5 | --versio | --versi | --vers | -V) 
    11551168    ac_init_version=: ;; 
    11561169 
     
    12471260                datadir sysconfdir sharedstatedir localstatedir includedir \ 
    12481261                oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ 
    1249                 libdir localedir mandir 
     1262                libdir localedir mandir runstatedir 
    12501263do 
    12511264  eval ac_val=\$$ac_var 
     
    13601373  # This message is too long to be a string in the A/UX 3.1 sh. 
    13611374  cat <<_ACEOF 
    1362 \`configure' configures nmxptool 2.1.4 to adapt to many kinds of systems. 
     1375\`configure' configures nmxptool 2.1.5 to adapt to many kinds of systems. 
    13631376 
    13641377Usage: $0 [OPTION]... [VAR=VALUE]... 
     
    14001413  --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com] 
    14011414  --localstatedir=DIR     modifiable single-machine data [PREFIX/var] 
     1415  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run] 
    14021416  --libdir=DIR            object code libraries [EPREFIX/lib] 
    14031417  --includedir=DIR        C header files [PREFIX/include] 
     
    14311445if test -n "$ac_init_help"; then 
    14321446  case $ac_init_help in 
    1433      short | recursive ) echo "Configuration of nmxptool 2.1.4:";; 
     1447     short | recursive ) echo "Configuration of nmxptool 2.1.5:";; 
    14341448   esac 
    14351449  cat <<\_ACEOF 
     
    14781492  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if 
    14791493              you have headers in a nonstandard directory <include dir> 
     1494  LT_SYS_LIBRARY_PATH 
     1495              User-defined run-time library search path. 
    14801496  CPP         C preprocessor 
    14811497  DIR_PTHREAD Directory containing PThread DDL library 
     
    15531569if $ac_init_version; then 
    15541570  cat <<\_ACEOF 
    1555 nmxptool configure 2.1.4 
     1571nmxptool configure 2.1.5 
    15561572generated by GNU Autoconf 2.69 
    15571573 
     
    22092225running configure, to aid debugging if configure makes a mistake. 
    22102226 
    2211 It was created by nmxptool $as_me 2.1.4, which was 
     2227It was created by nmxptool $as_me 2.1.5, which was 
    22122228generated by GNU Autoconf 2.69.  Invocation command line was 
    22132229 
     
    27192735avail_ew=YES 
    27202736 
    2721 am__api_version='1.15' 
     2737am__api_version='1.16' 
    27222738 
    27232739# Find a good install program.  We prefer a C program (faster), 
     
    30343050         for ac_exec_ext in '' $ac_executable_extensions; do 
    30353051           as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue 
    3036            case `"$as_dir/$ac_prog$ac_exec_ext" --2.1.4 2>&1` in #( 
     3052           case `"$as_dir/$ac_prog$ac_exec_ext" --2.1.5 2>&1` in #( 
    30373053             'mkdir (GNU coreutils) '* | \ 
    30383054             'mkdir (coreutils) '* | \ 
     
    30483064fi 
    30493065 
    3050   test -d ./--2.1.4 && rmdir ./--2.1.4 
     3066  test -d ./--2.1.5 && rmdir ./--2.1.5 
    30513067  if test "${ac_cv_path_mkdir+set}" = set; then 
    30523068    MKDIR_P="$ac_cv_path_mkdir -p" 
     
    31953211# test whether we have cygpath 
    31963212if test -z "$CYGPATH_W"; then 
    3197   if (cygpath --2.1.4) >/dev/null 2>/dev/null; then 
     3213  if (cygpath --2.1.5) >/dev/null 2>/dev/null; then 
    31983214    CYGPATH_W='cygpath -w' 
    31993215  else 
     
    32053221# Define the identity of the package. 
    32063222 PACKAGE='nmxptool' 
    3207  VERSION='2.1.4' 
     3223 VERSION='2.1.5' 
    32083224 
    32093225 
     
    32353251# For better backward compatibility.  To be removed once Automake 1.9.x 
    32363252# dies out for good.  For more background, see: 
    3237 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 
    3238 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 
     3253# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> 
     3254# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> 
    32393255mkdir_p='$(MKDIR_P)' 
    32403256 
     
    32873303 
    32883304You can download and install GNU coreutils to get an 'rm' implementation 
    3289 that behaves properly: <http://www.gnu.org/software/coreutils/>. 
     3305that behaves properly: <https://www.gnu.org/software/coreutils/>. 
    32903306 
    32913307If you want to complete the configuration process using your problematic 
     
    36733689 
    36743690# Provide some information about the compiler. 
    3675 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler 2.1.4" >&5 
     3691$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler 2.1.5" >&5 
    36763692set X $ac_compile 
    36773693ac_compiler=$2 
    3678 for ac_option in --2.1.4 -v -V -qversion; do 
     3694for ac_option in --2.1.5 -v -V -qversion; do 
    36793695  { { ac_try="$ac_compiler $ac_option >&5" 
    36803696case "(($ac_try" in 
     
    42204236ac_config_commands="$ac_config_commands depfiles" 
    42214237 
    4222  
    4223 am_make=${MAKE-make} 
    4224 cat > confinc << 'END' 
     4238{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 
     4239$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } 
     4240cat > confinc.mk << 'END' 
    42254241am__doit: 
    4226         @echo this is the am__doit target 
     4242        @echo this is the am__doit target >confinc.out 
    42274243.PHONY: am__doit 
    42284244END 
    4229 # If we don't find an include directive, just comment out the code. 
    4230 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 
    4231 $as_echo_n "checking for style of include used by $am_make... " >&6; } 
    42324245am__include="#" 
    42334246am__quote= 
    4234 _am_result=none 
    4235 # First try GNU make style include. 
    4236 echo "include confinc" > confmf 
    4237 # Ignore all kinds of additional output from 'make'. 
    4238 case `$am_make -s -f confmf 2> /dev/null` in #( 
    4239 *the\ am__doit\ target*) 
    4240   am__include=include 
    4241   am__quote= 
    4242   _am_result=GNU 
    4243   ;; 
     4247# BSD make does it like this. 
     4248echo '.include "confinc.mk" # ignored' > confmf.BSD 
     4249# Other make implementations (GNU, Solaris 10, AIX) do it like this. 
     4250echo 'include confinc.mk # ignored' > confmf.GNU 
     4251_am_result=no 
     4252for s in GNU BSD; do 
     4253  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 
     4254   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 
     4255   ac_status=$? 
     4256   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     4257   (exit $ac_status); } 
     4258  case $?:`cat confinc.out 2>/dev/null` in #( 
     4259  '0:this is the am__doit target') : 
     4260    case $s in #( 
     4261  BSD) : 
     4262    am__include='.include' am__quote='"' ;; #( 
     4263  *) : 
     4264    am__include='include' am__quote='' ;; 
     4265esac ;; #( 
     4266  *) : 
     4267     ;; 
    42444268esac 
    4245 # Now try BSD make style include. 
    4246 if test "$am__include" = "#"; then 
    4247    echo '.include "confinc"' > confmf 
    4248    case `$am_make -s -f confmf 2> /dev/null` in #( 
    4249    *the\ am__doit\ target*) 
    4250      am__include=.include 
    4251      am__quote="\"" 
    4252      _am_result=BSD 
    4253      ;; 
    4254    esac 
    4255 fi 
    4256  
    4257  
    4258 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 
    4259 $as_echo "$_am_result" >&6; } 
    4260 rm -f confinc confmf 
     4269  if test "$am__include" != "#"; then 
     4270    _am_result="yes ($s style)" 
     4271    break 
     4272  fi 
     4273done 
     4274rm -f confinc.* confmf.* 
     4275{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 
     4276$as_echo "${_am_result}" >&6; } 
    42614277 
    42624278# Check whether --enable-dependency-tracking was given. 
     
    45734589# Check for GNU ac_path_SED and select it if it is found. 
    45744590  # Check for GNU $ac_path_SED 
    4575 case `"$ac_path_SED" --2.1.4 2>&1` in 
     4591case `"$ac_path_SED" --2.1.5 2>&1` in 
    45764592*GNU*) 
    45774593  ac_cv_path_SED="$ac_path_SED" ac_path_SED_found=:;; 
     
    46494665# Check for GNU ac_path_GREP and select it if it is found. 
    46504666  # Check for GNU $ac_path_GREP 
    4651 case `"$ac_path_GREP" --2.1.4 2>&1` in 
     4667case `"$ac_path_GREP" --2.1.5 2>&1` in 
    46524668*GNU*) 
    46534669  ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; 
     
    47154731# Check for GNU ac_path_EGREP and select it if it is found. 
    47164732  # Check for GNU $ac_path_EGREP 
    4717 case `"$ac_path_EGREP" --2.1.4 2>&1` in 
     4733case `"$ac_path_EGREP" --2.1.5 2>&1` in 
    47184734*GNU*) 
    47194735  ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; 
     
    47824798# Check for GNU ac_path_FGREP and select it if it is found. 
    47834799  # Check for GNU $ac_path_FGREP 
    4784 case `"$ac_path_FGREP" --2.1.4 2>&1` in 
     4800case `"$ac_path_FGREP" --2.1.5 2>&1` in 
    47854801*GNU*) 
    47864802  ac_cv_path_FGREP="$ac_path_FGREP" ac_path_FGREP_found=:;; 
     
    56815697  ;; 
    56825698 
    5683 netbsd*) 
     5699netbsd* | netbsdelf*-gnu) 
    56845700  if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then 
    56855701    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' 
     
    65456561    # Now try to grab the symbols. 
    65466562    nlist=conftest.nm 
    6547     if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5 
    6548   (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5 
    6549   ac_status=$? 
    6550   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 
    6551   test $ac_status = 0; } && test -s "$nlist"; then 
     6563    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&5 
     6564    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&5 && test -s "$nlist"; then 
    65526565      # Try sorting and uniquifying the output. 
    65536566      if sort "$nlist" | uniq > "$nlist"T; then 
     
    68036816 
    68046817 
     6818 
     6819 
     6820# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix. 
     6821func_cc_basename () 
     6822{ 
     6823    for cc_temp in $*""; do 
     6824      case $cc_temp in 
     6825        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; 
     6826        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; 
     6827        \-*) ;; 
     6828        *) break;; 
     6829      esac 
     6830    done 
     6831    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` 
     6832} 
    68056833 
    68066834# Check whether --enable-libtool-lock was given. 
     
    78117839  esac 
    78127840 
     7841# func_munge_path_list VARIABLE PATH 
     7842# ----------------------------------- 
     7843# VARIABLE is name of variable containing _space_ separated list of 
     7844# directories to be munged by the contents of PATH, which is string 
     7845# having a format: 
     7846# "DIR[:DIR]:" 
     7847#       string "DIR[ DIR]" will be prepended to VARIABLE 
     7848# ":DIR[:DIR]" 
     7849#       string "DIR[ DIR]" will be appended to VARIABLE 
     7850# "DIRP[:DIRP]::[DIRA:]DIRA" 
     7851#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string 
     7852#       "DIRA[ DIRA]" will be appended to VARIABLE 
     7853# "DIR[:DIR]" 
     7854#       VARIABLE will be replaced by "DIR[ DIR]" 
     7855func_munge_path_list () 
     7856{ 
     7857    case x$2 in 
     7858    x) 
     7859        ;; 
     7860    *:) 
     7861        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" 
     7862        ;; 
     7863    x:*) 
     7864        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" 
     7865        ;; 
     7866    *::*) 
     7867        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" 
     7868        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" 
     7869        ;; 
     7870    *) 
     7871        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" 
     7872        ;; 
     7873    esac 
     7874} 
     7875 
    78137876ac_ext=c 
    78147877ac_cpp='$CPP $CPPFLAGS' 
     
    83988461test -z "$ac_objext" && ac_objext=o 
    83998462 
    8400 for cc_temp in $compiler""; do 
    8401   case $cc_temp in 
    8402     compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; 
    8403     distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; 
    8404     \-*) ;; 
    8405     *) break;; 
    8406   esac 
    8407 done 
    8408 cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` 
     8463func_cc_basename $compiler 
     8464cc_basename=$func_cc_basename_result 
    84098465 
    84108466 
     
    93319387    with_gnu_ld=no 
    93329388    ;; 
     9389  linux* | k*bsd*-gnu | gnu*) 
     9390    link_all_deplibs=no 
     9391    ;; 
    93339392  esac 
    93349393 
     
    95609619            cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 
    95619620            echo "local: *; };" >> $output_objdir/$libname.ver~ 
    9562             $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-2.1.4-script $wl$output_objdir/$libname.ver -o $lib' 
     9621            $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-2.1.5-script $wl$output_objdir/$libname.ver -o $lib' 
    95639622        fi 
    95649623 
     
    95769635              cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ 
    95779636              echo "local: *; };" >> $output_objdir/$libname.ver~ 
    9578               $LD -shared $libobjs $deplibs $linker_flags -soname $soname -2.1.4-script $output_objdir/$libname.ver -o $lib' 
     9637              $LD -shared $libobjs $deplibs $linker_flags -soname $soname -2.1.5-script $output_objdir/$libname.ver -o $lib' 
    95799638          fi 
    95809639          ;; 
     
    95859644      ;; 
    95869645 
    9587     netbsd*) 
     9646    netbsd* | netbsdelf*-gnu) 
    95889647      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 
    95899648        archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' 
     
    1025510314          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' 
    1025610315        fi 
     10316        link_all_deplibs=no 
    1025710317      else 
    1025810318        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' 
     
    1027610336      ;; 
    1027710337 
    10278     netbsd*) 
     10338    netbsd* | netbsdelf*-gnu) 
    1027910339      if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then 
    1028010340        archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out 
     
    1086510925need_version=unknown 
    1086610926 
     10927 
     10928 
    1086710929case $host_os in 
    1086810930aix3*) 
     
    1115311215    freebsd-elf*) 
    1115411216      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext' 
     11217      soname_spec='$libname$release$shared_ext$major' 
    1115511218      need_version=no 
    1115611219      need_lib_prefix=no 
     
    1121211275    if test 32 = "$HPUX_IA64_MODE"; then 
    1121311276      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" 
     11277      sys_lib_dlsearch_path_spec=/usr/lib/hpux32 
    1121411278    else 
    1121511279      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" 
     11280      sys_lib_dlsearch_path_spec=/usr/lib/hpux64 
    1121611281    fi 
    11217     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec 
    1121811282    ;; 
    1121911283  hppa*64*) 
     
    1136711431  hardcode_into_libs=yes 
    1136811432 
    11369   # Append ld.so.conf contents to the search path 
     11433  # Ideally, we could use ldconfig to report *all* directores which are 
     11434  # searched for libraries, however this is still not possible.  Aside from not 
     11435  # being certain /sbin/ldconfig is available, command 
     11436  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64, 
     11437  # even though it is searched at run-time.  Try to do the best guess by 
     11438  # appending ld.so.conf contents (and includes) to the search path. 
    1137011439  if test -f /etc/ld.so.conf; then 
    1137111440    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` 
     
    1138011449  # assume the GNU/Linux dynamic linker is in use. 
    1138111450  dynamic_linker='GNU/Linux ld.so' 
     11451  ;; 
     11452 
     11453netbsdelf*-gnu) 
     11454  version_type=linux 
     11455  need_lib_prefix=no 
     11456  need_version=no 
     11457  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' 
     11458  soname_spec='${libname}${release}${shared_ext}$major' 
     11459  shlibpath_var=LD_LIBRARY_PATH 
     11460  shlibpath_overrides_runpath=no 
     11461  hardcode_into_libs=yes 
     11462  dynamic_linker='NetBSD ld.elf_so' 
    1138211463  ;; 
    1138311464 
     
    1159211673  sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec 
    1159311674fi 
     11675 
    1159411676if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then 
    1159511677  sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec 
    1159611678fi 
     11679 
     11680# remember unaugmented sys_lib_dlsearch_path content for libtool script decls... 
     11681configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec 
     11682 
     11683# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code 
     11684func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH" 
     11685 
     11686# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool 
     11687configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH 
     11688 
     11689 
     11690 
     11691 
     11692 
    1159711693 
    1159811694 
     
    1253712633if test "x$ac_cv_lib_ws2_32_puts" = xyes; then : 
    1253812634  LIBS="$LIBS -lws2_32" 
     12635fi 
     12636 
     12637 
     12638{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5 
     12639$as_echo_n "checking for pthread_create in -lpthread... " >&6; } 
     12640if ${ac_cv_lib_pthread_pthread_create+:} false; then : 
     12641  $as_echo_n "(cached) " >&6 
     12642else 
     12643  ac_check_lib_save_LIBS=$LIBS 
     12644LIBS="-lpthread -lpthread $LIBS" 
     12645cat confdefs.h - <<_ACEOF >conftest.$ac_ext 
     12646/* end confdefs.h.  */ 
     12647 
     12648/* Override any GCC internal prototype to avoid an error. 
     12649   Use char because int might match the return type of a GCC 
     12650   builtin and then its argument prototype would still apply.  */ 
     12651#ifdef __cplusplus 
     12652extern "C" 
     12653#endif 
     12654char pthread_create (); 
     12655int 
     12656main () 
     12657{ 
     12658return pthread_create (); 
     12659  ; 
     12660  return 0; 
     12661} 
     12662_ACEOF 
     12663if ac_fn_c_try_link "$LINENO"; then : 
     12664  ac_cv_lib_pthread_pthread_create=yes 
     12665else 
     12666  ac_cv_lib_pthread_pthread_create=no 
     12667fi 
     12668rm -f core conftest.err conftest.$ac_objext \ 
     12669    conftest$ac_exeext conftest.$ac_ext 
     12670LIBS=$ac_check_lib_save_LIBS 
     12671fi 
     12672{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 
     12673$as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } 
     12674if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then : 
     12675  LIBS="$LIBS -lpthread" 
    1253912676fi 
    1254012677 
     
    1450914646# values after options handling. 
    1451014647ac_log=" 
    14511 This file was extended by nmxptool $as_me 2.1.4, which was 
     14648This file was extended by nmxptool $as_me 2.1.5, which was 
    1451214649generated by GNU Autoconf 2.69.  Invocation command line was 
    1451314650 
     
    1454914686 
    1455014687  -h, --help       print this help, then exit 
    14551   -V, --2.1.4    print 2.1.4 number and configuration settings, then exit 
     14688  -V, --2.1.5    print 2.1.5 number and configuration settings, then exit 
    1455214689      --config     print configuration, then exit 
    1455314690  -q, --quiet, --silent 
     
    1457514712ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" 
    1457614713ac_cs_version="\\ 
    14577 nmxptool config.status 2.1.4 
     14714nmxptool config.status 2.1.5 
    1457814715configured by $0, generated by GNU Autoconf 2.69, 
    1457914716  with options \\"\$ac_cs_config\\" 
     
    1461814755  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) 
    1461914756    ac_cs_recheck=: ;; 
    14620   --2.1.4 | --versio | --versi | --vers | --ver | --ve | --v | -V ) 
     14757  --2.1.5 | --versio | --versi | --vers | --ver | --ve | --v | -V ) 
    1462114758    $as_echo "$ac_cs_version"; exit ;; 
    1462214759  --config | --confi | --conf | --con | --co | --c ) 
     
    1469414831# INIT-COMMANDS 
    1469514832# 
    14696 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" 
     14833AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" 
    1469714834 
    1469814835 
     
    1483114968hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`' 
    1483214969sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`' 
    14833 sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`' 
     14970configure_time_dlsearch_path='`$ECHO "$configure_time_dlsearch_path" | $SED "$delay_single_quote_subst"`' 
     14971configure_time_lt_sys_library_path='`$ECHO "$configure_time_lt_sys_library_path" | $SED "$delay_single_quote_subst"`' 
    1483414972hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`' 
    1483514973enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`' 
     
    1494915087finish_cmds \ 
    1495015088sys_lib_search_path_spec \ 
    14951 sys_lib_dlsearch_path_spec; do 
     15089configure_time_dlsearch_path \ 
     15090configure_time_lt_sys_library_path; do 
    1495215091    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in 
    1495315092    *[\\\\\\\`\\"\\\$]*) 
     
    1559015729  # are listed without --file.  Let's play safe and only enable the eval 
    1559115730  # if we detect the quoting. 
    15592   case $CONFIG_FILES in 
    15593   *\'*) eval set x "$CONFIG_FILES" ;; 
    15594   *)   set x $CONFIG_FILES ;; 
    15595   esac 
     15731  # TODO: see whether this extra hack can be removed once we start 
     15732  # requiring Autoconf 2.70 or later. 
     15733  case $CONFIG_FILES in #( 
     15734  *\'*) : 
     15735    eval set x "$CONFIG_FILES" ;; #( 
     15736  *) : 
     15737    set x $CONFIG_FILES ;; #( 
     15738  *) : 
     15739     ;; 
     15740esac 
    1559615741  shift 
    15597   for mf 
     15742  # Used to flag and report bootstrapping failures. 
     15743  am_rc=0 
     15744  for am_mf 
    1559815745  do 
    1559915746    # Strip MF so we end up with the name of the file. 
    15600     mf=`echo "$mf" | sed -e 's/:.*$//'` 
    15601     # Check whether this is an Automake generated Makefile or not. 
    15602     # We used to match only the files named 'Makefile.in', but 
    15603     # some people rename them; so instead we look at the file content. 
    15604     # Grep'ing the first line is not enough: some people post-process 
    15605     # each Makefile.in and add a new line on top of each file to say so. 
    15606     # Grep'ing the whole file is not good either: AIX grep has a line 
     15747    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` 
     15748    # Check whether this is an Automake generated Makefile which includes 
     15749    # dependency-tracking related rules and includes. 
     15750    # Grep'ing the whole file directly is not great: AIX grep has a line 
    1560715751    # limit of 2048, but all sed's we know have understand at least 4000. 
    15608     if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then 
    15609       dirpart=`$as_dirname -- "$mf" || 
    15610 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 
    15611          X"$mf" : 'X\(//\)[^/]' \| \ 
    15612          X"$mf" : 'X\(//\)$' \| \ 
    15613          X"$mf" : 'X\(/\)' \| . 2>/dev/null || 
    15614 $as_echo X"$mf" | 
     15752    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ 
     15753      || continue 
     15754    am_dirpart=`$as_dirname -- "$am_mf" || 
     15755$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 
     15756         X"$am_mf" : 'X\(//\)[^/]' \| \ 
     15757         X"$am_mf" : 'X\(//\)$' \| \ 
     15758         X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || 
     15759$as_echo X"$am_mf" | 
    1561515760    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 
    1561615761            s//\1/ 
     
    1563015775          } 
    1563115776          s/.*/./; q'` 
    15632     else 
    15633       continue 
    15634     fi 
    15635     # Extract the definition of DEPDIR, am__include, and am__quote 
    15636     # from the Makefile without running 'make'. 
    15637     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` 
    15638     test -z "$DEPDIR" && continue 
    15639     am__include=`sed -n 's/^am__include = //p' < "$mf"` 
    15640     test -z "$am__include" && continue 
    15641     am__quote=`sed -n 's/^am__quote = //p' < "$mf"` 
    15642     # Find all dependency output files, they are included files with 
    15643     # $(DEPDIR) in their names.  We invoke sed twice because it is the 
    15644     # simplest approach to changing $(DEPDIR) to its actual value in the 
    15645     # expansion. 
    15646     for file in `sed -n " 
    15647       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ 
    15648          sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do 
    15649       # Make sure the directory exists. 
    15650       test -f "$dirpart/$file" && continue 
    15651       fdir=`$as_dirname -- "$file" || 
    15652 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 
    15653          X"$file" : 'X\(//\)[^/]' \| \ 
    15654          X"$file" : 'X\(//\)$' \| \ 
    15655          X"$file" : 'X\(/\)' \| . 2>/dev/null || 
    15656 $as_echo X"$file" | 
    15657     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ 
     15777    am_filepart=`$as_basename -- "$am_mf" || 
     15778$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ 
     15779         X"$am_mf" : 'X\(//\)$' \| \ 
     15780         X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || 
     15781$as_echo X/"$am_mf" | 
     15782    sed '/^.*\/\([^/][^/]*\)\/*$/{ 
    1565815783            s//\1/ 
    1565915784            q 
    1566015785          } 
    15661           /^X\(\/\/\)[^/].*/{ 
     15786          /^X\/\(\/\/\)$/{ 
    1566215787            s//\1/ 
    1566315788            q 
    1566415789          } 
    15665           /^X\(\/\/\)$/{ 
    15666             s//\1/ 
    15667             q 
    15668           } 
    15669           /^X\(\/\).*/{ 
     15790          /^X\/\(\/\).*/{ 
    1567015791            s//\1/ 
    1567115792            q 
    1567215793          } 
    1567315794          s/.*/./; q'` 
    15674       as_dir=$dirpart/$fdir; as_fn_mkdir_p 
    15675       # echo "creating $dirpart/$file" 
    15676       echo '# dummy' > "$dirpart/$file" 
    15677     done 
     15795    { echo "$as_me:$LINENO: cd "$am_dirpart" \ 
     15796      && sed -e '/# am--include-marker/d' "$am_filepart" \ 
     15797        | $MAKE -f - am--depfiles" >&5 
     15798   (cd "$am_dirpart" \ 
     15799      && sed -e '/# am--include-marker/d' "$am_filepart" \ 
     15800        | $MAKE -f - am--depfiles) >&5 2>&5 
     15801   ac_status=$? 
     15802   echo "$as_me:$LINENO: \$? = $ac_status" >&5 
     15803   (exit $ac_status); } || am_rc=$? 
    1567815804  done 
     15805  if test $am_rc -ne 0; then 
     15806    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 
     15807$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} 
     15808as_fn_error $? "Something went wrong bootstrapping makefile fragments 
     15809    for automatic dependency tracking.  Try re-running configure with the 
     15810    '--disable-dependency-tracking' option to at least be able to build 
     15811    the package (albeit without support for automatic dependency tracking). 
     15812See \`config.log' for more details" "$LINENO" 5; } 
     15813  fi 
     15814  { am_dirpart=; unset am_dirpart;} 
     15815  { am_filepart=; unset am_filepart;} 
     15816  { am_mf=; unset am_mf;} 
     15817  { am_rc=; unset am_rc;} 
     15818  rm -f conftest-deps.mk 
    1567915819} 
    1568015820 ;; 
     
    1569415834#! $SHELL 
    1569515835# Generated automatically by $as_me ($PACKAGE) $VERSION 
    15696 # Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: 
    1569715836# NOTE: Changes made to this file will be lost: look at ltmain.sh. 
    1569815837 
     
    1572615865available_tags='' 
    1572715866 
     15867# Configured defaults for sys_lib_dlsearch_path munging. 
     15868: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"} 
     15869 
    1572815870# ### BEGIN LIBTOOL CONFIG 
    1572915871 
     
    1592816070need_lib_prefix=$need_lib_prefix 
    1592916071 
    15930 # Do we need a 2.1.4 for libraries? 
     16072# Do we need a 2.1.5 for libraries? 
    1593116073need_version=$need_version 
    1593216074 
     
    1597516117sys_lib_search_path_spec=$lt_sys_lib_search_path_spec 
    1597616118 
    15977 # Run-time system search path for libraries. 
    15978 sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec 
     16119# Detected run-time system search path for libraries. 
     16120sys_lib_dlsearch_path_spec=$lt_configure_time_dlsearch_path 
     16121 
     16122# Explicit LT_SYS_LIBRARY_PATH set during ./configure time. 
     16123configure_time_lt_sys_library_path=$lt_configure_time_lt_sys_library_path 
    1597916124 
    1598016125# Whether dlopen is supported. 
     
    1612416269 
    1612516270# ### END LIBTOOL CONFIG 
     16271 
     16272_LT_EOF 
     16273 
     16274    cat <<'_LT_EOF' >> "$cfgfile" 
     16275 
     16276# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE 
     16277 
     16278# func_munge_path_list VARIABLE PATH 
     16279# ----------------------------------- 
     16280# VARIABLE is name of variable containing _space_ separated list of 
     16281# directories to be munged by the contents of PATH, which is string 
     16282# having a format: 
     16283# "DIR[:DIR]:" 
     16284#       string "DIR[ DIR]" will be prepended to VARIABLE 
     16285# ":DIR[:DIR]" 
     16286#       string "DIR[ DIR]" will be appended to VARIABLE 
     16287# "DIRP[:DIRP]::[DIRA:]DIRA" 
     16288#       string "DIRP[ DIRP]" will be prepended to VARIABLE and string 
     16289#       "DIRA[ DIRA]" will be appended to VARIABLE 
     16290# "DIR[:DIR]" 
     16291#       VARIABLE will be replaced by "DIR[ DIR]" 
     16292func_munge_path_list () 
     16293{ 
     16294    case x$2 in 
     16295    x) 
     16296        ;; 
     16297    *:) 
     16298        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \$$1\" 
     16299        ;; 
     16300    x:*) 
     16301        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\" 
     16302        ;; 
     16303    *::*) 
     16304        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\" 
     16305        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\" 
     16306        ;; 
     16307    *) 
     16308        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\" 
     16309        ;; 
     16310    esac 
     16311} 
     16312 
     16313 
     16314# Calculate cc_basename.  Skip known compiler wrappers and cross-prefix. 
     16315func_cc_basename () 
     16316{ 
     16317    for cc_temp in $*""; do 
     16318      case $cc_temp in 
     16319        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; 
     16320        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; 
     16321        \-*) ;; 
     16322        *) break;; 
     16323      esac 
     16324    done 
     16325    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"` 
     16326} 
     16327 
     16328 
     16329# ### END FUNCTIONS SHARED WITH CONFIGURE 
    1612616330 
    1612716331_LT_EOF 
  • trunk/src/data_sources/nmxptool/configure.ac

    r6894 r8318  
    1010m4_define([major_version], [2]) 
    1111m4_define([minor_version], [1]) 
    12 m4_define([micro_version], [4]) 
     12m4_define([micro_version], [5]) 
    1313# Comment build_version for stable release 
    1414# m4_define([build_version], [dev]) 
     
    7474 
    7575AC_CHECK_LIB(ws2_32, puts, LIBS="$LIBS -lws2_32", , -lws2_32) 
     76 
     77AC_CHECK_LIB(pthread, pthread_create, LIBS="$LIBS -lpthread", , -lpthread) 
    7678 
    7779AC_ARG_ENABLE([memdebug], 
  • trunk/src/data_sources/nmxptool/depcomp

    r6803 r8318  
    22# depcomp - compile a program generating dependencies as side-effects 
    33 
    4 scriptversion=2013-05-30.07; # UTC 
    5  
    6 # Copyright (C) 1999-2014 Free Software Foundation, Inc. 
     4scriptversion=2018-03-07.03; # UTC 
     5 
     6# Copyright (C) 1999-2018 Free Software Foundation, Inc. 
    77 
    88# This program is free software; you can redistribute it and/or modify 
     
    1717 
    1818# You should have received a copy of the GNU General Public License 
    19 # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
     19# along with this program.  If not, see <https://www.gnu.org/licenses/>. 
    2020 
    2121# As a special exception to the GNU General Public License, if you 
     
    784784# mode: shell-script 
    785785# sh-indentation: 2 
    786 # eval: (add-hook 'write-file-hooks 'time-stamp) 
     786# eval: (add-hook 'before-save-hook 'time-stamp) 
    787787# time-stamp-start: "scriptversion=" 
    788788# time-stamp-format: "%:y-%02m-%02d.%02H" 
    789 # time-stamp-time-zone: "UTC" 
     789# time-stamp-time-zone: "UTC0" 
    790790# time-stamp-end: "; # UTC" 
    791791# End: 
  • trunk/src/data_sources/nmxptool/earthworm/makefile.ux

    r7918 r8318  
    1111# For Windows-XP and Windows-2000 compile under MinGW. 
    1212# 
    13 # make -f makefile.ux.nognu 
     13# make -f makefile.ux.nognu  
    1414# make -f makefile.ux.nognu clean 
    1515# make -f makefile.ux.nognu clean_bin 
     
    3434 
    3535# Clean nmxptool binary from Earthworm system 
    36 clean_bin: PHONY 
    37         -@$(MAKE) uninstall-ew-bin 
     36clean_bin: 
     37        make uninstall-ew-bin 
    3838 
    3939reconfigure: distclean configurenmxp cleannmxp makenmxp installnmxp 
    4040         
    41 installnmxp: PHONY 
    42         $(MAKE) install-ew-bin 
     41installnmxp: 
     42        make install-ew-bin 
    4343 
    4444# # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
     
    5050# # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
    5151 
    52 configurenmxp: PHONY 
     52configurenmxp: 
    5353        ( test -f Makefile && test -f src/Makefile ) \ 
    5454                || ( ./configure $(DISABLEFEATURES) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ) 
    5555 
    56 makenmxp: PHONY 
    57         $(MAKE) 
     56makenmxp: 
     57        make 
    5858 
    59 cleannmxp: PHONY 
    60         -@( test ! -f Makefile ) \ 
    61                 || ( $(MAKE) clean ) 
     59cleannmxp: 
     60        ( test ! -f Makefile ) \ 
     61                || ( make clean ) 
    6262 
    63 distcleannmxp: PHONY 
    64         -@( test ! -f Makefile ) \ 
    65                 || ( $(MAKE) distclean ) 
     63distcleannmxp: 
     64        ( test ! -f Makefile ) \ 
     65                || ( make distclean ) 
    6666 
    67 PHONY: 
     67 
  • trunk/src/data_sources/nmxptool/earthworm/makefile.ux.nognu

    r7918 r8318  
    1111# For Windows-XP and Windows-2000 compile under MinGW. 
    1212# 
    13 # make -f makefile.ux.nognu 
     13# make -f makefile.ux.nognu  
    1414# make -f makefile.ux.nognu clean 
    1515# make -f makefile.ux.nognu clean_bin 
     
    3434 
    3535# Clean nmxptool binary from Earthworm system 
    36 clean_bin: PHONY 
    37         -@$(MAKE) uninstall-ew-bin 
     36clean_bin: 
     37        make uninstall-ew-bin 
    3838 
    3939reconfigure: distclean configurenmxp cleannmxp makenmxp installnmxp 
    4040         
    41 installnmxp: PHONY 
    42         $(MAKE) install-ew-bin 
     41installnmxp: 
     42        make install-ew-bin 
    4343 
    4444# # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
     
    5050# # # # # # # # # # # # # # # # # # # # # # # # # # # # # 
    5151 
    52 configurenmxp: PHONY 
     52configurenmxp: 
    5353        ( test -f Makefile && test -f src/Makefile ) \ 
    5454                || ( ./configure $(DISABLEFEATURES) CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ) 
    5555 
    56 makenmxp: PHONY 
    57         $(MAKE) 
     56makenmxp: 
     57        make 
    5858 
    59 cleannmxp: PHONY 
    60         -@( test ! -f Makefile ) \ 
    61                 || ( $(MAKE) clean ) 
     59cleannmxp: 
     60        ( test ! -f Makefile ) \ 
     61                || ( make clean ) 
    6262 
    63 distcleannmxp: PHONY 
    64         -@( test ! -f Makefile ) \ 
    65                 || ( $(MAKE) distclean ) 
     63distcleannmxp: 
     64        ( test ! -f Makefile ) \ 
     65                || ( make distclean ) 
    6666 
    67 PHONY: 
     67 
  • trunk/src/data_sources/nmxptool/install-sh

    r6803 r8318  
    22# install - install a program, script, or datafile 
    33 
    4 scriptversion=2013-12-25.23; # UTC 
     4scriptversion=2018-03-11.20; # UTC 
    55 
    66# This originates from X11R5 (mit/util/scripts/install.sh), which was 
     
    272272    dst=$dst_arg 
    273273 
    274     # If destination is a directory, append the input filename; won't work 
    275     # if double slashes aren't ignored. 
     274    # If destination is a directory, append the input filename. 
    276275    if test -d "$dst"; then 
    277276      if test "$is_target_a_directory" = never; then 
     
    280279      fi 
    281280      dstdir=$dst 
    282       dst=$dstdir/`basename "$src"` 
     281      dstbase=`basename "$src"` 
     282      case $dst in 
     283        */) dst=$dst$dstbase;; 
     284        *)  dst=$dst/$dstbase;; 
     285      esac 
    283286      dstdir_status=0 
    284287    else 
     
    288291    fi 
    289292  fi 
     293 
     294  case $dstdir in 
     295    */) dstdirslash=$dstdir;; 
     296    *)  dstdirslash=$dstdir/;; 
     297  esac 
    290298 
    291299  obsolete_mkdir_used=false 
     
    325333            ;; 
    326334          *) 
     335            # Note that $RANDOM variable is not portable (e.g. dash);  Use it 
     336            # here however when possible just to lower collision chance. 
    327337            tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ 
    328             trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 
    329  
     338 
     339            trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 
     340 
     341            # Because "mkdir -p" follows existing symlinks and we likely work 
     342            # directly in world-writeable /tmp, make sure that the '$tmpdir' 
     343            # directory is successfully created first before we actually test 
     344            # 'mkdir -p' feature. 
    330345            if (umask $mkdir_umask && 
    331                 exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 
     346                $mkdirprog $mkdir_mode "$tmpdir" && 
     347                exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 
    332348            then 
    333349              if test -z "$dir_arg" || { 
     
    336352                   # other-writable bit of parent directory when it shouldn't. 
    337353                   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. 
    338                    ls_ld_tmpdir=`ls -ld "$tmpdir"` 
     354                   test_tmpdir="$tmpdir/a" 
     355                   ls_ld_tmpdir=`ls -ld "$test_tmpdir"` 
    339356                   case $ls_ld_tmpdir in 
    340357                     d????-?r-*) different_mode=700;; 
     
    342359                     *) false;; 
    343360                   esac && 
    344                    $mkdirprog -m$different_mode -p -- "$tmpdir" && { 
    345                      ls_ld_tmpdir_1=`ls -ld "$tmpdir"` 
     361                   $mkdirprog -m$different_mode -p -- "$test_tmpdir" && { 
     362                     ls_ld_tmpdir_1=`ls -ld "$test_tmpdir"` 
    346363                     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" 
    347364                   } 
     
    349366              then posix_mkdir=: 
    350367              fi 
    351               rmdir "$tmpdir/d" "$tmpdir" 
     368              rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 
    352369            else 
    353370              # Remove any dirs left behind by ancient mkdir implementations. 
    354               rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null 
     371              rmdir ./$mkdir_mode ./-p ./-- "$tmpdir" 2>/dev/null 
    355372            fi 
    356373            trap '' 0;; 
     
    428445 
    429446    # Make a couple of temp file names in the proper directory. 
    430     dsttmp=$dstdir/_inst.$$_ 
    431     rmtmp=$dstdir/_rm.$$_ 
     447    dsttmp=${dstdirslash}_inst.$$_ 
     448    rmtmp=${dstdirslash}_rm.$$_ 
    432449 
    433450    # Trap to clean up those temp files at exit. 
     
    494511 
    495512# Local variables: 
    496 # eval: (add-hook 'write-file-hooks 'time-stamp) 
     513# eval: (add-hook 'before-save-hook 'time-stamp) 
    497514# time-stamp-start: "scriptversion=" 
    498515# time-stamp-format: "%:y-%02m-%02d.%02H" 
    499 # time-stamp-time-zone: "UTC" 
     516# time-stamp-time-zone: "UTC0" 
    500517# time-stamp-end: "; # UTC" 
    501518# End: 
  • trunk/src/data_sources/nmxptool/lib/Makefile.in

    r7918 r8318  
    1 # Makefile.in generated by automake 1.15 from Makefile.am. 
     1# Makefile.in generated by automake 1.16.1 from Makefile.am. 
    22# @configure_input@ 
    33 
    4 # Copyright (C) 1994-2014 Free Software Foundation, Inc. 
     4# Copyright (C) 1994-2018 Free Software Foundation, Inc. 
    55 
    66# This Makefile.in is free software; the Free Software Foundation 
     
    140140am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) 
    141141am__v_AR_0 = @echo "  AR      " $@; 
    142 am__v_AR_1 = 
     142am__v_AR_1 =  
    143143libnmxp_a_AR = $(AR) $(ARFLAGS) 
    144144libnmxp_a_LIBADD = 
     
    159159am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) 
    160160am__v_GEN_0 = @echo "  GEN     " $@; 
    161 am__v_GEN_1 = 
     161am__v_GEN_1 =  
    162162AM_V_at = $(am__v_at_@AM_V@) 
    163163am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) 
    164164am__v_at_0 = @ 
    165 am__v_at_1 = 
     165am__v_at_1 =  
    166166DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) 
    167167depcomp = $(SHELL) $(top_srcdir)/depcomp 
    168 am__depfiles_maybe = depfiles 
     168am__maybe_remake_depfiles = depfiles 
     169am__depfiles_remade = ./$(DEPDIR)/libnmxp_a-nmxp.Po \ 
     170        ./$(DEPDIR)/libnmxp_a-nmxp_base.Po \ 
     171        ./$(DEPDIR)/libnmxp_a-nmxp_chan.Po \ 
     172        ./$(DEPDIR)/libnmxp_a-nmxp_crc32.Po \ 
     173        ./$(DEPDIR)/libnmxp_a-nmxp_data.Po \ 
     174        ./$(DEPDIR)/libnmxp_a-nmxp_log.Po \ 
     175        ./$(DEPDIR)/libnmxp_a-nmxp_memory.Po \ 
     176        ./$(DEPDIR)/libnmxp_a-nmxp_win.Po 
    169177am__mv = mv -f 
    170178AM_V_lt = $(am__v_lt_@AM_V@) 
    171179am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) 
    172180am__v_lt_0 = --silent 
    173 am__v_lt_1 = 
     181am__v_lt_1 =  
    174182COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ 
    175183        $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) 
     
    181189am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) 
    182190am__v_CC_0 = @echo "  CC      " $@; 
    183 am__v_CC_1 = 
     191am__v_CC_1 =  
    184192CCLD = $(CC) 
    185193LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ 
     
    189197am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) 
    190198am__v_CCLD_0 = @echo "  CCLD    " $@; 
    191 am__v_CCLD_1 = 
     199am__v_CCLD_1 =  
    192200SOURCES = $(libnmxp_a_SOURCES) 
    193201DIST_SOURCES = $(am__libnmxp_a_SOURCES_DIST) 
     
    273281LN_S = @LN_S@ 
    274282LTLIBOBJS = @LTLIBOBJS@ 
     283LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ 
    275284MAINT = @MAINT@ 
    276285MAKEINFO = @MAKEINFO@ 
     
    342351program_transform_name = @program_transform_name@ 
    343352psdir = @psdir@ 
     353runstatedir = @runstatedir@ 
    344354sbindir = @sbindir@ 
    345355sharedstatedir = @sharedstatedir@ 
     
    386396            cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ 
    387397          *) \ 
    388             echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ 
    389             cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ 
     398            echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ 
     399            cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ 
    390400        esac; 
    391401 
     
    430440        -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) 
    431441 
    432 libnmxp.a: $(libnmxp_a_OBJECTS) $(libnmxp_a_DEPENDENCIES) $(EXTRA_libnmxp_a_DEPENDENCIES) 
     442libnmxp.a: $(libnmxp_a_OBJECTS) $(libnmxp_a_DEPENDENCIES) $(EXTRA_libnmxp_a_DEPENDENCIES)  
    433443        $(AM_V_at)-rm -f libnmxp.a 
    434444        $(AM_V_AR)$(libnmxp_a_AR) libnmxp.a $(libnmxp_a_OBJECTS) $(libnmxp_a_LIBADD) 
     
    441451        -rm -f *.tab.c 
    442452 
    443 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp.Po@am__quote@ 
    444 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_base.Po@am__quote@ 
    445 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_chan.Po@am__quote@ 
    446 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_crc32.Po@am__quote@ 
    447 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_data.Po@am__quote@ 
    448 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_log.Po@am__quote@ 
    449 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_memory.Po@am__quote@ 
    450 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_win.Po@am__quote@ 
     453@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp.Po@am__quote@ # am--include-marker 
     454@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_base.Po@am__quote@ # am--include-marker 
     455@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_chan.Po@am__quote@ # am--include-marker 
     456@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_crc32.Po@am__quote@ # am--include-marker 
     457@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_data.Po@am__quote@ # am--include-marker 
     458@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_log.Po@am__quote@ # am--include-marker 
     459@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_memory.Po@am__quote@ # am--include-marker 
     460@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libnmxp_a-nmxp_win.Po@am__quote@ # am--include-marker 
     461 
     462$(am__depfiles_remade): 
     463        @$(MKDIR_P) $(@D) 
     464        @echo '# dummy' >$@-t && $(am__mv) $@-t $@ 
     465 
     466am--depfiles: $(am__depfiles_remade) 
    451467 
    452468.c.o: 
     
    662678        -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags 
    663679 
    664 distdir: $(DISTFILES) 
     680distdir: $(BUILT_SOURCES) 
     681        $(MAKE) $(AM_MAKEFLAGS) distdir-am 
     682 
     683distdir-am: $(DISTFILES) 
    665684        @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
    666685        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ 
     
    735754 
    736755distclean: distclean-am 
    737         -rm -rf ./$(DEPDIR) 
     756                -rm -f ./$(DEPDIR)/libnmxp_a-nmxp.Po 
     757        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_base.Po 
     758        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_chan.Po 
     759        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_crc32.Po 
     760        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_data.Po 
     761        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_log.Po 
     762        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_memory.Po 
     763        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_win.Po 
    738764        -rm -f Makefile 
    739765distclean-am: clean-am distclean-compile distclean-generic \ 
     
    781807 
    782808maintainer-clean: maintainer-clean-am 
    783         -rm -rf ./$(DEPDIR) 
     809                -rm -f ./$(DEPDIR)/libnmxp_a-nmxp.Po 
     810        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_base.Po 
     811        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_chan.Po 
     812        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_crc32.Po 
     813        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_data.Po 
     814        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_log.Po 
     815        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_memory.Po 
     816        -rm -f ./$(DEPDIR)/libnmxp_a-nmxp_win.Po 
    784817        -rm -f Makefile 
    785818maintainer-clean-am: distclean-am maintainer-clean-generic 
     
    802835.MAKE: install-am install-strip 
    803836 
    804 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ 
    805         clean-libLIBRARIES clean-libtool cscopelist-am ctags ctags-am \ 
    806         distclean distclean-compile distclean-generic \ 
     837.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ 
     838        clean-generic clean-libLIBRARIES clean-libtool cscopelist-am \ 
     839        ctags ctags-am distclean distclean-compile distclean-generic \ 
    807840        distclean-libtool distclean-tags distdir dvi dvi-am html \ 
    808841        html-am info info-am install install-am install-data \ 
  • trunk/src/data_sources/nmxptool/lib/nmxp_base.c

    r7842 r8318  
    4646  struct sockaddr_in psServAddr; 
    4747  struct in_addr hostaddr; 
     48  time_t timeStart; 
    4849 
    4950#ifdef HAVE_WINDOWS_H 
     
    106107        return isock; 
    107108    } else { 
    108 #if 0 
    109         time_t timeStart; 
     109        nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_CONNFLOW, "connect(): (errno=%d) %s \n", errno, NMXP_LOG_STR(nmxp_strerror(errno))); 
     110        return -1; 
     111        /* 
    110112        nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_CONNFLOW, "Connecting to %s port %d. Trying again after %d seconds...\n", 
    111113                NMXP_LOG_STR(inet_ntoa(hostaddr)), portNum, sleepTime); 
     
    122124          sleepTime = NMXP_SLEEPMAX; 
    123125        } 
    124 #else 
    125         nmxp_log(NMXP_LOG_ERR, NMXP_LOG_D_CONNFLOW, "connect(): (errno=%d) %s \n", errno, NMXP_LOG_STR(nmxp_strerror(errno))); 
    126         return -1; 
    127 #endif 
     126        */ 
    128127    } 
    129128 
     
    369368 
    370369 
    371 /* #pragma GCC: silence Linux GCC missing field initializer warning           */ 
    372 /* #pragma GCC diagnostic not allowed inside function on GCC 4.4.7 (CentOS 6) */ 
    373 #ifdef __GNUC__ 
    374 #pragma GCC diagnostic push 
    375 #pragma GCC diagnostic ignored "-Wmissing-field-initializers" 
    376 #endif 
    377  
    378370int nmxp_receiveHeader(int isock, NMXP_MSG_SERVER *type, int32_t *length, int timeoutsec, int *recv_errno ) 
    379371 
    380372    int ret ; 
    381 /* #pragma clang: silence Mac OS X missing field initializer warning */ 
    382 #ifdef __clang__ 
    383 #pragma clang diagnostic push 
    384 #pragma clang diagnostic ignored "-Wmissing-field-initializers" 
    385 #endif 
    386373    NMXP_MESSAGE_HEADER msg={0}; 
    387 #ifdef __clang__ 
    388 #pragma clang diagnostic pop 
    389 #endif 
    390374 
    391375    ret = nmxp_recv_ctrl(isock, &msg, sizeof(NMXP_MESSAGE_HEADER), timeoutsec, recv_errno); 
     
    413397    return ret; 
    414398} 
    415  
    416 #ifdef __GNUC__ 
    417 #pragma GCC diagnostic pop 
    418 #endif 
    419399 
    420400 
  • trunk/src/data_sources/nmxptool/ltmain.sh

    r6803 r8318  
    3232PROGRAM=libtool 
    3333PACKAGE=libtool 
    34 VERSION=2.4.6 
     34VERSION="2.4.6 Debian-2.4.6-9" 
    3535package_revision=2.4.6 
    3636 
     
    13711371 
    13721372# Set a version string for this script. 
    1373 scriptversion=2014-01-07.03; # UTC 
     1373scriptversion=2015-10-07.11; # UTC 
    13741374 
    13751375# A portable, pluggable option parser for Bourne shell. 
     
    15311531    $debug_cmd 
    15321532 
     1533    _G_rc_run_hooks=false 
     1534 
    15331535    case " $hookable_fns " in 
    15341536      *" $1 "*) ;; 
     
    15391541 
    15401542    for _G_hook in $_G_hook_fns; do 
    1541       eval $_G_hook '"$@"' 
    1542  
    1543       # store returned options list back into positional 
    1544       # parameters for next 'cmd' execution. 
    1545       eval _G_hook_result=\$${_G_hook}_result 
    1546       eval set dummy "$_G_hook_result"; shift 
     1543      if eval $_G_hook '"$@"'; then 
     1544        # store returned options list back into positional 
     1545        # parameters for next 'cmd' execution. 
     1546        eval _G_hook_result=\$${_G_hook}_result 
     1547        eval set dummy "$_G_hook_result"; shift 
     1548        _G_rc_run_hooks=: 
     1549      fi 
    15471550    done 
    15481551 
    1549     func_quote_for_eval ${1+"$@"} 
    1550     func_run_hooks_result=$func_quote_for_eval_result 
     1552    $_G_rc_run_hooks && func_run_hooks_result=$_G_hook_result 
    15511553} 
    15521554 
     
    15581560 
    15591561# In order to add your own option parsing hooks, you must accept the 
    1560 # full positional parameter list in your hook function, remove any 
    1561 # options that you action, and then pass back the remaining unprocessed 
     1562# full positional parameter list in your hook function, you may remove/edit 
     1563# any options that you action, and then pass back the remaining unprocessed 
    15621564# options in '<hooked_function_name>_result', escaped suitably for 
    1563 # 'eval'.  Like this: 
     1565# 'eval'.  In this case you also must return $EXIT_SUCCESS to let the 
     1566# hook's caller know that it should pay attention to 
     1567# '<hooked_function_name>_result'.  Returning $EXIT_FAILURE signalizes that 
     1568# arguments are left untouched by the hook and therefore caller will ignore the 
     1569# result variable. 
     1570# 
     1571# Like this: 
    15641572# 
    15651573#    my_options_prep () 
     
    15711579#      -s, --silent       don'\''t print informational messages 
    15721580#    ' 
    1573 # 
    1574 #        func_quote_for_eval ${1+"$@"} 
    1575 #        my_options_prep_result=$func_quote_for_eval_result 
     1581#        # No change in '$@' (ignored completely by this hook).  There is 
     1582#        # no need to do the equivalent (but slower) action: 
     1583#        # func_quote_for_eval ${1+"$@"} 
     1584#        # my_options_prep_result=$func_quote_for_eval_result 
     1585#        false 
    15761586#    } 
    15771587#    func_add_hook func_options_prep my_options_prep 
     
    15821592#        $debug_cmd 
    15831593# 
     1594#        args_changed=false 
     1595# 
    15841596#        # Note that for efficiency, we parse as many options as we can 
    15851597#        # recognise in a loop before passing the remainder back to the 
     
    15881600#          opt=$1; shift 
    15891601#          case $opt in 
    1590 #            --silent|-s) opt_silent=: ;; 
     1602#            --silent|-s) opt_silent=: 
     1603#                         args_changed=: 
     1604#                         ;; 
    15911605#            # Separate non-argument short options: 
    15921606#            -s*)         func_split_short_opt "$_G_opt" 
     
    15941608#                             "-$func_split_short_opt_arg" ${1+"$@"} 
    15951609#                         shift 
     1610#                         args_changed=: 
    15961611#                         ;; 
    1597 #            *)            set dummy "$_G_opt" "$*"; shift; break ;; 
     1612#            *)           # Make sure the first unrecognised option "$_G_opt" 
     1613#                         # is added back to "$@", we could need that later 
     1614#                         # if $args_changed is true. 
     1615#                         set dummy "$_G_opt" ${1+"$@"}; shift; break ;; 
    15981616#          esac 
    15991617#        done 
    16001618# 
    1601 #        func_quote_for_eval ${1+"$@"} 
    1602 #        my_silent_option_result=$func_quote_for_eval_result 
     1619#        if $args_changed; then 
     1620#          func_quote_for_eval ${1+"$@"} 
     1621#          my_silent_option_result=$func_quote_for_eval_result 
     1622#        fi 
     1623# 
     1624#        $args_changed 
    16031625#    } 
    16041626#    func_add_hook func_parse_options my_silent_option 
     
    16121634#    '--silent' and '--verbose' options are mutually exclusive." 
    16131635# 
    1614 #        func_quote_for_eval ${1+"$@"} 
    1615 #        my_option_validation_result=$func_quote_for_eval_result 
     1636#        false 
    16161637#    } 
    16171638#    func_add_hook func_validate_options my_option_validation 
    16181639# 
    1619 # You'll alse need to manually amend $usage_message to reflect the extra 
     1640# You'll also need to manually amend $usage_message to reflect the extra 
    16201641# options you parse.  It's preferable to append if you can, so that 
    16211642# multiple option parsing hooks can be added safely. 
     1643 
     1644 
     1645# func_options_finish [ARG]... 
     1646# ---------------------------- 
     1647# Finishing the option parse loop (call 'func_options' hooks ATM). 
     1648func_options_finish () 
     1649{ 
     1650    $debug_cmd 
     1651 
     1652    _G_func_options_finish_exit=false 
     1653    if func_run_hooks func_options ${1+"$@"}; then 
     1654      func_options_finish_result=$func_run_hooks_result 
     1655      _G_func_options_finish_exit=: 
     1656    fi 
     1657 
     1658    $_G_func_options_finish_exit 
     1659} 
    16221660 
    16231661 
     
    16311669    $debug_cmd 
    16321670 
    1633     func_options_prep ${1+"$@"} 
    1634     eval func_parse_options \ 
    1635         ${func_options_prep_result+"$func_options_prep_result"} 
    1636     eval func_validate_options \ 
    1637         ${func_parse_options_result+"$func_parse_options_result"} 
    1638  
    1639     eval func_run_hooks func_options \ 
    1640         ${func_validate_options_result+"$func_validate_options_result"} 
    1641  
    1642     # save modified positional parameters for caller 
    1643     func_options_result=$func_run_hooks_result 
     1671    _G_rc_options=false 
     1672 
     1673    for my_func in options_prep parse_options validate_options options_finish 
     1674    do 
     1675      if eval func_$my_func '${1+"$@"}'; then 
     1676        eval _G_res_var='$'"func_${my_func}_result" 
     1677        eval set dummy "$_G_res_var" ; shift 
     1678        _G_rc_options=: 
     1679      fi 
     1680    done 
     1681 
     1682    # Save modified positional parameters for caller.  As a top-level 
     1683    # options-parser function we always need to set the 'func_options_result' 
     1684    # variable (regardless the $_G_rc_options value). 
     1685    if $_G_rc_options; then 
     1686      func_options_result=$_G_res_var 
     1687    else 
     1688      func_quote_for_eval ${1+"$@"} 
     1689      func_options_result=$func_quote_for_eval_result 
     1690    fi 
     1691 
     1692    $_G_rc_options 
    16441693} 
    16451694 
     
    16501699# Note that when calling hook functions, we pass through the list of 
    16511700# positional parameters.  If a hook function modifies that list, and 
    1652 # needs to propogate that back to rest of this script, then the complete 
     1701# needs to propagate that back to rest of this script, then the complete 
    16531702# modified list must be put in 'func_run_hooks_result' before 
    1654 # returning. 
     1703# returning $EXIT_SUCCESS (otherwise $EXIT_FAILURE is returned). 
    16551704func_hookable func_options_prep 
    16561705func_options_prep () 
     
    16621711    opt_warning_types= 
    16631712 
    1664     func_run_hooks func_options_prep ${1+"$@"} 
    1665  
    1666     # save modified positional parameters for caller 
    1667     func_options_prep_result=$func_run_hooks_result 
     1713    _G_rc_options_prep=false 
     1714    if func_run_hooks func_options_prep ${1+"$@"}; then 
     1715      _G_rc_options_prep=: 
     1716      # save modified positional parameters for caller 
     1717      func_options_prep_result=$func_run_hooks_result 
     1718    fi 
     1719 
     1720    $_G_rc_options_prep 
    16681721} 
    16691722 
     
    16791732    func_parse_options_result= 
    16801733 
     1734    _G_rc_parse_options=false 
    16811735    # this just eases exit handling 
    16821736    while test $# -gt 0; do 
    16831737      # Defer to hook functions for initial option parsing, so they 
    16841738      # get priority in the event of reusing an option name. 
    1685       func_run_hooks func_parse_options ${1+"$@"} 
    1686  
    1687       # Adjust func_parse_options positional parameters to match 
    1688       eval set dummy "$func_run_hooks_result"; shift 
     1739      if func_run_hooks func_parse_options ${1+"$@"}; then 
     1740        eval set dummy "$func_run_hooks_result"; shift 
     1741        _G_rc_parse_options=: 
     1742      fi 
    16891743 
    16901744      # Break out of the loop if we already parsed every option. 
    16911745      test $# -gt 0 || break 
    16921746 
     1747      _G_match_parse_options=: 
    16931748      _G_opt=$1 
    16941749      shift 
     
    17051760 
    17061761        --warnings|--warning|-W) 
    1707                       test $# = 0 && func_missing_arg $_G_opt && break 
     1762                      if test $# = 0 && func_missing_arg $_G_opt; then 
     1763                        _G_rc_parse_options=: 
     1764                        break 
     1765                      fi 
    17081766                      case " $warning_categories $1" in 
    17091767                        *" $1 "*) 
     
    17581816                      ;; 
    17591817 
    1760         --)           break ;; 
     1818        --)           _G_rc_parse_options=: ; break ;; 
    17611819        -*)           func_fatal_help "unrecognised option: '$_G_opt'" ;; 
    1762         *)            set dummy "$_G_opt" ${1+"$@"}; shift; break ;; 
     1820        *)            set dummy "$_G_opt" ${1+"$@"}; shift 
     1821                      _G_match_parse_options=false 
     1822                      break 
     1823                      ;; 
    17631824      esac 
     1825 
     1826      $_G_match_parse_options && _G_rc_parse_options=: 
    17641827    done 
    17651828 
    1766     # save modified positional parameters for caller 
    1767     func_quote_for_eval ${1+"$@"} 
    1768     func_parse_options_result=$func_quote_for_eval_result 
     1829 
     1830    if $_G_rc_parse_options; then 
     1831      # save modified positional parameters for caller 
     1832      func_quote_for_eval ${1+"$@"} 
     1833      func_parse_options_result=$func_quote_for_eval_result 
     1834    fi 
     1835 
     1836    $_G_rc_parse_options 
    17691837} 
    17701838 
     
    17791847    $debug_cmd 
    17801848 
     1849    _G_rc_validate_options=false 
     1850 
    17811851    # Display all warnings if -W was not given. 
    17821852    test -n "$opt_warning_types" || opt_warning_types=" $warning_categories" 
    17831853 
    1784     func_run_hooks func_validate_options ${1+"$@"}