bring master in sync with p4 main

2013-03-25 14:23:07 +00:00 · 2013-03-25 14:23:07 +00:00 · dedac1b286
parent 33b891186d
commit dedac1b286
400 changed files with 10745 additions and 6527 deletions
--- a/1
+++ b/1
@ -3,3 +3,4 @@ Enrico Fucile
 Baudoin Raoult
 Cristian Codorean
 Jean-Baptiste Filippi
--- a/458
+++ b/458
@ -1,457 +1,5 @@
-21-01-2013   Shahram Najm
+The changelog is now online. Please see:
-- released version 1.10.0
+
-	* Updated copyright notices to Apache Licence Version 2.0
+https://software.ecmwf.int/wiki/display/GRIB/History+of+Changes
 	  http://www.apache.org/licenses/LICENSE-2.0
 	* Availability of grib2netcdf tool from grib_api
 	* Support in grib_api for Lambert Conformal grid (grib_get_data)
 	* Updated GRIB edition 2 definitions with the latest WMO V9 templates/tables
 	* ERA-CLIM: Added support for Simulated Radiances
 	* LWDA: Added support to Long Window 4DVar
 	* ERA-CLIM: New stream (ensemble supplementary data) and origin (Hadley Centre)
 	* GRIB definitions of new variables from LISFLOOD hydrological model
 	* Added Local Definition 21 (Sensitive area predictions) for GRIB edition 2
 	* Provided user-friendly function in API to check if a key is defined (grib_is_defined)
 	* Python: Provided function to set key values in one go (like grib_set -s)
 	* New MARS codes for surface parameters (effective total cloudiness)
 	* Corrected ifs_samples installation path
 	* New streams for ensemble data added to the parameter database
 	* New mars streams added for ensemble data assimilation
 	* Added pseudo-grib (budg) sample file for IFS
 	* Added new centre codes for COSMO, Ireland and Austria
 	* Bug fix: python interface missing __version__
 	* Bug fix: on make dist, definitions and sample go to /usr/share instead of /usr/share/grib_api/
 	* Bug fix: padding.sh fails in Debian automatic build machines
 	* Bug fix: Lambert azimuthal equal area
 	* Bug fix: Assertion when trying to encode the level information of some cloud cover fields
 	* Bug fix: ERA-CLIM: Support for existing streams EDMM, EDMO, EWMM, EWMO
 	* Bug fix: Netcdfs generated by grib_to_netcdf seem to be upside down
 	* Bug fix: python binding without numpy support grib_get_array(gid,'pv',float)
 	* Bug fix: grib_dump crashing with some second order packed files
 	* Bug fix: running grib_to_netcdf on a non regular lat/lon grid grib file results in invalid netcdf
 	* Bug fix: Assertion: Interpolation (or truncation) of GRIB 2 data into T21
 	* Bug fix: Make sure that grib_filter checks all disk writes.
 	* Bug fix: if "configure" is run without --prefix, IFS_SAMPLES_PATH starts with "NONE"
 	* Bug fix: grib_to_netcdf: long_name/units incorrect
 	* Bug fix: grib_filter error: converting edition 1 to 2: unable to get extraDimensionPresent as long
 	* Bug fix: grib_check Fortran definition is inconsistent with other Fortran definition:
 		   uses "integer" instead of "integer(kind=kindOfInt)" as status variable
 	* Bug fix: Remove redundant MARS type and stream entries for TIGGE
 	* Bug fix: Remove layer information from grib_api concepts for soil parameters
 	* Bug fix: grib_api 1.10.0 with MARS client: Interpolation failed
 	* Bug fix: Remove parameter 500011: 2m Temperature
 	* Bug fix: Remove new grib2 representations for parameters: 210004 and 210061
 	* Bug fix: Wrong short name for centre 82 in 0.table
 	* Bug fix: configure option disable-vector actually enables it!
 	* Bug fix: LWDA: Support for Errors in Analysis
 19-10-2012   Shahram Najm
 -- released version 1.9.18
 	* Updated sample gribs with recent changes for Reduced Gaussian N1024 and N2000
 	* Updated GRIB2 definitions with the latest WMO version 8 templates/tables
 	* Added missing parts in Grid Definition Template 3.120
 	* Added GRIB2 template 4.32 (simulated satellite data)
 	* Removed redundant MARS files for type and stream combinations
 	* Bug fix: Segmentation violation: calling grib_set on 'values' (decimal scale factor)
 	* Bug fix: grib_get_data returns incorrect lat-lon values for some GRIBS
 	* Bug fix: grib_filter does not fail with a non-zero return code when setting an invalid key
 	* Bug fix: Cannot set paramId to 228170 (Field Capacity) for grib edition 2
 	* Bug fix: grib_api compilation fails when enabling pthreads in recent Linux distributions
 	* Bug fix: Segmentation violation when GRIB_DEFINITION_PATH contains colon
 	* Bug fix: Compilation failure: problems with GRIB_INLINE: undefined reference to stdio_read etc
 	* Bug fix: Setting step to the new value in GRIB2 creates wrong [day,hour]endOfOverallTimeInterval
 	* Bug fix: grib_keys -L should show the real contents of SAMPLES PATH
 	* Bug fix: Crash: Running the fortran example get_data
 	* Bug fix: grib_filter with verbose option -v writes out lots of blank lines
 	* Bug fix: tools/grib1to2.sh depends on /usr/bin/ksh which is a non standard location and breaks RPMs
 	* Bug fix: GRIB1: Problem with derive probability for wave height larger than 8m
 	* Bug fix: Bug when printing thickness of layers (typeOfLevel = depthBelowLandLayer)
 	* Bug fix: Correct typos in parameter database
 	* Bug fix: test script second_order.sh not working on some stricter shells
 	* Bug fix: Compilation failure: tools/grib_compare.c - error on SX9 with the "end" variable
 	* Bug fix: Build fails in Solaris 10: Wrong Fortran module include
 16-03-2012   Shahram Najm
 -- released version 1.9.16
 	* Disabled boustrophedonic ordering in second order packing.
 	* Fixed the python bug in setting keys of type "double".
 	* New parameters have been added to the parameter database and to the definition files.
 	* Fixed a problem producing unwanted padding between messages when converting some fields from second order packing
 	* Improved thread safety in relation to the creation of an index. Creating a new grib_handle or indexing different files is thread safe.
 	* Fixed grib_dump not to display zeros when all values were missing.
 	* Fixed minor bugs
 17-03-2011   Enrico Fucile
 -- released version 1.9.9
 	* Several changes have been made to the internal functions used by the interpolation package in EMOSLIB 381
 	  to make the results of the grib_api based interpolation as close as possible to the GRIBEX based one. 
 	* laplacianOperator for spectral fields is always computed. If the computation is not required please 
 	  set the key computeLaplacianOperator=0. Default behaviour is computeLaplacianOperator=1.
 	* New parameters have been added to the parameter database and to the definition files regarding 
 	  the MACC project. 
 	* Second order packing (packingType=grid_second_order) is producing smaller fields as the default setting 
 	  is to use the boustrophedonic option.
 25-02-2011   Enrico Fucile
 -- released version 1.9.8
 	*  WARNING: A significant change in the fortran interface has been done for which some 
 	   software using the previous versions could exhibits memory allocation problems due 
 	   to unreleased memory associated with the GRIB messages. In the previous versions 
 	   (starting from version 1.6.1) the argument IGRIB of the functions GRIB_NEW_FROM_FILE, 
 	   GRIB_NEW_FROM_MESSAGE, GRIB_NEW_FROM_INDEX, GRIB_CLONE was an input and output argument. 
 	   In the new version IGRIB is output only and the grib message associated with IGRIB will 
 	   never be released by the GRIB_NEW_FROM_FILE function. This means that to release the memory 
 	   associated to the message a call to GRIB_RELEASE(IGRIB) has to be introduced when the message 
 	   is not needed any more. In the previous version the memory was released when a value of IGRIB 
 	   associated with a valid message was passed to the function. It has been realised that this 
 	   behaviour was source of unexpected results when the IGRIB variables used in the user code were 
 	   not initialised to a non valid IGRIB value (zero or negative integer). We strongly advise the 
 	   users to revise the existing code using previous grib_api versions or to link to the new library, 
 	   add the appropriate GRIB_RELEASE calls and test it for memory allocation.
 	   For convenience we report an example of code which could cause problems and has to be reviewed.
 	   integer :: IGRIB1
 	   integer :: IGRIB2
 	   call grib_new_from_file(IGRIB1,...)
 	   ... do something ...
 	  call grib_new_from_file(IGRIB2,...)
 	  ... do something ...
 	  IGRIB1 and IGRIB2 are not initialised to zero and we don't know which value is assigned to them. 
 	  It could be IGRIB1=IGRIB2=5 or any other number greather or equal to zero. If this happens at the 
 	  second call of grib_new_from_file IGRIB1 will be replaced by IGRIB2 producing very dangerous 
 	  consequences as the IGRIB1 doesn't point any more to the GRIB message it was supposed to. 
 	  Please revise your code in view of this example or link to the new version and add a call 
 	  to the GRIB_RELEASE function to release the memory when the which is not any more released in the new version.
 	* Second order packing algorithm rewritten and working in GRIB edition 1 and 2 with
 	  packingType=grid_second_order.
 	* This version is ready to be used with the new GRIB1 and GRIB2 interpolation function (INTF2) 
 	  available in EMOSLIB.
 	* A significant change in the fortran interface has been done for which some software using the 
 	  previous versions could exhibits memory allocation problems due to unreleased memory associated 
 	  with the GRIB messages. In the previous versions (starting from version 1.6.1) the argument IGRIB 
 	  of the function GRIB_NEW_FROM_FILE(IFILE,IGRIB) was an input and output argument. 
 	  In the new version is output only and the grib message associated with IGRIB will never be released 
 	  by the GRIB_NEW_FROM_FILE function. This means that to release the memory associated to the message 
 	  a call to GRIB_RELEASE(IGRIB) has to be introduced when the message is not needed any more. In the 
 	  previous version the memory was released when a value of IGRIB associated with a valid message was 
 	  passed to the function. It has been realised that this behaviour was source of unexpected results 
 	  when the IGRIB variables used in the user code were not initialised to a non valid IGRIB value 
 	  (zero or negative integer).
 	* Review and update of the code tables.
 	* Added new parameters. Full list of parameters accessible from
 	  http://www.ecmwf.int/publications/manuals/d/gribapi/param/
 	* Bug fixes.
 14-10-2010   Enrico Fucile
 -- released version 1.9.5
 	* Python interface available with the configure option --enable-python. 
 	  See http://www.ecmwf.int/publications/manuals/grib_api/namespacegribapi.html
 	  and http://www.ecmwf.int/publications/manuals/grib_api/grib_examples.html
 	* Available new environment variable GRIB_API_IO_BUFFER_SIZE defining the size in bytes of the buffer
 	  used in the IO calls from Fortran and in the tools.
 	* Performance improvements and partial vectorisation for the NEC SX platform.
 	* Review and update of the code tables.
 	* Update of paramId, shortName, name key values and release of a new parameter database web interface.
 	* Added a new key called 'global' for regular_gg and reduced_gg which can take the values 1 ( =True) or 0 (=False). 
 	  This is used to specify whether the grid is global or not. Setting global=1 will set the grid parameters computed 
 	  only from N and Ni. It is used in the conversion from one edition to the other. 
 	* Available new environment variable GRIB_API_NO_ABORT. Default value is 0 and when it is set to 1 the library will not 
 	  abort on failing asserts.
 	* Bug fixes.
 07-05-2010   Enrico Fucile
 -- released version 1.9.0
 	* Setting paramId or converting from one edition to the other when a parameter is not
 	  defined in the paramId.def file will result in a failure.
 	* Improved performance in reading/cloning a message.
 	* Changed the indexing system and provided new functions to write the index on a file
 	  grib_index_write and read it grib_index_read
 	* Provided a new tool to build an index from a set of files: grib_index_build.
 	* The tool grib_compare is able to compare two index files, going through the grib messages 
 	  indexed in the first and searching for them in the second.
 	* definition files and library have been updated to be used in operational status in the
 	  IFS cycle 36R2
 	* grib_ls has slightly changed format.
 	* A -j option is provided in grib_ls (-l only) to have the output in json format.
 	* BUFR messages are read, but only very basic decoding is provided.
 	* Parameters have been updated.
 	* Native type of paramId has been changed from string to integer.
 	* Several small bug fixes.
 23-07-2009   Enrico Fucile
 -- released version 1.8.0
 	* Improved conversion from edition 1 to 2. Set edition=2 will do the conversion
 	  from edition 1 to 2 also of the parameter information.
 	* shortName, paramId and units are defined for all the official WMO parameters
 	  and for local parameters used at ECMWF and NCEP
 	* grib_compare has been modified to compare grib 1 and 2 (option -e). 
 	  Other important chages have been done on grib_compare to have a more powerful tool to compare headers and 
 	  values. New options are provided to choose the tolerance and new namespaces are available to 
 	  compare only the relevant part of information. The new namespaces are.
 	  parameter,geography,vertical,time,local,data.
 	* For some ECMWF local definitions the conversion rules have been included in grib_api.
 	* A new key cfName is provided for the netcdf CF name. It is at the moment defined
 	  only for some parameters.
 	* The parameter information is generated from a parameter database maintained at ECMWF
 	  and accessible from a new section in the grib_api web pages.
 	* A new key typeOfLevel valid for grib edition 1 and 2, with the following values has been introduced
 	  'surface', 'cloudBase', 'cloudTop', 'isothermZero', 'adiabaticCondensation', 'maxWind',
 	  'tropopause', 'nominalTop', 'seaBottom', 'isobaricInhPa', 'isobaricInPa', 'isobaricLayer',
 	  'meanSea', 'isobaricLayerHighPrecision', 'isobaricLayerMixedPrecision', 'heightAboveSea',
 	  'heightAboveSeaLayer', 'heightAboveGroundHighPrecision', 'heightAboveGround', 'heightAboveGroundLayer'
 	  'sigma', 'sigmaLayer', 'sigmaLayerHighPrecision', 'hybrid', 'hybridLayer', 'depthBelowLand',
 	  'depthBelowLandLayer', 'theta', 'thetaLayer', 'pressureFromGround', 'pressureFromGroundLayer',
 	  'potentialVorticity', 'depthBelowSea', 'entireAtmosphere', 'entireOcean', 'oceanWave', 'oceanMixedLayer'
 	* The open source library OpenJpeg can be used in place of Jasper for the jpeg 2000 coding.	
 	  --with-openjpeg options in the configure.
 	* decimalPrecision can be used also with grid_jpeg packing.
 	* parameterName,parameterUnits are provided from the code tables.
 	* packingError is also available for spherical harmonics packing. It provieds the error due to simple packing.
 	* option -l added in grib_get
 	* option -F added in grib_get and grib_ls to control the format of floating point keys.
 	* grib_ls output has been changed due to the introduction of the new typeOfLevel key
 	* Subroutine grib_is_missing added in the Fortran interface to check if a header value is missing.
 	* Changed step behaviour. If the step is "instant" and the value doesn't fit into one byte (in grib 1)
 	* an appropriate value of timeRangeIndicator is found to code the value in two bytes instead of 1.
 	* In grib_filter the function "append" has been added to append a message to a file as opposed to "write" which is 
 	  writing from the beginning of the file.
 	* A new grib_count function is available to count (very fate) the number of messages in a list of files.
 	* The value of the key level is zero in both edition when it is not relevant for the message and it is 
 	  missing in grib edition 2.
 	* The indexing routines have been improved to process string keys.
 06-03-2009   Enrico Fucile
 -- released version 1.7.0
 	* New indexing routines. 
 	  Example: index.f90 
 	  (http://www.ecmwf.int/publications/manuals/grib_api/grib_examples.html) 
 	* New keys stepType,stepUnits,stepRange,startStep,endStep. 
 	* New keys swapScanningX, swapScanningY, swapScanningLat, swapScanningLon. To
 	  swap the field respect one axis. They swap data and fix the header accordingly.
 	* "Improved" error messages.
 	* write multi fields. Previous versions of grib_api were able only to read multi
 	  fields, now you can also write multi fields. We don't suggest to you this
 	  feature, it is included only to be compliant with FM-92 spec. 
 	  Examples: multi.f90, multi_write.f90
 	  (http://www.ecmwf.int/publications/manuals/grib_api/grib_examples.html) 
 	* function grib_new_from_template is deprecated and it will be replaced with
 	  grib_new_from_samples. Also the environment variable GRIB_TEMPLATES_PATH is
 	  replaced by GRIB_SAMPLES_PATH. Please replace "template" with "samples" in all
 	  the C functions also. The behavior is the same. I made a new example showing the
 	  best practice to use samples. The technique of cloning is strongly recommended.
 	  Example: samples.f90
 	  (http://www.ecmwf.int/publications/manuals/grib_api/grib_examples.html) 
 	* New key decimalPrecision provided. Used in the previous example. Regarding
 	  decimalPrecision and bitsPerValue the following problem was found in the
 	  previous version. If after loading from file or from sample (template) or
 	  cloning a constant field you set some non constant values the library doesn't
 	  know the bitsPerValue or the decimalPrecision you want to code (those are zero
 	  in the constant field). The result could have been a field coded with a poor
 	  precision. Starting with the new 1.7.0 version in these ambiguous cases grib_api
 	  is using 24 bits to pack the field (safe value). We always suggest to set
 	  explicitly the bitsPerValue or decimalPrecision or to clone non constant fields
 	  with those values properly set.
 	* grib_copy, grib_set. A key name in square brackets can be used in the output
 	  file name. The key will be replaced with its value in the processed grib
 	  message. This will provide an easy way for splitting fields as the file name
 	  will be dependent on some key values. Example:
 	     grib_copy input.grib "output_[shortName]_[date]_[step].grib"
 	  Please remember to quote the file name otherwise you can get strange behaviors
 	  due to the shell.
 	* New key packingError. The error introduced by the packing algorithm is
 	  returned with this key. It is available only for some packing algorithms. All
 	  the packed values are affected by this error in the sense that
 	     original value before packing = unpacked value ± packingError
 	  packingError is different for different fields (also for different steps of the
 	  same parameter/level/run).
 	* all the nearest functions are returning the distance from the grid point in
 	  Km, using the radius coded in the message.
 	* key bitmapPresent now available also in grib 2. Example: bitmap.f90
 	  (http://www.ecmwf.int/publications/manuals/grib_api/grib_examples.html) 
 30-09-2008   Enrico Fucile
 -- released version 1.6.4
 	* Fields containing a bitmap with all missing values can be coded in grib1 and grib2
 	* Multifields grib2 messages can be loaded from memory.
 	* local definition 31 added
 	* Better use of memory
 	* minor bug fixes
 16-07-2008   Enrico Fucile
 -- released version 1.6.1
 	* More efficient use of memory and improvement of performance.
 	* Thread safe version available through the --enable-pthread configure option.
 	* New computation of kindOfInt, kindOfLong, kindOfDouble, kindOfFloat, kindOfSize 
 	  to allow safe arguments handing between Fortran 90 and C.
 	* A new key bitmap is provided to get the full bitmap as a string with the grib_filter
 	  instruction:  print "[bitmap]";
 	* all the tools are failing on error and can be forced to proceed execution with
 	  the option -f . The only exception is grib_ls because we already have an identical
 	  tool failing (grib_get).
 	* new error messages from the Fortran 90 interface will give you some more chance to debug
 	  your code.
 	* New function grib_count_in_file available from Fortran and C to count the messages in a file.
 	  See example: examples/F90/count_messages.f90
 	* In the Fortran 90 interface any valid grib id passed to a grib_new_from_file or grib_new_from_message
 	  will be released before being assigned to a new grib message. 
 	  Example
 		 call grib_new_from_file(ifile,igrib, iret)
 	     do while (iret /= GRIB_END_OF_FILE)
 		   ... do something with the message pointed by igrib
 		   ... igrib will have the same value, but 
 		   ... it will point to a different message each cycle
 		   ... the message from the previous cycle will be released
 		   ... no need for grib_release(igrib)
 		   call grib_new_from_file(ifile,igrib, iret)
 		 enddo
 	  If you want to keep the grib message in memory remember to pass a negative grib id.
 	  Example
 	     call grib_count_in_file(ifile,n)
 		 allocate (igrib(n))
 		 do i=1,n
 		   call grib_new_from_file(ifile,igrib(i), iret)
 		   ...
 		 enddo
 		 ... remember to release the grib ids to free memory
 		 do i=1,n
 		   call grib_release(igrib(i))
 		 enddo
 	* grib_filter is now able to print with a format, number of colums and a separator for array keys.
 	  The format is expressed with a % followed by a C like (printf) format declarator.
 	  The number of columns is started with !
 	  The separator string is delimited by ' '
 	  Examples 
 	   print "[values!6%.5f',']"       values with 5 digits precision in 6 columns separated by ,
 	   print "[latitudes%.3f!1]"       latitudes with 3 digits precision in a column
 	   print "pl={[pl!7', ']}"         pl (number of point for each latitude) in 7 columns separated by ', '
 	* New keys:
        julianDay
        latLonValues    array containing latitude(1),longitude(1),value(1), latitude(2),longitude(2),value(2),...,
                        latitude(N),longitude(N),value(N)   (N=number of points in the grid)
        latitudes       latitude(1),latitude(2),...,latitude(N) (N=number of points in the grid)
        longitudes      longitude(1),longitude(2),...,longitude(N) (N=number of points in the grid)
        distinctLatitudes    list of distinct latitudes
        distinctLongitudes   list of distinct longitudes
 	* minor bug fixes
 03-06-2008   Enrico Fucile
 -- released version 1.5.0
 	* Review of packing algorithms. Improvement of performance mainly on big endian
 	  platforms.
 	* Modified the internal retrieval of keys, improving performance in getting and setting
 	  keys.
 	* Implemented memory management. An efficient tecnique to reuse memory is implemented.
 	  --disable-memory-management configure option available to disable the memory managemet 
 	  and use system malloc/free.
 	* Some experimental multithreaded packing is available for big endian machines.
 	  A configure option --enable-omp-packing is provided to enable the openMP instructions
 	  contained in the new packing. The environment variable OMP_NUM_THREADS sets the number
 	  of threads used in the packing algorithm.
 	* grib_filter improvement:
 	  * it is now possible to set array keys like values or pl as follows:
 	    values = { 0.1, 3.2, 7.5 };
 	  * it is now possible to print array keys like values or pl as follows:
 	    print "values=[values]";
 		it is also possible to print on a file ("test.out") doing:
 		print("test.out") "values=[values]";
 	  * better error messages are printed
 	  * it does not fail if an undefined key is used in a write or print statement   
 	* New keys or changed keys:
 	  * a scale factor and an offset can be applied to the data values through the keys
 	    "scaleValuesBy" and "offsetValuesBy". 
 	  * setBitsPerValue is the new key to be used to change the number of bits per value.
 	    It also executes the repacking.
 	  * The keys periodOfTime is now working also when indicatorOfUnitOfTimeRange=0 (time units is
 	    minutes)
 	* Concepts can be defined by the user. Concepts are a way to link the value of a key to
 	  a combination of values of other keys. They are used to define the short_name and the
 	  name.
 	* minor bug fixes
 07-02-2008   Enrico Fucile
 -- released version 1.4.0
 	* New Fortan 90 interface. Main featues:
 	  * unique grib_get/grib_set subroutines to get/set any variable type.
 	  * status code is an optional argument in all the subroutines (when omitted 
 	    the program will exit in case of error)
 	  * new subroutine grib_get_data to get the latitude/longitude/values arrays.
 	  * new subroutine grib_get_element to get one or several elements of an array key 
 	    through their index.
 	  * new subroutine grib_nearest function to get the nearest grid point of a given lat/lon.  
 	    It accepts in input also arrays of latitude/longitudes to find the nearest points in one
 		single call. A land sea mask mode is also available to get the nearest land point.  
 	* New Fortran 90 examples and documentation.
 	* New grib_keys tool to obtain the list of keys available for a specified type of grib.
 	* Modified the -l option in grib_ls (see documentation or type grib_ls without arguments)
 	* fixed a bug in the grib_filter and added the -o option for the output file.
 	* minor bug fixes.
 12-11-2007   Enrico Fucile
 -- released version 1.3.0
 	* grib_ls -l lat/lon/mode to retrieve values in the nearest grid points of a given
 	  latitude longitude point
 	* grib_ls -B"order by" to order the output using some keys
 	* grib_ls -i index. To extract the value in the index grid point.
 	* new grib_dump exposing a minimum set of keys which are the ones suggested for the
 	  standard use. Some options added to the grib_dump. The output of this new
 	  grib_dump is ready to be coupled to the new grib_gen which will be released in the
 	  next version.
 	* grib_copy -r to repack data fixing problems in the original file
 	* improved keys search for faster tools
 	* grib_get_data and grib_iterator working with all scanning mode
 	* new experimental functions introduced, not available in the fortran
 	  interface: grib_fieldset_new,grib_fieldset_apply_order_by,grib_fieldset_next_handle
 	  grib_nearest_new,grib_nearest_find,grib_nearest_delete
 	* some examples on the grib_fieldset and grib_nearest are added.
 	* The management of the missing data in grib_get_data is changed. Please refer to the help
 	  obtained executing grib_get_data without arguments.
 	* Added the key stepRange which is native type string. It can represent start and end of a
 	  cumulation or a max of min interval. Example stepRange=24-36 for a precipitation means that it
 	  is cumulated between 24 and 36. It also addresses the problems with the big steps which don't
 	  fit in the grib1 P1 and P2. 
 	* Added key numberOfCodedValues. It is different from numberOfValues only if a bitmap is present and
 	  the difference between the two should be numberOfMissingValues.
 	* Added the option -g to grib_copy, grib_set, grib_convert, grib_filter to preserve GTS headers 
 	  wrapping the grib message
 	* fixed some bugs in the fortran interface
 	* fixed a bug in reading the signed floats with the grib_convert.
 01-09-2007   Enrico Fucile
 -- released version 1.2.0
 	* changed license. Now grib_api is distributed under LGPL see LICENSE file in distribution.
 	* changed io functions and configure.ac to support files larger than 2GB  
 	* as a consequence to the large file support the key offset has native type double
 	* added support for predefined grids
 	* modified grib_handle_new_from_file to read messages with wrong message length.
 	  In this case an error will be raised.
 	* A new -M option is provided for all the tools to turn off the multi-field grib
 	  support.
 	* Changed behaviour of grib_copy. Default is quiet and option -v (verbose) is available.
 09-07-2007   Enrico Fucile
 -- released version 1.1.0
 	* fixed a bug affecting constant fields.
 	* rewritten the ibm floating point encoding/decoding routines gaining a factor of 7 in performance
 	* fixed a problem in the configure affecting compilation of fortran programs on AIX platforms
 	* Added some new keys:
 		* max,min,average (maximum, minimum and average respectively of the data )
 		* numberOfDataPoints(alias numberOfPoints) computed from the grid description
 		* numberOfValues is the same as the numberOfPoints if a bitmap is not present 
 		  otherwise it takes into account the bitmap
 		* numberOfMissing (alias numberOfMissingValues) number of missing values in the field
 		It's easy to check if a field is constant by simply comparing max,min,average
 		and some information about bitmap and missing values can be found comparing numberOfValues
 		numberOfPoints, numberOfMissing.
 	* added some new tests
 	* added a new example on how to print all the data when the iterator is not available.
 	* grib_tools are now failing with an error when the input file does not contain any 
 	  valid grib message
 	* added management of reduced gaussian non global fields.
 17-04-2007   Enrico Fucile
 	* grib_api version 1.0 released
--- a/Makefile.am
+++ b/Makefile.am
@ -22,7 +22,7 @@ else
  PYTHON_OPT =
 endif
-SUBDIRS = src tools definitions samples ifs_samples/grib1 ifs_samples/grib1_mlgrib2 ifs_samples/grib1_mlgrib2_ieee64 tests tigge $(FORTRAN_MOD) examples/C $(F90_CHECK) $(PERL_OPT) python examples/python
+SUBDIRS = src tools definitions samples ifs_samples/grib1 ifs_samples/grib1_mlgrib2 ifs_samples/grib1_mlgrib2_ieee64 tests mars_tests tigge $(FORTRAN_MOD) examples/C $(F90_CHECK) $(PERL_OPT) python examples/python
 EXTRA_DIST = README AUTHORS NOTICE LICENSE ChangeLog version.sh html \
                src/extrules.am \
@ -93,12 +93,12 @@ EXTRA_DIST = README AUTHORS NOTICE LICENSE ChangeLog version.sh html \
 				data/spherical_pressure_level.grib1 \
 				data/missing.grib2 \
 				data/gfs.c255.grib2 \
-                data/constant_field.grib1 \
+            data/constant_field.grib1 \
-                data/reduced_gaussian_pressure_level_constant.grib1 \
+            data/reduced_gaussian_pressure_level_constant.grib1 \
-                data/reduced_latlon_surface_constant.grib1 \
+            data/reduced_latlon_surface_constant.grib1 \
-                data/regular_gaussian_pressure_level_constant.grib1 \
+            data/regular_gaussian_pressure_level_constant.grib1 \
-                data/regular_latlon_surface_constant.grib1 \
+            data/regular_latlon_surface_constant.grib1 \
-                data/reduced_gaussian_sub_area.grib1 \
+            data/reduced_gaussian_sub_area.grib1 \
 				data/constant_field.grib1 \
 				data/60_model_levels \
 				data/list_points \
--- a/VERSION.cmake
+++ b/VERSION.cmake
@ -1,2 +1,2 @@
-set( ${PROJECT_NAME}_VERSION_STR  "1.10.4" )
+set( ${PROJECT_NAME}_VERSION_STR  "2.0.0" )
--- a/config/config.guess
+++ b/config/config.guess
@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2008-01-23'
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@ -27,16 +27,16 @@ timestamp='2009-11-20'
 # the same distribution terms that you use for the rest of that program.
-# Originally written by Per Bothner.  Please send patches (context
+# Originally written by Per Bothner <per@bothner.com>.
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
+# Please send patches to <config-patches@gnu.org>.  Submit a context
-# entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # This script attempts to guess a canonical system name similar to
 # config.sub.  If it succeeds, it prints the system name on stdout, and
 # exits with 0.  Otherwise, it exits with 1.
 #
-# You can get the latest version of this script from:
+# The plan is that this can be called by configure scripts if you
-# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+# don't specify an explicit build system type.
 me=`echo "$0" | sed -e 's,.*/,,'`
@ -139,16 +139,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 case "${UNAME_MACHINE}" in
    i?86)
 	test -z "$VENDOR" && VENDOR=pc
 	;;
    *)
 	test -z "$VENDOR" && VENDOR=unknown
 	;;
 esac
 test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
 # Note: order is significant - the case branches are not exclusive.
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@ -180,7 +170,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
 		eval $set_cc_for_build
 		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep -q __ELF__
+			| grep __ELF__ >/dev/null
 		then
 		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
 		    # Return netbsd for either.  FIX?
@ -213,19 +203,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	exit ;;
    *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-${VENDOR}-openbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
 	exit ;;
    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-ekkobsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
 	exit ;;
    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-solidbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
 	exit ;;
    macppc:MirBSD:*:*)
-	echo powerpc-${VENDOR}-mirbsd${UNAME_RELEASE}
+	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-mirbsd${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
 	exit ;;
    alpha:OSF1:*:*)
 	case $UNAME_RELEASE in
@ -290,13 +280,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo alpha-dec-winnt3.5
 	exit ;;
    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-${VENDOR}-sysv4
+	echo m68k-unknown-sysv4
 	exit ;;
    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-amigaos
+	echo ${UNAME_MACHINE}-unknown-amigaos
 	exit ;;
    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-morphos
+	echo ${UNAME_MACHINE}-unknown-morphos
 	exit ;;
    *:OS/390:*:*)
 	echo i370-ibm-openedition
