diff options
Diffstat (limited to 'source3/build')
| -rw-r--r-- | source3/build/charset.py | 10 | ||||
| -rw-r--r-- | source3/build/wscript | 2 |
2 files changed, 1 insertions, 11 deletions
diff --git a/source3/build/charset.py b/source3/build/charset.py index 03ba249367..44852a6c52 100644 --- a/source3/build/charset.py +++ b/source3/build/charset.py @@ -8,7 +8,6 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): ''' if conf.CHECK_ICONV(define='HAVE_NATIVE_ICONV'): default_dos_charset=False - default_display_charset=False default_unix_charset=False # check for default dos charset name @@ -17,12 +16,6 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): default_dos_charset=charset break - # check for default display charset name - for charset in ['ASCII', '646']: - if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): - default_display_charset=charset - break - # check for default unix charset name for charset in ['UTF-8', 'UTF8']: if conf.CHECK_CHARSET_EXISTS(charset, headers='iconv.h'): @@ -37,16 +30,13 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False): # match the results we get at runtime anyway. if crossbuild: default_dos_charset="CP850" - default_display_charset="ASCII" default_unix_charset="UTF-8" # TODO: this used to warn about the set charset on cross builds conf.DEFINE('DEFAULT_DOS_CHARSET', default_dos_charset, quote=True) - conf.DEFINE('DEFAULT_DISPLAY_CHARSET', default_display_charset, quote=True) conf.DEFINE('DEFAULT_UNIX_CHARSET', default_unix_charset, quote=True) else: conf.DEFINE('DEFAULT_DOS_CHARSET', "ASCII", quote=True) - conf.DEFINE('DEFAULT_DISPLAY_CHARSET', "ASCII", quote=True) conf.DEFINE('DEFAULT_UNIX_CHARSET', "UTF8", quote=True) diff --git a/source3/build/wscript b/source3/build/wscript index d370daf899..b9c6bd264c 100644 --- a/source3/build/wscript +++ b/source3/build/wscript @@ -42,7 +42,7 @@ def configure(conf): def build(bld): cflags = dynconfig_cflags(bld) bld.SAMBA3_SUBSYSTEM('DYNCONFIG', - '../dynconfig.c', + '../../dynconfig/dynconfig.c', deps='replace talloc tdb popt', cflags=cflags) |