summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-26 01:05:37 -0600
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:08 +1000
commit0b47bda8166f42381abf7d29e3d5863515f93289 (patch)
tree046a1d8e89c494fc004ed0879dfbcb659c5af84f
parent2201d3d232f1a6e5e4054469f0897b70becf3ab6 (diff)
downloadsamba-0b47bda8166f42381abf7d29e3d5863515f93289.tar.gz
samba-0b47bda8166f42381abf7d29e3d5863515f93289.tar.bz2
samba-0b47bda8166f42381abf7d29e3d5863515f93289.zip
s3-waf: charsets needs to be quoted as strings in config.h
Pair-Programmed-With: Kai Blin <kai@samba.org>
-rw-r--r--source3/build/charset.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/build/charset.py b/source3/build/charset.py
index d1940c3ef1..03ba249367 100644
--- a/source3/build/charset.py
+++ b/source3/build/charset.py
@@ -41,12 +41,12 @@ def CHECK_SAMBA3_CHARSET(conf, crossbuild=False):
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)
- conf.DEFINE('DEFAULT_DISPLAY_CHARSET', default_display_charset)
- conf.DEFINE('DEFAULT_UNIX_CHARSET', default_unix_charset)
+ 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")
- conf.DEFINE('DEFAULT_DISPLAY_CHARSET', "ASCII")
- conf.DEFINE('DEFAULT_UNIX_CHARSET', "UTF8")
+ conf.DEFINE('DEFAULT_DOS_CHARSET', "ASCII", quote=True)
+ conf.DEFINE('DEFAULT_DISPLAY_CHARSET', "ASCII", quote=True)
+ conf.DEFINE('DEFAULT_UNIX_CHARSET', "UTF8", quote=True)