Permalink
Browse files

Let one specify the Apache module dir

  • Loading branch information...
1 parent 08dc23a commit 3f7d1a7da6345b466c2cb2648f590a9159b3cfa4 @gholms gholms committed Jan 28, 2011
Showing with 49 additions and 20 deletions.
  1. +7 −6 Makedefs.in
  2. +23 −9 configure
  3. +9 −0 configure.ac
  4. +6 −1 eucalyptus-eee.spec
  5. +1 −1 tools/eucalyptus-cc.in
  6. +2 −2 tools/eucalyptus-nc.in
  7. +1 −1 tools/httpd.conf
View
@@ -6,12 +6,13 @@
# which version
export VERSION = @EUCA_VERSION@
-# packages we depend upon
-export AXIS2C_HOME = @AXIS2C_HOME@
-export AXIS2C_SERVICES = @AXIS2C_SERVICES@
-export AXIS2_HOME = @AXIS2_HOME@
-export LIBVIRT_HOME = @LIBVIRT_HOME@
-export VDDK_HOME = @VDDK_HOME@
+# packages we depend upon
+export APACHE2_MODULE_DIR = @APACHE2_MODULE_DIR@
+export AXIS2C_HOME = @AXIS2C_HOME@
+export AXIS2C_SERVICES = @AXIS2C_SERVICES@
+export AXIS2_HOME = @AXIS2_HOME@
+export LIBVIRT_HOME = @LIBVIRT_HOME@
+export VDDK_HOME = @VDDK_HOME@
# where eucalyptus will install and other standard stuff: eventually we'll
# comply to the GNU standard
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.66 for Eucalyptus eee-2.1.
+# Generated by GNU Autoconf 2.66 for Eucalyptus eee-2.1.0.
#
# Report bugs to <support@open.eucalyptus.com>.
#
@@ -552,8 +552,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='Eucalyptus'
PACKAGE_TARNAME='eucalyptus'
-PACKAGE_VERSION='eee-2.1'
-PACKAGE_STRING='Eucalyptus eee-2.1'
+PACKAGE_VERSION='eee-2.1.0'
+PACKAGE_STRING='Eucalyptus eee-2.1.0'
PACKAGE_BUGREPORT='support@open.eucalyptus.com'
PACKAGE_URL=''
@@ -676,6 +676,7 @@ ac_user_opts='
enable_option_checking
with_axis2c
with_axis2c_services
+with_apache2_module_dir
with_axis2
with_libvirt
with_wsdl2c_sh
@@ -1234,7 +1235,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 eee-2.1 to adapt to many kinds of systems.
+\`configure' configures Eucalyptus eee-2.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1298,7 +1299,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Eucalyptus eee-2.1:";;
+ short | recursive ) echo "Configuration of Eucalyptus eee-2.1.0:";;
esac
cat <<\_ACEOF
@@ -1314,6 +1315,7 @@ Optional Packages:
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--with-axis2c=<dir> where axis2c is installed
--with-axis2c-services=<dir> where axis2c services are installed
+ --with-apache2-module-dir=<dir> where Apache modules reside
--with-axis2=<dir> where axis2 is installed
--with-libvirt=<dir> where libvirt is installed
--with-wsdl2c-sh=<file> where WSDL2C.sh is installed
@@ -1396,7 +1398,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Eucalyptus configure eee-2.1
+Eucalyptus configure eee-2.1.0
generated by GNU Autoconf 2.66
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -1872,7 +1874,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 eee-2.1, which was
+It was created by Eucalyptus $as_me eee-2.1.0, which was
generated by GNU Autoconf 2.66. Invocation command line was
$ $0 $@
@@ -3591,6 +3593,12 @@ if test "${with_axis2c_services+set}" = set; then :
fi
+# Check whether --with-apache2-module-dir was given.
+if test "${with_apache2_module_dir+set}" = set; then :
+ withval=$with_apache2_module_dir; APACHE2_MODULE_DIR="${withval}"
+fi
+
+
# Check whether --with-axis2 was given.
if test "${with_axis2+set}" = set; then :
withval=$with_axis2; AXIS2_HOME="${withval}"
@@ -3642,6 +3650,12 @@ if test -z "$AXIS2C_SERVICES" ; then
AXIS2C_SERVICES="${AXIS2C_HOME}/services"
fi
+# If we didn't specify the location of Apache modules, assume mod_axis2
+# resides within AXIS2C_HOME
+if test -z "$APACHE2_MODULE_DIR"; then
+ APACHE2_MODULE_DIR="${AXIS2C_HOME}/lib"
+fi
+
# Fix the paths for includes and libraries
if test -n "${AXIS2C_HOME}" ; then
if test -d "${AXIS2C_HOME}"/include ; then
@@ -7648,7 +7662,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 eee-2.1, which was
+This file was extended by Eucalyptus $as_me eee-2.1.0, which was
generated by GNU Autoconf 2.66. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7710,7 +7724,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Eucalyptus config.status eee-2.1
+Eucalyptus config.status eee-2.1.0
configured by $0, generated by GNU Autoconf 2.66,
with options \\"\$ac_cs_config\\"
View
@@ -58,6 +58,9 @@ AC_ARG_WITH(axis2c,
AC_ARG_WITH(axis2c-services,
[ --with-axis2c-services=<dir> where axis2c services are installed],
[AXIS2C_SERVICES="${withval}"])
+AC_ARG_WITH(apache2-module-dir,
+ [ --with-apache2-module-dir=<dir> where Apache modules reside],
+ [APACHE2_MODULE_DIR="${withval}"])
AC_ARG_WITH(axis2,
[ --with-axis2=<dir> where axis2 is installed],
[AXIS2_HOME="${withval}"])
@@ -91,6 +94,12 @@ if test -z "$AXIS2C_SERVICES" ; then
AXIS2C_SERVICES="${AXIS2C_HOME}/services"
fi
+# If we didn't specify the location of Apache modules, assume mod_axis2
+# resides within AXIS2C_HOME
+if test -z "$APACHE2_MODULE_DIR"; then
+ APACHE2_MODULE_DIR="${AXIS2C_HOME}/lib"
+fi
+
# Fix the paths for includes and libraries
if test -n "${AXIS2C_HOME}" ; then
if test -d "${AXIS2C_HOME}"/include ; then
View
@@ -289,7 +289,12 @@ VMware installation.
export DESTDIR=$RPM_BUILD_ROOT
# Oracle JDK links to Java without using alternatives
export JAVA_HOME=/usr/java/latest
-./configure --with-axis2=%{_datadir}/axis2-* --with-axis2c=%{_libdir}/axis2c --with-wsdl2c-sh=%{S:1} --enable-debug --prefix=/ --with-vddk=$RPM_BUILD_DIR/vmware-vix-disklib-distrib
+
+%if %{is_opensuse}
+./configure --with-axis2=%{_datadir}/axis2-* --with-axis2c=%{_libdir}/axis2c --with-wsdl2c-sh=%{S:1} --enable-debug --prefix=/ --with-vddk=$RPM_BUILD_DIR/vmware-vix-disklib-distrib --with-apache2-module-dir=%{_libdir}/apache2
+%else
+./configure --with-axis2=%{_datadir}/axis2-* --with-axis2c=%{_libdir}/axis2c --with-wsdl2c-sh=%{S:1} --enable-debug --prefix=/ --with-vddk=$RPM_BUILD_DIR/vmware-vix-disklib-distrib --with-apache2-module-dir=%{_libdir}/httpd/modules
+%fi
pushd clc
make deps
View
@@ -112,7 +112,7 @@ create_httpd_config() {
IPS="all"
# let's configure the common parts for both CC and NC
- cat $EUCALYPTUS/etc/eucalyptus/httpd.conf |sed "s|EUCALYPTUS|$EUCALYPTUS|"|sed "s|AXIS2C_HOME|$AXIS2C_HOME|"|sed "s|\(ServerRoot\).*|\1 "$HTTPD_HOME"|" |sed "s|EUCA_USER|$EUCA_USER|" > $EUCALYPTUS/etc/eucalyptus/httpd-tmp.conf
+ cat $EUCALYPTUS/etc/eucalyptus/httpd.conf | sed -e "s|EUCALYPTUS|$EUCALYPTUS|" -e "s|APACHE2_MODULE_DIR|$APACHE2_MODULE_DIR" -e "s|AXIS2C_HOME|$AXIS2C_HOME|" -e "s|\(ServerRoot\).*|\1 "$HTTPD_HOME"|" -e "s|EUCA_USER|$EUCA_USER|" > $EUCALYPTUS/etc/eucalyptus/httpd-tmp.conf
# if we find authz load it (needed by ubuntu)
if [ -e $HTTPD_HOME/usr/lib/apache2/modules/mod_authz_host.so ]; then
View
@@ -113,9 +113,9 @@ export EUCALYPTUS
create_httpd_config() {
IPS="all"
-
+
# let's configure the common parts for both CC and NC
- cat $EUCALYPTUS/etc/eucalyptus/httpd.conf |sed "s|EUCALYPTUS|$EUCALYPTUS|"|sed "s|AXIS2C_HOME|$AXIS2C_HOME|"|sed "s|\(ServerRoot\).*|\1 "$HTTPD_HOME"|" |sed "s|EUCA_USER|$EUCA_USER|" > $EUCALYPTUS/etc/eucalyptus/httpd-tmp.conf
+ cat $EUCALYPTUS/etc/eucalyptus/httpd.conf | sed -e "s|EUCALYPTUS|$EUCALYPTUS|" -e "s|APACHE2_MODULE_DIR|$APACHE2_MODULE_DIR" -e "s|AXIS2C_HOME|$AXIS2C_HOME|" -e "s|\(ServerRoot\).*|\1 "$HTTPD_HOME"|" -e "s|EUCA_USER|$EUCA_USER|" > $EUCALYPTUS/etc/eucalyptus/httpd-tmp.conf
# load authz if we have it (ubuntu needs it)
if [ -e $HTTPD_HOME/usr/lib/apache2/modules/mod_authz_host.so ]; then
View
@@ -57,7 +57,7 @@ LogLevel warn
MaxRequestsPerChild 0
</IfModule>
-LoadModule axis2_module AXIS2C_HOME/lib/libmod_axis2.so
+LoadModule axis2_module APACHE2_MODULE_DIR/libmod_axis2.so
Axis2RepoPath AXIS2C_HOME
Axis2LogFile EUCALYPTUS/var/log/eucalyptus/axis2c.log
Axis2MaxLogFileSize 128

0 comments on commit 3f7d1a7

Please sign in to comment.