svn commit: r1577265 - /subversion/trunk/configure.ac

[ph...@apache.org]

Author: philip
Date: Thu Mar 13 18:06:17 2014
New Revision: 1577265

URL: http://svn.apache.org/r1577265
Log:
Revert part of r1577223 in an attempt to unbreak the Unix build.

* configure.ac: Don't set SVN_INTL_LIBS thus making it always empty.

Modified:
    subversion/trunk/configure.ac

Modified: subversion/trunk/configure.ac
URL: http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1577265&r1=1577264&r2=1577265&view=diff
==============================================================================
--- subversion/trunk/configure.ac (original)
+++ subversion/trunk/configure.ac Thu Mar 13 18:06:17 2014
@@ -690,10 +690,7 @@ if test "$enable_nls" = "yes"; then
   AC_PATH_PROG(MSGMERGE, msgmerge, none)
   AC_PATH_PROG(XGETTEXT, xgettext, none)
   if test "$MSGFMT" != "none"; then
-    AC_SEARCH_LIBS(bindtextdomain, [intl],
-                   [
-                    SVN_INTL_LIBS="-lintl"
-                   ],
+    AC_SEARCH_LIBS(bindtextdomain, [intl], [],
                    [
                     enable_nls="no"
                    ])
@@ -705,7 +702,9 @@ if test "$enable_nls" = "yes"; then
       AC_SEARCH_LIBS(bindtextdomain, [intl],
                      [
                       enable_nls="yes"
-                      SVN_INTL_LIBS="-lintl -liconv"
+                      # This is here so that -liconv ends up in LIBS
+                      # if it worked with -liconv.
+                      AC_CHECK_LIB(iconv, libiconv_open)
                      ], 
                      [
                       AC_MSG_WARN([bindtextdomain() not found.  Disabling NLS.])
@@ -721,6 +720,7 @@ if test "$enable_nls" = "yes"; then
   fi
 fi
 
+dnl Currently SVN_INTL_LIBS is always empty.
 AC_SUBST(SVN_INTL_LIBS)
 
 AH_BOTTOM([