[GRASS-SVN] r67023 - grass/trunk/mswindows/osgeo4w

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-05 07:12:17 -0800 (Sat, 05 Dec 2015)
New Revision: 67023

Modified:
   grass/trunk/mswindows/osgeo4w/gdal-config
   grass/trunk/mswindows/osgeo4w/geos-config
   grass/trunk/mswindows/osgeo4w/liblas-config
Log:
wingrass: remove hardcoded options from config scripts

Modified: grass/trunk/mswindows/osgeo4w/gdal-config
===================================================================
--- grass/trunk/mswindows/osgeo4w/gdal-config	2015-12-05 15:10:01 UTC (rev 67022)
+++ grass/trunk/mswindows/osgeo4w/gdal-config	2015-12-05 15:12:17 UTC (rev 67023)
@@ -5,9 +5,7 @@
 CONFIG_DEP_LIBS="$OSGEO4W_ROOT_MSYS/lib/libpng13.lib $OSGEO4W_ROOT_MSYS/lib/zlib.lib"
 CONFIG_PREFIX="$OSGEO4W_ROOT_MSYS"
 CONFIG_CFLAGS="-I$OSGEO4W_ROOT_MSYS/include"
-CONFIG_VERSION="1.9.0"
 CONFIG_OGR_ENABLED=yes
-CONFIG_FORMATS="gxf gtiff hfa aigrid aaigrid ceos ceos2 iso8211 xpm sdts raw dted mem jdem envisat elas fit vrt usgsdem l1b nitf bmp pcidsk airsar rs2 ilwis rmf rik leveller sgi idrisi bsb gif jpeg png pcraster "
 usage()
 {
 	cat <<EOF
@@ -17,9 +15,7 @@
 	[--libs]
 	[--dep-libs]
 	[--cflags]
-	[--version]
 	[--ogr-enabled]
-	[--formats]
 EOF
 	exit $1
 }
@@ -45,18 +41,10 @@
     echo $CONFIG_PREFIX
     ;;
 
-  --version)
-    echo $CONFIG_VERSION
-    ;;
-
   --ogr-enabled)
     echo $CONFIG_OGR_ENABLED
     ;;
 
-  --formats)
-    echo $CONFIG_FORMATS
-    ;;
-
   *)
     usage 1 1>&2
     ;;

Modified: grass/trunk/mswindows/osgeo4w/geos-config
===================================================================
--- grass/trunk/mswindows/osgeo4w/geos-config	2015-12-05 15:10:01 UTC (rev 67022)
+++ grass/trunk/mswindows/osgeo4w/geos-config	2015-12-05 15:12:17 UTC (rev 67023)
@@ -6,12 +6,10 @@
 Usage: geos-config [OPTIONS]
 Options:
      [--prefix]
-     [--version]
      [--libs]
      [--cflags]
      [--ldflags]
      [--includes]
-     [--jtsport]
 EOF
     exit $1
 }
@@ -25,13 +23,10 @@
 esac
 case $1 in
     --prefix)
-    echo $OSGEO4W_ROOT_MSYS
+      echo $OSGEO4W_ROOT_MSYS
      ;;
-    --version)
-    echo 3.2.2
-     ;;
     --cflags)
-    echo -I$OSGEO4W_ROOT_MSYS/include
+      echo -I$OSGEO4W_ROOT_MSYS/include
       ;;
     --libs)
       echo $OSGEO4W_ROOT_MSYS/lib/geos_c.lib
@@ -42,9 +37,6 @@
     --includes)
       echo $OSGEO4W_ROOT_MSYS/include
       ;;
-    --jtsport)
-    echo 1.10.0 
-      ;;
     *)
       usage 1 1>&2
       ;;

Modified: grass/trunk/mswindows/osgeo4w/liblas-config
===================================================================
--- grass/trunk/mswindows/osgeo4w/liblas-config	2015-12-05 15:10:01 UTC (rev 67022)
+++ grass/trunk/mswindows/osgeo4w/liblas-config	2015-12-05 15:12:17 UTC (rev 67023)
@@ -72,7 +72,6 @@
 	[--cxxflags]
 	[--defines]
 	[--includes]
-	[--version]
 EOF
 	exit $1
 }
@@ -110,10 +109,6 @@
     echo  -pedantic -ansi -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wfloat-equal -Wredundant-decls -Wno-long-long -std=c++98
     ;;
     
-  --version)
-    echo 1.6.0
-    ;;
-
   *)
     usage 1 1>&2
     ;;