#638, minor fixes & updates;

README.MacOSX

@@ -41,6 +41,16 @@ of "Command Line Tools for Xcode". This package contains /usr/bin/clang and
 
 3. Install necessary python modules: pyYAML, python-daemon
 -------------
+If you use latest Mac OS X version it is recommended using easy_install or pip.
+For instance to install these packages via easy_install just type following commands
+into terminal:
+
+sudo easy_install pyyaml
+sudo easy_install pydaemon
+sudo easy_install daemon
+
+Otherwise see following instruction
+
 NB: it is recommended to install python modules through setup.py,
 using the default python (which should be >= 2.6.x and < 3.x);
 
@@ -60,7 +70,7 @@ NOTE: If you want to get DMG package go to section 6.
 
     cd tarantool
     mkdir build && cd build
-    CC=clang CXX=clang++ cmake .. \
+    cmake .. \
         -DCMAKE_BUILD_TYPE=RelWithDebugInfo \
         -DENABLE_CLIENT=true \
         -DDARWIN_BUILD_TYPE=Ports

cmake/FindReadline.cmake

@@ -25,17 +25,17 @@ endif()
 SET(READLINE_FOUND FALSE)
 
 IF (READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
-	SET (READLINE_FOUND TRUE)
-	SET (READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
-	SET (READLINE_LIBRARIES ${READLINE_READLINE_LIBRARY})
-	MESSAGE(STATUS "Found GNU readline: ${READLINE_READLINE_LIBRARY}")
-	IF (TERMCAP_FOUND)
-		SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${TERMCAP_LIBRARY})
-	ENDIF (TERMCAP_FOUND)
+  SET (READLINE_FOUND TRUE)
+  SET (READLINE_INCLUDE_DIR ${READLINE_INCLUDE_DIR})
+  SET (READLINE_LIBRARIES ${READLINE_READLINE_LIBRARY})
+  MESSAGE(STATUS "Found GNU readline: ${READLINE_READLINE_LIBRARY}, include dir ${READLINE_INCLUDE_DIR}")
+  IF (TERMCAP_FOUND)
+    SET (READLINE_LIBRARIES ${READLINE_LIBRARIES} ${TERMCAP_LIBRARY})
+  ENDIF (TERMCAP_FOUND)
 ENDIF (READLINE_READLINE_LIBRARY AND READLINE_INCLUDE_DIR)
 
 MARK_AS_ADVANCED(
-	READLINE_FOUND
-	READLINE_INCLUDE_DIR
-	READLINE_LIBRARIES
-	)
+  READLINE_FOUND
+  READLINE_INCLUDE_DIR
+  READLINE_LIBRARIES
+  )

src/tarantool.cc

@@ -543,10 +543,11 @@ main(int argc, char **argv)
 	__libc_stack_end = (void*) &argv;
 #endif
 	start_time = ev_time();
+#ifndef __APPLE__
 	/* set locale to make iswXXXX function work */
 	if (setlocale(LC_CTYPE, "C.UTF-8") == NULL)
 		fprintf(stderr, "Failed to set locale to C.UTF-8\n");
-
+#endif
 	if (argc > 1 && access(argv[1], R_OK) != 0) {
 		if (argc == 2 && argv[1][0] != '-') {
 			/*