# HG changeset patch
# User nexus
# Date 1002875508 0
# Node ID d64159386b90f2dc24b821add20a5429ee4505e4
# Parent  531bf16643484ca3ac6e13b152491830810b9d6d
optimize iconv detection \n malloc.h useless in FreeBSD

diff -r 531bf1664348 -r d64159386b90 configure
--- a/configure	Fri Oct 12 07:56:54 2001 +0000
+++ b/configure	Fri Oct 12 08:31:48 2001 +0000
@@ -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'
@@ -1999,12 +2003,6 @@
 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
-
 
 # 64 bit file offsets?
 if test "$_largefiles" = yes || test "$system_name" = "FreeBSD" ; then