@ -311,7 +301,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-${VENDOR}-riscos
+	echo arm-unknown-riscos
 	exit ;;
    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
 	echo hppa1.1-hitachi-hiuxmpp
@ -334,33 +324,14 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
 	case `/usr/bin/uname -p` in
 	    sparc) echo sparc-icl-nx7; exit ;;
 	esac ;;
    s390x:SunOS:*:*)
 	echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4H:SunOS:5.*:*)
 	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
 	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
 	echo i386-pc-auroraux${UNAME_RELEASE}
 	exit ;;
    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	eval $set_cc_for_build
+	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	SUN_ARCH="i386"
 	# If there is a compiler, see if it is configured for 64-bit objects.
 	# Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
 	# This test works for both compilers.
 	if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 	    if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
 		(CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		grep IS_64BIT_ARCH >/dev/null
 	    then
 		SUN_ARCH="x86_64"
 	    fi
 	fi
 	echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    sun4*:SunOS:6*:*)
 	# According to config.sub, this is the proper way to canonicalize
@ -419,7 +390,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
        echo m68k-hades-mint${UNAME_RELEASE}
        exit ;;
    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-${VENDOR}-mint${UNAME_RELEASE}
+        echo m68k-unknown-mint${UNAME_RELEASE}
        exit ;;
    m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
