configure | 11 +++++------
configure.ac | 11 +++++------
2 files changed, 10 insertions(+), 12 deletions(-)
New commits:
commit 4aecc235548490c4ff3a26066471fa6399c6f367
Author: Noriko Hosoi <nhosoi(a)redhat.com>
Date: Fri Feb 4 13:37:36 2011 -0800
Bug 618858 - move start-ds-admin env file into main admin server
config path
https://bugzilla.redhat.com/show_bug.cgi?id=618858
Description by Ulf Weltman (ulf.weltman(a)hp.com):
To improve feng-shui on HP-UX we modify the layout by moving
start-ds-admin's env file dirsrv-admin from
/etc/opt/dirsrv-admin/config to /etc/opt/dirsrv/admin-serv.
(On HP-UX we keep files in /opt/dirsrv, /var/opt/dirsrv and
/etc/opt/dirsrv. That additional /etc/opt/dirsrv-admin path
was awkward since it just contained the single env file.)
I had to move the assignment of the instancename variable up
in the file so it's available when the initconfigdir is set.
diff --git a/configure b/configure
index 87c4c08..1a1cc46 100755
--- a/configure
+++ b/configure
@@ -16714,6 +16714,9 @@ httpduser=nobody
httpdgroup=nobody
admservport=9830
admservip=0.0.0.0
+# this is the subdir under $PACKAGE_BASE_NAME where admin server
+# specific configs, logs, etc. are found
+instancename=admin-serv
# initdir
# initdir is the location for the SysV init scripts - very heavily platform
# dependent and not specified in fhs or lsb
@@ -16793,7 +16796,7 @@ $as_echo "#define _HPUX_SOURCE 1" >>confdefs.h
CXXLINK_REQUIRED=1
httpdgroup=nogroup
platform="hpux"
- initconfigdir="/$PACKAGE_NAME/config"
+ initconfigdir="/$PACKAGE_BASE_NAME/$instancename"
# HPUX doesn't use /etc for this
initdir=/init.d
;;
@@ -16830,7 +16833,7 @@ $as_echo "#define _HPUX_SOURCE 1" >>confdefs.h
# assume 64 bit
perlexec='/opt/perl_64/bin/perl'
platform="hpux"
- initconfigdir="/$PACKAGE_NAME/config"
+ initconfigdir="/$PACKAGE_BASE_NAME/$instancename"
# HPUX doesn't use /etc for this
initdir=/init.d
;;
@@ -18946,10 +18949,6 @@ else
fi
-# this is the subdir under $PACKAGE_BASE_NAME where admin server
-# specific configs, logs, etc. are found
-instancename=admin-serv
-
# check for --with-instconfigdir
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --with-instconfigdir"
>&5
$as_echo_n "checking for --with-instconfigdir... " >&6; }
diff --git a/configure.ac b/configure.ac
index 6d72542..9fd1b3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,9 @@ httpduser=nobody
httpdgroup=nobody
admservport=9830
admservip=0.0.0.0
+# this is the subdir under $PACKAGE_BASE_NAME where admin server
+# specific configs, logs, etc. are found
+instancename=admin-serv
# initdir
# initdir is the location for the SysV init scripts - very heavily platform
# dependent and not specified in fhs or lsb
@@ -166,7 +169,7 @@ case $host in
CXXLINK_REQUIRED=1
httpdgroup=nogroup
platform="hpux"
- initconfigdir="/$PACKAGE_NAME/config"
+ initconfigdir="/$PACKAGE_BASE_NAME/$instancename"
# HPUX doesn't use /etc for this
initdir=/init.d
;;
@@ -185,7 +188,7 @@ case $host in
# assume 64 bit
perlexec='/opt/perl_64/bin/perl'
platform="hpux"
- initconfigdir="/$PACKAGE_NAME/config"
+ initconfigdir="/$PACKAGE_BASE_NAME/$instancename"
# HPUX doesn't use /etc for this
initdir=/init.d
;;
@@ -260,10 +263,6 @@ m4_include(m4/mod_nss.m4)
m4_include(m4/selinux.m4)
AM_CONDITIONAL(SELINUX,test "$with_selinux" = "yes")
-# this is the subdir under $PACKAGE_BASE_NAME where admin server
-# specific configs, logs, etc. are found
-instancename=admin-serv
-
# check for --with-instconfigdir
AC_MSG_CHECKING(for --with-instconfigdir)
AC_ARG_WITH(instconfigdir,