Mercurial > mplayer.hg

changeset 2358:8b971caf9e03

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
better FreeBSD iconv implementation
author nexus
date Mon, 22 Oct 2001 07:43:32 +0000
parents 427dc863fe4b
children ee6ef0b10655
files configure subreader.c
diffstat 2 files changed, 18 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Oct 22 07:42:57 2001 +0000
+++ b/configure	Mon Oct 22 07:43:32 2001 +0000
@@ -896,10 +896,16 @@
   cc_check $_x11libdir -lX11 -lXext -lGL -lm $_socklib && _gl=yes
 fi
 
+if freebsd ; then
+  _iconv_tmp='#include <giconv.h>'
+else
+  _iconv_tmp='#include <iconv.h>'
+fi
+
 cat > $TMPC << EOF
 #include <stdio.h>
 #include <unistd.h>
-#include <iconv.h>
+$_iconv_tmp
 
 #define INBUFSIZE 1024
 #define OUTBUFSIZE 4096
@@ -930,7 +936,10 @@
 
 EOF
 _iconv=yes
-if freebsd || bsdos ; then
+if freebsd ; then
+  cc_check $_extraincdir $_extralibdir -lm -lgiconv >/dev/null 2>&1 || \
+ { _iconv=no ; echo "iconv(3) function not detected!" ;}
+elif bsdos ; then
   cc_check $_extraincdir $_extralibdir -lm -liconv >/dev/null 2>&1 || \
  { _iconv=no ; echo "iconv(3) function not detected!" ;}
 else
@@ -1878,7 +1887,9 @@
 
 if test "$_iconv" = yes ; then
  _iconv='#define USE_ICONV'
- if freebsd || bsdos ; then
+ if freebsd ; then
+  _iconvlib="-lgiconv"
+ elif bsdos ; then
   _iconvlib="-liconv"
  fi
 else
--- a/subreader.c	Mon Oct 22 07:42:57 2001 +0000
+++ b/subreader.c	Mon Oct 22 07:43:32 2001 +0000
@@ -18,7 +18,11 @@
 #define ERR (void *)-1
 
 #ifdef USE_ICONV
+#ifdef __FreeBSD__
+#include <giconv.h>
+#else
 #include <iconv.h>
+#endif
 char *sub_cp=NULL;
 #endif