[Mplayer-cvslog] CVS: main configure,1.194,1.195 subreader.c,1.30,1.31

[Bohdan 'Nexus' Horst]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv18088

Modified Files:
	configure subreader.c 
Log Message:
better FreeBSD iconv implementation

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -r1.194 -r1.195
--- configure	20 Oct 2001 23:53:43 -0000	1.194
+++ configure	22 Oct 2001 07:43:31 -0000	1.195
@@ -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

Index: subreader.c
===================================================================
RCS file: /cvsroot/mplayer/main/subreader.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- subreader.c	21 Oct 2001 17:19:59 -0000	1.30
+++ subreader.c	22 Oct 2001 07:43:32 -0000	1.31
@@ -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