aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMark Pulford <mark@kyne.com.au>2011-10-07 23:55:49 +1030
committerMark Pulford <mark@kyne.com.au>2011-10-07 23:55:49 +1030
commit049691cb11115fbdb750021556cad3507fad4e69 (patch)
tree3ef83227a086c2dbd70633a55a8425335a8e92fb /Makefile
parent48c5cf183fa7cab608168fdec2406a1ca3cb2c11 (diff)
downloadlua-cjson-049691cb11115fbdb750021556cad3507fad4e69.tar.gz
lua-cjson-049691cb11115fbdb750021556cad3507fad4e69.tar.bz2
lua-cjson-049691cb11115fbdb750021556cad3507fad4e69.zip
Add USE_POSIX_SETLOCALE option
Add USE_POSIX_SETLOCALE option for platforms missing uselocale(). Document locale options in README, Makefile & rockspec. Also: - Rename USE_POSIX_LOCALE define to USE_POSIX_USELOCALE. - Use uselocale() by default through Makefile (Linux, OSX). - Use setlocale() by default through rockspec (other platforms).
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 5857aee..082c720 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,12 @@ override CFLAGS += -fpic -I$(LUA_INCLUDE_DIR) -DVERSION=\"$(CJSON_VERSION)\"
23# Handle Solaris platforms that are missing isinf(). 23# Handle Solaris platforms that are missing isinf().
24#override CFLAGS += -DUSE_INTERNAL_ISINF 24#override CFLAGS += -DUSE_INTERNAL_ISINF
25# Handle locales that use comma as a decimal separator on locale aware 25# Handle locales that use comma as a decimal separator on locale aware
26# platforms. Requires POSIX-1.2008 support. 26# platforms (optional, but recommended).
27override CFLAGS += -DUSE_POSIX_LOCALE 27# USE_POSIX_USELOCALE: Linux, OSX. Thread safe. Recommended option.
28# USE_POSIX_SETLOCALE: Works on all ANSI C platforms. May be used when
29# thread-safety isn't required.
30override CFLAGS += -DUSE_POSIX_USELOCALE
31#override CFLAGS += -DUSE_POSIX_SETLOCALE
28 32
29INSTALL ?= install 33INSTALL ?= install
30 34