From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 17 May 2012 22:28:18 +0000 (+1000)
Subject: build: Also look for iconv in /usr/local by default
X-Git-Tag: samba-4.0.0alpha21~78
X-Git-Url: http://git.samba.org/samba.git/?p=nivanova%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=8e5badc2564019bc2d8b923971bd37bd8e5bb039

build: Also look for iconv in /usr/local by default

This should help the build find iconv on FreeBSD and similar systems,
and make it possible to operate with 8-bit character sets.

Andrew Bartlett
---

diff --git a/buildtools/wafsamba/wscript b/buildtools/wafsamba/wscript
index 7bbec946c5b..7bf6a13fa9b 100755
--- a/buildtools/wafsamba/wscript
+++ b/buildtools/wafsamba/wscript
@@ -78,8 +78,8 @@ def set_options(opt):
                    action="store", dest='PRIVATELIBDIR', default=None)
 
     opt.add_option('--with-libiconv',
-                   help='installation directory for libiconv',
-                   action='store', dest='iconv_open', default=None,
+                   help='additional directory to search for for libiconv',
+                   action='store', dest='iconv_open', default='/usr/local',
                    match = ['Checking for library iconv', 'Checking for iconv_open', 'Checking for header iconv.h'])
 
     gr = opt.option_group('developer options')