adium-1.4 3562:547b8dd41fd4: Remove facebook from the libpurple ...

[commits at adium.im]

details:	http://hg.adium.im/adium-1.4/rev/547b8dd41fd4
revision:	3562:547b8dd41fd4
branch:		(none)
author:		Evan Schoenberg
date:		Tue Jun 28 11:21:29 2011 -0500

Remove facebook from the libpurple build process
Subject: adium-1.4 3563:86b50c088f22: Use a variable for the developer directory to make it easier to change in one place, and revert it to the default to fix compilation

details:	http://hg.adium.im/adium-1.4/rev/86b50c088f22
revision:	3563:86b50c088f22
branch:		(none)
author:		Evan Schoenberg
date:		Tue Jun 28 11:26:00 2011 -0500

Use a variable for the developer directory to make it easier to change in one place, and revert it to the default to fix compilation

diffs (46 lines):

diff -r 047d85edaf6b -r 86b50c088f22 Utilities/dep-build-scripts/common.sh
--- a/Utilities/dep-build-scripts/common.sh	Tue Jun 28 11:20:38 2011 -0500
+++ b/Utilities/dep-build-scripts/common.sh	Tue Jun 28 11:26:00 2011 -0500
@@ -4,6 +4,8 @@
 # Bails out if any command exits with a non zero exit code
 # In all scripts if it doesn't matter what a return code is make sure to use cmd || true
 set -e
+
+DEVELOPER_DIR="/Developer"
 	
 # Package Versions - if a package is changed also update urls.txt
 PKGCONFIG=pkg-config-0.22
@@ -43,9 +45,9 @@
 fi
 
 # Compiler options
-export CC="/Developer-old/usr/bin/gcc"
-export CPP="/Developer-old/usr/bin/gcc -E"
-export CXX="/Developer-old/usr/bin/g++"
+export CC="$DEVELOPER_DIR/usr/bin/gcc"
+export CPP="$DEVELOPER_DIR/usr/bin/gcc -E"
+export CXX="$DEVELOPER_DIR/usr/bin/g++"
 
 TARGET_DIR_PPC="$BUILDDIR/root-ppc"
 TARGET_DIR_I386="$BUILDDIR/root-i386"
@@ -64,7 +66,7 @@
     BASE_LDFLAGS="-miphoneos-version-min=2.2 -headerpad_max_install_names -Wl,-syslibroot,$SDK_ROOT"
 
 else
-    SDK_ROOT="/Developer-old/SDKs/MacOSX10.5.sdk"
+    SDK_ROOT="$DEVELOPER_DIR/SDKs/MacOSX10.5.sdk"
     BASE_CFLAGS="-mmacosx-version-min=10.5 -isysroot $SDK_ROOT"
     BASE_LDFLAGS="-mmacosx-version-min=10.5 -headerpad_max_install_names -Wl,-syslibroot,$SDK_ROOT"
 fi
diff -r 047d85edaf6b -r 86b50c088f22 Utilities/dep-build-scripts/purple_make.sh
--- a/Utilities/dep-build-scripts/purple_make.sh	Tue Jun 28 11:20:38 2011 -0500
+++ b/Utilities/dep-build-scripts/purple_make.sh	Tue Jun 28 11:26:00 2011 -0500
@@ -38,7 +38,7 @@
 echo purple_make.sh: Compiling ${ARCHES[@]}
 
 DEBUG_SYMBOLS=TRUE
-PROTOCOLS="bonjour facebook gg irc jabber msn myspace novell oscar qq sametime simple yahoo zephyr"
+PROTOCOLS="bonjour gg irc jabber msn myspace novell oscar qq sametime simple yahoo zephyr"
 
 ###
 # These files are overwritten during each build, which prevents us from