# HG changeset patch
# User nexus
# Date 1030575625 0
# Node ID dc48f2130a76696e7a4e4458fc63347be64fa636
# Parent  1e47c2e7aa8e896956271852cb23c40904d209ad
FreeBSD iconv change/fix

diff -r 1e47c2e7aa8e -r dc48f2130a76 Gui/interface.c
--- a/Gui/interface.c	Wed Aug 28 22:45:48 2002 +0000
+++ b/Gui/interface.c	Wed Aug 28 23:00:25 2002 +0000
@@ -30,11 +30,7 @@
 #include <sys/types.h>
 
 #ifdef USE_ICONV
- #ifdef __FreeBSD__
-  #include <giconv.h>
- #else
-  #include <iconv.h>
- #endif
+#include <iconv.h>
 #endif
 
 #include "../libmpdemux/stream.h"
diff -r 1e47c2e7aa8e -r dc48f2130a76 configure
--- a/configure	Wed Aug 28 22:45:48 2002 +0000
+++ b/configure	Wed Aug 28 23:00:25 2002 +0000
@@ -3527,11 +3527,8 @@
 
 echocheck "iconv"
 if test "$_iconv" = auto ; then
-  if freebsd ; then
-    _iconv_tmp='#include <giconv.h>'
-  else
-    _iconv_tmp='#include <iconv.h>'
-  fi
+  _iconv_tmp='#include <iconv.h>'
+
   cat > $TMPC << EOF
 #include <stdio.h>
 #include <unistd.h>
@@ -3564,9 +3561,7 @@
 }
 EOF
   _iconv=no
-  if freebsd ; then
-    cc_check  -lm -lgiconv && _iconv=yes
-  elif bsdos || openbsd ; then
+  if freebsd || bsdos || openbsd ; then
     cc_check  -lm -liconv && _iconv=yes
   else
     cc_check -lm && _iconv=yes
@@ -3574,7 +3569,7 @@
 fi
 if test "$_iconv" = yes ; then
   _def_iconv='#define USE_ICONV 1'
-  freebsd && _ld_iconv='-lgiconv'
+  freebsd && _ld_iconv='-liconv'
   bsdos && _ld_iconv='-liconv'
   openbsd && _ld_iconv='-liconv'
 else
diff -r 1e47c2e7aa8e -r dc48f2130a76 subreader.c
--- a/subreader.c	Wed Aug 28 22:45:48 2002 +0000
+++ b/subreader.c	Wed Aug 28 23:00:25 2002 +0000
@@ -19,11 +19,7 @@
 #define ERR ((void *) -1)
 
 #ifdef USE_ICONV
-#ifdef __FreeBSD__
-#include <giconv.h>
-#else
 #include <iconv.h>
-#endif
 char *sub_cp=NULL;
 #endif