svn commit: samba r7374 - branches/SAMBA_3_0/source trunk/source

[jerry at samba.org]

Author: jerry
Date: 2005-06-07 19:01:45 +0000 (Tue, 07 Jun 2005)
New Revision: 7374

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7374

Log:
BUG 1261: remove unusable libbiconv after discussion with Timur (FreeBSD Samba maintainer)
Modified:
   branches/SAMBA_3_0/source/aclocal.m4
   trunk/source/aclocal.m4


Changeset:
Modified: branches/SAMBA_3_0/source/aclocal.m4
===================================================================
--- branches/SAMBA_3_0/source/aclocal.m4	2005-06-07 18:11:59 UTC (rev 7373)
+++ branches/SAMBA_3_0/source/aclocal.m4	2005-06-07 19:01:45 UTC (rev 7374)
@@ -564,17 +564,6 @@
     jm_cv_lib_iconv=""
     jm_cv_giconv=no
     jm_save_LIBS="$LIBS"
-    LIBS="$LIBS -lbiconv"
-    AC_TRY_LINK([#include <stdlib.h>
-#include <biconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-      jm_cv_func_iconv=yes
-      jm_cv_biconv=yes
-      jm_cv_include="biconv.h"
-      jm_cv_lib_iconv="biconv")
-      LIBS="$jm_save_LIBS"
 
     dnl Check for include in funny place but no lib needed
     if test "$jm_cv_func_iconv" != yes; then 

Modified: trunk/source/aclocal.m4
===================================================================
--- trunk/source/aclocal.m4	2005-06-07 18:11:59 UTC (rev 7373)
+++ trunk/source/aclocal.m4	2005-06-07 19:01:45 UTC (rev 7374)
@@ -564,17 +564,6 @@
     jm_cv_lib_iconv=""
     jm_cv_giconv=no
     jm_save_LIBS="$LIBS"
-    LIBS="$LIBS -lbiconv"
-    AC_TRY_LINK([#include <stdlib.h>
-#include <biconv.h>],
-        [iconv_t cd = iconv_open("","");
-         iconv(cd,NULL,NULL,NULL,NULL);
-         iconv_close(cd);],
-      jm_cv_func_iconv=yes
-      jm_cv_biconv=yes
-      jm_cv_include="biconv.h"
-      jm_cv_lib_iconv="biconv")
-      LIBS="$jm_save_LIBS"
 
     dnl Check for include in funny place but no lib needed
     if test "$jm_cv_func_iconv" != yes; then