10:40 a.m.
Author: rmeggins
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4733/adminserver
Modified Files:
configure.ac aclocal.m4 configure missing install-sh depcomp
config.sub config.guess compile Makefile.in
Log Message:
Resolves: bug 251549
Bug Description: Change filesystem path naming from "fedora-ds" to
"dirsrv"
Reviewed by: nkinder (Thanks!)
Fix Description: Mostly just changing the package name in configure.ac, and making sure we
consistently use that in path naming (e.g. /etc/@PACKAGE_NAME@ or /etc/@PACKAGE_NAME_BASE@
for adminserver).
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Oh yes.
QA impact: Any existing tests that depend on /path/brand-ds will need to change to use
dirsrv. It is highly encouraged to use a macro or variable for the package name in any
scripts to minimize the impact of future package name changes.
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- configure.ac 2 Aug 2007 14:58:34 -0000 1.17
+++ configure.ac 13 Aug 2007 15:40:47 -0000 1.18
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([fedora-ds-admin], [1.1.0], [http://bugzilla.redhat.com/])
+AC_INIT([dirsrv-admin], [1.1.0], [http://bugzilla.redhat.com/])
AC_CONFIG_SRCDIR([admserv/cgi-src40/viewlog.c])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
AM_MAINTAINER_MODE
@@ -59,7 +59,8 @@
PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//`
AC_SUBST(PACKAGE_BASE_NAME)
# the default prefix - override with --prefix or --with-fhs or --with-fhs-opt
-AC_PREFIX_DEFAULT([/opt/fedora-ds])
+# unfortunately, this must be a literal - it should be $PACKAGE_BASE_NAME
+AC_PREFIX_DEFAULT([/opt/dirsrv])
PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print
$1"."$2}'`
AC_SUBST(PACKAGE_BASE_VERSION)
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure 6 Aug 2007 19:54:25 -0000 1.30
+++ configure 13 Aug 2007 15:40:47 -0000 1.31
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds-admin 1.1.0.
+# Generated by GNU Autoconf 2.59 for dirsrv-admin 1.1.0.
#
# Report bugs to <http://bugzilla.redhat.com/>;.
#
@@ -421,10 +421,10 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME='fedora-ds-admin'
-PACKAGE_TARNAME='fedora-ds-admin'
+PACKAGE_NAME='dirsrv-admin'
+PACKAGE_TARNAME='dirsrv-admin'
PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='fedora-ds-admin 1.1.0'
+PACKAGE_STRING='dirsrv-admin 1.1.0'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
ac_unique_file="admserv/cgi-src40/viewlog.c"
@@ -465,7 +465,7 @@
# include <unistd.h>
#endif"
-ac_default_prefix=/opt/fedora-ds
+ac_default_prefix=/opt/dirsrv
ac_subdirs_all="$ac_subdirs_all mod_admserv"
ac_subdirs_all="$ac_subdirs_all mod_restartd"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION
PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir
libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir
infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS
INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF
AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p
AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE
MAINTAINER_MODE_FALSE MAINT build build_cpu build_vendor build_os host host_cpu
host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT DEPDIR
am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CXXDEPMODE am__fastdepCXX_TRUE
am__fastdepCXX_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE
SED EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CP!
P CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS PACKAGE_BASE_NAME PACKAGE_BASE_VERSION
debug_defs BUNDLE_TRUE BUNDLE_FALSE LIBSOCKET LIBNSL LIBCSTD LIBCRUN initdir perlexec
CXXLINK_REQUIRED_TRUE CXXLINK_REQUIRED_FALSE HPUX_TRUE HPUX_FALSE SOLARIS_TRUE
SOLARIS_FALSE HTTPD APXS APR_CONFIG PKG_CONFIG ICU_CONFIG nsspcache instconfigdir dslibdir
nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir sasl_inc sasl_lib sasl_libdir
ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir
adminutil_ver icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir
cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf httpdconfdir
mimemagic httpduser httpdgroup logdir piddir pidfile admservport ldifdir admmoddir
nssmoddir infdir perldir brand capbrand vendor WINNT_TRUE WINNT_FALSE APACHE22_TRUE
APACHE22_FALSE subdirs MOD_ADMSERV_TRUE MOD_ADMSERV_FALSE MOD_RESTARTD_TRUE
MOD_RESTARTD_FALSE LTLIBOBJS'
@@ -957,7 +957,7 @@
# 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 fedora-ds-admin 1.1.0 to adapt to many kinds of systems.
+\`configure' configures dirsrv-admin 1.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1023,7 +1023,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fedora-ds-admin 1.1.0:";;
+ short | recursive ) echo "Configuration of dirsrv-admin 1.1.0:";;
esac
cat <<\_ACEOF
@@ -1200,7 +1200,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-fedora-ds-admin configure 1.1.0
+dirsrv-admin configure 1.1.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1214,7 +1214,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by fedora-ds-admin $as_me 1.1.0, which was
+It was created by dirsrv-admin $as_me 1.1.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1857,7 +1857,7 @@
# Define the identity of the package.
- PACKAGE='fedora-ds-admin'
+ PACKAGE='dirsrv-admin'
VERSION='1.1.0'
@@ -23014,6 +23014,7 @@
PACKAGE_BASE_NAME=`echo $PACKAGE_NAME | sed -e s/-admin//`
# the default prefix - override with --prefix or --with-fhs or --with-fhs-opt
+# unfortunately, this must be a literal - it should be $PACKAGE_BASE_NAME
PACKAGE_BASE_VERSION=`echo $PACKAGE_VERSION | awk -F\. '{print
$1"."$2}'`
@@ -25697,7 +25698,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by fedora-ds-admin $as_me 1.1.0, which was
+This file was extended by dirsrv-admin $as_me 1.1.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25760,7 +25761,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fedora-ds-admin config.status 1.1.0
+dirsrv-admin config.status 1.1.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed
's/[\\""\`\$]/\\\\&/g'`\\"