From 5e418ef224f9b87ea039f8ea6cba856e31a708a8 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 20 Jul 2012 11:55:14 +0000
Subject: [PATCH] Remove unnecessary configure options from wxOSX install.txt.

There is no need to specify --enable-unicode nor --disable-shared. The latter
is mentioned below anyhow.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72162 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/osx/install.txt | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/docs/osx/install.txt b/docs/osx/install.txt
index f44e4831c0..02fefa17a0 100644
--- a/docs/osx/install.txt
+++ b/docs/osx/install.txt
@@ -24,22 +24,22 @@ one of the following sets of commands from the wxWidgets directory
 # Build the library for Cocoa (wxWidgets 2.9.0 and later)
 mkdir build-cocoa-debug
 cd build-cocoa-debug
-../configure --enable-unicode --enable-debug --disable-shared --with-osx_cocoa
-make;cd ..
+../configure --with-osx_cocoa --enable-debug
+make
 # Build the samples and demos
-cd build-cocoa-debug/samples; make;cd ../..
-cd build-cocoa-debug/demos;   make;cd ../..
+cd samples; make;cd ..
+cd demos;   make;cd ..
 
 ---------
 
 # Build the library for Carbon
 mkdir build-carbon-debug
 cd build-carbon-debug
-../configure --enable-unicode --enable-debug --disable-shared
-make;cd ..
+../configure --with-osx_carbon --enable-debug
+make
 # Build the samples and demos
-cd build-carbon-debug/samples;make;cd ../..
-cd build-carbon-debug/demos;  make;cd ../..
+cd samples;make;cd ..
+cd demos;  make;cd ..
 
 ---------
 
@@ -80,15 +80,6 @@ is to configure wxWidgets with --disable-shared.  Another way to avoid
 it is to make a framework for wxWidgets.  Making frameworks is beyond
 the scope of this document.
 
-Note:
-We recommend you configure a static library instead:
-
-4) ../configure --disable-shared
-
-or activate OpenGL:
-
-4) ../configure --with-opengl
-
 Note:
 It is rarely desirable to install non-Apple software into system directories.
 By configuring the library with --disable-shared and using the full path