diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-09-12 21:24:18 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-09-12 21:24:18 +0000 |
| commit | d466d6a39f785c44a09adf3fc58b5a425c63f33b (patch) | |
| tree | e24919f69ac661aeb3fd14b2439a84d88abaef74 /configure.ac | |
| parent | a065c7dc482ea280d7f30f23626171a8303ec488 (diff) | |
| download | xine-lib-d466d6a39f785c44a09adf3fc58b5a425c63f33b.tar.gz xine-lib-d466d6a39f785c44a09adf3fc58b5a425c63f33b.tar.bz2 | |
Fixed iconv warnings on FreeBSD, fixed build w/o iconv but require it as default.
CVS patchset: 8223
CVS date: 2006/09/12 21:24:18
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 83b8239da..4057a2071 100644 --- a/configure.ac +++ b/configure.ac @@ -157,6 +157,25 @@ dnl --------------------------------------------- dnl ALL_LINGUAS="cs da de el en@quot en@boldquot es et fr gl id it ja ko nl nn no pl pt pt_BR ru sl sv tr zh" AM_ICONV +AC_ARG_ENABLE([iconvtest], + AS_HELP_STRING([--disable-iconvtest], [don't require iconv library])) +if test x$enable_iconvtest != xno; then + if test x"$am_cv_func_iconv" != xyes; then + AC_MSG_ERROR([ +**************************************************************** +* iconv library not found. It's necessary for proper * +* manipulation with texts so xine requires it as default. * +* * +* You need to install iconv library or to specify prefix * +* by option --with-libiconv-prefix. * +* * +* If you don't want iconv support use the option * +* --disable-iconvtest. * +**************************************************************** + ]) + fi +fi + AM_GNU_GETTEXT([external]) AC_PROG_GMSGFMT_PLURAL @@ -201,18 +220,6 @@ case "$host" in THREAD_CPPFLAGS="-I$pthread_prefix/include" CPPFLAGS="$CPPFLAGS $THREAD_CPPFLAGS -D_THREAD_SAFE" have_pthread=yes - - if test x"$am_cv_func_iconv" != xyes; then - AC_MSG_WARN([ -**************************************************************** -* You need to install a recent version of the port 'libiconv' * -* (in /usr/ports/converters/libiconv) or to specify prefix * -* by option --with-libiconv-prefix. * -* The library in this port is needed to successfully compile * -* libsputext plugin. * -**************************************************************** - ]) - fi ;; *-*-hpux11*) |