Index: eucalyptus-2.0+bzr1241/configure
===================================================================
--- eucalyptus-2.0+bzr1241.orig/configure	2010-12-26 21:51:01.323479001 +0100
+++ eucalyptus-2.0+bzr1241/configure	2010-12-26 21:51:13.103479001 +0100
@@ -3638,6 +3638,9 @@
 java_min_version="1.6.0"
 ant_min_version="1.6.5"
 
+# We need to explicitly link against OpenSSL
+LIBS="-lssl -lcrypto"
+
 # these are for large files (>2GB)
 LDFLAGS="`getconf LFS64_LDFLAGS` $LDFLAGS"
 LIBS="`getconf LFS64_LIBS` $LIBS"
@@ -3706,16 +3709,16 @@
 		for x in `ls ${AXIS2C_HOME}/include`; do
 			INCLUDES="${INCLUDES} -I${AXIS2C_HOME}/include/$x"
 		done
-		LIBS="-L${AXIS2C_HOME}/lib ${LIBS}"
+		LDFLAGS="-L${AXIS2C_HOME}/lib ${LDFLAGS}"
 	fi
 	if test -d ${AXIS2C_HOME}/modules/rampart ; then
-		LIBS="-L${AXIS2C_HOME}/modules/rampart ${LIBS}"
+		LDFLAGS="-L${AXIS2C_HOME}/modules/rampart ${LDFLAGS}"
 	fi
 fi
 if test -n "${LIBVIRT_HOME}" ; then
 	if test -d "${LIBVIRT_HOME}"/include ; then
 		INCLUDES="${INCLUDES} -I${LIBVIRT_HOME}/include"
-		LIBS="-L${LIBVIRT_HOME}/lib ${LIBS}"
+		LDFLAGS="-L${LIBVIRT_HOME}/lib ${LDFLAGS}"
 	fi
 fi
 
Index: eucalyptus-2.0+bzr1241/storage/Makefile
===================================================================
--- eucalyptus-2.0+bzr1241.orig/storage/Makefile	2010-12-26 21:51:01.313479001 +0100
+++ eucalyptus-2.0+bzr1241/storage/Makefile	2010-12-26 21:51:13.103479001 +0100
@@ -11,7 +11,7 @@
 build: all
 
 Wclient: Makefile Wclient.c ../util/euca_auth.o ../util/misc.o walrus.o
-	$(CC) $(CFLAGS) $(INCLUDES) Wclient.c -o Wclient ../util/euca_auth.o ../util/misc.o walrus.o $(STORAGE_LIBS)
+	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) Wclient.c -o Wclient ../util/euca_auth.o ../util/misc.o walrus.o $(STORAGE_LIBS)
 
 walrus.o: walrus.c walrus.h
 	$(CC) $(CFLAGS) $(INCLUDES) -c walrus.c 
Index: eucalyptus-2.0+bzr1241/gatherlog/Makefile
===================================================================
--- eucalyptus-2.0+bzr1241.orig/gatherlog/Makefile	2010-12-26 21:51:12.833479001 +0100
+++ eucalyptus-2.0+bzr1241/gatherlog/Makefile	2010-12-26 21:51:13.103479001 +0100
@@ -43,7 +43,7 @@
 client: $(CLIENT)
 
 $(CLIENT): generated/stubs $(CLIENT).c gl-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
