diff options
| -rwxr-xr-x | configure | 24 | ||||
| -rwxr-xr-x | libtool | 10 | ||||
| -rw-r--r-- | nad/Makefile.in | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 2 |
4 files changed, 21 insertions, 22 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for PROJ.4 Projections 4.9.1. +# Generated by GNU Autoconf 2.69 for PROJ.4 Projections 4.9.2. # # Report bugs to <warmerdam@pobox.com>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='PROJ.4 Projections' PACKAGE_TARNAME='proj' -PACKAGE_VERSION='4.9.1' -PACKAGE_STRING='PROJ.4 Projections 4.9.1' +PACKAGE_VERSION='4.9.2' +PACKAGE_STRING='PROJ.4 Projections 4.9.2' PACKAGE_BUGREPORT='warmerdam@pobox.com' PACKAGE_URL='' @@ -1319,7 +1319,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures PROJ.4 Projections 4.9.1 to adapt to many kinds of systems. +\`configure' configures PROJ.4 Projections 4.9.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1389,7 +1389,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of PROJ.4 Projections 4.9.1:";; + short | recursive ) echo "Configuration of PROJ.4 Projections 4.9.2:";; esac cat <<\_ACEOF @@ -1499,7 +1499,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -PROJ.4 Projections configure 4.9.1 +PROJ.4 Projections configure 4.9.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1868,7 +1868,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by PROJ.4 Projections $as_me 4.9.1, which was +It was created by PROJ.4 Projections $as_me 4.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2739,7 +2739,7 @@ fi # Define the identity of the package. PACKAGE='proj' - VERSION='4.9.1' + VERSION='4.9.2' cat >>confdefs.h <<_ACEOF @@ -13219,7 +13219,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by PROJ.4 Projections $as_me 4.9.1, which was +This file was extended by PROJ.4 Projections $as_me 4.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -13285,7 +13285,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -PROJ.4 Projections config.status 4.9.1 +PROJ.4 Projections config.status 4.9.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -15604,7 +15604,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by PROJ.4 Projections $as_me 4.9.1, which was +This file was extended by PROJ.4 Projections $as_me 4.9.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15670,7 +15670,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -PROJ.4 Projections config.status 4.9.1 +PROJ.4 Projections config.status 4.9.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -1,8 +1,8 @@ #! /bin/bash # libtool - Provide generalized library-building support services. -# Generated automatically by config.status (proj) 4.9.1 -# Libtool was configured on host even-desktop: +# Generated automatically by config.status (proj) 4.9.2 +# Libtool was configured on host pdal-vagrant: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, @@ -164,7 +164,7 @@ lock_old_archive_extraction=no LTCC="gcc" # LTCC compiler flags. -LTCFLAGS="--coverage" +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'" @@ -272,10 +272,10 @@ finish_eval="" hardcode_into_libs=yes # Compile-time system search path for libraries. -sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.4.3 /usr/lib /lib /usr/lib/x86_64-linux-gnu " +sys_lib_search_path_spec="/usr/lib/gcc/x86_64-linux-gnu/4.8 /usr/lib/x86_64-linux-gnu /usr/lib /lib/x86_64-linux-gnu /lib " # Run-time system search path for libraries. -sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/fglrx /usr/lib32/fglrx /usr/lib/atlas /usr/lib32/alsa-lib /usr/lib/alsa-lib /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu " +sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/lib/jvm/java-7-oracle/jre/lib/amd64 /usr/lib/x86_64-linux-gnu/libfakeroot /usr/lib/jvm/java-7-oracle/jre/lib/amd64/server /usr/local/lib /lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu/mesa /lib32 /usr/lib32 /libx32 /usr/libx32 " # Whether dlopen is supported. dlopen_support=unknown diff --git a/nad/Makefile.in b/nad/Makefile.in index 446d3864..03c3d28f 100644 --- a/nad/Makefile.in +++ b/nad/Makefile.in @@ -278,15 +278,15 @@ TESTDATUMFILE = $(NADPATH)/testdatumfile TESTIGN = $(NADPATH)/testIGNF pkgdata_DATA = GL27 nad.lst proj_def.dat nad27 nad83 world epsg esri \ esri.extra other.extra \ - CH IGNF + CH IGNF testIGNF proj_outIGNF.dist \ + null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt EXTRA_DIST = GL27 nad.lst proj_def.dat nad27 nad83 pj_out27.dist pj_out83.dist td_out.dist \ test27 test83 world epsg esri tv_out.dist tf_out.dist \ testflaky testvarious testdatumfile testntv2 ntv2_out.dist \ esri.extra other.extra \ CH IGNF testIGNF proj_outIGNF.dist \ - null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat \ - makefile.vc CMakeLists.txt + null.lla ntf_r93.gsb nzgd2kgrid0005.gsb ntv1_can.dat makefile.vc CMakeLists.txt all: all-am @@ -504,7 +504,6 @@ uninstall-am: uninstall-pkgdataDATA mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags-am uninstall uninstall-am uninstall-pkgdataDATA - process-nad2bin: @if [ -f $(NADPATH)/null.lla -a ! -f null ] || [ -f $(NADPATH)/conus.lla -a ! -f conus ] ; then \ for x in $(NADPATH)/*.lla ; do \ diff --git a/src/Makefile.in b/src/Makefile.in index 856cd107..fbc3b76e 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -402,7 +402,7 @@ geod_LDADD = libproj.la multistresstest_LDADD = libproj.la @THREAD_LIB@ test228_LDADD = libproj.la @THREAD_LIB@ lib_LTLIBRARIES = libproj.la -libproj_la_LDFLAGS = -no-undefined -version-info 9:0:0 +libproj_la_LDFLAGS = -no-undefined -version-info 10:0:1 libproj_la_SOURCES = \ pj_list.h \ PJ_aeqd.c PJ_gnom.c PJ_laea.c PJ_mod_ster.c \ |