Merge from 3.0:

>Explicitly initialise the value of AR for vendor makes that don't do
>this (HPUX 11).  Currently it's initialised to 'ar' but this may have
>to be changed if any systems pop up that have archivers that aren't
>named 'ar'. Closes bug #552.

>Fallback to our defaults (CP850/ASCII/UTF8) if there is no native
>iconv on the platform. This allows to compile and complain about it
>at runtime
(This used to be commit 442cfcce0d8dcd7b653a6260c5efcb72b84ce74f)

diff --git a/source3/configure.in b/source3/configure.in
index 987e1ceb6be6dfa5649d5d6bfb88edbfd988c82e..394bf2fb3e029488ac5c7e1e40ffde1dabc8dce6 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -206,6 +206,8 @@ AC_PROG_INSTALL
 AC_PROG_AWK
 AC_PATH_PROG(PERL, perl)
 
+AC_CHECK_TOOL(AR, ar)
+
 # compile with optimization and without debugging by default, but
 # allow people to set their own preference.
 if test "x$CFLAGS" = x
@@ -1695,7 +1697,7 @@ done
 if test x"$ICONV_FOUND" = x"no" -o 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!])
-   AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,"CP850",[Default dos charset name])
+   AC_DEFINE_UNQUOTED(DEFAULT_DOS_CHARSET,"ASCII",[Default dos charset name])
    AC_DEFINE_UNQUOTED(DEFAULT_DISPLAY_CHARSET,"ASCII",[Default display charset name])
    AC_DEFINE_UNQUOTED(DEFAULT_UNIX_CHARSET,"UTF8",[Default unix charset name])
 fi