Changeset 36464

Timestamp:

Mar 23, 2009, 8:03:32 PM (15 years ago)

Author:

1gray

Message:

Fix `--without-gdal'.
lib/vector/Vlib/field.c
(gdal_version.h): Include only if `HAVE_GDAL' is defined.
(Vect_read_dblinks): Guard a part of code with `#ifdef HAVE_GDAL'.

File:

• grass/trunk/lib/vector/Vlib/field.c (modified) (3 diffs)

grass/trunk/lib/vector/Vlib/field.c

@@ -30 +30 @@
 #include <grass/Vect.h>
 
+#ifdef HAVE_GDAL
 #include <gdal_version.h>       /* needed for FID detection */
+#endif  /* HAVE_GDAL */
 
 /*!
@@ -445 +447 @@
     if (Map->format == GV_FORMAT_OGR) {
 
+#ifndef HAVE_GDAL
+        G_fatal_error(_("The support for OGR vector maps wasn't"
+                        " compiled in."));
+#else
 #if GDAL_VERSION_NUM > 1320     /* seems to be fixed after 1320 release */
         int layer, nLayers;
@@ -597 +603 @@
 #endif /* GDAL_VERSION_NUM > 1320 */
         return (1);
+#endif  /* HAVE_GDAL */
     }
     else if (Map->format != GV_FORMAT_NATIVE) {