Changeset 3356

Timestamp:

06/06/11 18:37:53 (2 years ago)

Author:

chrfranke

Message:

Re-enable '--with-initscriptdir=auto' as default.
Change search for initddir and systemdsystemunitdir such that
default ./configure does never overwrite system files.

Location:

trunk/smartmontools

Files:

• CHANGELOG (modified) (1 diff)
• INSTALL (modified) (2 diffs)
• configure.in (modified) (3 diffs)

trunk/smartmontools/CHANGELOG

@@ -41 +41 @@
 <DEVELOPERS: ADDITIONS TO THE CHANGE LOG GO JUST BELOW HERE, PLEASE>
 
+  [CF] Re-enable '--with-initscriptdir=auto' as default.
+       Change search for initddir and systemdsystemunitdir such that
+       default ./configure does never overwrite system files.
+
   [MS] drivedb.h update:
        disentangle Transcend SSD versions

trunk/smartmontools/INSTALL

@@ -689 +689 @@
                                                                   Contents of smartd/smartd.conf man pages;
                                                                   Directory for rc.d/init.d/smartd init script
---with-initscriptdir  no                                          Location of init scripts, use "auto" to autodetect
+--with-initscriptdir           auto                               Location of init scripts
 --with-systemdsystemunitdir    auto                               Location of systemd service files
 --with-docdir         ${prefix}/share/doc/smartmontools           Location of the documentation
@@ -713 +713 @@
 new --docdir option added in autoconf 2.60.
 
+The defaults for --with-initscriptdir and --with-systemdsystemunitdir are
+guessed such that the following rules apply:
+- If --prefix=/usr --sysconfdir=/etc is specified, the guessed directories
+  should be the defaults used by the current OS or distribution.
+- If --sysconfdir=/etc is NOT specified, the guessed directories should
+  always be below ${prefix} or below ${sysconfdir}.
+
 Here's an example:
 If you set --prefix=/home/joe and none of the other four
 variables then the different directories that are used would be:
 --sbindir             /home/joe/sbin
+--docdir              /home/joe/share/doc/smartmontools
 --mandir              /home/joe/share/man
 --sysconfdir          /home/joe/etc
---with-initscriptdir  [disabled]
---with-docdir         /home/joe/doc/smartmontools
+--with-exampledir     /home/joe/share/doc/smartmontools/examplescripts
+--with-drivedbdir     /home/joe/share/smartmontools
+--with-initscriptdir         [see below]
+--with-systemdsystemunitdir  [see below]
+
+If systemd is present (and pkg-config reports /lib/systemd/system
+as the systemdsystemunitdir):
+
+--with-initscriptdir         [disabled]
+--with-systemdsystemunitdir  /home/joe/lib/systemd/system
+
+else if /etc/rc.d/init.d exists:
+
+--with-initscriptdir         /home/joe/etc/rc.d/init.d
+--with-systemdsystemunitdir  [disabled]
+
+else if /etc/init.d exists:
+
+--with-initscriptdir         /home/joe/etc/init.d
+--with-systemdsystemunitdir  [disabled]
+
+else if /etc/rc.d exists:
+
+--with-initscriptdir         /home/joe/etc/rc.d
+--with-systemdsystemunitdir  [disabled]
+
+else
+
+--with-initscriptdir         [disabled]
+--with-systemdsystemunitdir  [disabled]
 
 This is useful for test installs in a harmless subdirectory somewhere.

trunk/smartmontools/configure.in

@@ -174 +174 @@
  auto|yes)
    test -n "$PKG_CONFIG" && systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd`
-   if test "$with_systemdsystemunitdir" = "yes" && test -z "$systemdsystemunitdir"; then
-     AC_MSG_ERROR([Location of systemd service files not found])
-   fi ;;
+   case "$with_systemdsystemunitdir:$sysconfdir:$systemdsystemunitdir" in
+     yes:*:) AC_MSG_ERROR([Location of systemd service files not found]) ;;
+     yes:*:*|auto:*:|auto:/etc:*) ;;
+     *) systemdsystemunitdir='${prefix}'$systemdsystemunitdir ;;
+   esac ;;
  no) ;;
  *) systemdsystemunitdir="$with_systemdsystemunitdir" ;;
@@ -184 +186 @@
 
 AC_ARG_WITH(initscriptdir,
-  [AC_HELP_STRING([--with-initscriptdir=DIR],[Location of the init script])],
-  [], [with_initscriptdir=no])
+  [AC_HELP_STRING([--with-initscriptdir@<:@=DIR|auto|yes|no@:>@], [Location of init scripts [auto]])],
+  [], [with_initscriptdir=auto])
 
 AC_MSG_CHECKING(which init (rc) directory to use)
 initddir=""
-for initdir in /etc/init.d /etc/rc.d/init.d /sbin/init.d        \
-         /usr/local/etc/rc.d /etc/rc.d
-do
-  if
-    test -d $initdir
-  then
-    initddir=$initdir
+for dir in rc.d/init.d init.d rc.d; do
+  if test -d /etc/$dir; then
+    initddir='${sysconfdir}'/$dir
     break
   fi
@@ -203 +201 @@
 case "$with_initscriptdir" in
   auto) test -n "$systemdsystemunitdir" && initddir= ;;
-  yes) ;;
+  yes)
+   if test -z "$initddir"; then
+     AC_MSG_ERROR([Location of init scripts not found])
+   fi ;;
   no) initddir= ;;
   *) initddir="$with_initscriptdir" ;;