Permalink
Browse files

We had a too strict dependency on libvirt: fixed it (only NC depends …

…on it

now). libcurl dependency is a bit more widespread. Version is 1.5 now.
  • Loading branch information...
graziano obertelli
graziano obertelli committed Jan 15, 2009
1 parent 9cdca9f commit ec3f7289c418d6d47daa45a1fa51f9800e1dda5a
Showing with 36 additions and 42 deletions.
  1. +1 −1 VERSION
  2. +4 −3 cluster/Makefile
  3. +11 −23 configure
  4. +2 −2 configure.ac
  5. +8 −6 eucalyptus.spec.in
  6. +7 −6 node/Makefile
  7. +3 −1 storage/Makefile
View
@@ -1 +1 @@
-1.4
+1.5
View
@@ -17,6 +17,7 @@ NCLIBS=../util/data.o ../node/client-marshal-adb.o ../util/ipc.o
SCLIBS=../storage/storage.o
VNLIBS=../net/vnetwork.o ../util/misc.o
WSSECLIBS=../util/euca_auth.o
+CC_LIBS = ${LIBS} -lcurl
all: server client
@@ -44,13 +45,13 @@ generated/stubs: $(CCWSDL)
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) $(LIBS) -o $(SERVICE_SO)
+ $(CC) -shared generated/*.o server-marshal.o handlers.o $(SCLIBS) $(NCLIBS) $(VNLIBS) $(WSSECLIBS) $(CC_LIBS) -o $(SERVICE_SO)
client: $(CLIENT)
$(CLIENT): generated/stubs $(CLIENT).c cc-client-marshal-adb.c handlers.o $(AXIS2C_HOME)/lib/libaxutil.so
- $(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
- $(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
+ $(CC) -o $(CLIENTKILLALL) $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c cc-client-marshal-adb.c -DMODE=0
+ $(CC) -o $(CLIENT)_full $(CFLAGS) $(INCLUDES) $(CC_LIBS) generated/adb_*.o generated/axis2_stub_*.o ../util/misc.o ../util/euca_auth.o $(CLIENT).c cc-client-marshal-adb.c -DMODE=1
deploy:
$(INSTALL) -d $(AXIS2C_HOME)/services/$(SERVICE_NAME)/
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for Eucalyptus 1.4rc3.
+# Generated by GNU Autoconf 2.61 for Eucalyptus 1.5.
#
# Report bugs to <support@eucalyptus.cs.ucsb.edu>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='Eucalyptus'
PACKAGE_TARNAME='eucalyptus'
-PACKAGE_VERSION='1.4rc3'
-PACKAGE_STRING='Eucalyptus 1.4rc3'
+PACKAGE_VERSION='1.5'
+PACKAGE_STRING='Eucalyptus 1.5'
PACKAGE_BUGREPORT='support@eucalyptus.cs.ucsb.edu'
ac_unique_file="wsdl/eucalyptus_nc.wsdl"
@@ -1193,7 +1193,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Eucalyptus 1.4rc3 to adapt to many kinds of systems.
+\`configure' configures Eucalyptus 1.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1254,7 +1254,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Eucalyptus 1.4rc3:";;
+ short | recursive ) echo "Configuration of Eucalyptus 1.5:";;
esac
cat <<\_ACEOF
@@ -1344,7 +1344,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Eucalyptus configure 1.4rc3
+Eucalyptus configure 1.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1358,7 +1358,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Eucalyptus $as_me 1.4rc3, which was
+It was created by Eucalyptus $as_me 1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -5616,7 +5616,6 @@ _ACEOF
fi
-
{ echo "$as_me:$LINENO: checking for main in -lvirt" >&5
echo $ECHO_N "checking for main in -lvirt... $ECHO_C" >&6; }
if test "${ac_cv_lib_virt_main+set}" = set; then
@@ -5673,19 +5672,13 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_virt_main" >&5
echo "${ECHO_T}$ac_cv_lib_virt_main" >&6; }
if test $ac_cv_lib_virt_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBVIRT 1
-_ACEOF
-
- LIBS="-lvirt $LIBS"
-
+ true
else
{ { echo "$as_me:$LINENO: error: Cannot find libvirt!" >&5
echo "$as_me: error: Cannot find libvirt!" >&2;}
{ (exit 1); exit 1; }; }
fi
-
{ echo "$as_me:$LINENO: checking for main in -lcurl" >&5
echo $ECHO_N "checking for main in -lcurl... $ECHO_C" >&6; }
if test "${ac_cv_lib_curl_main+set}" = set; then
@@ -5742,12 +5735,7 @@ fi
{ echo "$as_me:$LINENO: result: $ac_cv_lib_curl_main" >&5
echo "${ECHO_T}$ac_cv_lib_curl_main" >&6; }
if test $ac_cv_lib_curl_main = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCURL 1
-_ACEOF
-
- LIBS="-lcurl $LIBS"
-
+ true
else
{ { echo "$as_me:$LINENO: error: Cannot find libcurl!" >&5
echo "$as_me: error: Cannot find libcurl!" >&2;}
@@ -10510,7 +10498,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Eucalyptus $as_me 1.4rc3, which was
+This file was extended by Eucalyptus $as_me 1.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -10559,7 +10547,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-Eucalyptus config.status 1.4rc3
+Eucalyptus config.status 1.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
View
@@ -124,8 +124,8 @@ AC_CHECK_LIB([omxmlsec],[main],,AC_MSG_ERROR([Cannot find libomxmlsec!]))
AC_CHECK_LIB([oxstokens],[main],,AC_MSG_ERROR([Cannot find liboxstokens!]))
AC_CHECK_LIB([pthread],[main])
AC_CHECK_LIB([rt],[main])
-AC_CHECK_LIB([virt],[main],,AC_MSG_ERROR([Cannot find libvirt!]))
-AC_CHECK_LIB([curl],[main],,AC_MSG_ERROR([Cannot find libcurl!]))
+AC_CHECK_LIB([virt],[main],true,AC_MSG_ERROR([Cannot find libvirt!]))
+AC_CHECK_LIB([curl],[main],true,AC_MSG_ERROR([Cannot find libcurl!]))
# Checks for header files.
AC_HEADER_DIRENT
View
@@ -4,7 +4,7 @@ Version: @VERSION@
Release: 2
License: BSD
Group: Applications/System
-Requires: vconfig, euca-libvirt
+Requires: vconfig
Vendor: Mayhem lab
#Icon: someicon.xpm
Source: http://eucalyptus.cs.ucsb.edu/downloads/eucalyptus-%{version}.tgz
@@ -47,7 +47,7 @@ This package contains the cluster controller part of eucalyptus.
%package nc
Summary: Elastic Utility Computing Architecture - node controller
-Requires: eucalyptus >= @VERSION@, euca-httpd, euca-axis2c, bridge-utils, eucalyptus-gl
+Requires: eucalyptus >= @VERSION@, euca-httpd, euca-axis2c, bridge-utils, eucalyptus-gl, euca-libvirt
Group: Applications/System
%description nc
@@ -100,14 +100,12 @@ rm -f /etc/init.d/eucalyptus
/opt/eucalyptus/var/eucalyptus/keys
/opt/eucalyptus/var/log
/opt/eucalyptus/var/run
-/opt/eucalyptus/usr/share/eucalyptus/add_key.sh
-/opt/eucalyptus/usr/share/eucalyptus/gen_libvirt_xml
-/opt/eucalyptus/usr/share/eucalyptus/get_xen_info
+/opt/eucalyptus/usr/share/eucalyptus/add_key.pl
/opt/eucalyptus/usr/share/eucalyptus/euca_ipt
+/opt/eucalyptus/usr/share/eucalyptus/euca_rootwrap
/opt/eucalyptus/usr/sbin/euca_conf
/opt/eucalyptus/usr/sbin/euca_sync_key
/opt/eucalyptus/usr/sbin/euca_killall
-/opt/eucalyptus/usr/sbin/euca_test_nc
/opt/eucalyptus/etc/init.d/eucalyptus
/opt/eucalyptus/etc/eucalyptus/httpd.conf
@@ -133,6 +131,10 @@ rm -f /etc/init.d/eucalyptus
/opt/euca-axis2c/services/EucalyptusCC
%files nc
+/opt/eucalyptus/usr/share/eucalyptus/euca_mountwrap
+/opt/eucalyptus/usr/share/eucalyptus/gen_libvirt_xml
+/opt/eucalyptus/usr/share/eucalyptus/get_xen_info
+/opt/eucalyptus/usr/sbin/euca_test_nc
/opt/euca-axis2c/services/EucalyptusNC
%files gl
View
@@ -10,6 +10,7 @@ SERVICE_SO=libEucalyptusNC.so
SERVICE_NAME=EucalyptusNC
CLIENT=NCclient
WSDL2C=$(AXIS2C_HOME)/bin/tools/wsdl2c/WSDL2C.sh
+NC_LIBS = $(LIBS) -lvirt -lcurl
all: server client clientlib test_nc test
@@ -53,23 +54,23 @@ server: $(SERVICE_SO)
make -C ../util
$(SERVICE_SO): generated/stubs ../storage/storage.o ../net/vnetwork.o ../util/misc.o ../util/data.o server-marshal.o handlers.o $(AXIS2C_HOME)/lib/libaxutil.so ../util/eucalyptus.h ../util/euca_auth.o
- $(CC) -o $(SERVICE_SO) -shared $(LIBS) generated/adb_*.o generated/axis2*_skel_*.o server-marshal.o handlers.o ../storage/*.o ../net/*.o ../util/*.o
+ $(CC) -o $(SERVICE_SO) -shared $(NC_LIBS) generated/adb_*.o generated/axis2*_skel_*.o server-marshal.o handlers.o ../storage/*.o ../net/*.o ../util/*.o
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 handlers.o $(AXIS2C_HOME)/lib/libaxutil.so $(CLIENT).c
- $(CC) -o $(CLIENT) $(CFLAGS) $(INCLUDES) $(LIBS) generated/adb_*.o generated/axis2_stub_*.o client-marshal-adb.o ../util/*.o ../storage/*.o ../net/*.o $(CLIENT).c
+$(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/*.o ../net/*.o $(CLIENT).c
$(CLIENT)_local: generated/stubs ../util/misc.o ../util/data.o client-marshal-adb.o client-marshal-local.o handlers.o $(CLIENT).c ../util/euca_auth.o
- $(CC) -o $(CLIENT)_local $(INCLUDES) $(CFLAGS) client-marshal-local.o ../util/*.o ../storage/*.o ../net/*.o handlers.o $(CLIENT).c $(LIBS)
+ $(CC) -o $(CLIENT)_local $(INCLUDES) $(CFLAGS) client-marshal-local.o ../util/*.o ../storage/*.o ../net/*.o handlers.o $(CLIENT).c $(NC_LIBS)
test: test.c ../util/misc.o ../util/data.o
- $(CC) $(CFLAGS) $(INCLUDES) $(LIBS) -o test test.c ../util/misc.o ../util/data.o
+ $(CC) $(CFLAGS) $(INCLUDES) $(NC_LIBS) -o test test.c ../util/misc.o ../util/data.o
test_nc: test_nc.c ../util/misc.o
- $(CC) $(CFLAGS) $(INCLUDES) $(LIBS) -o test_nc test_nc.c ../util/misc.o
+ $(CC) $(CFLAGS) $(INCLUDES) $(NC_LIBS) -o test_nc test_nc.c ../util/misc.o
deploy:
$(INSTALL) -d $(AXIS2C_HOME)/services/$(SERVICE_NAME)/
View
@@ -5,12 +5,14 @@
include ../Makedefs
+STORAGE_LIBS = ${LIBS} -lcurl
+
all: storage.o walrus.o Wclient
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 $(LIBS)
+ $(CC) $(CFLAGS) $(INCLUDES) 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

0 comments on commit ec3f728

Please sign in to comment.