@ -669,7 +640,7 @@ EOF
 	    # => hppa64-hp-hpux11.23
 	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep -q __LP64__
+		grep __LP64__ >/dev/null
 	    then
 		HP_ARCH="hppa2.0w"
 	    else
@ -730,9 +701,9 @@ EOF
 	exit ;;
    i*86:OSF1:*:*)
 	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1mk
+	    echo ${UNAME_MACHINE}-unknown-osf1mk
 	else
-	    echo ${UNAME_MACHINE}-${VENDOR}-osf1
+	    echo ${UNAME_MACHINE}-unknown-osf1
 	fi
 	exit ;;
    parisc*:Lites*:*:*)
@ -792,19 +763,19 @@ EOF
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
 	exit ;;
    sparc*:BSD/OS:*:*)
-	echo sparc-${VENDOR}-bsdi${UNAME_RELEASE}
+	echo sparc-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-bsdi${UNAME_RELEASE}
+	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
    *:FreeBSD:*:*)
 	case ${UNAME_MACHINE} in
 	    pc98)
-		echo i386-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    amd64)
-		echo x86_64-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-${VENDOR}-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
    i*:CYGWIN*:*)
@ -820,24 +791,21 @@ EOF
    i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
-    *:Interix*:*)
+    *:Interix*:[3456]*)
    	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
-	    authenticamd | genuineintel | EM64T)
+	    EM64T | authenticamd)
-		echo x86_64-${VENDOR}-interix${UNAME_RELEASE}
+		echo x86_64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	    IA64)
-		echo ia64-${VENDOR}-interix${UNAME_RELEASE}
+		echo ia64-unknown-interix${UNAME_RELEASE}
 		exit ;;
 	esac ;;
    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
 	echo i${UNAME_MACHINE}-pc-mks
 	exit ;;
    8664:Windows_NT:*)
 	echo x86_64-pc-mks
 	exit ;;
    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
@ -848,25 +816,111 @@ EOF
 	echo ${UNAME_MACHINE}-pc-uwin
 	exit ;;
    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-${VENDOR}-cygwin
+	echo x86_64-unknown-cygwin
 	exit ;;
    p*:CYGWIN*:*)
-	echo powerpcle-${VENDOR}-cygwin
+	echo powerpcle-unknown-cygwin
 	exit ;;
    prep*:SunOS:5.*:*)
-	echo powerpcle-${VENDOR}-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
 	exit ;;
    *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-${VENDOR}-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
    *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-${VENDOR}-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
 	exit ;;
    i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
 	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
    crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
    	echo frv-unknown-linux-gnu
 	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    mips:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef mips
 	#undef mipsel
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 	CPU=mipsel
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=mips
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 	    /^CPU/{
 		s: ::g
 		p
 	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef mips64
 	#undef mips64el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 	CPU=mips64el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=mips64
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 	    /^CPU/{
 		s: ::g
 		p
 	    }'`"
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
    or32:Linux:*:*)
 	echo or32-unknown-linux-gnu
 	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-unknown-linux-gnu
 	exit ;;
    ppc64:Linux:*:*)
 	echo powerpc64-unknown-linux-gnu
 	exit ;;
    alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@ -877,115 +931,105 @@ EOF
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
        esac
-	objdump --private-headers /bin/sh | grep -q ld.so.1
+	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
    arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
 	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	else
 	    echo ${UNAME_MACHINE}-${VENDOR}-linux-gnueabi
 	fi
 	exit ;;
    avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    cris:Linux:*:*)
 	echo cris-axis-linux-gnu
 	exit ;;
    crisv32:Linux:*:*)
 	echo crisv32-axis-linux-gnu
 	exit ;;
    frv:Linux:*:*)
    	echo frv-${VENDOR}-linux-gnu
 	exit ;;
    i*86:Linux:*:*)
 	LIBC=gnu
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
 	echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}"
 	exit ;;
    ia64:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    m32r*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    m68*:Linux:*:*)
 	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
 	exit ;;
    mips:Linux:*:* | mips64:Linux:*:*)
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#undef CPU
 	#undef ${UNAME_MACHINE}
 	#undef ${UNAME_MACHINE}el
 	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
 	CPU=${UNAME_MACHINE}el
 	#else
 	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
 	CPU=${UNAME_MACHINE}
 	#else
 	CPU=
 	#endif
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
 	test x"${CPU}" != x && { echo "${CPU}-${VENDOR}-linux-gnu"; exit; }
 	;;
    or32:Linux:*:*)
 	echo or32-${VENDOR}-linux-gnu
 	exit ;;
    padre:Linux:*:*)
 	echo sparc-${VENDOR}-linux-gnu
 	exit ;;
    parisc64:Linux:*:* | hppa64:Linux:*:*)
 	echo hppa64-${VENDOR}-linux-gnu
 	exit ;;
    parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux-gnu ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-${VENDOR}-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
-    ppc64:Linux:*:*)
+    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux-gnu
+	echo hppa64-unknown-linux-gnu
 	exit ;;
    ppc:Linux:*:*)
 	echo powerpc-${VENDOR}-linux-gnu
 	exit ;;
    s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
    x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux-gnu