-	$(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o ../util/euca_auth.o $(CLIENT).c gl-client-marshal-adb.c -DMODE=1
+	$(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(LDFLAGS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o ../util/euca_auth.o $(CLIENT).c gl-client-marshal-adb.c -DMODE=1 $(LIBS)
 
 deploy:
 	$(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
Index: eucalyptus-2.0+bzr1241/node/Makefile
===================================================================
--- eucalyptus-2.0+bzr1241.orig/node/Makefile	2010-12-26 21:51:12.833479001 +0100
+++ eucalyptus-2.0+bzr1241/node/Makefile	2010-12-26 21:51:13.103479001 +0100
@@ -62,23 +62,23 @@
 	make -C ../util
 
 $(SERVICE_SO): generated/stubs ../storage/storage.o ../storage/walrus.o ../net/vnetwork.o ../util/misc.o ../util/data.o server-marshal.o handlers.o $(NC_HANDLERS) $(AXIS2C_HOME)/lib/libaxutil.so ../util/eucalyptus.h ../util/euca_auth.o
-	$(CC) -o $(SERVICE_SO) -shared $(NC_LIBS) generated/adb_*.o generated/axis2*_skel_*.o server-marshal.o handlers.o $(NC_HANDLERS) ../storage/walrus.o ../storage/storage.o ../net/*.o ../util/*.o
+	$(CC) -o $(SERVICE_SO) -shared $(LDFLAGS) generated/adb_*.o generated/axis2*_skel_*.o server-marshal.o handlers.o $(NC_HANDLERS) ../storage/walrus.o ../storage/storage.o ../net/*.o ../util/*.o $(NC_LIBS)
 
 clientlib: generated/stubs ../util/data.o client-marshal-adb.o
 
 client: $(CLIENT) $(CLIENT)_local
 
 $(CLIENT): generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o $(AXIS2C_HOME)/lib/libaxutil.so $(CLIENT).c
-	$(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(NC_LIBS) generated/adb_*.o generated/axis2_stub_*.o client-marshal-adb.o ../util/*.o ../storage/storage.o ../storage/walrus.o ../net/*.o $(CLIENT).c
+	$(CC) -o $(CLIENT) -shared $(CFLAGS) $(INCLUDES) $(LDFLAGS) generated/adb_*.o generated/axis2_stub_*.o client-marshal-adb.o ../util/*.o ../storage/storage.o ../storage/walrus.o ../net/*.o $(CLIENT).c $(NC_LIBS)
 
 $(CLIENT)_local: generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o handlers.o $(NC_HANDLERS) $(CLIENT).c ../util/euca_auth.o
-	$(CC) -o $(CLIENT)_local $(INCLUDES) $(CFLAGS) client-marshal-local.o ../util/*.o ../storage/storage.o ../storage/walrus.o ../net/*.o handlers.o $(NC_HANDLERS) $(CLIENT).c $(NC_LIBS)
+	$(CC) -o $(CLIENT)_local -shared $(INCLUDES) $(CFLAGS) $(LDFLAGS) client-marshal-local.o ../util/*.o ../storage/storage.o ../storage/walrus.o ../net/*.o handlers.o $(NC_HANDLERS) $(CLIENT).c $(NC_LIBS)
 
 test: test.c ../util/misc.o ../util/data.o
-	$(CC) $(CFLAGS) $(INCLUDES) $(NC_LIBS) -o test test.c ../util/misc.o ../util/data.o
+	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) -o test test.c ../util/misc.o ../util/data.o $(NC_LIBS)
 
 test_nc: test_nc.c ../util/misc.o
-	$(CC) $(CFLAGS) $(INCLUDES) $(NC_LIBS) -o test_nc test_nc.c ../util/misc.o
+	$(CC) $(CFLAGS) $(INCLUDES) $(LDFLAGS) -o test_nc test_nc.c ../util/misc.o $(NC_LIBS)
 
 deploy:
 	$(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/
Index: eucalyptus-2.0+bzr1241/cluster/Makefile
===================================================================
--- eucalyptus-2.0+bzr1241.orig/cluster/Makefile	2010-12-26 21:51:12.823479001 +0100
+++ eucalyptus-2.0+bzr1241/cluster/Makefile	2010-12-26 21:51:21.353479001 +0100
@@ -50,15 +50,15 @@
 server: $(SERVICE_SO)
 
 $(SERVICE_SO): generated/stubs ../storage/storage.o server-marshal.o handlers.o $(AXIS2C_HOME)/lib/libaxutil.so 
-	$(CC) -shared generated/*.o server-marshal.o handlers.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
+	$(CC) -shared generated/*.o server-marshal.o handlers.o $(LDFLAGS) -o $(SERVICE_SO) $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS)
 
 client: $(CLIENT)_full $(CLIENTKILLALL)
 
 $(CLIENT)_full: generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
-	$(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
+	$(CC) -o $(CLIENT)_full -shared $(CFLAGS) $(INCLUDES) $(LDFLAGS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=1 $(CC_LIBS)
 
 $(CLIENTKILLALL): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
-	$(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
+	$(CC) -o $(CLIENTKILLALL) -shared $(CFLAGS) $(INCLUDES) $(LDFLAGS) generated/adb_*.o generated/axis2_stub_*.o  ../util/misc.o $(WSSECLIBS) $(CLIENT).c cc-client-marshal-adb.c -DMODE=0 $(CC_LIBS)
 
 deploy:
 	$(INSTALL) -d $(DESTDIR)$(AXIS2C_SERVICES)/$(SERVICE_NAME)/