From 5e931c4612a203d2e3c4e274d4aa567d9e212e2a Mon Sep 17 00:00:00 2001
From: Sebastien Vincent <seb@jitsi.org>
Date: Wed, 21 Dec 2011 08:02:00 +0000
Subject: [PATCH] Revert some changes that should not be part of the previous
 commit.

---
 .classpath                        |  2 +-
 src/native/libjunbound/readme.txt | 70 ++-----------------------------
 2 files changed, 4 insertions(+), 68 deletions(-)

diff --git a/.classpath b/.classpath
index a38ea4b70..9a97ae24b 100644
--- a/.classpath
+++ b/.classpath
@@ -91,5 +91,5 @@
 	<classpathentry kind="lib" path="lib/installer-exclude/cglib-nodep.osgi-2.1_3.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/easymock-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/installer-exclude/objenesis-1.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/src/native/libjunbound/readme.txt b/src/native/libjunbound/readme.txt
index 36dc8649c..e04f0a945 100644
--- a/src/native/libjunbound/readme.txt
+++ b/src/native/libjunbound/readme.txt
@@ -13,7 +13,7 @@ make -f makefile.linux
 
 Linux (libunbound statically linked, lcrypto shared):
 ----------------------------------------------------
-Install libexpat, libldns and unbound to a separate directory ($libdir)
+Install libexpoat, libldns and unbound to a separate directory ($libdir)
 
 expat:
 ./configure --with-pic --prefix=$libdir && make && make install
@@ -54,70 +54,6 @@ cp libssl.a lib
 
 Mac:
 ---
-
-Download libexpat, ldns and unbound.
-
-Untar them in the same repository:
-mkdir repos
-tar -xzvf expat-2.0.1.tar.gz
-tar -xzvf unbound-1.4.14.tar.gz
-tar -xzvf ldns-1.6.11.tar.gz
-
-Create prefix for i386, x86_64 and ppc:
-mkdir prefix32 prefix64 prefixppc
-
-First compile for i386:
-
-libdir=/path/to/prefix32
-
-cd expat-2.0.1
-CC="gcc -arch i386" ./configure --with-pic --prefix=$libdir && make && make install
-
-cd ../ldns-1.6.11
-CC="gcc -arch i386" ./configure --disable-gost --with-pic --prefix=$libdir && make && make install
-
-cd ../unbound-1.4.14
-CC="gcc -arch i386" ./configure --with-pic --prefix=$libdir && make && make install
-
-Then for x86_64:
-
-libdir=/path/to/prefix64
-
-cd expat-2.0.1
-make clean
-CC="gcc -arch x86_64" ./configure --with-pic --prefix=$libdir && make && make install
-
-cd ../ldns-1.6.11
-make clean
-CC="gcc -arch x86_64" ./configure --disable-gost --with-pic --prefix=$libdir && make && make install
-
-cd ../unbound-1.4.14
-make clean
-CC="gcc -arch x86_64" ./configure --with-pic --prefix=$libdir && make && make install
-
-Finally for ppc:
-
-libdir=/path/to/prefixppc
-
-cd expat-2.0.1
-make clean
-CC="gcc -arch ppc" ./configure --with-pic --prefix=$libdir && make && make install
-
-cd ../ldns-1.6.11
-make clean
-CC="gcc -arch ppc" ./configure --disable-gost --with-pic --prefix=$libdir && make && make install
-
-cd ../unbound-1.4.14
-make clean
-CC="gcc -arch ppc" ./configure --with-pic --prefix=$libdir && make && make install
-
-Combine the libraries:
-mkdir -p prefixuniversal/lib
-
-lipo -create prefix32/lib/libexpat.a prefix64/lib/libexpat.a prefixppc/lib/libexpat.a -output prefixuniversal/lib/libexpat.a
-lipo -create prefix32/lib/libldns.a prefix64/lib/libldns.a prefixppc/lib/libldns.a -output prefixuniversal/lib/libldns.a
-lipo -create prefix32/lib/libunbound.a prefix64/lib/libunbound.a prefixppc/lib/libunbound.a -output prefixuniversal/lib/libunbound.a
-cp -r prefix32/include prefixuniversal/
-
+Same as Linux, except:
 libjunbound:
-g++ -arch x86_64 -arch i386 -arch ppc src/net_java_sip_communicator_util_dns_UnboundApi.cpp -fpic -shared -o libjunbound.jnilib -I/System/Library/Frameworks/JavaVM.framework/Version/CurrentJDK/Home/include -I$libdir/include -L$libdir/lib -lunbound -lldns -lcrypto
+g++ src/net_java_sip_communicator_util_dns_UnboundApi.cpp -fpic -shared -o libjunbound.jnilib -I/System/Library/Frameworks/JavaVM.framework/Version/CurrentJDK/Home/include -I$libdir/include -L$libdir/lib -lunbound -lldns -lcrypto