aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar nexus <nexus@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-12 08:31:48 +0000
committerGravatar nexus <nexus@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-12 08:31:48 +0000
commit5ec72e78b71014335c5ee0b6ff8a026e51739a60 (patch)
tree777df5438c8dabbf47272c5b484b4a9293a69ee6
parentb794a50c7390bc4bc040ae81145a5f9d37ae7d32 (diff)
optimize iconv detection \n malloc.h useless in FreeBSD
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2174 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure12
1 files changed, 5 insertions, 7 deletions
diff --git a/configure b/configure
index c3315ca38f..2035b8a424 100755
--- a/configure
+++ b/configure
@@ -1895,6 +1895,9 @@ fi
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 @@ else
_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 @@ 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
-
# 64 bit file offsets?
if test "$_largefiles" = yes || test "$system_name" = "FreeBSD" ; then