[Fedora-directory-commits] ldapserver Makefile.am, 1.22, 1.23 configure.ac, 1.15, 1.16 aclocal.m4, 1.15, 1.16 missing, 1.10, 1.11 install-sh, 1.10, 1.11 depcomp, 1.10, 1.11 compile, 1.10, 1.11 config.guess, 1.9, 1.10 config.sub, 1.9, 1.10 Makefile.in, 1.25, 1.26 configure, 1.24, 1.25
Richard Allen Megginson (rmeggins)
fedora-directory-commits at redhat.com
Fri Feb 9 22:34:00 UTC 2007
Author: rmeggins
Update of /cvs/dirsec/ldapserver
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5558/ldapserver
Modified Files:
Makefile.am configure.ac aclocal.m4 missing install-sh depcomp
compile config.guess config.sub Makefile.in configure
Log Message:
Resolves: bug 160235
Bug Description: Add support for /etc/init scripts
Reviewed by: nkinder (Thanks!)
Fix Description: Add the new initscript. The initscript is called $PACKAGE_NAME which by
default is fedora-ds. This script is created from wrappers/initscript.in,
sed'd by the fixupcmd in Makefile.am during make install. The way it works is
this: service fedora-ds cmd will execute the cmd on all instances (found in
/etc/fedora-ds by default). service fedora-ds cmd instance will execute cmd on
only that instance. So if you have
/etc/fedora-ds/slapd-foo
/etc/fedora-ds/slapd-bar
and you do
service start fedora-ds
it will start up both slapd-foo and slapd-bar. If you do
service start fedora-ds bar
it will start up only slapd-bar. If you do
service start fedora-ds biff
you will get an error message. The initdir is platform specific (e.g.
/etc/rc.d/init.d on linux, /etc/init.d on Solaris) so the
definition was added to the platform dependent section of configure.ac.
The init script is explicitly branded, including the filename. I needed to add
support to the autotool files so that we could change the name of the file.
Since package_name is defined when you use the AC_INIT macro in configure.ac,
we don't need to define it elsewhere (e.g. #define BRAND_DS). So I added the
branding and other information to the autotool files, and changed
create_instance to use package_name instead of brand_ds to be consistent.
Having the package_name defined in much fewer places should make it much easier
to change in the future if necessary.
I also fixed a compiler warning in ldaprot.h.
Platforms tested: RHEL4, FC6
Flag Day: no
Doc impact: Yes. We need to document how to use the initscript, and how to enable startup on boot - chkconfig fedora-ds on
Index: Makefile.am
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Makefile.am 8 Feb 2007 18:40:12 -0000 1.22
+++ Makefile.am 9 Feb 2007 22:33:58 -0000 1.23
@@ -66,6 +66,7 @@
serverdir = $(libdir)@serverdir@
serverplugindir = $(libdir)@serverplugindir@
taskdir = $(datadir)@scripttemplatedir@
+initdir = $(sysconfdir)@initdir@
#------------------------
# Build Products
@@ -173,6 +174,8 @@
$(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
+init_SCRIPTS = wrappers/$(PACKAGE_NAME)
+
#////////////////////////////////////////////////////////////////
#
# Server Strings
@@ -942,8 +945,14 @@
-e 's, at serverdir\@,$(serverdir),g' \
-e 's, at serverplugindir\@,$(serverplugindir),g' \
-e 's, at taskdir\@,$(taskdir),g' \
- -e 's, at configdir\@,$(configdir),g'
+ -e 's, at configdir\@,$(configdir),g' \
+ -e 's, at sysconfdir\@,$(sysconfdir),g' \
+ -e 's, at localstatedir\@,$(localstatedir),g' \
+ -e 's, at package_name\@,$(PACKAGE_NAME),g'
%: %.in
mkdir -p $(dir $@)
$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initscript.in
+ $(fixupcmd) $^ > $@
Index: configure.ac
===================================================================
RCS file: /cvs/dirsec/ldapserver/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- configure.ac 6 Feb 2007 15:51:22 -0000 1.15
+++ configure.ac 9 Feb 2007 22:33:58 -0000 1.16
@@ -1,7 +1,7 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.59)
-AC_INIT([fedora-ds], [1.1], [http://bugzilla.redhat.com/])
+AC_INIT([fedora-ds], [1.1.0], [http://bugzilla.redhat.com/])
# AC_CONFIG_HEADER must be called right after AC_INIT.
AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([1.9 foreign subdir-objects])
@@ -59,7 +59,7 @@
])
AC_SUBST([debug_defs])
-AC_PREFIX_DEFAULT([/opt/fedora-ds])
+AC_PREFIX_DEFAULT([/opt/$PACKAGE_NAME])
# installation paths - by default, configure will just
# use /usr as the prefix for everything, which means
@@ -75,19 +75,19 @@
fi
# relative to sysconfdir
-configdir=/fedora-ds/config
+configdir=/$PACKAGE_NAME/config
# relative to datadir
-sampledatadir=/fedora-ds/data
+sampledatadir=/$PACKAGE_NAME/data
# relative to sysconfdir
-propertydir=/fedora-ds/property
+propertydir=/$PACKAGE_NAME/property
# relative to sysconfdir
-schemadir=/fedora-ds/schema
+schemadir=/$PACKAGE_NAME/schema
# relative to libdir
-serverdir=/fedora-ds
+serverdir=/$PACKAGE_NAME
# relative to libdir
-serverplugindir=/fedora-ds/plugins
+serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
-scripttemplatedir=/fedora-ds/script-templates
+scripttemplatedir=/$PACKAGE_NAME/script-templates
AC_SUBST(configdir)
AC_SUBST(sampledatadir)
AC_SUBST(propertydir)
@@ -101,6 +101,8 @@
AM_CONDITIONAL([WINNT], false)
# Deal with platform dependent defines
+# relative to sysconfdir
+initdir=/rc.d
case $host in
*-*-linux*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -110,6 +112,8 @@
AC_DEFINE([LINUX2_2], [1], [Linux 2.2])
AC_DEFINE([LINUX2_4], [1], [Linux 2.4])
platform="linux"
+ # relative to sysconfdir
+ initdir=/rc.d/init.d
;;
ia64-hp-hpux*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -150,11 +154,14 @@
LIBDL=-ldl
AC_SUBST([LIBDL], [$LIBDL])
platform="solaris"
+ # relative to sysconfdir
+ initdir=/init.d
;;
*)
platform=""
;;
esac
+AC_SUBST(initdir)
AM_CONDITIONAL(SOLARIS,test "$platform" = "solaris")
Index: Makefile.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- Makefile.in 8 Feb 2007 18:40:12 -0000 1.25
+++ Makefile.in 9 Feb 2007 22:33:58 -0000 1.26
@@ -94,9 +94,9 @@
am__installdirs = "$(DESTDIR)$(serverdir)" \
"$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" \
- "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" \
- "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" \
- "$(DESTDIR)$(schemadir)"
+ "$(DESTDIR)$(initdir)" "$(DESTDIR)$(taskdir)" \
+ "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" \
+ "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"
serverLTLIBRARIES_INSTALL = $(INSTALL)
serverpluginLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(server_LTLIBRARIES) $(serverplugin_LTLIBRARIES)
@@ -677,8 +677,9 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
taskSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(task_SCRIPTS)
+SCRIPTS = $(bin_SCRIPTS) $(init_SCRIPTS) $(task_SCRIPTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -879,6 +880,7 @@
icu_lib = @icu_lib@
includedir = @includedir@
infodir = @infodir@
+initdir = $(sysconfdir)@initdir@
install_sh = @install_sh@
ldapsdk_bindir = @ldapsdk_bindir@
ldapsdk_inc = @ldapsdk_inc@
@@ -1059,6 +1061,7 @@
$(srcdir)/ldap/admin/src/scripts/template-migrateInstance7 \
$(srcdir)/ldap/admin/src/scripts/template-migrateTo7
+init_SCRIPTS = wrappers/$(PACKAGE_NAME)
#////////////////////////////////////////////////////////////////
#
@@ -1805,7 +1808,10 @@
-e 's, at serverdir\@,$(serverdir),g' \
-e 's, at serverplugindir\@,$(serverplugindir),g' \
-e 's, at taskdir\@,$(taskdir),g' \
- -e 's, at configdir\@,$(configdir),g'
+ -e 's, at configdir\@,$(configdir),g' \
+ -e 's, at sysconfdir\@,$(sysconfdir),g' \
+ -e 's, at localstatedir\@,$(localstatedir),g' \
+ -e 's, at package_name\@,$(PACKAGE_NAME),g'
all: $(BUILT_SOURCES) config.h
$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -3612,6 +3618,25 @@
echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
rm -f "$(DESTDIR)$(bindir)/$$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-taskSCRIPTS: $(task_SCRIPTS)
@$(NORMAL_INSTALL)
test -z "$(taskdir)" || $(mkdir_p) "$(DESTDIR)$(taskdir)"
@@ -8826,7 +8851,7 @@
all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) \
$(DATA) config.h
installdirs:
- for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
+ for dir in "$(DESTDIR)$(serverdir)" "$(DESTDIR)$(serverplugindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(initdir)" "$(DESTDIR)$(taskdir)" "$(DESTDIR)$(configdir)" "$(DESTDIR)$(propertydir)" "$(DESTDIR)$(sampledatadir)" "$(DESTDIR)$(schemadir)"; do \
test -z "$$dir" || $(mkdir_p) "$$dir"; \
done
install: $(BUILT_SOURCES)
@@ -8952,10 +8977,10 @@
info-am:
-install-data-am: install-configDATA install-nodist_propertyDATA \
- install-sampledataDATA install-schemaDATA \
- install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
- install-taskSCRIPTS
+install-data-am: install-configDATA install-initSCRIPTS \
+ install-nodist_propertyDATA install-sampledataDATA \
+ install-schemaDATA install-serverLTLIBRARIES \
+ install-serverpluginLTLIBRARIES install-taskSCRIPTS
install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-sbinPROGRAMS
@@ -8987,7 +9012,7 @@
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
- uninstall-configDATA uninstall-info-am \
+ uninstall-configDATA uninstall-info-am uninstall-initSCRIPTS \
uninstall-nodist_propertyDATA uninstall-sampledataDATA \
uninstall-sbinPROGRAMS uninstall-schemaDATA \
uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
@@ -9004,7 +9029,7 @@
dvi-am html html-am info info-am install install-am \
install-binPROGRAMS install-binSCRIPTS install-configDATA \
install-data install-data-am install-exec install-exec-am \
- install-info install-info-am install-man \
+ install-info install-info-am install-initSCRIPTS install-man \
install-nodist_propertyDATA install-sampledataDATA \
install-sbinPROGRAMS install-schemaDATA \
install-serverLTLIBRARIES install-serverpluginLTLIBRARIES \
@@ -9013,7 +9038,7 @@
mostlyclean mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS \
- uninstall-configDATA uninstall-info-am \
+ uninstall-configDATA uninstall-info-am uninstall-initSCRIPTS \
uninstall-nodist_propertyDATA uninstall-sampledataDATA \
uninstall-sbinPROGRAMS uninstall-schemaDATA \
uninstall-serverLTLIBRARIES uninstall-serverpluginLTLIBRARIES \
@@ -9035,6 +9060,9 @@
%: %.in
mkdir -p $(dir $@)
$(fixupcmd) $^ > $@
+
+%/$(PACKAGE_NAME): %/initscript.in
+ $(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/ldapserver/configure,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- configure 8 Feb 2007 18:40:12 -0000 1.24
+++ configure 9 Feb 2007 22:33:58 -0000 1.25
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.
+# Generated by GNU Autoconf 2.59 for fedora-ds 1.1.0.
#
# Report bugs to <http://bugzilla.redhat.com/>.
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='fedora-ds'
PACKAGE_TARNAME='fedora-ds'
-PACKAGE_VERSION='1.1'
-PACKAGE_STRING='fedora-ds 1.1'
+PACKAGE_VERSION='1.1.0'
+PACKAGE_STRING='fedora-ds 1.1.0'
PACKAGE_BUGREPORT='http://bugzilla.redhat.com/'
# Factoring default headers for most tests.
@@ -464,8 +464,8 @@
# include <unistd.h>
#endif"
-ac_default_prefix=/opt/fedora-ds
-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 debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
+ac_default_prefix=/opt/$PACKAGE_NAME
+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 debug_defs configdir sampledatadir propertydir schemadir serverdir serverplugindir scripttemplatedir WINNT_TRUE WINNT_FALSE LIBSOCKET LIBNSL LIBDL initdir SOLARIS_TRUE SOLARIS_FALSE PKG_CONFIG ICU_CONFIG NETSNMP_CONFIG nspr_inc nspr_lib nspr_libdir nss_inc nss_lib nss_libdir ldapsdk_inc ldapsdk_lib ldapsdk_libdir ldapsdk_bindir db_inc db_incdir db_lib db_libdir db_bindir db_libver sasl_inc sasl_lib sasl_libdir svrcore_inc svrcore_lib icu_lib icu_inc icu_bin netsnmp_inc netsnmp_lib netsnmp_libdir netsnmp_link LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -954,7 +954,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 1.1 to adapt to many kinds of systems.
+\`configure' configures fedora-ds 1.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1020,7 +1020,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of fedora-ds 1.1:";;
+ short | recursive ) echo "Configuration of fedora-ds 1.1.0:";;
esac
cat <<\_ACEOF
@@ -1186,7 +1186,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-fedora-ds configure 1.1
+fedora-ds configure 1.1.0
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1200,7 +1200,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 $as_me 1.1, which was
+It was created by fedora-ds $as_me 1.1.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1846,7 +1846,7 @@
# Define the identity of the package.
PACKAGE='fedora-ds'
- VERSION='1.1'
+ VERSION='1.1.0'
cat >>confdefs.h <<_ACEOF
@@ -22887,19 +22887,19 @@
fi
# relative to sysconfdir
-configdir=/fedora-ds/config
+configdir=/$PACKAGE_NAME/config
# relative to datadir
-sampledatadir=/fedora-ds/data
+sampledatadir=/$PACKAGE_NAME/data
# relative to sysconfdir
-propertydir=/fedora-ds/property
+propertydir=/$PACKAGE_NAME/property
# relative to sysconfdir
-schemadir=/fedora-ds/schema
+schemadir=/$PACKAGE_NAME/schema
# relative to libdir
-serverdir=/fedora-ds
+serverdir=/$PACKAGE_NAME
# relative to libdir
-serverplugindir=/fedora-ds/plugins
+serverplugindir=/$PACKAGE_NAME/plugins
# relative to datadir
-scripttemplatedir=/fedora-ds/script-templates
+scripttemplatedir=/$PACKAGE_NAME/script-templates
@@ -22922,6 +22922,8 @@
# Deal with platform dependent defines
+# relative to sysconfdir
+initdir=/rc.d
case $host in
*-*-linux*)
@@ -22955,6 +22957,8 @@
_ACEOF
platform="linux"
+ # relative to sysconfdir
+ initdir=/rc.d/init.d
;;
ia64-hp-hpux*)
@@ -23098,6 +23102,8 @@
LIBDL=$LIBDL
platform="solaris"
+ # relative to sysconfdir
+ initdir=/init.d
;;
*)
platform=""
@@ -23106,6 +23112,7 @@
+
if test "$platform" = "solaris"; then
SOLARIS_TRUE=
SOLARIS_FALSE='#'
@@ -25259,7 +25266,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by fedora-ds $as_me 1.1, which was
+This file was extended by fedora-ds $as_me 1.1.0, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -25322,7 +25329,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-fedora-ds config.status 1.1
+fedora-ds config.status 1.1.0
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -25603,6 +25610,7 @@
s, at LIBSOCKET@,$LIBSOCKET,;t t
s, at LIBNSL@,$LIBNSL,;t t
s, at LIBDL@,$LIBDL,;t t
+s, at initdir@,$initdir,;t t
s, at SOLARIS_TRUE@,$SOLARIS_TRUE,;t t
s, at SOLARIS_FALSE@,$SOLARIS_FALSE,;t t
s, at PKG_CONFIG@,$PKG_CONFIG,;t t
More information about the Fedora-directory-commits
mailing list