Attachment 1857 Details for Bug 3688 – second part of the fix

[patch] second part of the fix

patch-lib_charset_config.m4 (text/plain), 2.20 KB, created by Timur Bakeyev on 2006-04-15 23:00:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Timur Bakeyev

Created: 2006-04-15 23:00:38 UTC

Size: 2.20 KB

patch

obsolete

>--- lib/charset/config.m4.orig	Sun Apr 16 04:48:09 2006
>+++ lib/charset/config.m4	Sun Apr 16 05:35:58 2006
>@@ -1,6 +1,6 @@
> dnl # ICONV/CHARSET subsystem
> 
>-ICONV_LOCATION=standard
>+ICONV_FOUND=no
> LOOK_DIRS="/usr /usr/local /sw"
> AC_ARG_WITH(libiconv,
> [  --with-libiconv=BASEDIR Use libiconv in BASEDIR/lib and BASEDIR/include (default=auto) ],
>@@ -14,36 +14,8 @@
>   fi
> ])
> 
>-ICONV_FOUND="no"
>-for i in $LOOK_DIRS ; do
>-    save_LIBS=$LIBS
>-    save_LDFLAGS=$LDFLAGS
>-    save_CPPFLAGS=$CPPFLAGS
>-    CPPFLAGS="-I$i/include"
>-    LDFLAGS="-L$i/lib"
>-    LIBS=
>-    export LDFLAGS LIBS CPPFLAGS
>-dnl Try to find iconv(3)
>-    jm_ICONV($i)
>-
>-    TMP_ICONV_LIBS="$LIBS"
>-
>-    CPPFLAGS=$save_CPPFLAGS
>-    LDFLAGS=$save_LDFLAGS
>-    LIBS=$save_LIBS
>-    export LDFLAGS LIBS CPPFLAGS
>-
>-    if test -n "$ICONV_FOUND" ; then
>-        LIB_ADD_DIR(ICONV_LDFLAGS, $i/lib)
>-        CFLAGS_ADD_DIR(ICONV_CPPFLAGS, $i/include)
>-        ICONV_LIBS="$TMP_ICONV_LIBS"
>-        break
>-    fi
>-done
>-
>-############
> # check for iconv in libc
>-AC_CACHE_CHECK([for working iconv],samba_cv_HAVE_NATIVE_ICONV,[
>+AC_CACHE_CHECK([for native iconv],samba_cv_HAVE_NATIVE_ICONV,[
> AC_TRY_RUN([
> #include <iconv.h>
> main() {
>@@ -57,7 +29,34 @@
>     AC_DEFINE(HAVE_NATIVE_ICONV,1,[Whether to use native iconv])
> fi
> 
>-if test x"$ICONV_FOUND" = x"no" -o x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
>+if test x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes"; then
>+    for i in $LOOK_DIRS; do
>+	save_LIBS=$LIBS
>+	save_LDFLAGS=$LDFLAGS
>+	save_CPPFLAGS=$CPPFLAGS
>+	CPPFLAGS="-I$i/include"
>+	LDFLAGS="-L$i/lib"
>+	LIBS=
>+	export LDFLAGS LIBS CPPFLAGS
>+	dnl Try to find iconv(3)
>+	jm_ICONV($i)
>+
>+	TMP_ICONV_LIBS="$LIBS"
>+	CPPFLAGS=$save_CPPFLAGS
>+	LDFLAGS=$save_LDFLAGS
>+	LIBS=$save_LIBS
>+	export LDFLAGS LIBS CPPFLAGS
>+	
>+	if test x"$ICONV_FOUND" = x"yes" ; then
>+	    LIB_ADD_DIR(ICONV_LDFLAGS, $i/lib)
>+	    CFLAGS_ADD_DIR(ICONV_CPPFLAGS, $i/include)
>+	    ICONV_LIBS="$TMP_ICONV_LIBS"
>+	    break
>+	fi
>+    done
>+fi
>+
>+if test x"$ICONV_FOUND" = x"no" -a x"$samba_cv_HAVE_NATIVE_ICONV" != x"yes" ; then
>     AC_MSG_WARN([Sufficient support for iconv function was not found. 
>     Install libiconv from http://freshmeat.net/projects/libiconv/ for better charset compatibility!])
> fi

Actions: View

Attachments on bug 3688: 1856 | 1857