This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental-2.1 in repository gdal-grass.
commit 1591ed694414169e5c97fdad2ebc496c6ef3a108 Author: Bas Couwenberg <[email protected]> Date: Fri Jan 20 10:39:07 2017 +0100 Imported Upstream version 2.1.3~rc1 --- Makefile.in | 13 ----------- VERSION | 2 +- configure | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----- configure.in | 15 +++++++++---- 4 files changed, 77 insertions(+), 23 deletions(-) diff --git a/Makefile.in b/Makefile.in index 9bac96a..568d554 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,8 +14,6 @@ LD_SHARED = @LD_SHARED@ LIBS = @LIBS@ -GRASSTABLES_DIR = @prefix@/share/gdal/grass - AUTOLOAD_DIR = @AUTOLOAD_DIR@ GLIBNAME = gdal_GRASS.so @@ -27,17 +25,6 @@ install: default install -d $(AUTOLOAD_DIR) cp $(GLIBNAME) $(AUTOLOAD_DIR) cp $(OLIBNAME) $(AUTOLOAD_DIR) - test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR} - test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc - test ! -e @GRASS_GISBASE@/etc/ellipse.table || cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc - test ! -e @GRASS_GISBASE@/etc/datum.table || cp @GRASS_GISBASE@/etc/datum.table ${GRASSTABLES_DIR}/etc - test ! -e @GRASS_GISBASE@/etc/datumtransform.table || cp @GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc - test ! -e @GRASS_GISBASE@/etc/proj/ellipse.table || cp @GRASS_GISBASE@/etc/proj/ellipse.table ${GRASSTABLES_DIR}/etc - test ! -e @GRASS_GISBASE@/etc/proj/datum.table || cp @GRASS_GISBASE@/etc/proj/datum.table ${GRASSTABLES_DIR}/etc - test ! -e @GRASS_GISBASE@/etc/proj/datumtransform.table || cp @GRASS_GISBASE@/etc/proj/datumtransform.table ${GRASSTABLES_DIR}/etc - test -d ${GRASSTABLES_DIR}/driver || mkdir ${GRASSTABLES_DIR}/driver - test -d ${GRASSTABLES_DIR}/driver/db || mkdir ${GRASSTABLES_DIR}/driver/db - cp -r @GRASS_GISBASE@/driver/db/* ${GRASSTABLES_DIR}/driver/db/ clean: rm -f $(OLIBNAME) $(GLIBNAME) *.o diff --git a/VERSION b/VERSION index eca07e4..ac2cdeb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.1.2 +2.1.3 diff --git a/configure b/configure index ae5e319..39649f1 100755 --- a/configure +++ b/configure @@ -626,6 +626,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -703,6 +704,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE}' @@ -955,6 +957,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1092,7 +1103,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1245,6 +1256,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -3279,7 +3291,50 @@ fi if test "$with_grass" != "yes" ; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for G_is_initialized in -lgrass_gis" >&5 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for G_read_compressed in -lgrass_gis" >&5 +$as_echo_n "checking for G_read_compressed in -lgrass_gis... " >&6; } +if ${ac_cv_lib_grass_gis_G_read_compressed+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgrass_gis -L$with_grass/lib -lgrass_datetime $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char G_read_compressed (); +int +main () +{ +return G_read_compressed (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_grass_gis_G_read_compressed=yes +else + ac_cv_lib_grass_gis_G_read_compressed=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_grass_gis_G_read_compressed" >&5 +$as_echo "$ac_cv_lib_grass_gis_G_read_compressed" >&6; } +if test "x$ac_cv_lib_grass_gis_G_read_compressed" = xyes; then : + GRASS_SETTING=grass72+ +else + GRASS_SETTING=no +fi + + if test "$GRASS_SETTING" = "no" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for G_is_initialized in -lgrass_gis" >&5 $as_echo_n "checking for G_is_initialized in -lgrass_gis... " >&6; } if ${ac_cv_lib_grass_gis_G_is_initialized+:} false; then : $as_echo_n "(cached) " >&6 @@ -3321,8 +3376,8 @@ else GRASS_SETTING=no fi - if test "$GRASS_SETTING" = "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for G_asprintf in -lgrass_gis" >&5 + if test "$GRASS_SETTING" = "no" ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for G_asprintf in -lgrass_gis" >&5 $as_echo_n "checking for G_asprintf in -lgrass_gis... " >&6; } if ${ac_cv_lib_grass_gis_G_asprintf+:} false; then : $as_echo_n "(cached) " >&6 @@ -3364,10 +3419,15 @@ else GRASS_SETTING=no fi + fi fi if test "$GRASS_SETTING" != "no" ; then - if test "$GRASS_SETTING" = "grass70+" ; then + if test "$GRASS_SETTING" = "grass72+" ; then + G_RASTLIBS="-lgrass_raster -lgrass_imagery" + G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" + LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS" + elif test "$GRASS_SETTING" = "grass70+" ; then G_RASTLIBS="-lgrass_raster -lgrass_imagery" G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" diff --git a/configure.in b/configure.in index a0cfa9c..ff96173 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl *************************************************************************** -dnl $Id: configure.in 33717 2016-03-14 06:29:14Z goatbar $ +dnl $Id: configure.in 37161 2017-01-17 07:34:30Z rouault $ dnl dnl Project: GDAL GRASS Plugin dnl Purpose: Configure source file. @@ -123,13 +123,20 @@ fi if test "$with_grass" != "yes" ; then - AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) + AC_CHECK_LIB(grass_gis,G_read_compressed,GRASS_SETTING=grass72+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) if test "$GRASS_SETTING" = "no" ; then - AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) + AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) + if test "$GRASS_SETTING" = "no" ; then + AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) + fi fi if test "$GRASS_SETTING" != "no" ; then - if test "$GRASS_SETTING" = "grass70+" ; then + if test "$GRASS_SETTING" = "grass72+" ; then + G_RASTLIBS="-lgrass_raster -lgrass_imagery" + G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" + LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_btree2 -lgrass_ccmath $LIBS" + elif test "$GRASS_SETTING" = "grass70+" ; then G_RASTLIBS="-lgrass_raster -lgrass_imagery" G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