+	echo x86_64-unknown-linux-gnu
 	exit ;;
    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux-gnu
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
    i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
 	# first see if it will tell us. cd to the root directory to prevent
 	# problems with other programs or directories called `ld' in the path.
 	# Set LC_ALL=C to ensure ld outputs messages in English.
 	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
 			 | sed -ne '/supported targets:/!d
 				    s/[ 	][ 	]*/ /g
 				    s/.*supported targets: *//
 				    s/ .*//
 				    p'`
        case "$ld_supported_targets" in
 	  elf32-i386)
 		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
 		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
 	  coff-i386)
 		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
 		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
 	#include <features.h>
 	#ifdef __ELF__
 	# ifdef __GLIBC__
 	#  if __GLIBC__ >= 2
 	LIBC=gnu
 	#  else
 	LIBC=gnulibc1
 	#  endif
 	# else
 	LIBC=gnulibc1
 	# endif
 	#else
 	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
 	LIBC=gnu
 	#else
 	LIBC=gnuaout
 	#endif
 	#endif
 	#ifdef __dietlibc__
 	LIBC=dietlibc
 	#endif
 EOF
 	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
 	    /^LIBC/{
 		s: ::g
 		p
 	    }'`"
 	test x"${LIBC}" != x && {
 		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
 		exit
 	}
 	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
 	;;
    i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
 	# earlier versions are messed up and put the nodename in both
@ -1006,16 +1050,16 @@ EOF
 	echo ${UNAME_MACHINE}-pc-os2-emx
 	exit ;;
    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-${VENDOR}-stop
+	echo ${UNAME_MACHINE}-unknown-stop
 	exit ;;
    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-atheos
+	echo ${UNAME_MACHINE}-unknown-atheos
 	exit ;;
    i*86:syllable:*:*)
 	echo ${UNAME_MACHINE}-pc-syllable
 	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
+    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo i386-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    i*86:*DOS:*:*)
 	echo ${UNAME_MACHINE}-pc-msdosdjgpp
@ -1035,7 +1079,7 @@ EOF
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
 	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
 	esac
-	echo ${UNAME_MACHINE}-${VENDOR}-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
 	exit ;;
    i*86:*:3.2:*)
 	if test -f /usr/options/cb.name; then
@ -1058,11 +1102,8 @@ EOF
    pc:*:*:*)
 	# Left here for compatibility:
        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+        # the processor, so we play safe by assuming i386.
-	# Note: whatever this is, it MUST be the same as what config.sub
+	echo i386-pc-msdosdjgpp
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
        exit ;;
    Intel:Mach:3*:*)
 	echo i386-pc-mach3
@ -1074,7 +1115,7 @@ EOF
 	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
 	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
 	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-${VENDOR}-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
+	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
 	fi
 	exit ;;
    mini*:CTIX:SYS*5:*)
@ -1100,30 +1141,20 @@ EOF
    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
          && { echo i486-ncr-sysv4; exit; } ;;
    NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
 	    && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
 	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
 	    && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
 	/bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
 	    && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo m68k-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    mc68030:UNIX_System_V:4.*:*)
 	echo m68k-atari-sysv4
 	exit ;;
    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo sparc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    rs6000:LynxOS:2.*:*)
-	echo rs6000-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo rs6000-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
+    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-${VENDOR}-lynxos${UNAME_RELEASE}
+	echo powerpc-unknown-lynxos${UNAME_RELEASE}
 	exit ;;
    SM[BE]S:UNIX_SV:*:*)
 	echo mips-dde-sysv${UNAME_RELEASE}
@ -1173,7 +1204,7 @@ EOF
 	if [ -d /usr/nec ]; then
 	        echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-${VENDOR}-sysv${UNAME_RELEASE}
+	        echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
        exit ;;
    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
@ -1185,9 +1216,6 @@ EOF
    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
 	echo i586-pc-beos
 	exit ;;
    BePC:Haiku:*:*)	# Haiku running on Intel PC compatible.
 	echo i586-pc-haiku
 	exit ;;
    SX-4:SUPER-UX:*:*)
 	echo sx4-nec-superux${UNAME_RELEASE}
 	exit ;;
@ -1206,6 +1234,9 @@ EOF
    SX-8R:SUPER-UX:*:*)
 	echo sx8r-nec-superux${UNAME_RELEASE}
 	exit ;;
    SX-9:SUPER-UX:*:*)
 	echo sx9-nec-superux${UNAME_RELEASE}
 	exit ;;
    Power*:Rhapsody:*:*)
 	echo powerpc-apple-rhapsody${UNAME_RELEASE}
 	exit ;;
@ -1215,16 +1246,6 @@ EOF
    *:Darwin:*:*)
 	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
 	case $UNAME_PROCESSOR in
 	    i386)
 		eval $set_cc_for_build
 		if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
 		  if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
 		      (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
 		      grep IS_64BIT_ARCH >/dev/null
 		  then
 		      UNAME_PROCESSOR="x86_64"
 		  fi
 		fi ;;
 	    unknown) UNAME_PROCESSOR=powerpc ;;
 	esac
 	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
@ -1264,13 +1285,13 @@ EOF
 	else
 	    UNAME_MACHINE="$cputype"
 	fi
-	echo ${UNAME_MACHINE}-${VENDOR}-plan9
+	echo ${UNAME_MACHINE}-unknown-plan9
 	exit ;;
    *:TOPS-10:*:*)
-	echo pdp10-${VENDOR}-tops10
+	echo pdp10-unknown-tops10
 	exit ;;
    *:TENEX:*:*)
-	echo pdp10-${VENDOR}-tenex
+	echo pdp10-unknown-tenex
 	exit ;;
    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
 	echo pdp10-dec-tops20
@ -1279,16 +1300,16 @@ EOF
 	echo pdp10-xkl-tops20
 	exit ;;
    *:TOPS-20:*:*)
-	echo pdp10-${VENDOR}-tops20
+	echo pdp10-unknown-tops20
 	exit ;;
    *:ITS:*:*)
-	echo pdp10-${VENDOR}-its
+	echo pdp10-unknown-its
 	exit ;;
    SEI:*:*:SEIUX)
        echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
    *:*VMS:*:*)
    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
@ -1306,9 +1327,6 @@ EOF
    i*86:rdos:*:*)
 	echo ${UNAME_MACHINE}-pc-rdos
 	exit ;;
    i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
 esac
 #echo '(No uname command or uname output not recognized.)' 1>&2
--- a/config/config.sub
+++ b/config/config.sub
@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
 #   Free Software Foundation, Inc.
-timestamp='2009-11-20'
+timestamp='2008-01-16'
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@ -32,16 +32,13 @@ timestamp='2009-11-20'
 # Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted GNU ChangeLog entry.
+# diff and a properly formatted ChangeLog entry.
 #
 # Configuration subroutine to validate and canonicalize a configuration type.
 # Supply the specified configuration type as an argument.
 # If it is invalid, we print an error message on stderr and exit with code 1.
 # Otherwise, we print the canonical config type on stdout and succeed.
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
 # This file is supposed to be the same for all GNU packages
 # and recognize all the CPU types, system types and aliases
 # that are meaningful with *any* GNU software.
@ -125,7 +122,6 @@ maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
  kopensolaris*-gnu* | \
  storm-chaos* | os2-emx* | rtmk-nova*)
    os=-$maybe_os
    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@ -152,13 +148,10 @@ case $os in
 	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
 	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
 	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray | -microblaze)
+	-apple | -axis | -knuth | -cray)
 		os=
 		basic_machine=$1
 		;;
        -bluegene*)
 	        os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
 		basic_machine=$1
@ -256,16 +249,13 @@ case $basic_machine in
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep | metag \
+	| maxq | mb | microblaze | mcore | mep \
 	| mips | mipsbe | mipseb | mipsel | mipsle \
 	| mips16 \
 	| mips64 | mips64el \
 	| mips64octeon | mips64octeonel \
 	| mips64orion | mips64orionel \
 	| mips64r5900 | mips64r5900el \
 	| mips64vr | mips64vrel \
 	| mips64orion | mips64orionel \
 	| mips64vr4100 | mips64vr4100el \
 	| mips64vr4300 | mips64vr4300el \
 	| mips64vr5000 | mips64vr5000el \
@ -278,7 +268,6 @@ case $basic_machine in
 	| mipsisa64sr71k | mipsisa64sr71kel \
 	| mipstx39 | mipstx39el \
 	| mn10200 | mn10300 \
 	| moxie \
 	| mt \
 	| msp430 \
 	| nios | nios2 \
@ -287,22 +276,20 @@ case $basic_machine in
 	| pdp10 | pdp11 | pj | pjl \
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| rx \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
 	| spu | strongarm \
 	| tahoe | thumb | tic4x | tic80 | tron \
 	| ubicom32 \
 	| v850 | v850e \
 	| we32k \
 	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k | z80)
+	| z8k)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
+	m6811 | m68hc11 | m6812 | m68hc12)
 		# Motorola 68HC11/12.
 		basic_machine=$basic_machine-unknown
 		os=-none
@ -342,17 +329,14 @@ case $basic_machine in
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
+	| m88110-* | m88k-* | maxq-* | mcore-* \
 	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
 	| mips16-* \
 	| mips64-* | mips64el-* \
 	| mips64octeon-* | mips64octeonel-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64r5900-* | mips64r5900el-* \
 	| mips64vr-* | mips64vrel-* \
 	| mips64orion-* | mips64orionel-* \
 	| mips64vr4100-* | mips64vr4100el-* \
 	| mips64vr4300-* | mips64vr4300el-* \
 	| mips64vr5000-* | mips64vr5000el-* \
@ -373,22 +357,21 @@ case $basic_machine in
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
 	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
 	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* | tile-* \
+	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
 	| tron-* \
 	| ubicom32-* \
 	| v850-* | v850e-* | vax-* \
 	| we32k-* \
 	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
-	| z8k-* | z80-*)
+	| z8k-*)
 		;;
 	# Recognize the basic CPU types without company name, with glob match.
 	xtensa*)
@ -456,10 +439,6 @@ case $basic_machine in
 		basic_machine=m68k-apollo
 		os=-bsd
 		;;
 	aros)
 		basic_machine=i386-pc
 		os=-aros
 		;;
 	aux)
 		basic_machine=m68k-apple
 		os=-aux
@ -476,18 +455,10 @@ case $basic_machine in
 		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
 		os=-linux
 		;;
 	bluegene*)
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
        cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
 	convex-c1)
 		basic_machine=c1-convex
 		os=-bsd
@ -555,10 +526,6 @@ case $basic_machine in
 		basic_machine=m88k-motorola
 		os=-sysv3
 		;;
 	dicos)
 		basic_machine=i686-pc
 		os=-dicos
 		;;
 	djgpp)
 		basic_machine=i586-pc
 		os=-msdosdjgpp
@ -732,9 +699,6 @@ case $basic_machine in
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
        microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
 		basic_machine=i386-pc
 		os=-mingw32
@ -1164,10 +1128,6 @@ case $basic_machine in
 		basic_machine=z8k-unknown
 		os=-sim
 		;;
 	z80-*-coff)
 		basic_machine=z80-unknown
 		os=-sim
 		;;
 	none)
 		basic_machine=none-none
 		os=-none
@ -1206,7 +1166,7 @@ case $basic_machine in
 	we32k)
 		basic_machine=we32k-att
 		;;
-	sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
+	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
 		basic_machine=sh-unknown
 		;;
 	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
@ -1256,9 +1216,6 @@ case $os in
        # First match some system type aliases
        # that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
        -auroraux)
 	        os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
 		;;
@ -1279,11 +1236,10 @@ case $os in
 	# Each alternative MUST END IN A *, to match a version number.
 	# -sysv* is not here because it comes later, after sysvr4.
 	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
+	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
+	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
 	      | -sym* | -kopensolaris* \
 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* | -aros* \
+	      | -aos* \
 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
@ -1292,7 +1248,7 @@ case $os in
 	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* | -cegcc* \
+	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
 	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
@ -1302,7 +1258,7 @@ case $os in
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
@ -1432,9 +1388,6 @@ case $os in
 	-zvmoe)
 		os=-zvmoe
 		;;
 	-dicos*)
 		os=-dicos
 		;;
 	-none)
 		;;
 	*)
@ -1632,7 +1585,7 @@ case $basic_machine in
 			-sunos*)
 				vendor=sun
 				;;
-			-cnk*|-aix*)
+			-aix*)
 				vendor=ibm
 				;;
 			-beos*)
--- a/config/depcomp
+++ b/config/depcomp
@ -1,10 +1,9 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2003-11-08.23
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
+# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
 # Software Foundation, Inc.
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@ -17,7 +16,9 @@ scriptversion=2009-04-28.21; # UTC
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -42,18 +43,17 @@ Environment variables:
  depmode     Dependency tracking mode.
  source      Source file read by `PROGRAMS ARGS'.
  object      Object file output by `PROGRAMS ARGS'.
  DEPDIR      directory where to store dependencies.
  depfile     Dependency file to output.
  tmpdepfile  Temporary file to use when outputing dependencies.
  libtool     Whether libtool is used (yes/no).
 Report bugs to <bug-automake@gnu.org>.
 EOF
-    exit $?
+    exit 0
    ;;
  -v | --v*)
    echo "depcomp $scriptversion"
-    exit $?
+    exit 0
    ;;
 esac
