On Thu, Mar 13, 2014 at 04:16:17PM -0000, s...@apache.org wrote: > Author: stsp > Date: Thu Mar 13 16:16:16 2014 > New Revision: 1577223 > > URL: http://svn.apache.org/r1577223 > Log: > Add libintl link flags to SVN_INTL_LIBS on *nix builds. > > The SVN_INTL_LIBS variable was referred to but never defined. > > * Makefile.in: Define SVN_INTL_LIBS. > > * configure.ac: Set SVN_INTL_LIBS to the linker flags required > to link to libintl and export the value of SVN_INTL_LIBS > to the Makefile.
A side-effect of this change is that -lintl now appears in both SVN_INTL_LIBS and LIBS. It is in LIBS because AC_SEARCH_LIBS insits on putting it there. Do we care enough to somehow work around that? Or do we just live with potential redundant -lintl linker flags? > Modified: > subversion/trunk/Makefile.in > subversion/trunk/configure.ac > > Modified: subversion/trunk/Makefile.in > URL: > http://svn.apache.org/viewvc/subversion/trunk/Makefile.in?rev=1577223&r1=1577222&r2=1577223&view=diff > ============================================================================== > --- subversion/trunk/Makefile.in (original) > +++ subversion/trunk/Makefile.in Thu Mar 13 16:16:16 2014 > @@ -48,6 +48,7 @@ SVN_GPG_AGENT_LIBS = @SVN_GPG_AGENT_LIBS > SVN_GNOME_KEYRING_LIBS = @SVN_GNOME_KEYRING_LIBS@ > SVN_KWALLET_LIBS = @SVN_KWALLET_LIBS@ > SVN_MAGIC_LIBS = @SVN_MAGIC_LIBS@ > +SVN_INTL_LIBS = @SVN_INTL_LIBS@ > SVN_SASL_LIBS = @SVN_SASL_LIBS@ > SVN_SERF_LIBS = @SVN_SERF_LIBS@ > SVN_SQLITE_LIBS = @SVN_SQLITE_LIBS@ > > Modified: subversion/trunk/configure.ac > URL: > http://svn.apache.org/viewvc/subversion/trunk/configure.ac?rev=1577223&r1=1577222&r2=1577223&view=diff > ============================================================================== > --- subversion/trunk/configure.ac (original) > +++ subversion/trunk/configure.ac Thu Mar 13 16:16:16 2014 > @@ -690,7 +690,10 @@ 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], [], > + AC_SEARCH_LIBS(bindtextdomain, [intl], > + [ > + SVN_INTL_LIBS="-lintl" > + ], > [ > enable_nls="no" > ]) > @@ -702,9 +705,7 @@ if test "$enable_nls" = "yes"; then > AC_SEARCH_LIBS(bindtextdomain, [intl], > [ > enable_nls="yes" > - # This is here so that -liconv ends up in LIBS > - # if it worked with -liconv. > - AC_CHECK_LIB(iconv, libiconv_open) > + SVN_INTL_LIBS="-lintl -liconv" > ], > [ > AC_MSG_WARN([bindtextdomain() not found. Disabling > NLS.]) > @@ -720,6 +721,8 @@ if test "$enable_nls" = "yes"; then > fi > fi > > +AC_SUBST(SVN_INTL_LIBS) > + > AH_BOTTOM([ > /* Indicate to translators that string X should be translated. Do not look > up the translation at run time; just expand to X. This macro is suitable >
