diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | HOWTO-RELEASE | 3 | ||||
| -rw-r--r-- | NEWS | 21 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rwxr-xr-x | libtool | 125 | ||||
| -rw-r--r-- | src/pj_release.c | 2 | ||||
| -rw-r--r-- | src/proj_api.h | 2 |
7 files changed, 89 insertions, 69 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 10ea19ab..cb78613c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,7 +31,8 @@ colormsg(_HIBLUE_ "Configuring PROJ:") #PROJ version information ################################################################################# include(Proj4Version) -proj_version(MAJOR 4 MINOR 9 PATCH 0) +proj_version(MAJOR 4 MINOR 9 PATCH 1) +set(PROJ_SOVERSION "8.1.8") ################################################################################# # Build features and variants diff --git a/HOWTO-RELEASE b/HOWTO-RELEASE index b3a01f81..cd4645f6 100644 --- a/HOWTO-RELEASE +++ b/HOWTO-RELEASE @@ -8,7 +8,8 @@ 3) Update the version number, and date in src/pj_release.c. 4) Update the version number in the -version-info definition in - src/Makefile.am. It consists of "current:revision:age". + src/Makefile.am. It consists of "current:revision:age". Set + the same in the PROJ_SOVERSION variable in CMakeLists.txt - If the library source code has changed at all since the last update, then increment revision (c:r:a becomes c:r+1:a). @@ -1,3 +1,24 @@ +4.9.1 Release Notes +------------------- + + o 4.9.0RC2 release was abandoned because it was not promoted in a + timely fashion. Subsequent maintenance of tickets has continued, + and a new 4.9.1 release was issued in its place. + + o Implement inverse solution for Winkel Tripel from Drazan Tutic #250 + + o More CMake configuration tweaks. The CMake configuration is probably + not at feature parity with the autotools builds at this point but it + is converging #256 + + o Tweak initialization ordering around setlocal which may have caused + issues #237 + + o Support out-of-tree autoconf builds more completely #247 + + o Fix NaN handling by geod_inverse and geod_polygon_addedge #251 & #253 + + 4.9.0 Release Notes ------------------- diff --git a/configure.in b/configure.in index d348a8c2..fd7f3c03 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([PROJ.4 Projections], 4.9.0, [warmerdam@pobox.com], proj) +AC_INIT([PROJ.4 Projections], 4.9.1, [warmerdam@pobox.com], proj) AC_CONFIG_MACRO_DIR([m4]) AC_LANG(C) @@ -1,8 +1,8 @@ -#! /bin/bash +#! /bin/sh # libtool - Provide generalized library-building support services. # Generated automatically by config.status (proj) 4.9.0 -# Libtool was configured on host gdal-c: +# Libtool was configured on host pyro.local: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -53,10 +53,10 @@ build_old_libs=yes pic_mode=default # Whether or not to optimize for fast installation. -fast_install=yes +fast_install=needless # Shell to use when invoking shell scripts. -SHELL="/bin/bash" +SHELL="/bin/sh" # An echo program that protects backslashes. ECHO="printf %s\\n" @@ -66,37 +66,37 @@ PATH_SEPARATOR=":" # The host system. host_alias= -host=x86_64-unknown-linux-gnu -host_os=linux-gnu +host=x86_64-apple-darwin14.1.0 +host_os=darwin14.1.0 # The build system. build_alias= -build=x86_64-unknown-linux-gnu -build_os=linux-gnu +build=x86_64-apple-darwin14.1.0 +build_os=darwin14.1.0 # A sed program that does not truncate output. -SED="/bin/sed" +SED="/usr/bin/sed" # Sed that helps us avoid accidentally triggering echo(1) options like -n. Xsed="$SED -e 1s/^X//" # A grep program that handles long lines. -GREP="/bin/grep" +GREP="/usr/bin/grep" # An ERE matcher. -EGREP="/bin/grep -E" +EGREP="/usr/bin/grep -E" # A literal string matcher. -FGREP="/bin/grep -F" +FGREP="/usr/bin/grep -F" # A BSD- or MS-compatible name lister. -NM="/usr/bin/nm -B" +NM="/usr/bin/nm" # Whether we need soft or hard links. LN_S="ln -s" # What is the maximum length of a command? -max_cmd_len=3458764513820540925 +max_cmd_len=196608 # Object file suffix (normally "o"). objext=o @@ -120,7 +120,7 @@ to_host_file_cmd=func_convert_file_noop to_tool_file_cmd=func_convert_file_noop # An object symbol dumper. -OBJDUMP="objdump" +OBJDUMP="false" # Method to check whether dependent libraries are shared objects. deplibs_check_method="pass_all" @@ -147,7 +147,7 @@ AR="ar" AR_FLAGS="cru" # How to feed a file listing to the archiver. -archiver_list_spec="@" +archiver_list_spec="" # A symbol stripping program. STRIP="strip" @@ -158,7 +158,7 @@ old_postinstall_cmds="chmod 644 \$oldlib~\$RANLIB \$tool_oldlib" old_postuninstall_cmds="" # Whether to use a lock for old archive extraction. -lock_old_archive_extraction=no +lock_old_archive_extraction=yes # A C compiler. LTCC="gcc" @@ -167,19 +167,19 @@ LTCC="gcc" LTCFLAGS="-g -O2" # Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2 \\2/p' | sed '/ __gnu_lto/d'" +global_symbol_pipe="sed -n -e 's/^.*[ ]\\([BCDEGRST][BCDEGRST]*\\)[ ][ ]*_\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 _\\2 \\2/p' | sed '/ __gnu_lto/d'" # Transform the output of nm in a proper C declaration. -global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[ABCDGIRSTW]* .* \\(.*\\)\$/extern char \\1;/p'" +global_symbol_to_cdecl="sed -n -e 's/^T .* \\(.*\\)\$/extern int \\1();/p' -e 's/^[BCDEGRST]* .* \\(.*\\)\$/extern char \\1;/p'" # Transform the output of nm in a C name address pair. -global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'" +global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p'" # Transform the output of nm in a C name address pair when lib prefix is needed. -global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[ABCDGIRSTW]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'" +global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \\([^ ]*\\)[ ]*\$/ {\\\"\\1\\\", (void *) 0},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\(lib[^ ]*\\)\$/ {\"\\2\", (void *) \\&\\2},/p' -e 's/^[BCDEGRST]* \\([^ ]*\\) \\([^ ]*\\)\$/ {\"lib\\2\", (void *) \\&\\2},/p'" # Specify filename containing input files for $NM. -nm_file_list_spec="@" +nm_file_list_spec="" # The root where to search for dependent libraries,and in which our libraries should be installed. lt_sysroot= @@ -197,32 +197,32 @@ need_locks="no" MANIFEST_TOOL=":" # Tool to manipulate archived DWARF debug symbol files on Mac OS X. -DSYMUTIL="" +DSYMUTIL="dsymutil" # Tool to change global to local symbols on Mac OS X. -NMEDIT="" +NMEDIT="nmedit" # Tool to manipulate fat objects and archives on Mac OS X. -LIPO="" +LIPO="lipo" # ldd/readelf like tool for Mach-O binaries on Mac OS X. -OTOOL="" +OTOOL="otool" # ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4. -OTOOL64="" +OTOOL64=":" # Old archive suffix (normally "a"). libext=a # Shared library suffix (normally ".so"). -shrext_cmds=".so" +shrext_cmds="\`test .\$module = .yes && echo .so || echo .dylib\`" # The commands to extract the exported symbol list from a shared archive. extract_expsyms_cmds="" # Variables whose values should be saved in libtool wrapper scripts and # restored at link time. -variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" +variables_saved_for_relink="PATH DYLD_LIBRARY_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" # Do we need the "lib" prefix for modules? need_lib_prefix=no @@ -231,26 +231,26 @@ need_lib_prefix=no need_version=no # Library versioning type. -version_type=linux +version_type=darwin # Shared library runtime path variable. -runpath_var=LD_RUN_PATH +runpath_var= # Shared library path variable. -shlibpath_var=LD_LIBRARY_PATH +shlibpath_var=DYLD_LIBRARY_PATH # Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=no +shlibpath_overrides_runpath=yes # Format of library name prefix. libname_spec="lib\$name" # List of archive names. First name is the real one, the rest are links. # The last name is the one that the linker finds with -lNAME -library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}" +library_names_spec="\${libname}\${release}\${major}\$shared_ext \${libname}\$shared_ext" # The coded name of the library, if different from the real name. -soname_spec="\${libname}\${release}\${shared_ext}\$major" +soname_spec="\${libname}\${release}\${major}\$shared_ext" # Permission mode override for installation of shared libraries. install_override_mode="" @@ -262,20 +262,20 @@ postinstall_cmds="" postuninstall_cmds="" # Commands used to finish a libtool library installation in a directory. -finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir" +finish_cmds="" # As "finish_cmds", except a single script fragment to be evaled but # not shown. finish_eval="" # Whether we should hardcode library paths into libraries. -hardcode_into_libs=yes +hardcode_into_libs=no # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.6 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib " +sys_lib_search_path_spec="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/clang/6.0 /usr/local/lib" # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/local/pl/lib /usr/grass-7.0.svn/lib /lib/i386-linux-gnu /usr/lib/i386-linux-gnu /lib/i686-linux-gnu /usr/lib/i686-linux-gnu /usr/local/lib /usr/lib/nvidia-settings-304 /usr/local/pl/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/nvidia-319 /usr/lib32/nvidia-319 " +sys_lib_dlsearch_path_spec="/usr/local/lib /lib /usr/lib" # Whether dlopen is supported. dlopen_support=unknown @@ -287,16 +287,16 @@ dlopen_self=unknown dlopen_self_static=unknown # Commands to strip libraries. -old_striplib="strip --strip-debug" -striplib="strip --strip-unneeded" +old_striplib="strip -S" +striplib="strip -x" # The linker used to build libraries. -LD="/usr/bin/ld -m elf_x86_64" +LD="/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" # How to create reloadable object files. reload_flag=" -r" -reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs" +reload_cmds="\$LTCC \$LTCFLAGS -nostdlib \${wl}-r -o \$output\$reload_objs" # Commands used to build an old-style archive. old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs~\$RANLIB \$tool_oldlib" @@ -308,16 +308,16 @@ CC="gcc" with_gcc=yes # Compiler flag to turn off builtin functions. -no_builtin_flag=" -fno-builtin" +no_builtin_flag=" -fno-builtin -fno-rtti -fno-exceptions" # Additional compiler flags for building library objects. -pic_flag=" -fPIC -DPIC" +pic_flag=" -fno-common -DPIC" # How to pass a linker flag through the compiler. wl="-Wl," # Compiler flag to prevent dynamic linking. -link_static_flag="-static" +link_static_flag="" # Does compiler simultaneously support -c and -o options? compiler_c_o="yes" @@ -329,10 +329,10 @@ build_libtool_need_lc=no allow_libtool_libs_with_static_runtimes=no # Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec="\${wl}--export-dynamic" +export_dynamic_flag_spec="" # Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive" +whole_archive_flag_spec="\`for conv in \$convenience\\\"\\\"; do test -n \\\"\$conv\\\" && new_convenience=\\\"\$new_convenience \${wl}-force_load,\$conv\\\"; done; func_echo_all \\\"\$new_convenience\\\"\`" # Whether the compiler copes with passing no objects directly. compiler_needs_object="no" @@ -344,29 +344,26 @@ old_archive_from_new_cmds="" old_archive_from_expsyms_cmds="" # Commands used to build a shared archive. -archive_cmds="\$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib" -archive_expsym_cmds="echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~ - cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~ - echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~ - \$CC -shared \$pic_flag \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib" +archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module" +archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring \$single_module \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym" # Commands used to build a loadable module if different from building # a shared archive. -module_cmds="" -module_expsym_cmds="" +module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags" +module_expsym_cmds="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags \${wl}-exported_symbols_list,\$output_objdir/\${libname}-symbols.expsym" # Whether we are building with GNU ld or not. -with_gnu_ld="yes" +with_gnu_ld="no" # Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag="" +allow_undefined_flag="\${wl}-undefined \${wl}dynamic_lookup" # Flag that enforces no undefined symbols. no_undefined_flag="" # Flag to hardcode $libdir into a binary during linking. # This must work even if $libdir does not exist -hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir" +hardcode_libdir_flag_spec="" # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator="" @@ -392,14 +389,14 @@ hardcode_shlibpath_var=unsupported # Set to "yes" if building a shared library automatically hardcodes DIR # into the library and all subsequent libraries and executables linked # against it. -hardcode_automatic=no +hardcode_automatic=yes # Set to yes if linker adds runtime paths of dependent libraries # to runtime path list. inherit_rpath=no # Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=no +link_all_deplibs=yes # Set to "yes" if exported symbols are required. always_export_symbols=no @@ -1263,7 +1260,7 @@ exec_cmd= # Append VALUE to the end of shell variable VAR. func_append () { - eval "${1}+=\${2}" +eval "${1}+=\${2}" } # Extended-shell func_append implementation # func_append_quoted var value @@ -1279,7 +1276,7 @@ func_append_quoted () # func_arith arithmetic-term... func_arith () { - func_arith_result=$(( $* )) +func_arith_result=$(( $* )) } # Extended-shell func_arith implementation @@ -1287,7 +1284,7 @@ func_arith () # STRING may not start with a hyphen. func_len () { - func_len_result=${#1} +func_len_result=${#1} } # Extended-shell func_len implementation @@ -1304,7 +1301,7 @@ func_lo2o () # func_xform libobj-or-source func_xform () { - func_xform_result=${1%.*}.lo +func_xform_result=${1%.*}.lo } # Extended-shell func_xform implementation diff --git a/src/pj_release.c b/src/pj_release.c index c1d4f696..7495673d 100644 --- a/src/pj_release.c +++ b/src/pj_release.c @@ -2,7 +2,7 @@ #include <projects.h> -char const pj_release[]="Rel. 4.9.0, 13 September 2014"; +char const pj_release[]="Rel. 4.9.1, 17 February 2015"; const char *pj_get_release() diff --git a/src/proj_api.h b/src/proj_api.h index 0299cdeb..ccef7132 100644 --- a/src/proj_api.h +++ b/src/proj_api.h @@ -40,7 +40,7 @@ extern "C" { #endif /* Try to update this every version! */ -#define PJ_VERSION 490 +#define PJ_VERSION 491 extern char const pj_release[]; /* global release id string */ |