[GRASS-SVN] r54353 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: neteler
Date: 2012-12-20 00:58:40 -0800 (Thu, 20 Dec 2012)
New Revision: 54353

Modified:
   grass/branches/develbranch_6/aclocal.m4
   grass/branches/develbranch_6/configure
Log:
glynn: fix for MINGW; junk char removed

Modified: grass/branches/develbranch_6/aclocal.m4
===================================================================
--- grass/branches/develbranch_6/aclocal.m4	2012-12-20 08:58:11 UTC (rev 54352)
+++ grass/branches/develbranch_6/aclocal.m4	2012-12-20 08:58:40 UTC (rev 54353)
@@ -968,7 +968,7 @@
             LD_SEARCH_FLAGS=""
 	    LD_LIBRARY_PATH_VAR="PATH"
 	    ;;
-        MINGW*)
+        MINGW* | MSYS*)
             SHLIB_CFLAGS=""
             SHLIB_LD_LIBS='${LIBS}'
             SHLIB_SUFFIX=".dll"
@@ -1162,7 +1162,7 @@
 	    fi
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
-	    LDFLAGS=""
+	    LDFLAGS=""
 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 	    if test "$GCC" = "yes" ; then

Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure	2012-12-20 08:58:11 UTC (rev 54352)
+++ grass/branches/develbranch_6/configure	2012-12-20 08:58:40 UTC (rev 54353)
@@ -2326,7 +2326,7 @@
             LD_SEARCH_FLAGS=""
 	    LD_LIBRARY_PATH_VAR="PATH"
 	    ;;
-        MINGW*)
+        MINGW* | MSYS*)
             SHLIB_CFLAGS=""
             SHLIB_LD_LIBS='${LIBS}'
             SHLIB_SUFFIX=".dll"
@@ -2579,7 +2579,7 @@
 	    fi
 	    SHLIB_LD_LIBS=""
 	    SHLIB_SUFFIX=".so"
-	    LDFLAGS=""
+	    LDFLAGS=""
 	    CC_SEARCH_FLAGS='-Wl,-rpath,${LIB_RUNTIME_DIR}'
 	    LD_SEARCH_FLAGS='-rpath ${LIB_RUNTIME_DIR}'
 	    if test "$GCC" = "yes" ; then