diff options
| author | Tim Potter <tpot@samba.org> | 2003-10-09 06:02:07 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2003-10-09 06:02:07 +0000 |
| commit | 629375a206a0f3a2e418e97f6cdd071d7994f35a (patch) | |
| tree | 0d6babecb195c9ec6127b31c848f47502e7aca7d | |
| parent | 92ac1e11896a9e20c16209a85467ccbdd9eba3d9 (diff) | |
| download | samba-629375a206a0f3a2e418e97f6cdd071d7994f35a.tar.gz samba-629375a206a0f3a2e418e97f6cdd071d7994f35a.tar.bz2 samba-629375a206a0f3a2e418e97f6cdd071d7994f35a.zip | |
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)
| -rw-r--r-- | source3/configure.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index 987e1ceb6b..394bf2fb3e 100644 --- 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 |