[gdal-grass] 03/03: Drop configure.in changes from grass7 patch, in favor of those in grass7-configure.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Feb 21 21:14:04 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository gdal-grass.
commit 3bafb516dcd3c65f0651deb45652cade4ae7df9b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Feb 21 21:53:05 2015 +0100
Drop configure.in changes from grass7 patch, in favor of those in grass7-configure.
---
debian/patches/grass7 | 44 -----------------------------------
debian/patches/grass7-configure | 51 +++++++++++++++++------------------------
debian/patches/grass7-makefile | 21 +++++++++++++++++
debian/patches/series | 4 ++--
4 files changed, 44 insertions(+), 76 deletions(-)
diff --git a/debian/patches/grass7 b/debian/patches/grass7
deleted file mode 100644
index a4880aa..0000000
--- a/debian/patches/grass7
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Update GRASS support for 7.0.0RC2.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: https://trac.osgeo.org/gdal/ticket/5852
-
---- a/configure.in
-+++ b/configure.in
-@@ -131,14 +131,22 @@ if test "$with_grass" != "yes" ; then
- GRASS_GISBASE="$with_grass"
- else
-
-- # Check for GRASS >= 7.0
-+ # Check for GRASS >= 7.0 (SVN)
- AC_CHECK_LIB(grass_gis.7.0.svn,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn)
- if test "$GRASS_SETTING" = "grass7+" ; then
- LIBS="-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn $LIBS"
- GRASS_INCLUDE="-I$with_grass/include"
- GRASS_GISBASE="$with_grass"
- else
-- AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found! Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
-+ # Check for GRASS 7.0.0
-+ AC_CHECK_LIB(grass_gis.7.0.0,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.0 -lgrass_gmath.7.0.0 -lgrass_gis.7.0.0 -lgrass_datetime.7.0.0 -lgrass_gproj.7.0.0 -lgrass_vector.7.0.0 -lgrass_dbmibase.7.0.0 -lgrass_dbmiclient.7.0.0 -lgrass_dgl.7.0.0 -lgrass_dig2.7.0.0 -lgrass_rtree.7.0.0 -lgrass_linkm.7.0.0 -lgrass_btree2.7.0.0 -lgrass_ccmath.7.0.0)
-+ if test "$GRASS_SETTING" = "grass7+" ; then
-+ LIBS="-L$with_grass/lib -lgrass_raster.7.0.0 -lgrass_gmath.7.0.0 -lgrass_gis.7.0.0 -lgrass_datetime.7.0.0 -lgrass_gproj.7.0.0 -lgrass_vector.7.0.0 -lgrass_dbmibase.7.0.0 -lgrass_dbmiclient.7.0.0 -lgrass_dgl.7.0.0 -lgrass_dig2.7.0.0 -lgrass_rtree.7.0.0 -lgrass_linkm.7.0.0 -lgrass_btree2.7.0.0 -lgrass_ccmath.7.0.0 $LIBS"
-+ GRASS_INCLUDE="-I$with_grass/include"
-+ GRASS_GISBASE="$with_grass"
-+ else
-+ AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found! Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
-+ fi
- fi
- fi
- fi
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -30,8 +30,8 @@ install: default
- cp $(OLIBNAME) $(AUTOLOAD_DIR)
- test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR}
- test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc
-- cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
-- cp @GRASS_GISBASE@/etc/datum.table @GRASS_GISBASE@/etc/datumtransform.table ${GRASSTABLES_DIR}/etc
-+ cp @GRASS_GISBASE@/etc/proj/ellipse.table ${GRASSTABLES_DIR}/etc
-+ cp @GRASS_GISBASE@/etc/proj/datum.table @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/
diff --git a/debian/patches/grass7-configure b/debian/patches/grass7-configure
index 9490139..da98120 100644
--- a/debian/patches/grass7-configure
+++ b/debian/patches/grass7-configure
@@ -5,51 +5,42 @@ Author: Marin Landa <landa.martin at gmail.com>
--- a/configure.in
+++ b/configure.in
-@@ -123,31 +123,26 @@ fi
+@@ -123,23 +123,26 @@ fi
if test "$with_grass" != "yes" ; then
- AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm)
--
-- if test "$GRASS_SETTING" = "grass57+" ; then
-- LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm $LIBS"
-- GRASS_INCLUDE="-I$with_grass/include"
-- GRASS_GISBASE="$with_grass"
-- else
+ 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
-
-- # Check for GRASS >= 7.0 (SVN)
-- AC_CHECK_LIB(grass_gis.7.0.svn,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn)
-- if test "$GRASS_SETTING" = "grass7+" ; then
-- LIBS="-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn $LIBS"
-- GRASS_INCLUDE="-I$with_grass/include"
-- GRASS_GISBASE="$with_grass"
-+ if test "$GRASS_SETTING" != "no" ; then
-+ if test "$GRASS_SETTING" = "grass70+" ; then
+
+- if test "$GRASS_SETTING" = "grass57+" ; then
+- LIBS="-L$with_grass/lib -lgrass_I -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime -lgrass_gproj -lgrass_vect -lgrass_dbmibase -lgrass_dbmiclient -lgrass_dgl -lgrass_dig2 -lgrass_rtree -lgrass_linkm $LIBS"
++ if test "$GRASS_SETTING" != "no" ; then
++ if 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"
- else
-- # Check for GRASS 7.0.0
-- AC_CHECK_LIB(grass_gis.7.0.0,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.0 -lgrass_gmath.7.0.0 -lgrass_gis.7.0.0 -lgrass_datetime.7.0.0 -lgrass_gproj.7.0.0 -lgrass_vector.7.0.0 -lgrass_dbmibase.7.0.0 -lgrass_dbmiclient.7.0.0 -lgrass_dgl.7.0.0 -lgrass_dig2.7.0.0 -lgrass_rtree.7.0.0 -lgrass_linkm.7.0.0 -lgrass_btree2.7.0.0 -lgrass_ccmath.7.0.0)
-- if test "$GRASS_SETTING" = "grass7+" ; then
-- LIBS="-L$with_grass/lib -lgrass_raster.7.0.0 -lgrass_gmath.7.0.0 -lgrass_gis.7.0.0 -lgrass_datetime.7.0.0 -lgrass_gproj.7.0.0 -lgrass_vector.7.0.0 -lgrass_dbmibase.7.0.0 -lgrass_dbmiclient.7.0.0 -lgrass_dgl.7.0.0 -lgrass_dig2.7.0.0 -lgrass_rtree.7.0.0 -lgrass_linkm.7.0.0 -lgrass_btree2.7.0.0 -lgrass_ccmath.7.0.0 $LIBS"
-- GRASS_INCLUDE="-I$with_grass/include"
-- GRASS_GISBASE="$with_grass"
-- else
-- AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found! Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
-- fi
++ else
+ G_RASTLIBS="-lgrass_I"
+ G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase"
+ LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS"
- fi
-+ GRASS_INCLUDE="-I$with_grass/include"
-+ GRASS_GISBASE="$with_grass"
++ fi
+ GRASS_INCLUDE="-I$with_grass/include"
+ GRASS_GISBASE="$with_grass"
+ HAVE_GRASS=yes
-+ else
+ else
+-
+- # Check for GRASS >= 7.0
+- AC_CHECK_LIB(grass_gis.7.0.svn,G_putenv,GRASS_SETTING=grass7+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn)
+- if test "$GRASS_SETTING" = "grass7+" ; then
+- LIBS="-L$with_grass/lib -lgrass_raster.7.0.svn -lgrass_gmath.7.0.svn -lgrass_gis.7.0.svn -lgrass_datetime.7.0.svn -lgrass_gproj.7.0.svn -lgrass_vector.7.0.svn -lgrass_dbmibase.7.0.svn -lgrass_dbmiclient.7.0.svn -lgrass_dgl.7.0.svn -lgrass_dig2.7.0.svn -lgrass_rtree.7.0.svn -lgrass_linkm.7.0.svn -lgrass_btree2.7.0.svn -lgrass_ccmath.7.0.svn $LIBS"
+- GRASS_INCLUDE="-I$with_grass/include"
+- GRASS_GISBASE="$with_grass"
+- else
+- AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found! Perhaps you need to set LD_LIBRARY_PATH to include $with_grass/lib?])
+- fi
+ AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found!])
fi
fi
diff --git a/debian/patches/grass7-makefile b/debian/patches/grass7-makefile
new file mode 100644
index 0000000..c3e5707
--- /dev/null
+++ b/debian/patches/grass7-makefile
@@ -0,0 +1,21 @@
+Description: Update GRASS support for 7.0.0, .tables files moved to etc/proj/
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Forwarded: https://trac.osgeo.org/gdal/ticket/5852
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -30,8 +30,12 @@ install: default
+ cp $(OLIBNAME) $(AUTOLOAD_DIR)
+ test -d ${GRASSTABLES_DIR} || mkdir ${GRASSTABLES_DIR}
+ test -d ${GRASSTABLES_DIR}/etc || mkdir ${GRASSTABLES_DIR}/etc
+- cp @GRASS_GISBASE@/etc/ellipse.table ${GRASSTABLES_DIR}/etc
+- cp @GRASS_GISBASE@/etc/datum.table @GRASS_GISBASE@/etc/datumtransform.table ${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/
diff --git a/debian/patches/series b/debian/patches/series
index 07c2d2f..119047c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,6 @@
rpath
hardening
environment-typo
-grass7
-libpq
+grass7-makefile
grass7-configure
+libpq
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git
More information about the Pkg-grass-devel
mailing list