@ -61,10 +61,18 @@ if test -z "$depmode" || test -z "$source" || test -z "$object"; then
  echo "depcomp: Variables source, object and depmode must be set" 1>&2
  exit 1
 fi
 # `libtool' can also be set to `yes' or `no'.
 if test -z "$depfile"; then
   base=`echo "$object" | sed -e 's,^.*/,,' -e 's,\.\([^.]*\)$,.P\1,'`
   dir=`echo "$object" | sed 's,/.*$,/,'`
   if test "$dir" = "$object"; then
      dir=
   fi
   # FIXME: should be _deps on DOS.
   depfile="$dir.deps/$base"
 fi
 # Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
 depfile=${depfile-`echo "$object" |
  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
 tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
 rm -f "$tmpdepfile"
@ -85,34 +93,12 @@ if test "$depmode" = dashXmstdout; then
   depmode=dashmstdout
 fi
 cygpath_u="cygpath -u -f -"
 if test "$depmode" = msvcmsys; then
   # This is just like msvisualcpp but w/o cygpath translation.
   # Just convert the backslash-escaped backslashes to single forward
   # slashes to satisfy depend.m4
   cygpath_u="sed s,\\\\\\\\,/,g"
   depmode=msvisualcpp
 fi
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
 ## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
 ## it if -MD -MP comes after the -MF stuff.  Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
+  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
 ## the command line argument order; so add the flags where they
 ## appear in depend2.am.  Note that the slowdown incurred here
 ## affects only configure: in makefiles, %FASTDEP% shortcuts this.
  for arg
  do
    case $arg in
    -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
    *)  set fnord "$@" "$arg" ;;
    esac
    shift # fnord
    shift # $arg
  done
  "$@"
  stat=$?
  if test $stat -eq 0; then :
  else
@ -199,14 +185,14 @@ sgi)
 ' < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
    tr '
-' ' ' >> "$depfile"
+' ' ' >> $depfile
-    echo >> "$depfile"
+    echo >> $depfile
    # The second pass generates a dummy entry for each header file.
    tr ' ' '
 ' < "$tmpdepfile" \
   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> "$depfile"
+   >> $depfile
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
@ -222,39 +208,34 @@ aix)
  # current directory.  Also, the AIX compiler puts `$object:' at the
  # start of each line; $object doesn't have directory information.
  # Version 6 uses the directory in both cases.
-  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
+  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  test "x$dir" = "x$object" && dir=
+  tmpdepfile="$stripped.u"
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$base.u
    tmpdepfile3=$dir.libs/$base.u
    "$@" -Wc,-M
  else
    tmpdepfile1=$dir$base.u
    tmpdepfile2=$dir$base.u
    tmpdepfile3=$dir$base.u
    "$@" -M
  fi
  stat=$?
  if test -f "$tmpdepfile"; then :
  else
    stripped=`echo "$stripped" | sed 's,^.*/,,'`
    tmpdepfile="$stripped.u"
  fi
  if test $stat -eq 0; then :
  else
-    rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
+    rm -f "$tmpdepfile"
    exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    outname="$stripped.o"
    # Each line is of the form `foo.o: dependent.h'.
    # Do two passes, one to just change these to
    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
+    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
+    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
  else
    # The sourcefile does not contain any dependencies, so just
    # store a dummy comment line, to avoid errors with the Makefile
@ -302,51 +283,6 @@ icc)
  rm -f "$tmpdepfile"
  ;;
 hp2)
  # The "hp" stanza above does not work with aCC (C++) and HP's ia64
  # compilers, which have integrated preprocessors.  The correct option
  # to use with these is +Maked; it writes dependencies to a file named
  # 'foo.d', which lands next to the object file, wherever that
  # happens to be.
  # Much of this is similar to the tru64 case; see comments there.
  dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
  test "x$dir" = "x$object" && dir=
  base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
  if test "$libtool" = yes; then
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir.libs/$base.d
    "$@" -Wc,+Maked
  else
    tmpdepfile1=$dir$base.d
    tmpdepfile2=$dir$base.d
    "$@" +Maked
  fi
  stat=$?
  if test $stat -eq 0; then :
  else
     rm -f "$tmpdepfile1" "$tmpdepfile2"
     exit $stat
  fi
  for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
  do
    test -f "$tmpdepfile" && break
  done
  if test -f "$tmpdepfile"; then
    sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
    # Add `dependent.h:' lines.
    sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
 	       s/$/:/
 	       p
 	     }' "$tmpdepfile" >> "$depfile"
  else
    echo "#dummy" > "$depfile"
  fi
  rm -f "$tmpdepfile" "$tmpdepfile2"
  ;;
 tru64)
   # The Tru64 compiler uses -MD to generate dependencies as a side
   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@ -358,43 +294,27 @@ tru64)
   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
+      tmpdepfile1="$dir.libs/$base.lo.d"
-      # static library.  This mechanism is used in libtool 1.4 series to
+      tmpdepfile2="$dir.libs/$base.d"
      # handle both shared and static libraries in a single compilation.
      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
      #
      # With libtool 1.5 this exception was removed, and libtool now
      # generates 2 separate objects for the 2 libraries.  These two
      # compilations output dependencies in $dir.libs/$base.o.d and
      # in $dir$base.o.d.  We have to check for both files, because
      # one of the two compilations can be disabled.  We should prefer
      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
      # automatically cleaned when .libs/ is deleted, while ignoring
      # the former would cause a distcleancheck panic.
      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
      tmpdepfile2=$dir$base.o.d          # libtool 1.5
      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
      "$@" -Wc,-MD
   else
-      tmpdepfile1=$dir$base.o.d
+      tmpdepfile1="$dir$base.o.d"
-      tmpdepfile2=$dir$base.d
+      tmpdepfile2="$dir$base.d"
      tmpdepfile3=$dir$base.d
      tmpdepfile4=$dir$base.d
      "$@" -MD
   fi
   stat=$?
   if test $stat -eq 0; then :
   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+      rm -f "$tmpdepfile1" "$tmpdepfile2"
      exit $stat
   fi
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
+   if test -f "$tmpdepfile1"; then
-   do
+      tmpdepfile="$tmpdepfile1"
-     test -f "$tmpdepfile" && break
+   else
-   done
+      tmpdepfile="$tmpdepfile2"
   fi
   if test -f "$tmpdepfile"; then
      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
      # That's a tab and a space in the [].
@ -416,7 +336,7 @@ dashmstdout)
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
@ -467,39 +387,32 @@ makedepend)
  "$@" || exit $?
  # Remove any Libtool call
  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
  fi
  # X makedepend
  shift
-  cleared=no eat=no
+  cleared=no
-  for arg
+  for arg in "$@"; do
  do
    case $cleared in
    no)
      set ""; shift
      cleared=yes ;;
    esac
    if test $eat = yes; then
      eat=no
      continue
    fi
    case "$arg" in
    -D*|-I*)
      set fnord "$@" "$arg"; shift ;;
    # Strip any option that makedepend may not understand.  Remove
    # the object too, otherwise makedepend will parse it as a source file.
    -arch)
      eat=yes ;;
    -*|$object)
      ;;
    *)
      set fnord "$@" "$arg"; shift ;;
    esac
  done
-  obj_suffix=`echo "$object" | sed 's/^.*\././'`
+  obj_suffix="`echo $object | sed 's/^.*\././'`"
  touch "$tmpdepfile"
  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
  rm -f "$depfile"
@ -519,7 +432,7 @@ cpp)
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
-    while test "X$1" != 'X--mode=compile'; do
+    while test $1 != '--mode=compile'; do
      shift
    done
    shift
@ -545,8 +458,7 @@ cpp)
  done
  "$@" -E |
-    sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \
+    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
       -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
    sed '$ s: \\$::' > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
@ -557,27 +469,13 @@ cpp)
 msvisualcpp)
  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
+  # always write the preprocessed file to stdout, regardless of -o,
  # because we must use -o when running libtool.
  "$@" || exit $?
  # Remove the call to Libtool.
  if test "$libtool" = yes; then
    while test "X$1" != 'X--mode=compile'; do
      shift
    done
    shift
  fi
  IFS=" "
  for arg
  do
    case "$arg" in
    -o)
      shift
      ;;
    $object)
      shift
      ;;
    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
 	set fnord "$@"
 	shift
@ -590,23 +488,16 @@ msvisualcpp)
 	;;
    esac
  done
-  "$@" -E 2>/dev/null |
+  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
+  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
  rm -f "$depfile"
  echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
  echo "	" >> "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
+  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
  rm -f "$tmpdepfile"
  ;;
 msvcmsys)
  # This case exists only to let depend.m4 do its work.  It works by
  # looking at the text of this script.  This case will never be run,
  # since it is checked for above.
  exit 1
  ;;
 none)
  exec "$@"
  ;;
@ -625,6 +516,5 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-end: "$"
 # time-stamp-end: "; # UTC"
 # End:
--- a/config/install-sh
+++ b/config/install-sh
@ -1,520 +1,276 @@
 #!/bin/sh
 #
 # install - install a program, script, or datafile
-
+# This comes from X11R5 (mit/util/scripts/install.sh).
 scriptversion=2009-04-28.21; # UTC
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
 # following copyright and license.
 #
-# Copyright (C) 1994 X Consortium
+# Copyright 1991 by the Massachusetts Institute of Technology
 #
-# Permission is hereby granted, free of charge, to any person obtaining a copy
+# Permission to use, copy, modify, distribute, and sell this software and its
-# of this software and associated documentation files (the "Software"), to
+# documentation for any purpose is hereby granted without fee, provided that
-# deal in the Software without restriction, including without limitation the
+# the above copyright notice appear in all copies and that both that
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+# copyright notice and this permission notice appear in supporting
-# sell copies of the Software, and to permit persons to whom the Software is
+# documentation, and that the name of M.I.T. not be used in advertising or
-# furnished to do so, subject to the following conditions:
+# publicity pertaining to distribution of the software without specific,
-#
+# written prior permission.  M.I.T. makes no representations about the
-# The above copyright notice and this permission notice shall be included in
+# suitability of this software for any purpose.  It is provided "as is"
-# all copies or substantial portions of the Software.
+# without express or implied warranty.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
 # X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
 # AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
 # TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 # Except as contained in this notice, the name of the X Consortium shall not
 # be used in advertising or otherwise to promote the sale, use or other deal-
 # ings in this Software without prior written authorization from the X Consor-
 # tium.
 #
 #
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
 # `make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
-# from scratch.
+# from scratch.  It can only install one file at a time, a restriction
 # shared with many OS's install programs.
 nl='
 '
 IFS=" ""	$nl"
 # set DOITPROG to echo to test this script
 # Don't use :- since 4.3BSD and earlier shells don't like it.
-doit=${DOITPROG-}
+doit="${DOITPROG-}"
 if test -z "$doit"; then
  doit_exec=exec
 else
  doit_exec=$doit
 fi
 # Put in absolute file names if you don't have them in your path;
 # or use environment vars.
-chgrpprog=${CHGRPPROG-chgrp}
+# put in absolute paths if you don't have them in your path; or use env. vars.
 chmodprog=${CHMODPROG-chmod}
 chownprog=${CHOWNPROG-chown}
 cmpprog=${CMPPROG-cmp}
 cpprog=${CPPROG-cp}
 mkdirprog=${MKDIRPROG-mkdir}
 mvprog=${MVPROG-mv}
 rmprog=${RMPROG-rm}
 stripprog=${STRIPPROG-strip}
-posix_glob='?'
+mvprog="${MVPROG-mv}"
-initialize_posix_glob='
+cpprog="${CPPROG-cp}"
-  test "$posix_glob" != "?" || {
+chmodprog="${CHMODPROG-chmod}"
-    if (set -f) 2>/dev/null; then
+chownprog="${CHOWNPROG-chown}"
-      posix_glob=
+chgrpprog="${CHGRPPROG-chgrp}"
-    else
+stripprog="${STRIPPROG-strip}"
-      posix_glob=:
+rmprog="${RMPROG-rm}"
-    fi
+mkdirprog="${MKDIRPROG-mkdir}"
  }
 '
-posix_mkdir=
+transformbasename=""
-
+transform_arg=""
-# Desired mode of installed file.
+instcmd="$mvprog"
-mode=0755
+chmodcmd="$chmodprog 0755"
-
+chowncmd=""
-chgrpcmd=
+chgrpcmd=""
-chmodcmd=$chmodprog
+stripcmd=""
 chowncmd=
 mvcmd=$mvprog
 rmcmd="$rmprog -f"
-stripcmd=
+mvcmd="$mvprog"
 src=""
 dst=""
 dir_arg=""
-src=
+while [ x"$1" != x ]; do
-dst=
+    case $1 in
-dir_arg=
+	-c) instcmd=$cpprog
-dst_arg=
+	    shift
 	    continue;;
-copy_on_change=false
+	-d) dir_arg=true
-no_target_directory=
+	    shift
 	    continue;;
-usage="\
+	-m) chmodcmd="$chmodprog $2"
-Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
+	    shift
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
+	    shift
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
+	    continue;;
   or: $0 [OPTION]... -d DIRECTORIES...
-In the 1st form, copy SRCFILE to DSTFILE.
+	-o) chowncmd="$chownprog $2"
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
+	    shift
-In the 4th, create DIRECTORIES.
+	    shift
 	    continue;;
