[389-commits] 2 commits - configure configure.ac ltmain.sh Makefile.am Makefile.in VERSION.sh
Richard Allen Megginson
rmeggins at fedoraproject.org
Fri Feb 26 23:10:00 UTC 2010
Makefile.am | 2 -
Makefile.in | 2 -
VERSION.sh | 2 -
configure | 98 +++++++++++++++++++++++++++++++++++++++--------------------
configure.ac | 31 +++++++++++++++---
5 files changed, 94 insertions(+), 41 deletions(-)
New commits:
commit 5ddb5afff730c46f82fc1b6c040e87d7ce303100
Author: Rich Megginson <rmeggins at redhat.com>
Date: Fri Feb 26 12:05:31 2010 -0700
Bug 460162 - FedoraDS "with-FHS" installs init.d StartupScript in wrong loca
https://bugzilla.redhat.com/show_bug.cgi?id=460162
Resolves: bug 460162
Bug Description: FedoraDS "with-FHS" installs init.d StartupScript in wrong
Reviewed by: nkinder (Thanks!)
Branch: HEAD
Fix Description: There is no LSB or FHS standard for the init script locatio
and it varies widely across systems and even linux distros. I've added
a --with-initddir (default $(sysconfig)/rc.d) so that the location can be
specified. Note that this changes the initdir parameter to be an absolute
path, instead of relative to sysconfdir. Some systems do not use /etc at al
for this (e.g. HPUX uses /init.d).
Platforms tested: RHEL5 x86_64
Flag Day: yes - autotool file change
Doc impact: no
diff --git a/Makefile.am b/Makefile.am
index f84257b..4c2bf24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,7 +61,7 @@ icondir = $(datadir)@icondir@
httpdconf = @httpdconf@
manualdir = $(datadir)@manualdir@
helpdir = $(manualdir)/help
-initdir = $(sysconfdir)@initdir@
+initdir = @initdir@
initconfigdir = $(sysconfdir)@initconfigdir@
instconfigdir = @instconfigdir@
instancename = @instancename@
diff --git a/Makefile.in b/Makefile.in
old mode 100755
new mode 100644
index 3c9521b..c2b03a9
--- a/Makefile.in
+++ b/Makefile.in
@@ -435,7 +435,7 @@ includedir = @includedir@
infdir = $(datadir)@infdir@
infodir = @infodir@
initconfigdir = $(sysconfdir)@initconfigdir@
-initdir = $(sysconfdir)@initdir@
+initdir = @initdir@
install_sh = @install_sh@
instancename = @instancename@
instconfigdir = @instconfigdir@
diff --git a/configure b/configure
index bf06e3a..2582ca3 100755
--- a/configure
+++ b/configure
@@ -1057,6 +1057,9 @@ Optional Packages:
include additional configurations [automatic]
--with-fhs Use FHS layout
--with-fhs-opt Use FHS optional layout
+ --with-initddir=/path Absolute path (not relative like some of the other
+ options) that should contain the SysV init scripts
+ (default '$(sysconfdir)/rc.d')
--with-fortitude=PATH Fortitude root directory (default:
$default_fortitudedir)
--with-httpd=PATH Full path of Apache binary. Configure will usually
@@ -4355,7 +4358,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4358 "configure"' > conftest.$ac_ext
+ echo '#line 4361 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5490,7 +5493,7 @@ fi
# Provide some information about the compiler.
-echo "$as_me:5493:" \
+echo "$as_me:5496:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6553,11 +6556,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6556: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6559: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6560: \$? = $ac_status" >&5
+ echo "$as_me:6563: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6821,11 +6824,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6824: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6827: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6828: \$? = $ac_status" >&5
+ echo "$as_me:6831: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6925,11 +6928,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6928: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6931: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:6932: \$? = $ac_status" >&5
+ echo "$as_me:6935: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -8394,7 +8397,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 8397 "configure"' > conftest.$ac_ext
+ echo '#line 8400 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9291,7 +9294,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9294 "configure"
+#line 9297 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9391,7 +9394,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9394 "configure"
+#line 9397 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11734,11 +11737,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11737: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11740: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11741: \$? = $ac_status" >&5
+ echo "$as_me:11744: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11838,11 +11841,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11841: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11844: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11845: \$? = $ac_status" >&5
+ echo "$as_me:11848: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -12374,7 +12377,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 12377 "configure"' > conftest.$ac_ext
+ echo '#line 12380 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13432,11 +13435,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13435: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13438: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13439: \$? = $ac_status" >&5
+ echo "$as_me:13442: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13536,11 +13539,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13539: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13542: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13543: \$? = $ac_status" >&5
+ echo "$as_me:13546: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14985,7 +14988,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 14988 "configure"' > conftest.$ac_ext
+ echo '#line 14991 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -15763,11 +15766,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15766: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15769: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15770: \$? = $ac_status" >&5
+ echo "$as_me:15773: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16031,11 +16034,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16034: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16037: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16038: \$? = $ac_status" >&5
+ echo "$as_me:16041: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16135,11 +16138,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16138: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16141: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16142: \$? = $ac_status" >&5
+ echo "$as_me:16145: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -17604,7 +17607,7 @@ linux*)
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 17607 "configure"' > conftest.$ac_ext
+ echo '#line 17610 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -23078,7 +23081,30 @@ httpdgroup=nobody
admservport=9830
admservip=0.0.0.0
# initdir
-initdir=/rc.d
+# initdir is the location for the SysV init scripts - very heavily platform
+# dependent and not specified in fhs or lsb
+initdir='$(sysconfdir)/rc.d'
+echo "$as_me:$LINENO: checking for --with-initddir" >&5
+echo $ECHO_N "checking for --with-initddir... $ECHO_C" >&6
+
+# Check whether --with-initddir or --without-initddir was given.
+if test "${with_initddir+set}" = set; then
+ withval="$with_initddir"
+
+ if test "$withval" = yes -o "$withval" = no ; then
+ { { echo "$as_me:$LINENO: error: Please specify a full path with --with-initddir" >&5
+echo "$as_me: error: Please specify a full path with --with-initddir" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+ echo "$as_me:$LINENO: result: $withval" >&5
+echo "${ECHO_T}$withval" >&6
+
+else
+
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+
+fi;
CXXLINK_REQUIRED=0
# on most platforms, we will just use perl from PATH
# On some platforms, we cannot. Why not just use any old
@@ -23106,8 +23132,7 @@ cat >>confdefs.h <<\_ACEOF
_ACEOF
platform="linux"
- # relative to sysconfdir
- initdir=/rc.d/init.d
+ initdir='$(sysconfdir)/rc.d/init.d'
;;
ia64-hp-hpux*)
@@ -23161,6 +23186,8 @@ _ACEOF
httpdgroup=nogroup
platform="hpux"
initconfigdir="/$PACKAGE_NAME/config"
+ # HPUX doesn't use /etc for this
+ initdir=/init.d
;;
hppa*-hp-hpux*)
@@ -23214,6 +23241,8 @@ _ACEOF
perlexec='/opt/perl_64/bin/perl'
platform="hpux"
initconfigdir="/$PACKAGE_NAME/config"
+ # HPUX doesn't use /etc for this
+ initdir=/init.d
;;
sparc-sun-solaris*)
@@ -23282,11 +23311,14 @@ _ACEOF
platform="solaris"
# assume 64 bit
perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
- # relative to sysconfdir
- initdir=/init.d
+ initdir='$(sysconfdir)/init.d'
;;
*)
esac
+# cmd line overrides default setting above
+if test -n "$with_initddir" ; then
+ initdir="$with_initddir"
+fi
diff --git a/configure.ac b/configure.ac
index eca3cb9..c64774d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,22 @@ httpdgroup=nobody
admservport=9830
admservip=0.0.0.0
# initdir
-initdir=/rc.d
+# initdir is the location for the SysV init scripts - very heavily platform
+# dependent and not specified in fhs or lsb
+initdir='$(sysconfdir)/rc.d'
+AC_MSG_CHECKING(for --with-initddir)
+AC_ARG_WITH(initddir,
+ AS_HELP_STRING([--with-initddir=/path],
+ [Absolute path (not relative like some of the other options) that should contain the SysV init scripts (default '$(sysconfdir)/rc.d')]),
+[
+ if test "$withval" = yes -o "$withval" = no ; then
+ AC_ERROR([Please specify a full path with --with-initddir])
+ fi
+ AC_MSG_RESULT($withval)
+],
+[
+ AC_MSG_RESULT(no)
+])
CXXLINK_REQUIRED=0
# on most platforms, we will just use perl from PATH
# On some platforms, we cannot. Why not just use any old
@@ -134,8 +149,7 @@ case $host in
AC_DEFINE([Linux], [1], [Linux])
AC_DEFINE([LINUX], [1], [Linux])
platform="linux"
- # relative to sysconfdir
- initdir=/rc.d/init.d
+ initdir='$(sysconfdir)/rc.d/init.d'
;;
ia64-hp-hpux*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -153,6 +167,8 @@ case $host in
httpdgroup=nogroup
platform="hpux"
initconfigdir="/$PACKAGE_NAME/config"
+ # HPUX doesn't use /etc for this
+ initdir=/init.d
;;
hppa*-hp-hpux*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -170,6 +186,8 @@ case $host in
perlexec='/opt/perl_64/bin/perl'
platform="hpux"
initconfigdir="/$PACKAGE_NAME/config"
+ # HPUX doesn't use /etc for this
+ initdir=/init.d
;;
sparc-sun-solaris*)
AC_DEFINE([XP_UNIX], [1], [UNIX])
@@ -196,11 +214,14 @@ dnl Cstd and Crun are required to link any C++ related code (ICU)
platform="solaris"
# assume 64 bit
perlexec='/usr/lib/sparcv9/dirsec/perl5x/bin/perl'
- # relative to sysconfdir
- initdir=/init.d
+ initdir='$(sysconfdir)/init.d'
;;
*)
esac
+# cmd line overrides default setting above
+if test -n "$with_initddir" ; then
+ initdir="$with_initddir"
+fi
AC_SUBST(initdir)
AC_SUBST(perlexec)
AM_CONDITIONAL([CXXLINK_REQUIRED], test "$CXXLINK_REQUIRED" = 1)
diff --git a/ltmain.sh b/ltmain.sh
old mode 100755
new mode 100644
commit 5c13bf4d56873ba0425a2fb91dc69d90e8fb45e4
Author: Rich Megginson <rmeggins at redhat.com>
Date: Fri Feb 26 11:53:37 2010 -0700
bump version to 1.1.11.a2
diff --git a/VERSION.sh b/VERSION.sh
index 352a1ef..3541ac3 100644
--- a/VERSION.sh
+++ b/VERSION.sh
@@ -15,7 +15,7 @@ VERSION_MAINT=11
# if this is a PRERELEASE, set VERSION_PREREL
# otherwise, comment it out
# be sure to include the dot prefix in the prerel
-VERSION_PREREL=.a1
+VERSION_PREREL=.a2
# NOTES on VERSION_PREREL
# use aN for an alpha release e.g. a1, a2, etc.
# use rcN for a release candidate e.g. rc1, rc2, etc.
More information about the 389-commits
mailing list