fix configure & geos-config for osgeo4w

geos 3.3.6 installs geos_c.lib, see http://osgeo-org.1560.n6.nabble.com/osgeo4w-329-update-geos-to-3-3-6-td5024605.html


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@54511 15284696-431f-4ddb-bdfa-cd5b030d7da7

configure.in

@@ -897,11 +897,12 @@ else
   fi
   
   LOC_CHECK_INCLUDES(geos_c.h,GEOS,$GEOS_CFLAGS)
-  if test "$MINGW32" = yes ; then
-    LOC_CHECK_LIBS(geos_c_i,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
-  else
-    LOC_CHECK_LIBS(geos_c,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
-  fi
+### geos 3.3.6 installs geos_c.lib, see http://osgeo-org.1560.n6.nabble.com/osgeo4w-329-update-geos-to-3-3-6-td5024605.html
+#  if test "$MINGW32" = yes ; then
+#    LOC_CHECK_LIBS(geos_c_i,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
+#  else
+  LOC_CHECK_LIBS(geos_c,initGEOS,GEOS,$GEOS_LIBS,GEOS_LIBS)
+#  fi
   AC_DEFINE(HAVE_GEOS)
 fi
 

mswindows/osgeo4w/geos-config

@@ -34,7 +34,7 @@ case $1 in
     echo -I$OSGEO4W_ROOT_MSYS/include
       ;;
     --libs)
-      echo $OSGEO4W_ROOT_MSYS/lib/geos_c_i.lib
+      echo $OSGEO4W_ROOT_MSYS/lib/geos_c.lib
       ;;
     --ldflags)
       echo