-Options:
+	-g) chgrpcmd="$chgrpprog $2"
-     --help     display this help and exit.
+	    shift
-     --version  display version info and exit.
+	    shift
 	    continue;;
-  -c            (ignored)
+	-s) stripcmd=$stripprog
-  -C            install only if different (preserve the last data modification time)
+	    shift
-  -d            create directories instead of installing files.
+	    continue;;
  -g GROUP      $chgrpprog installed files to GROUP.
  -m MODE       $chmodprog installed files to MODE.
  -o USER       $chownprog installed files to USER.
  -s            $stripprog installed files.
  -t DIRECTORY  install into DIRECTORY.
  -T            report an error if DSTFILE is a directory.
-Environment variables override the default commands:
+	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-  CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
+	    shift
-  RMPROG STRIPPROG
+	    continue;;
 "
-while test $# -ne 0; do
+	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-  case $1 in
+	    shift
-    -c) ;;
+	    continue;;
-    -C) copy_on_change=true;;
+	*)  if [ x"$src" = x ]
    -d) dir_arg=true;;
    -g) chgrpcmd="$chgrpprog $2"
 	shift;;
    --help) echo "$usage"; exit $?;;
    -m) mode=$2
 	case $mode in
 	  *' '* | *'	'* | *'
 '*	  | *'*'* | *'?'* | *'['*)
 	    echo "$0: invalid mode: $mode" >&2
 	    exit 1;;
 	esac
 	shift;;
    -o) chowncmd="$chownprog $2"
 	shift;;
    -s) stripcmd=$stripprog;;
    -t) dst_arg=$2
 	shift;;
    -T) no_target_directory=true;;
    --version) echo "$0 $scriptversion"; exit $?;;
    --)	shift
 	break;;
    -*)	echo "$0: invalid option: $1" >&2
 	exit 1;;
    *)  break;;
  esac
  shift
 done
 if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
  # When -d is used, all remaining arguments are directories to create.
  # When -t is used, the destination is already specified.
  # Otherwise, the last argument is the destination.  Remove it from $@.
  for arg
  do
    if test -n "$dst_arg"; then
      # $@ is not empty: it contains at least $arg.
      set fnord "$@" "$dst_arg"
      shift # fnord
    fi
    shift # arg
    dst_arg=$arg
  done
 fi
 if test $# -eq 0; then
  if test -z "$dir_arg"; then
    echo "$0: no input file specified." >&2
    exit 1
  fi
  # It's OK to call `install-sh -d' without argument.
  # This can happen when creating conditional directories.
  exit 0
 fi
 if test -z "$dir_arg"; then
  trap '(exit $?); exit' 1 2 13 15
  # Set umask so as not to create temps with too-generous modes.
  # However, 'strip' requires both read and write access to temps.
  case $mode in
    # Optimize common cases.
    *644) cp_umask=133;;
    *755) cp_umask=22;;
    *[0-7])
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw='% 200'
      fi
      cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
    *)
      if test -z "$stripcmd"; then
 	u_plus_rw=
      else
 	u_plus_rw=,u+rw
      fi
      cp_umask=$mode$u_plus_rw;;
  esac
 fi
 for src
 do
  # Protect names starting with `-'.
  case $src in
    -*) src=./$src;;
  esac
  if test -n "$dir_arg"; then
    dst=$src
    dstdir=$dst
    test -d "$dstdir"
    dstdir_status=$?
  else
    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
    # might cause directories to be created, which would be especially bad
    # if $src (and thus $dsttmp) contains '*'.
    if test ! -f "$src" && test ! -d "$src"; then
      echo "$0: $src does not exist." >&2
      exit 1
    fi
    if test -z "$dst_arg"; then
      echo "$0: no destination specified." >&2
      exit 1
    fi
    dst=$dst_arg
    # Protect names starting with `-'.
    case $dst in
      -*) dst=./$dst;;
    esac
    # If destination is a directory, append the input filename; won't work
    # if double slashes aren't ignored.
    if test -d "$dst"; then
      if test -n "$no_target_directory"; then
 	echo "$0: $dst_arg: Is a directory" >&2
 	exit 1
      fi
      dstdir=$dst
      dst=$dstdir/`basename "$src"`
      dstdir_status=0
    else
      # Prefer dirname, but fall back on a substitute if dirname fails.
      dstdir=`
 	(dirname "$dst") 2>/dev/null ||
 	expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
 	     X"$dst" : 'X\(//\)[^/]' \| \
 	     X"$dst" : 'X\(//\)$' \| \
 	     X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
 	echo X"$dst" |
 	    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)[^/].*/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\/\)$/{
 		   s//\1/
 		   q
 		 }
 		 /^X\(\/\).*/{
 		   s//\1/
 		   q
 		 }
 		 s/.*/./; q'
      `
      test -d "$dstdir"
      dstdir_status=$?
    fi
  fi
  obsolete_mkdir_used=false
  if test $dstdir_status != 0; then
    case $posix_mkdir in
      '')
 	# Create intermediate dirs using mode 755 as modified by the umask.
 	# This is like FreeBSD 'install' as of 1997-10-28.
 	umask=`umask`
 	case $stripcmd.$umask in
 	  # Optimize common cases.
 	  *[2367][2367]) mkdir_umask=$umask;;
 	  .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
 	  *[0-7])
 	    mkdir_umask=`expr $umask + 22 \
 	      - $umask % 100 % 40 + $umask % 20 \
 	      - $umask % 10 % 4 + $umask % 2
 	    `;;
 	  *) mkdir_umask=$umask,go-w;;
 	esac
 	# With -d, create the new directory with the user-specified mode.
 	# Otherwise, rely on $mkdir_umask.
 	if test -n "$dir_arg"; then
 	  mkdir_mode=-m$mode
 	else
 	  mkdir_mode=
 	fi
 	posix_mkdir=false
 	case $umask in
 	  *[123567][0-7][0-7])
 	    # POSIX mkdir -p sets u+wx bits regardless of umask, which
 	    # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
 	    ;;
 	  *)
 	    tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
 	    trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
 	    if (umask $mkdir_umask &&
 		exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
 	    then
-	      if test -z "$dir_arg" || {
+		src=$1
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 		   # other-writeable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in
 		     d????-?r-*) different_mode=700;;
 		     d????-?--*) different_mode=755;;
 		     *) false;;
 		   esac &&
 		   $mkdirprog -m$different_mode -p -- "$tmpdir" && {
 		     ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
 		     test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
 		   }
 		 }
 	      then posix_mkdir=:
 	      fi
 	      rmdir "$tmpdir/d" "$tmpdir"
 	    else
-	      # Remove any dirs left behind by ancient mkdir implementations.
+		# this colon is to work around a 386BSD /bin/sh bug
-	      rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
+		:
 		dst=$1
 	    fi
