[Fedora-directory-commits] adminserver Makefile.am, 1.8, 1.9 Makefile.in, 1.8, 1.9 configure, 1.7, 1.8 configure.ac, 1.5, 1.6
Noriko Hosoi (nhosoi)
fedora-directory-commits at redhat.com
Fri Jun 15 17:13:04 UTC 2007
Author: nhosoi
Update of /cvs/dirsec/adminserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4913
Modified Files:
Makefile.am Makefile.in configure configure.ac
Log Message:
Resolves: #244325
Summary: init script for the Admin Server
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.am 13 Jun 2007 17:48:34 -0000 1.8
+++ Makefile.am 15 Jun 2007 17:13:02 -0000 1.9
@@ -119,6 +119,8 @@
SETUPUTIL_LIBS = @setuputil_lib@ -ldsinstall
+init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -128,7 +130,7 @@
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl
-inf_DATA = admserv/newinst/src/admin.inf admserv/newinst/src/register_param.map
+inf_DATA = admserv/newinst/src/admin.inf admserv/newinst/src/register_param.map admserv/newinst/common/setup.inf
cgibin_PROGRAMS = mergeConfig admpw security ugdsconfig ReadLog start_config_ds \
config statpingserv viewdata dsconfig monreplication restartsrv \
@@ -357,8 +359,12 @@
# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
# ADMConfigDir = /etc/packagename
fixupcmd = sed \
+ -e 's, at ECHO_C\@,$(ECHO_C),g' \
+ -e 's, at ECHO_N\@,$(ECHO_N),g' \
-e 's, at HTTPD\@,$(HTTPD),g' \
-e 's, at bindir\@,$(bindir),g' \
+ -e 's, at sbindir\@,$(sbindir),g' \
+ -e 's, at localstatedir\@,$(localstatedir),g' \
-e 's, at cgibindir\@,$(cgibindir),g' \
-e 's, at cmdbindir\@,$(cmdbindir),g' \
-e 's, at moddir\@,$(moddir),g' \
@@ -388,6 +394,7 @@
-e 's, at instancename\@,$(instancename),g' \
-e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ -e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's, at brand\@,$(brand),g' \
@@ -395,6 +402,8 @@
-e 's, at vendor\@,$(vendor),g' \
-e 's, at helpdir\@,$(helpdir),g' \
-e 's, at mimemagic\@,$(mimemagic),g' \
+ -e 's, at initdir\@,$(initdir),g' \
+ -e 's, at shared_lib_suffix\@,$(shared_lib_suffix),g' \
-e 's, at perldir\@,$(perldir),g'
# because the source may be either httpd.conf.in or httpd-2.2.conf.in
@@ -405,3 +414,7 @@
% : %.in
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(fixupcmd) $< > $@
+
+%/$(PACKAGE_NAME): %/initscript.in
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(fixupcmd) $^ > $@
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/adminserver/Makefile.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Makefile.in 13 Jun 2007 17:48:34 -0000 1.8
+++ Makefile.in 15 Jun 2007 17:13:02 -0000 1.9
@@ -103,11 +103,12 @@
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" \
"$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" \
- "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" \
- "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" \
- "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" \
- "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" \
+ "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" \
+ "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" \
+ "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(propertydir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(lib_LTLIBRARIES)
libds_admin_serv_la_LIBADD =
@@ -266,10 +267,11 @@
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
cgibinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
nodist_cmdbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
perlSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS) $(cgibin_SCRIPTS) $(cmdbin_SCRIPTS) \
- $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
+ $(init_SCRIPTS) $(nodist_cmdbin_SCRIPTS) $(perl_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -472,6 +474,7 @@
includedir = @includedir@
infdir = $(datadir)@infdir@
infodir = @infodir@
+initdir = $(sysconfdir)@initdir@
install_sh = @install_sh@
instancename = @instancename@
instconfigdir = @instconfigdir@
@@ -509,6 +512,7 @@
setuputil_inc = @setuputil_inc@
setuputil_lib = @setuputil_lib@
setuputil_libdir = @setuputil_libdir@
+shared_lib_suffix = @shared_lib_suffix@
sharedstatedir = @sharedstatedir@
subdirs = @subdirs@
sysconfdir = @sysconfdir@
@@ -551,7 +555,6 @@
@MOD_RESTARTD_TRUE at MOD_RESTARTD_SUB = mod_restartd
SUBDIRS = $(MOD_ADMSERV_SUB) $(MOD_RESTARTD_SUB)
helpdir = $(manualdir)/help
-initdir = $(sysconfdir)@initdir@
configdir = $(instconfigdir)/$(instancename)
# same as configdir for now
securitydir = $(configdir)
@@ -584,6 +587,7 @@
@nss_lib@ -lsmime3 -lssl3 -lnss3 @nspr_lib@ -lnspr4 -lplc4
SETUPUTIL_LIBS = @setuputil_lib@ -ldsinstall
+init_SCRIPTS = wrappers/$(PACKAGE_NAME)
ldif_DATA = admserv/schema/ldif/00nsroot_backend.ldif.tmpl \
admserv/schema/ldif/01nsroot.ldif.tmpl \
admserv/schema/ldif/02globalpreferences.ldif.tmpl \
@@ -593,7 +597,7 @@
admserv/schema/ldif/21astasks.ldif.tmpl \
admserv/schema/ldif/22ascommands.ldif.tmpl
-inf_DATA = admserv/newinst/src/admin.inf admserv/newinst/src/register_param.map
+inf_DATA = admserv/newinst/src/admin.inf admserv/newinst/src/register_param.map admserv/newinst/common/setup.inf
bin_SCRIPTS = admserv/newinst/src/register_server.pl
cgibin_SCRIPTS = admserv/cgi-src40/Cgi.pm
nodist_cmdbin_SCRIPTS = admserv/cfgstuff/start-ds-admin admserv/cfgstuff/stop-ds-admin admserv/cfgstuff/restart-ds-admin
@@ -773,8 +777,12 @@
# i.e. it literally copies in '${prefix}' rather than expanding it out - we want this instead:
# ADMConfigDir = /etc/packagename
fixupcmd = sed \
+ -e 's, at ECHO_C\@,$(ECHO_C),g' \
+ -e 's, at ECHO_N\@,$(ECHO_N),g' \
-e 's, at HTTPD\@,$(HTTPD),g' \
-e 's, at bindir\@,$(bindir),g' \
+ -e 's, at sbindir\@,$(sbindir),g' \
+ -e 's, at localstatedir\@,$(localstatedir),g' \
-e 's, at cgibindir\@,$(cgibindir),g' \
-e 's, at cmdbindir\@,$(cmdbindir),g' \
-e 's, at moddir\@,$(moddir),g' \
@@ -804,6 +812,7 @@
-e 's, at instancename\@,$(instancename),g' \
-e 's, at BUILD_NUM\@,$(BUILDNUM),g' \
-e 's, at NQBUILD_NUM\@,$(NQBUILDNUM),g' \
+ -e 's, at package_name\@,$(PACKAGE_NAME),g' \
-e 's, at PACKAGE_BASE_NAME\@,$(PACKAGE_BASE_NAME),g' \
-e 's, at PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
-e 's, at brand\@,$(brand),g' \
@@ -811,6 +820,8 @@
-e 's, at vendor\@,$(vendor),g' \
-e 's, at helpdir\@,$(helpdir),g' \
-e 's, at mimemagic\@,$(mimemagic),g' \
+ -e 's, at initdir\@,$(initdir),g' \
+ -e 's, at shared_lib_suffix\@,$(shared_lib_suffix),g' \
-e 's, at perldir\@,$(perldir),g'
all: config.h
@@ -1376,6 +1387,25 @@
echo " rm -f '$(DESTDIR)$(cmdbindir)/$$f'"; \
rm -f "$(DESTDIR)$(cmdbindir)/$$f"; \
done
+install-initSCRIPTS: $(init_SCRIPTS)
+ @$(NORMAL_INSTALL)
+ test -z "$(initdir)" || $(mkdir_p) "$(DESTDIR)$(initdir)"
+ @list='$(init_SCRIPTS)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ if test -f $$d$$p; then \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " $(initSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(initdir)/$$f'"; \
+ $(initSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(initdir)/$$f"; \
+ else :; fi; \
+ done
+
+uninstall-initSCRIPTS:
+ @$(NORMAL_UNINSTALL)
+ @list='$(init_SCRIPTS)'; for p in $$list; do \
+ f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+ echo " rm -f '$(DESTDIR)$(initdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(initdir)/$$f"; \
+ done
install-nodist_cmdbinSCRIPTS: $(nodist_cmdbin_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(cmdbindir)" || $(mkdir_p) "$(DESTDIR)$(cmdbindir)"
@@ -2704,7 +2734,7 @@
$(DATA) config.h
installdirs: installdirs-recursive
installdirs-am:
- for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
+ for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(cgibindir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(cmdbindir)" "$(DESTDIR)$(perldir)" "$(DESTDIR)$(helpdir)" "$(DESTDIR)$(htmldir)" "$(DESTDIR)$(icondir)" "$(DESTDIR)$(infdir)" "$(DESTDIR)$(ldifdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(propertydir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: install-recursive
@@ -2772,10 +2802,10 @@
install-data-am: install-cgibinPROGRAMS install-cgibinSCRIPTS \
install-cmdbinPROGRAMS install-cmdbinSCRIPTS \
install-dist_helpDATA install-dist_htmlDATA \
- install-dist_iconDATA install-infDATA install-ldifDATA \
- install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
- install-propertyDATA
+ install-dist_iconDATA install-infDATA install-initSCRIPTS \
+ install-ldifDATA install-nodist_cmdbinSCRIPTS \
+ install-nodist_configDATA install-nodist_propertyDATA \
+ install-perlSCRIPTS install-propertyDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
@@ -2811,10 +2841,11 @@
uninstall-cgibinSCRIPTS uninstall-cmdbinPROGRAMS \
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
- uninstall-infDATA uninstall-info-am uninstall-ldifDATA \
- uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
- uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
+ uninstall-ldifDATA uninstall-libLTLIBRARIES \
+ uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA
uninstall-info: uninstall-info-recursive
@@ -2832,24 +2863,25 @@
install-cmdbinSCRIPTS install-data install-data-am \
install-data-hook install-dist_helpDATA install-dist_htmlDATA \
install-dist_iconDATA install-exec install-exec-am \
- install-infDATA install-info install-info-am install-ldifDATA \
- install-libLTLIBRARIES install-man \
- install-nodist_cmdbinSCRIPTS install-nodist_configDATA \
- install-nodist_propertyDATA install-perlSCRIPTS \
- install-propertyDATA install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-compile mostlyclean-generic \
- mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
- tags tags-recursive uninstall uninstall-am \
+ install-infDATA install-info install-info-am \
+ install-initSCRIPTS install-ldifDATA install-libLTLIBRARIES \
+ install-man install-nodist_cmdbinSCRIPTS \
+ install-nodist_configDATA install-nodist_propertyDATA \
+ install-perlSCRIPTS install-propertyDATA install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-compile \
+ mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+ pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
uninstall-binSCRIPTS uninstall-cgibinPROGRAMS \
uninstall-cgibinSCRIPTS uninstall-cmdbinPROGRAMS \
uninstall-cmdbinSCRIPTS uninstall-dist_helpDATA \
uninstall-dist_htmlDATA uninstall-dist_iconDATA \
- uninstall-infDATA uninstall-info-am uninstall-ldifDATA \
- uninstall-libLTLIBRARIES uninstall-nodist_cmdbinSCRIPTS \
- uninstall-nodist_configDATA uninstall-nodist_propertyDATA \
- uninstall-perlSCRIPTS uninstall-propertyDATA
+ uninstall-infDATA uninstall-info-am uninstall-initSCRIPTS \
+ uninstall-ldifDATA uninstall-libLTLIBRARIES \
+ uninstall-nodist_cmdbinSCRIPTS uninstall-nodist_configDATA \
+ uninstall-nodist_propertyDATA uninstall-perlSCRIPTS \
+ uninstall-propertyDATA
define NL
\\n
@@ -2890,6 +2922,10 @@
% : %.in
if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
$(fixupcmd) $< > $@
+
+%/$(PACKAGE_NAME): %/initscript.in
+ if [ ! -d $(dir $@) ] ; then mkdir -p $(dir $@) ; fi
+ $(fixupcmd) $^ > $@
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
Index: configure
===================================================================
RCS file: /cvs/dirsec/adminserver/configure,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- configure 13 Jun 2007 17:48:34 -0000 1.7
+++ configure 15 Jun 2007 17:13:02 -0000 1.8
@@ -468,7 +468,7 @@
ac_default_prefix=/opt/$PACKAGE_BASE_NAME
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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf 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'
+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 EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CX!
XCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS initdir shared_lib_suffix HTTPD APXS PKG_CONFIG ICU_CONFIG nsspcache instconfigdir PACKAGE_BASE_NAME nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir adminutil_inc adminutil_lib adminutil_libdir adminutil_ver setuputil_lib setuputil_libdir setuputil_inc setuputil_bin icu_lib icu_libdir icu_inc icu_bin curses_lib instancename cgibindir cmdbindir moddir modnssbindir propertydir htmldir icondir manualdir httpdconf 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'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23195,6 +23195,25 @@
localstatedir='/var'
fi
+shared_lib_suffix=.so
+initdir=/rc.d
+case $host in
+ *-*-linux*)
+ initdir=/rc.d/init.d
+ ;;
+ ia64-hp-hpux*)
+ ;;
+ hppa*-hp-hpux*)
+ shared_lib_suffix=.sl
+ ;;
+ sparc-sun-solaris*)
+ initdir=/init.d
+ ;;
+ *)
+esac
+
+
+
# Check for web server
# BEGIN COPYRIGHT BLOCK
# Copyright (C) 2006 Red Hat, Inc.
@@ -24663,6 +24682,7 @@
+
# write out paths for data/config files
@@ -25507,6 +25527,8 @@
s, at ac_ct_F77@,$ac_ct_F77,;t t
s, at LIBTOOL@,$LIBTOOL,;t t
s, at LIBOBJS@,$LIBOBJS,;t t
+s, at initdir@,$initdir,;t t
+s, at shared_lib_suffix@,$shared_lib_suffix,;t t
s, at HTTPD@,$HTTPD,;t t
s, at APXS@,$APXS,;t t
s, at PKG_CONFIG@,$PKG_CONFIG,;t t
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/adminserver/configure.ac,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- configure.ac 8 Jun 2007 22:49:18 -0000 1.5
+++ configure.ac 15 Jun 2007 17:13:02 -0000 1.6
@@ -80,6 +80,25 @@
localstatedir='/var'
fi
+shared_lib_suffix=.so
+initdir=/rc.d
+case $host in
+ *-*-linux*)
+ initdir=/rc.d/init.d
+ ;;
+ ia64-hp-hpux*)
+ ;;
+ hppa*-hp-hpux*)
+ shared_lib_suffix=.sl
+ ;;
+ sparc-sun-solaris*)
+ initdir=/init.d
+ ;;
+ *)
+esac
+AC_SUBST(initdir)
+AC_SUBST(shared_lib_suffix)
+
# Check for web server
m4_include(m4/httpd.m4)
@@ -146,6 +165,7 @@
perldir=/$PACKAGE_BASE_NAME/perl
# write out paths for binary components
+AC_SUBST(PACKAGE_NAME)
AC_SUBST(PACKAGE_BASE_NAME)
AC_SUBST(nspr_inc)
AC_SUBST(nspr_lib)
More information about the Fedora-directory-commits
mailing list