projects / packages / gdal.git / blame
| Commit | Line | Data |
|---|---|---|
| 0316feee JB |
1 | --- gdal-1.11.0/configure.in.orig 2014-05-11 06:25:06.870303219 +0200 |
| 2 | +++ gdal-1.11.0/configure.in 2014-05-11 09:17:12.103421341 +0200 | |
| 3 | @@ -718,25 +718,33 @@ | |
| 4 | ||
| 5 | # Check for GRASS 5.7.0 or later library use. | |
| 6 | # TODO: separate libs for rasters and vectors | |
| 7 | -if test "$with_grass" != "yes" -a "$with_grass" != "no" ; then | |
| 8 | +if test "$with_grass" != "no" ; then | |
| 9 | ||
| 10 | - AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) | |
| 11 | + if test "$with_grass" = "yes" ; then | |
| 12 | + GRASS_I= | |
| 13 | + GRASS_L= | |
| 14 | + GRASS_GISBASE="$prefix" | |
| 15 | + else | |
| 16 | + GRASS_I="-I$with_grass/include" | |
| 17 | + GRASS_L="-L$with_grass/lib" | |
| 18 | + GRASS_GISBASE="$with_grass" | |
| 19 | + fi | |
| 20 | + AC_CHECK_LIB(grass_gis,G_is_initialized,GRASS_SETTING=grass70+,GRASS_SETTING=no,$GRASS_L -lgrass_datetime) | |
| 21 | if test "$GRASS_SETTING" = "no" ; then | |
| 22 | - AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,-L$with_grass/lib -lgrass_datetime) | |
| 23 | + AC_CHECK_LIB(grass_gis,G_asprintf,GRASS_SETTING=grass57+,GRASS_SETTING=no,$GRASS_L -lgrass_datetime) | |
| 24 | fi | |
| 25 | ||
| 26 | if test "$GRASS_SETTING" != "no" ; then | |
| 27 | if test "$GRASS_SETTING" = "grass70+" ; then | |
| 28 | G_RASTLIBS="-lgrass_raster -lgrass_imagery" | |
| 29 | G_VECTLIBS="-lgrass_vector -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" | |
| 30 | - LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" | |
| 31 | + LIBS="$GRASS_L $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" | |
| 32 | else | |
| 33 | G_RASTLIBS="-lgrass_I" | |
| 34 | G_VECTLIBS="-lgrass_vect -lgrass_dig2 -lgrass_dgl -lgrass_rtree -lgrass_linkm -lgrass_dbmiclient -lgrass_dbmibase" | |
| 35 | - LIBS="-L$with_grass/lib $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" | |
| 36 | + LIBS="$GRASS_L $G_VECTLIBS $G_RASTLIBS -lgrass_gproj -lgrass_vask -lgrass_gmath -lgrass_gis -lgrass_datetime $LIBS" | |
| 37 | fi | |
| 38 | - GRASS_INCLUDE="-I$with_grass/include" | |
| 39 | - GRASS_GISBASE="$with_grass" | |
| 40 | + GRASS_INCLUDE="$GRASS_I" | |
| 41 | HAVE_GRASS=yes | |
| 42 | else | |
| 43 | AC_MSG_ERROR([--with-grass=$with_grass requested, but libraries not found!]) |