Commit 1965e41d authored by Sam Hocevar's avatar Sam Hocevar

* ./configure.ac.in: we don't link with -lintl if building against our

    internal one.
parent 34791061
...@@ -172,6 +172,13 @@ AM_GNU_GETTEXT ...@@ -172,6 +172,13 @@ AM_GNU_GETTEXT
if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then if test "${nls_cv_force_use_gnu_gettext}" = "yes"; then
AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl) AC_DEFINE(HAVE_INCLUDED_GETTEXT, 1, Define if we use the local libintl)
INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl" INCLUDES="${INCLUDES} -I\\\$(top_srcdir)/intl"
else
AC_CHECK_FUNC(textdomain,,[
AC_CHECK_LIB(intl,textdomain,
LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
)
])
fi fi
AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes") AM_CONDITIONAL(BUILD_INTL, test "${nls_cv_force_use_gnu_gettext}" = "yes")
XGETTEXT="${XGETTEXT} --keyword=_NS" XGETTEXT="${XGETTEXT} --keyword=_NS"
...@@ -313,12 +320,6 @@ AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"]) ...@@ -313,12 +320,6 @@ AC_CHECK_LIB(rt,sem_init, [LDFLAGS_vlc="${LDFLAGS_vlc} -lrt"])
AC_CHECK_FUNC(inet_aton,,[ AC_CHECK_FUNC(inet_aton,,[
AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv") AC_CHECK_LIB(resolv,inet_aton,LDFLAGS_ipv4="${LDFLAGS_ipv4} -lresolv")
]) ])
AC_CHECK_FUNC(textdomain,,[
AC_CHECK_LIB(intl,textdomain,
LDFLAGS_vlc="${LDFLAGS_vlc} -lintl"
LDFLAGS_plugins="${LDFLAGS_plugins} -lintl"
)
])
dnl Check for getopt dnl Check for getopt
need_getopt=false need_getopt=false
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment