summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-11 12:25:20 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-11 12:25:20 +0000
commit3bf5010cd19d2034fd1b7b6a6daece1046707f64 (patch)
tree5064d854cd84b7cda7f744c6387a241e016b0401
parente58d091f45966e66b44392d6f38586eaca04b898 (diff)
downloadmpv-3bf5010cd19d2034fd1b7b6a6daece1046707f64.tar.bz2
mpv-3bf5010cd19d2034fd1b7b6a6daece1046707f64.tar.xz
LANG=C added. idea by pl <p_l@gmx.fr>
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2165 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure15
1 files changed, 14 insertions, 1 deletions
diff --git a/configure b/configure
index 887cdf648c..adab75786f 100755
--- a/configure
+++ b/configure
@@ -538,6 +538,7 @@ _ggilib=
_xvlib=
_x11lib=
_xineramalib=
+_iconvlib=
_select='#define HAVE_AUDIO_SELECT'
@@ -937,8 +938,13 @@ main()
EOF
_iconv=yes
+if [ "$system_name" = "FreeBSD" ]; then
+$_cc $_extraincdir $TMPC -o $TMPO $_extralibdir -lm -liconv > /dev/null 2>&1 || \
+ { _iconv=no ; echo "iconv(3) function not detected!" ;}
+else
$_cc $TMPC -o $TMPO -lm > /dev/null 2>&1 || \
{ _iconv=no ; echo "iconv(3) function not detected!" ;}
+fi
cat > $TMPC << EOF
#include <GL/gl.h>
int main( void ) { return 0; }
@@ -1994,6 +2000,11 @@ if [ "$system_name" = "FreeBSD" ]; then
CFLAGS="$CFLAGS -D_THREAD_SAFE"
fi
+if [ "$system_name" = "FreeBSD" ] && [ "$_iconv" = "#define USE_ICONV" ]; then
+_iconvlib="-liconv"
+fi
+
+
# 64 bit file offsets?
if [ "$_largefiles" = "yes" -o "$system_name" = "FreeBSD" ]; then
CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"
@@ -2231,6 +2242,8 @@ cat > $MCONF << EOF
# -------- Generated by ./configure -----------
+LANG=C
+
prefix = $_prefix
AR=ar
CC=$_cc
@@ -2258,7 +2271,7 @@ AV_DEP = $_lavcdep
AV_LIB = $_lavclib
ALSA_LIB = $_alsalib
ESD_LIB = $_esdlib
-ARCH_LIBS = $_archlibs
+ARCH_LIBS = $_archlibs $_iconvlib
STREAM_SRCS = $_streamingsrcs
DECORE_LIBS = $_decorelibs
DIVX4LINUX=$_divx4linux