[or-cvs] r12321: As nick commented, tor's configure doesn't know what --enabl (in tor/trunk: . doc)

[phobos@xxxxxxxx]

Author: phobos
Date: 2007-11-01 22:40:03 -0400 (Thu, 01 Nov 2007)
New Revision: 12321

Modified:
   tor/trunk/doc/tor-osx-dmg-creation.txt
   tor/trunk/doc/tor-rpm-creation.txt
   tor/trunk/doc/tor-win32-mingw-creation.txt
   tor/trunk/tor.spec.in
Log:
As nick commented, tor's configure doesn't know what --enable-static and
--disable-shared actually are, so remove it from docs and spec file.


Modified: tor/trunk/doc/tor-osx-dmg-creation.txt
===================================================================
--- tor/trunk/doc/tor-osx-dmg-creation.txt	2007-11-02 02:32:47 UTC (rev 12320)
+++ tor/trunk/doc/tor-osx-dmg-creation.txt	2007-11-02 02:40:03 UTC (rev 12321)
@@ -69,7 +69,7 @@
 
 11) Update three variables in contrib/osx/package.sh:
 PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
-TORBUTTON_PATH=~/tmp/torbutton-1.1.8-alpha.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.1.9.1-alpha.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 Make sure the paths are correct.  The build will fail if they are not.
@@ -80,8 +80,7 @@
 LDFLAGS="-Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk" \
 CONFDIR=/Library/Tor \
 ./configure --prefix=/Library/Tor --bindir=/Library/Tor \
---sysconfdir=/Library --enable-static --disable-shared \
---disable-dependency-tracking
+--sysconfdir=/Library --disable-dependency-tracking
 
 13) "make dist-osx"
 
@@ -138,7 +137,7 @@
 
 4) Update three variables in contrib/osx/package.sh:
 PRIVOXY_PKG_ZIP=~/tmp/privoxyosx_setup_3.0.6.zip
-TORBUTTON_PATH=~/tmp/torbutton-1.1.8-alpha.xpi
+TORBUTTON_PATH=~/tmp/torbutton-1.1.9.1-alpha.xpi
 TORBUTTON_LIC_PATH=~/tmp/LICENSE
 
 Make sure the paths are correct.  The build will fail if they are not.
@@ -146,8 +145,7 @@
 5) In the top level, this means /path/to/tor/, not tor/contrib/osx,
 do a configure with these parameters:
      CONFDIR=/Library/Tor ./configure --prefix=/Library/Tor \
-     --bindir=/Library/Tor --sysconfdir=/Library  \
-     --enable-eventdns --enable-static --disable-shared
+     --bindir=/Library/Tor --sysconfdir=/Library
 
 6) In same top level dir, do a "make dist-osx".  There now exists a
 .dmg file in the same directory.  Install from this dmg.

Modified: tor/trunk/doc/tor-rpm-creation.txt
===================================================================
--- tor/trunk/doc/tor-rpm-creation.txt	2007-11-02 02:32:47 UTC (rev 12320)
+++ tor/trunk/doc/tor-rpm-creation.txt	2007-11-02 02:40:03 UTC (rev 12321)
@@ -58,7 +58,7 @@
 
 Download and Extract the latest tor source code from https://www.torproject.org/.
 In the Tor directory:
-./configure --enable-eventdns --enable-static --disable-shared
+./configure
 make dist-rpm
 
 You should have at least two, maybe three, rpms.  There should be the binary

Modified: tor/trunk/doc/tor-win32-mingw-creation.txt
===================================================================
--- tor/trunk/doc/tor-win32-mingw-creation.txt	2007-11-02 02:32:47 UTC (rev 12320)
+++ tor/trunk/doc/tor-win32-mingw-creation.txt	2007-11-02 02:40:03 UTC (rev 12321)
@@ -27,15 +27,15 @@
 ----------------------------------------------
 
 Download openssl:
-http://www.openssl.org/source/openssl-0.9.8e.tar.gz
+http://www.openssl.org/source/openssl-0.9.8g.tar.gz
 
 Extract openssl:
 Copy the openssl tarball into the "tor-mingw" directory.
 Type "cd tor-mingw/"
-Type "tar zxf openssl-0.9.8e.tar.gz"
+Type "tar zxf openssl-0.9.8g.tar.gz"
 
 Make openssl libraries:
-Type "cd tor-mingw/openssl-0.9.8e/"
+Type "cd tor-mingw/openssl-0.9.8g/"
 Type "./Configure -no-idea -no-rc5 -no-mdc2 mingw"
 Edit Makefile and remove the "test:" and "tests:" sections.
 Type "rm -rf ./test"
@@ -107,7 +107,7 @@
 Type "tar zxf latest-tor-alpha.tar.gz"
 
 cd tor-<version>
-Type "./configure --enable-static --disable-shared"
+Type "./configure"
 Type "make"
 
 You now have a tor.exe in src/or/.  This is Tor.

Modified: tor/trunk/tor.spec.in
===================================================================
--- tor/trunk/tor.spec.in	2007-11-02 02:32:47 UTC (rev 12320)
+++ tor/trunk/tor.spec.in	2007-11-02 02:40:03 UTC (rev 12321)
@@ -170,8 +170,7 @@
 %build
 %if %{is_suse}
 %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
-	--build=%{_host} --host=%{_host} --target=%{_host} \
-	--enable-static --disable-shared
+	--build=%{_host} --host=%{_host} --target=%{_host} 
 %else
 %configure --with-tor-user=%{toruser} --with-tor-group=%{torgroup} \
 	--build=%{_host} --host=%{_host} --target=%{_host}