Mercurial > mplayer.hg

diff configure @ 7128:dc48f2130a76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
FreeBSD iconv change/fix
author nexus
date Wed, 28 Aug 2002 23:00:25 +0000
parents 0dc9cb756b68
children 2c34499ef4af
line wrap: on
line diff
--- 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