Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv18745 Modified Files: configure Log Message: optimize iconv detection \n malloc.h useless in FreeBSD Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.183 retrieving revision 1.184 diff -u -r1.183 -r1.184 --- configure 12 Oct 2001 07:56:54 -0000 1.183 +++ configure 12 Oct 2001 08:31:48 -0000 1.184 @@ -1895,6 +1895,9 @@ if test "$_iconv" = yes ; then _iconv='#define USE_ICONV' + if test "$system_name" = "FreeBSD" || test "$system_name" = "BSD/OS" ; then + _iconvlib="-liconv" + fi else _iconv='#undef USE_ICONV' fi @@ -1954,7 +1957,8 @@ _have_soundcard_h='#undef HAVE_SYS_SOUNDCARD_H' fi -if test "$_malloc_h" = yes ; then +# malloc.h useless in FreeBSD +if test "$_malloc_h" = yes && test "$system_name" != "FreeBSD" ; then _have_malloc_h='#define HAVE_MALLOC_H 1' else _have_malloc_h='#undef HAVE_MALLOC_H' @@ -1997,12 +2001,6 @@ # for MT applications: if test "$system_name" = "Linux" || test "$system_name" = "FreeBSD" ; then CFLAGS="$CFLAGS -D_THREAD_SAFE" -fi - -if test "$system_name" = "FreeBSD" || test "$system_name" = "BSD/OS" ; then - if test "$_iconv" = "#define USE_ICONV" ; then - _iconvlib="-liconv" - fi fi