[mapserver-commits] r12938 - trunk/mapserver

[svn at osgeo.org]

Author: tbonfort
Date: 2012-01-02 06:46:05 -0800 (Mon, 02 Jan 2012)
New Revision: 12938

Modified:
   trunk/mapserver/configure
   trunk/mapserver/configure.in
Log:
don't add an empty "-L" flag to libiconv linking flags


Modified: trunk/mapserver/configure
===================================================================
--- trunk/mapserver/configure	2012-01-02 09:31:04 UTC (rev 12937)
+++ trunk/mapserver/configure	2012-01-02 14:46:05 UTC (rev 12938)
@@ -16962,7 +16962,7 @@
 
 ICONV_LIB=''
 
-if test -n "$ICONV_DIR" ; then
+if test -n "$ICONV_DIR" -a "$ICONV_DIR" != "yes" ; then
 
 
   if test -z "$ICONV_DIR" || echo "$ICONV_DIR" | grep '^/' >/dev/null ; then

Modified: trunk/mapserver/configure.in
===================================================================
--- trunk/mapserver/configure.in	2012-01-02 09:31:04 UTC (rev 12937)
+++ trunk/mapserver/configure.in	2012-01-02 14:46:05 UTC (rev 12938)
@@ -533,7 +533,7 @@
 
 ICONV_LIB=''
 
-if test -n "$ICONV_DIR" ; then
+if test -n "$ICONV_DIR" -a "$ICONV_DIR" != "yes" ; then
 
   AC_EXPAND_PATH($ICONV_DIR, ICONV_DIR)