-	    trap '' 0;;
+	    shift
-	esac;;
+	    continue;;
    esac
    if
      $posix_mkdir && (
 	umask $mkdir_umask &&
 	$doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
      )
    then :
    else
      # The umask is ridiculous, or mkdir does not conform to POSIX,
      # or it failed possibly due to a race condition.  Create the
      # directory the slow way, step by step, checking for races as we go.
      case $dstdir in
 	/*) prefix='/';;
 	-*) prefix='./';;
 	*)  prefix='';;
      esac
      eval "$initialize_posix_glob"
      oIFS=$IFS
      IFS=/
      $posix_glob set -f
      set fnord $dstdir
      shift
      $posix_glob set +f
      IFS=$oIFS
      prefixes=
      for d
      do
 	test -z "$d" && continue
 	prefix=$prefix$d
 	if test -d "$prefix"; then
 	  prefixes=
 	else
 	  if $posix_mkdir; then
 	    (umask=$mkdir_umask &&
 	     $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
 	    # Don't fail if two instances are running concurrently.
 	    test -d "$prefix" || exit 1
 	  else
 	    case $prefix in
 	      *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
 	      *) qprefix=$prefix;;
 	    esac
 	    prefixes="$prefixes '$qprefix'"
 	  fi
 	fi
 	prefix=$prefix/
      done
      if test -n "$prefixes"; then
 	# Don't fail if two instances are running concurrently.
 	(umask $mkdir_umask &&
 	 eval "\$doit_exec \$mkdirprog $prefixes") ||
 	  test -d "$dstdir" || exit 1
 	obsolete_mkdir_used=true
      fi
    fi
  fi
  if test -n "$dir_arg"; then
    { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
    { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
      test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
  else
    # Make a couple of temp file names in the proper directory.
    dsttmp=$dstdir/_inst.$$_
    rmtmp=$dstdir/_rm.$$_
    # Trap to clean up those temp files at exit.
    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
    # Copy the file name to the temp name.
    (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
    # and set any options; do chmod last to preserve setuid bits.
    #
    # If any of these fail, we abort the whole thing.  If we want to
    # ignore errors from any of these, just make sure not to ignore
    # errors from the above "$doit $cpprog $src $dsttmp" command.
    #
    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } &&
    { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } &&
    { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } &&
    { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
    # If -C, don't bother to copy if it wouldn't change the file.
    if $copy_on_change &&
       old=`LC_ALL=C ls -dlL "$dst"	2>/dev/null` &&
       new=`LC_ALL=C ls -dlL "$dsttmp"	2>/dev/null` &&
       eval "$initialize_posix_glob" &&
       $posix_glob set -f &&
       set X $old && old=:$2:$4:$5:$6 &&
       set X $new && new=:$2:$4:$5:$6 &&
       $posix_glob set +f &&
       test "$old" = "$new" &&
       $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
    then
      rm -f "$dsttmp"
    else
      # Rename the file to the real destination.
      $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null ||
      # The rename failed, perhaps because mv can't rename something else
      # to itself, or perhaps because mv is so ancient that it does not
      # support -f.
      {
 	# Now remove or move aside any old file at destination location.
 	# We try this two ways since rm can't unlink itself on some
 	# systems and the destination file might be busy for other
 	# reasons.  In this case, the final cleanup might fail but the new
 	# file should still install successfully.
 	{
 	  test ! -f "$dst" ||
 	  $doit $rmcmd -f "$dst" 2>/dev/null ||
 	  { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
 	    { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
 	  } ||
 	  { echo "$0: cannot unlink or rename $dst" >&2
 	    (exit 1); exit 1
 	  }
 	} &&
 	# Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dst"
      }
    fi || exit 1
    trap '' 0
  fi
 done
-# Local variables:
+if [ x"$src" = x ]
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+then
-# time-stamp-start: "scriptversion="
+	echo "$0: no input file specified" >&2
-# time-stamp-format: "%:y-%02m-%02d.%02H"
+	exit 1
-# time-stamp-time-zone: "UTC"
+else
-# time-stamp-end: "; # UTC"
+	:
-# End:
+fi
 if [ x"$dir_arg" != x ]; then
 	dst=$src
 	src=""
 	if [ -d "$dst" ]; then
 		instcmd=:
 		chmodcmd=""
 	else
 		instcmd=$mkdirprog
 	fi
 else
 # Waiting for this to be detected by the "$instcmd $src $dsttmp" command
 # might cause directories to be created, which would be especially bad
 # if $src (and thus $dsttmp) contains '*'.
 	if [ -f "$src" ] || [ -d "$src" ]
 	then
 		:
 	else
 		echo "$0: $src does not exist" >&2
 		exit 1
 	fi
 	if [ x"$dst" = x ]
 	then
 		echo "$0: no destination specified" >&2
 		exit 1
 	else
 		:
 	fi
 # If destination is a directory, append the input filename; if your system
 # does not like double slashes in filenames, you may need to add some logic
 	if [ -d "$dst" ]
 	then
 		dst=$dst/`basename "$src"`
 	else
 		:
 	fi
 fi
 ## this sed command emulates the dirname command
 dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
 # Make sure that the destination directory exists.
 #  this part is taken from Noah Friedman's mkinstalldirs script
 # Skip lots of stat calls in the usual case.
 if [ ! -d "$dstdir" ]; then
 defaultIFS='
 	'
 IFS="${IFS-$defaultIFS}"
 oIFS=$IFS
 # Some sh's can't handle IFS=/ for some reason.
 IFS='%'
 set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
 IFS=$oIFS
 pathcomp=''
 while [ $# -ne 0 ] ; do
 	pathcomp=$pathcomp$1
 	shift
 	if [ ! -d "$pathcomp" ] ;
        then
 		$mkdirprog "$pathcomp"
 	else
 		:
 	fi
 	pathcomp=$pathcomp/
 done
 fi
 if [ x"$dir_arg" != x ]
 then
 	$doit $instcmd "$dst" &&
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi
 else
 # If we're going to rename the final executable, determine the name now.
 	if [ x"$transformarg" = x ]
 	then
 		dstfile=`basename "$dst"`
 	else
 		dstfile=`basename "$dst" $transformbasename |
 			sed $transformarg`$transformbasename
 	fi
 # don't allow the sed command to completely eliminate the filename
 	if [ x"$dstfile" = x ]
 	then
 		dstfile=`basename "$dst"`
 	else
 		:
 	fi
 # Make a couple of temp file names in the proper directory.
 	dsttmp=$dstdir/#inst.$$#
 	rmtmp=$dstdir/#rm.$$#
 # Trap to clean up temp files at exit.
 	trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0
 	trap '(exit $?); exit' 1 2 13 15
 # Move or copy the file name to the temp name
 	$doit $instcmd "$src" "$dsttmp" &&
 # and set any options; do chmod last to preserve setuid bits
 # If any of these fail, we abort the whole thing.  If we want to
 # ignore errors from any of these, just make sure not to ignore
 # errors from the above "$doit $instcmd $src $dsttmp" command.
 	if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi &&
 	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi &&
 	if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi &&
 	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi &&
 # Now remove or move aside any old file at destination location.  We try this
 # two ways since rm can't unlink itself on some systems and the destination
 # file might be busy for other reasons.  In this case, the final cleanup
 # might fail but the new file should still install successfully.
 {
 	if [ -f "$dstdir/$dstfile" ]
 	then
 		$doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null ||
 		$doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null ||
 		{
 		  echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
 		  (exit 1); exit
 		}
 	else
 		:
 	fi
 } &&
 # Now rename the file to the real destination.
 	$doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
 fi &&
 # The final little trick to "correctly" pass the exit status to the exit trap.
 {
 	(exit 0); exit
 }
--- a/config/missing
+++ b/config/missing
@ -1,10 +1,6 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-
+# Copyright (C) 1996, 1997, 1999, 2000, 2002 Free Software Foundation, Inc.
 scriptversion=2009-04-28.21; # UTC
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
 # 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 # This program is free software; you can redistribute it and/or modify
@ -18,7 +14,9 @@ scriptversion=2009-04-28.21; # UTC
 # GNU General Public License for more details.
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@ -31,8 +29,6 @@ if test $# -eq 0; then
 fi
 run=:
 sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
 sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
 # In the cases where this matters, `missing' is being run in the
 # srcdir already.
@ -42,24 +38,18 @@ else
  configure_ac=configure.in
 fi
-msg="missing on your system"
+case "$1" in
 case $1 in
 --run)
  # Try to run requested program, and just exit if it succeeds.
  run=
  shift
  "$@" && exit 0
  # Exit code 63 means version mismatch.  This often happens
  # when the user try to use an ancient version of a tool on
  # a file that requires a minimum version.  In this case we
  # we should proceed has if the program had been absent, or
  # if --run hadn't been passed.
  if test $? = 63; then
    run=:
    msg="probably too old"
  fi
  ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case "$1" in
  -h|--h|--he|--hel|--help)
    echo "\
@ -77,7 +67,6 @@ Supported PROGRAM values:
  aclocal      touch file \`aclocal.m4'
  autoconf     touch file \`configure'
  autoheader   touch file \`config.h.in'
  autom4te     touch the output file, or create a stub one
  automake     touch all \`Makefile.in' files
  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
  flex         create \`lex.yy.c', if possible, from existing .c
@ -85,18 +74,11 @@ Supported PROGRAM values:
  lex          create \`lex.yy.c', if possible, from existing .c
  makeinfo     touch the output file
  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
+  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
 \`g' are ignored when checking the name.
 Send bug reports to <bug-automake@gnu.org>."
    exit $?
    ;;
  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
+    echo "missing 0.4 - GNU automake"
    exit $?
    ;;
  -*)
@ -105,69 +87,42 @@ Send bug reports to <bug-automake@gnu.org>."
    exit 1
    ;;
-esac
+  aclocal*)
 # normalize program name to check for.
 program=`echo "$1" | sed '
  s/^gnu-//; t
  s/^gnu//; t
  s/^g//; t'`
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
 # the program).  This is about non-GNU programs, so use $1 not
 # $program.
 case $1 in
  lex*|yacc*)
    # Not GNU programs, they don't have --version.
    ;;
  tar*)
    if test -n "$run"; then
       echo 1>&2 "ERROR: \`tar' requires --run"
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       exit 1
    fi
    ;;
  *)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
       # Could not run --version or --help.  This is probably someone
       # running `$TOOL --version' or `$TOOL --help' to check whether
       # $TOOL exists and not knowing $TOOL uses missing.
       exit 1
    fi
    ;;
 esac
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
 case $program in
  aclocal*)
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
         to install the \`Automake' and \`Perl' packages.  Grab them from
         any GNU archive site."
    touch aclocal.m4
    ;;
-  autoconf*)
+  autoconf)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`${configure_ac}'.  You might want to install the
         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
         archive site."
    touch configure
    ;;
-  autoheader*)
+  autoheader)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
         from any GNU archive site."
@ -175,7 +130,7 @@ WARNING: \`$1' is $msg.  You should only need it if
    test -z "$files" && files="config.h"
    touch_files=
    for f in $files; do
-      case $f in
+      case "$f" in
      *:*) touch_files="$touch_files "`echo "$f" |
 				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
      *) touch_files="$touch_files $f.in";;
@ -185,8 +140,13 @@ WARNING: \`$1' is $msg.  You should only need it if
    ;;
  automake*)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
         You might want to install the \`Automake' and \`Perl' packages.
         Grab them from any GNU archive site."
@ -195,16 +155,21 @@ WARNING: \`$1' is $msg.  You should only need it if
 	   while read f; do touch "$f"; done
    ;;
-  autom4te*)
+  autom4te)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         You might have modified some files without having the
+         system.  You might have modified some files without having the
         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
+         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
         archive site."
-    file=`echo "$*" | sed -n "$sed_output"`
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
    if test -f "$file"; then
 	touch $file
    else
@ -218,108 +183,111 @@ WARNING: \`$1' is needed, but is $msg.
    fi
    ;;
-  bison*|yacc*)
+  bison|yacc)
    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.y' file.  You may need the \`Bison' package
         in order for those modifications to take effect.  You can get
         \`Bison' from any GNU archive site."
    rm -f y.tab.c y.tab.h
-    if test $# -ne 1; then
+    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
-	case $LASTARG in
+	case "$LASTARG" in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.c
 	    fi
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" y.tab.h
 	    fi
 	  ;;
 	esac
    fi
-    if test ! -f y.tab.h; then
+    if [ ! -f y.tab.h ]; then
 	echo >y.tab.h
    fi
-    if test ! -f y.tab.c; then
+    if [ ! -f y.tab.c ]; then
 	echo 'main() { return 0; }' >y.tab.c
    fi
    ;;
-  lex*|flex*)
+  lex|flex)
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.l' file.  You may need the \`Flex' package
         in order for those modifications to take effect.  You can get
         \`Flex' from any GNU archive site."
    rm -f lex.yy.c
-    if test $# -ne 1; then
+    if [ $# -ne 1 ]; then
        eval LASTARG="\${$#}"
-	case $LASTARG in
+	case "$LASTARG" in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if test -f "$SRCFILE"; then
+	    if [ -f "$SRCFILE" ]; then
 	         cp "$SRCFILE" lex.yy.c
 	    fi
 	  ;;
 	esac
    fi
-    if test ! -f lex.yy.c; then
+    if [ ! -f lex.yy.c ]; then
 	echo 'main() { return 0; }' >lex.yy.c
    fi
    ;;
-  help2man*)
+  help2man)
    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
       # We have it, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
 	 \`Help2man' package in order for those modifications to take
 	 effect.  You can get \`Help2man' from any GNU archive site."
-    file=`echo "$*" | sed -n "$sed_output"`
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+    if test -z "$file"; then
-    if test -f "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
    fi
    if [ -f "$file" ]; then
 	touch $file
    else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit $?
+	exit 1
    fi
    ;;
-  makeinfo*)
+  makeinfo)
    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
       # We have makeinfo, but it failed.
       exit 1
    fi
    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
+WARNING: \`$1' is missing on your system.  You should only need it if
         you modified a \`.texi' or \`.texinfo' file, or any other file
         indirectly affecting the aspect of the manual.  The spurious
         call might also be the consequence of using a buggy \`make' (AIX,
         DU, IRIX).  You might want to install the \`Texinfo' package or
         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
    file=`echo "$*" | sed -n "$sed_output"`
    test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
+      file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
      file=`sed -n '
 	/^@setfilename/{
 	  s/.* \([^ ]*\) *$/\1/
 	  p
 	  q
 	}' $infile`
      # ... or it is derived from the source name (dir/f.texi becomes f.info)
      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
    fi
    # If the file does not exist, the user really needs makeinfo;
    # let's fail without touching anything.
    test -f $file || exit 1
    touch $file
    ;;
-  tar*)
+  tar)
    shift
    if test -n "$run"; then
      echo 1>&2 "ERROR: \`tar' requires --run"
      exit 1
    fi
    # We have already tried tar in the generic part.
    # Look for gnutar/gtar before invocation to avoid ugly error
@ -332,13 +300,13 @@ WARNING: \`$1' is $msg.  You should only need it if
    fi
    firstarg="$1"
    if shift; then
-	case $firstarg in
+	case "$firstarg" in
 	*o*)
 	    firstarg=`echo "$firstarg" | sed s/o//`
 	    tar "$firstarg" "$@" && exit 0
 	    ;;
 	esac
-	case $firstarg in
+	case "$firstarg" in
 	*h*)
 	    firstarg=`echo "$firstarg" | sed s/h//`
 	    tar "$firstarg" "$@" && exit 0
@ -355,10 +323,10 @@ WARNING: I can't seem to be able to run \`tar' with the given arguments.
  *)
    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
-         You might have modified some files without having the
+         system.  You might have modified some files without having the
         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
+         it often tells you about the needed prerequirements for installing
         this package.  You may also peek at any GNU archive site, in case
         some other package would contain this missing \`$1' program."
    exit 1
@ -366,11 +334,3 @@ WARNING: \`$1' is needed, and is $msg.
 esac
 exit 0
 # Local variables:
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
 # time-stamp-time-zone: "UTC"
 # time-stamp-end: "; # UTC"
 # End:
--- a/configure.ac
+++ b/configure.ac
@ -59,7 +59,7 @@ AC_SUBST(PERLDIR)
 dnl Checks for programs.
-AC_PROG_CC(xlc_r xlc gcc cc pgcc) 
+AC_PROG_CC(xlc_r xlc gcc cc pgcc)
 AC_PROG_CPP
 AC_PROG_INSTALL
 AC_PROG_LN_S
@ -72,15 +72,20 @@ AC_PROG_FC(pgf90 xlf90 gfortran f90 ifort)
 dnl check availability of pthreads
 AC_ARG_ENABLE([pthread],
  [AS_HELP_STRING([--enable-pthread],[enable POSIX threads [by default disabled]])],
-    GRIB_PTHREADS=1 , GRIB_PTHREADS=0
+    [pthreads=${enableval}] , [pthreads=no]
 )
 if test "x${pthreads}" = xyes; then
   GRIB_PTHREADS=1
 else
   GRIB_PTHREADS=0
 fi
 if test $GRIB_PTHREADS -eq 1
 then
-AC_GRIB_PTHREADS
+   AC_GRIB_PTHREADS
-AC_GRIB_LINUX_PTHREADS
+   AC_GRIB_LINUX_PTHREADS
 else
-GRIB_LINUX_PTHREADS=0
+   GRIB_LINUX_PTHREADS=0
 fi
 AC_DEFINE_UNQUOTED(GRIB_PTHREADS,$GRIB_PTHREADS,1->pthreads enabled 0->pthreads disabled)
@ -123,10 +128,10 @@ AC_CHECK_FUNC([posix_memalign],
 AC_ARG_ENABLE([align-memory],
  [AS_HELP_STRING([--enable-align-memory],[enable memory alignment [by default disabled]])],
-AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required) ,
+                  AC_DEFINE_UNQUOTED(GRIB_MEM_ALIGN,1,memory alignment required),
-	 )
+)
-dnl use vectorised code     
+dnl use vectorised code
 AC_ARG_ENABLE([vector],
  [AS_HELP_STRING([--enable-vector],[enable vectorised code [by default disabled]] )],
 	 [vectorise=${enableval}],[vectorise=no])
@ -162,6 +167,7 @@ fi
 AC_SUBST(DEVEL_RULES)
 AC_SUBST(GRIB_DEVEL)
 AM_CONDITIONAL([WITH_MARS_TESTS], [test $GRIB_DEVEL -eq 1])
 dnl Large file support
 AC_FUNC_FSEEKO
@ -206,7 +212,13 @@ AC_SUBST(GRIB_DEFINITION_PATH)
 dnl Fortran interface
 AC_ARG_ENABLE([fortran],
  [AS_HELP_STRING([--disable-fortran],[disable fortran interface [by default enabled]])],
-     without_fortran=1,without_fortran=0)
+     [with_fortran=${enableval}], [with_fortran=yes])
 if test "x${with_fortran}" = xyes; then
   without_fortran=0
 else
   without_fortran=1
 fi
 if test "x$FC" = "x"
 then
@ -256,7 +268,7 @@ then
    AC_MSG_ERROR([unable to find compiler flag for modules inclusion])
  fi
  F90_MODULE_FLAG=$ax_cv_f90_modflag
-     AC_SUBST([F90_MODULE_FLAG])
+  AC_SUBST([F90_MODULE_FLAG])
 fi
 dnl ifs_samples
@ -306,9 +318,8 @@ AC_SUBST(EMOS_LIB)
 dnl timer
 AC_ARG_ENABLE([timer],
  [AS_HELP_STRING([--enable-timer],[enable timer [by default disabled]])],
-     with_timer=1,with_timer=0)
+     [with_timer=${enableval}], [with_timer=no])
-if test ${with_timer} -eq 1
+if test "x${with_timer}" = xyes; then
 then
  AC_DEFINE(GRIB_TIMER,1,1->Timer on 0->Timer off)
 else
  AC_DEFINE(GRIB_TIMER,0,1->Timer on 0->Timer off)
@ -318,9 +329,8 @@ fi
 dnl multithread packing
 AC_ARG_ENABLE([omp-packing],
  [AS_HELP_STRING([--enable-omp-packing],[enable OpenMP multithreaded packing [by default disabled]])],
-     with_omp=1,with_omp=0)
+     [with_omp=${enableval}], [with_omp=no])
-if test ${with_omp} -eq 1
+if test "x${with_omp}" = xyes; then
 then
  AC_DEFINE(OMP_PACKING,1,1->OpenMP packing 0->single thread packing)
 else
  AC_DEFINE(OMP_PACKING,0,1->OpenMP packing 0->single thread packing)
@ -332,12 +342,12 @@ AC_ARG_WITH([netcdf],
 with_netcdf=0
 if test $netcdf_dir != 'none'
 then
-    with_netcdf=1
+	with_netcdf=1
-    CFLAGS="$CFLAGS -I${netcdf_dir}/include"
+	CFLAGS="$CFLAGS -I${netcdf_dir}/include"
    LDFLAGS="$LDFLAGS -L${netcdf_dir}/lib"
    AC_CHECK_LIB(netcdf,nc_open,netcdf_ok=1,netcdf_ok=0)
-    if test $netcdf_ok -eq 0
+	if test $netcdf_ok -eq 0
-    then
+	then
      AC_MSG_NOTICE([
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  CONFIGURATION ERROR: netcdf test not passed.                                                               
@ -348,7 +358,7 @@ then
 	  test 0 -eq 1
 	  exit 
    fi
-    LIBS="-lnetcdf $LIBS"
+	LIBS="-lnetcdf $LIBS"
    AC_DEFINE(HAVE_NETCDF,1,NETCDF enabled)
 fi
@ -401,16 +411,16 @@ then
      AC_SUBST(LIB_OPENJPEG)
    elif test $jasper_ok -eq 1
    then
-      jpeg_ok=1
+	  jpeg_ok=1
      LIB_JASPER='-ljasper'
      LIBS="$LIB_JASPER $LIBS"
      AC_DEFINE(HAVE_LIBJASPER,1,Define if you have JPEG version 2 "Jasper" library)
      AC_SUBST(LIB_JASPER)
 	fi
-      if test $jpeg_ok -eq 0
+	if test $jpeg_ok -eq 0
-      then
+	then
-         AC_MSG_NOTICE([
+      AC_MSG_NOTICE([
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
  CONFIGURATION ERROR: jpeg library (jasper or openjpeg) required.                                                               
@ -570,12 +580,12 @@ then
    has_numpy=`$PYTHON -c "import numpy;print numpy" 2> /dev/null`
    if test "x$has_numpy" = "x"
    then
-        AC_MSG_RESULT(no)
+       AC_MSG_RESULT(no)
-        AC_MSG_ERROR([NumPy is not installed. Use --disable-numpy if you want to disable Numpy from the build.])
+       AC_MSG_ERROR([NumPy is not installed. Use --disable-numpy if you want to disable Numpy from the build.])
    else
-        AC_MSG_RESULT(yes)
+       AC_MSG_RESULT(yes)
-        NUMPY_INCLUDE=`$PYTHON -c "import numpy;print numpy.get_include()"`
+       NUMPY_INCLUDE=`$PYTHON -c "import numpy;print numpy.get_include()"`
-        AC_SUBST(NUMPY_INCLUDE)
+       AC_SUBST(NUMPY_INCLUDE)
    fi
  else
    data_handler=array
@ -623,7 +633,7 @@ AC_CHECK_FUNCS([bzero gettimeofday])
 AX_LINUX_DISTRIBUTION
-AC_OUTPUT( Makefile src/Makefile fortran/Makefile tools/Makefile definitions/Makefile samples/Makefile ifs_samples/grib1/Makefile ifs_samples/grib1_mlgrib2/Makefile ifs_samples/grib1_mlgrib2_ieee64/Makefile tests/Makefile examples/C/Makefile examples/F90/Makefile tigge/Makefile perl/GRIB-API/Makefile.PL perl/Makefile python/Makefile examples/python/Makefile rpms/grib_api.spec rpms/grib_api.pc rpms/grib_api_f90.pc)
+AC_OUTPUT( Makefile src/Makefile fortran/Makefile tools/Makefile definitions/Makefile samples/Makefile ifs_samples/grib1/Makefile ifs_samples/grib1_mlgrib2/Makefile ifs_samples/grib1_mlgrib2_ieee64/Makefile tests/Makefile mars_tests/Makefile examples/C/Makefile examples/F90/Makefile tigge/Makefile perl/GRIB-API/Makefile.PL perl/Makefile python/Makefile examples/python/Makefile rpms/grib_api.spec rpms/grib_api.pc rpms/grib_api_f90.pc)
 AC_MSG_NOTICE([
--- a/definitions/Makefile.am
+++ b/definitions/Makefile.am
@ -254,6 +254,13 @@ dist_definitionsgrib1_localConcepts_edzw_DATA = \
 	grib1/localConcepts/edzw/shortName.def\
 	grib1/localConcepts/edzw/units.def
 definitionsgrib1_localConcepts_kwbcdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/kwbc
 dist_definitionsgrib1_localConcepts_kwbc_DATA = \
 	grib1/localConcepts/kwbc/name.def\
 	grib1/localConcepts/kwbc/paramId.def\
 	grib1/localConcepts/kwbc/shortName.def\
 	grib1/localConcepts/kwbc/units.def
 definitionsgrib1_localConcepts_lfpwdir = @GRIB_DEFINITION_PATH@/grib1/localConcepts/lfpw
 dist_definitionsgrib1_localConcepts_lfpw_DATA = \
 	grib1/localConcepts/lfpw/name.def\
--- a/definitions/budg/boot.def
+++ b/definitions/budg/boot.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/budg/mars_labeling.def
+++ b/definitions/budg/mars_labeling.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/budg/section.1.def
+++ b/definitions/budg/section.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/budg/section.4.def
+++ b/definitions/budg/section.4.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/boot.def
+++ b/definitions/bufr/boot.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/old_section.1.def
+++ b/definitions/bufr/old_section.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/section.0.def
+++ b/definitions/bufr/section.0.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/section.1.def
+++ b/definitions/bufr/section.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/section.2.def
+++ b/definitions/bufr/section.2.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/section.3.def
+++ b/definitions/bufr/section.3.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/section.4.def
+++ b/definitions/bufr/section.4.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/bufr/section.5.def
+++ b/definitions/bufr/section.5.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/2.98.131.table
+++ b/definitions/grib1/2.98.131.table
@ -71,4 +71,4 @@
 228 228 TPP Total precipitation probability percentage
 229 229 SWHP Significant wave height probability percentage
 232 232 MWPP Mean wave period probability percentage
-255 255 - Indicates a missing value 
+255 255 - Indicates a missing value
--- a/definitions/grib1/boot.def
+++ b/definitions/grib1/boot.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_ieee.def
+++ b/definitions/grib1/data.grid_ieee.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_second_order.def
+++ b/definitions/grib1/data.grid_second_order.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_second_order_constant_width.def
+++ b/definitions/grib1/data.grid_second_order_constant_width.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_second_order_general_grib1.def
+++ b/definitions/grib1/data.grid_second_order_general_grib1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_second_order_row_by_row.def
+++ b/definitions/grib1/data.grid_second_order_row_by_row.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_simple.def
+++ b/definitions/grib1/data.grid_simple.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.grid_simple_matrix.def
+++ b/definitions/grib1/data.grid_simple_matrix.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.spectral_complex.def
+++ b/definitions/grib1/data.spectral_complex.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.spectral_ieee.def
+++ b/definitions/grib1/data.spectral_ieee.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/data.spectral_simple.def
+++ b/definitions/grib1/data.spectral_simple.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/gds_not_present_bitmap.def
+++ b/definitions/grib1/gds_not_present_bitmap.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_21.def
+++ b/definitions/grib1/grid_21.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_22.def
+++ b/definitions/grib1/grid_22.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_23.def
+++ b/definitions/grib1/grid_23.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_24.def
+++ b/definitions/grib1/grid_24.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_25.def
+++ b/definitions/grib1/grid_25.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_26.def
+++ b/definitions/grib1/grid_26.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_61.def
+++ b/definitions/grib1/grid_61.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_62.def
+++ b/definitions/grib1/grid_62.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_63.def
+++ b/definitions/grib1/grid_63.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_64.def
+++ b/definitions/grib1/grid_64.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_0.def
+++ b/definitions/grib1/grid_definition_0.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_1.def
+++ b/definitions/grib1/grid_definition_1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_10.def
+++ b/definitions/grib1/grid_definition_10.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_13.def
+++ b/definitions/grib1/grid_definition_13.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_14.def
+++ b/definitions/grib1/grid_definition_14.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_192.78.def
+++ b/definitions/grib1/grid_definition_192.78.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_192.98.def
+++ b/definitions/grib1/grid_definition_192.98.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_193.98.def
+++ b/definitions/grib1/grid_definition_193.98.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_20.def
+++ b/definitions/grib1/grid_definition_20.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_24.def
+++ b/definitions/grib1/grid_definition_24.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_3.def
+++ b/definitions/grib1/grid_definition_3.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_30.def
+++ b/definitions/grib1/grid_definition_30.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_34.def
+++ b/definitions/grib1/grid_definition_34.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_4.def
+++ b/definitions/grib1/grid_definition_4.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_5.def
+++ b/definitions/grib1/grid_definition_5.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_50.def
+++ b/definitions/grib1/grid_definition_50.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_60.def
+++ b/definitions/grib1/grid_definition_60.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_70.def
+++ b/definitions/grib1/grid_definition_70.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_8.def
+++ b/definitions/grib1/grid_definition_8.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_80.def
+++ b/definitions/grib1/grid_definition_80.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_90.def
+++ b/definitions/grib1/grid_definition_90.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_gaussian.def
+++ b/definitions/grib1/grid_definition_gaussian.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_latlon.def
+++ b/definitions/grib1/grid_definition_latlon.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_definition_spherical_harmonics.def
+++ b/definitions/grib1/grid_definition_spherical_harmonics.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_first_last_resandcomp.def
+++ b/definitions/grib1/grid_first_last_resandcomp.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_rotation.def
+++ b/definitions/grib1/grid_rotation.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/grid_stretching.def
+++ b/definitions/grib1/grid_stretching.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.1.def
+++ b/definitions/grib1/local.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.214.1.def
+++ b/definitions/grib1/local.214.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.214.244.def
+++ b/definitions/grib1/local.214.244.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.214.245.def
+++ b/definitions/grib1/local.214.245.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.253.def
+++ b/definitions/grib1/local.253.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.254.def
+++ b/definitions/grib1/local.254.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.46.def
+++ b/definitions/grib1/local.46.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.54.def
+++ b/definitions/grib1/local.54.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.7.1.def
+++ b/definitions/grib1/local.7.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.80.def
+++ b/definitions/grib1/local.80.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.1.def
+++ b/definitions/grib1/local.98.1.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.10.def
+++ b/definitions/grib1/local.98.10.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.11.def
+++ b/definitions/grib1/local.98.11.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.14.def
+++ b/definitions/grib1/local.98.14.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.15.def
+++ b/definitions/grib1/local.98.15.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.16.def
+++ b/definitions/grib1/local.98.16.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.17.def
+++ b/definitions/grib1/local.98.17.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.18.def
+++ b/definitions/grib1/local.98.18.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.19.def
+++ b/definitions/grib1/local.98.19.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.190.def
+++ b/definitions/grib1/local.98.190.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.191.def
+++ b/definitions/grib1/local.98.191.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.192.def
+++ b/definitions/grib1/local.98.192.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.2.def
+++ b/definitions/grib1/local.98.2.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.20.def
+++ b/definitions/grib1/local.98.20.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.21.def
+++ b/definitions/grib1/local.98.21.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.218.def
+++ b/definitions/grib1/local.98.218.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/definitions/grib1/local.98.23.def
+++ b/definitions/grib1/local.98.23.def
@ -2,7 +2,7 @@
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
 # which can be obtained at http://www.apache.org/licenses/LICENSE-2.0.
-#
+# 
 # In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 # virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 #
--- a/Show More
+++ b/Show More
`@ -1,2 +1,2 @@`
	`set( ${PROJECT_NAME}_VERSION_STR "1.10.4" )`	`set( ${PROJECT_NAME}_VERSION_STR "2.0.0" )`