autofs-5.1.4 - use systemd sd_notify() at startup

From: Ian Kent <ikent@redhat.com>

autofs needs to ensure statd is started before any NFS mounts

are attempted.

When starting the statd service with the autofs service the statd

service will trigger a restart of the autofs service during its

start up. Sometimes this can happen during the automount start up

itself.

When this happens it causes systemd to become confused and remove

the pid file created by automount leaving systemd thinking the

autofs service had failed start up when it was actually running.

It was recommened that autofs be changed to a "Type=notify" service

to avoid this. Using this a pid file is no longer needed and is now

not used.

Signed-off-by: Ian Kent <raven@themaw.net>

---

 CHANGELOG                 |    1 

 Makefile.conf.in          |    3 

 aclocal.m4                |    3 

 configure                 |  708 ++++++++++++++++++++++++++++------------------

 configure.in              |    8 

 daemon/Makefile           |    5 

 daemon/automount.c        |   83 +++--

 samples/autofs.service.in |    5 

 8 files changed, 514 insertions(+), 302 deletions(-)

--- autofs-5.1.4.orig/Makefile.conf.in

+++ autofs-5.1.4/Makefile.conf.in

@@ -18,6 +18,9 @@ LIBCLOCK_GETTIME = @LIBCLOCK_GETTIME@

 LIBNSL    = @LIBNSL@

 LIBRESOLV = @LIBRESOLV@

+SYSTEMD = @WITH_SYSTEMD@

+LIBSYSTEMD = @systemd_LIBS@

+

 # Hesiod support: yes (1) no (0)

 HESIOD = @HAVE_HESIOD@

 LIBHESIOD = @LIBHESIOD@

--- autofs-5.1.4.orig/aclocal.m4

+++ autofs-5.1.4/aclocal.m4

@@ -257,14 +257,17 @@ AC_DEFUN([AF_WITH_SYSTEMD],

       fi

     done

   fi

+  WITH_SYSTEMD=0

   if test -n "$systemddir"; then

     AC_MSG_RESULT($systemddir)

+    WITH_SYSTEMD=1

   else

     AC_MSG_RESULT(not found)

   fi

 else

  if test "$withval" != no; then

   systemddir=$withval

+  WITH_SYSTEMD=1

  fi

 fi])

 ])

--- autofs-5.1.4.orig/configure

+++ autofs-5.1.4/configure

@@ -672,6 +672,12 @@ MOUNT_NFS

 HAVE_MOUNT

 MOUNT

 DMALLOCLIB

+TIRPC_LIBS

+TIRPC_CFLAGS

+flagdir

+fifodir

+mapdir

+confdir

 OBJEXT

 EXEEXT

 ac_ct_CC

@@ -679,16 +685,13 @@ CPPFLAGS

 LDFLAGS

 CFLAGS

 CC

-TIRPC_LIBS

-TIRPC_CFLAGS

+systemd_LIBS

+systemd_CFLAGS

+WITH_SYSTEMD

+systemddir

 PKG_CONFIG_LIBDIR

 PKG_CONFIG_PATH

 PKG_CONFIG

-flagdir

-fifodir

-mapdir

-confdir

-systemddir

 piddir

 initdir

 target_alias

@@ -757,13 +760,15 @@ target_alias

 PKG_CONFIG

 PKG_CONFIG_PATH

 PKG_CONFIG_LIBDIR

-TIRPC_CFLAGS

-TIRPC_LIBS

+systemd_CFLAGS

+systemd_LIBS

 CC

 CFLAGS

 LDFLAGS

 LIBS

 CPPFLAGS

+TIRPC_CFLAGS

+TIRPC_LIBS

 CPP'

@@ -1407,9 +1412,10 @@ Some influential environment variables:

               directories to add to pkg-config's search path

   PKG_CONFIG_LIBDIR

               path overriding pkg-config's built-in search path

-  TIRPC_CFLAGS

-              C compiler flags for TIRPC, overriding pkg-config

-  TIRPC_LIBS  linker flags for TIRPC, overriding pkg-config

+  systemd_CFLAGS

+              C compiler flags for systemd, overriding pkg-config

+  systemd_LIBS

+              linker flags for systemd, overriding pkg-config

   CC          C compiler command

   CFLAGS      C compiler flags

   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a

@@ -1417,6 +1423,9 @@ Some influential environment variables:

   LIBS        libraries to pass to the linker, e.g. -l<library>

   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if

               you have headers in a nonstandard directory <include dir>

+  TIRPC_CFLAGS

+              C compiler flags for TIRPC, overriding pkg-config

+  TIRPC_LIBS  linker flags for TIRPC, overriding pkg-config

   CPP         C preprocessor

 Use these variables to override the choices made by `configure' or to help

@@ -2283,166 +2292,6 @@ if test -z "$piddir"; then

 fi

-#

-# Check for systemd unit files direectory exists if unit file installation

-# is requested

-#

-

-# Check whether --with-systemd was given.

-if test "${with_systemd+set}" = set; then :

-  withval=$with_systemd; if test "$withval" = yes; then

-  if test -z "$systemddir"; then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking location of the systemd unit files directory" >&5

-$as_echo_n "checking location of the systemd unit files directory... " >&6; }

-    for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system /lib/systemd/system /lib64/systemd/system; do

-      if test -z "$systemddir"; then

-        if test -d "$systemd_d"; then

-          systemddir="$systemd_d"

-        fi

-      fi

-    done

-  fi

-  if test -n "$systemddir"; then

-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $systemddir" >&5

-$as_echo "$systemddir" >&6; }

-  else

-    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

-$as_echo "not found" >&6; }

-  fi

-else

- if test "$withval" != no; then

-  systemddir=$withval

- fi

-fi

-fi

-

-

-

-

-#

-# Location of system config script directory?

-#

-if test -z "$confdir"; then

-  for conf_d in /etc/sysconfig /etc/defaults /etc/conf.d /etc/default; do

-    if test -z "$confdir"; then

-      if test -d "$conf_d"; then

-	confdir="$conf_d"

-      fi

-    fi

-  done

-fi

-

-# Check whether --with-confdir was given.

-if test "${with_confdir+set}" = set; then :

-  withval=$with_confdir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

-	then

-		:

-	else

-		confdir="${withval}"

-	fi

-

-fi

-

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs configuration file directory" >&5

-$as_echo_n "checking for autofs configuration file directory... " >&6; }

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $confdir" >&5

-$as_echo "$confdir" >&6; }

-

-

-#

-# The user can specify --with-mapsdir=PATH to specify autofs maps go

-#

-if test -z "$mapdir"; then

-  for map_d in /etc/autofs /etc; do

-    if test -z "$mapdir"; then

-      if test -d "$map_d"; then

-	mapdir="$map_d"

-      fi

-    fi

-  done

-fi

-

-# Check whether --with-mapdir was given.

-if test "${with_mapdir+set}" = set; then :

-  withval=$with_mapdir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

-	then

-		:

-	else

-		mapdir="${withval}"

-	fi

-

-fi

-

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs maps directory" >&5

-$as_echo_n "checking for autofs maps directory... " >&6; }

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mapdir" >&5

-$as_echo "$mapdir" >&6; }

-

-

-#

-# The user can specify --with-fifodir=PATH to specify where autofs fifos go

-#

-if test -z "$fifodir"; then

-  for fifo_d in /run /var/run /tmp; do

-    if test -z "$fifodir"; then

-      if test -d "$fifo_d"; then

-        fifodir="$fifo_d"

-      fi

-    fi

-  done

-fi

-

-# Check whether --with-fifodir was given.

-if test "${with_fifodir+set}" = set; then :

-  withval=$with_fifodir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

-	then

-		:

-	else

-		fifodir="${withval}"

-	fi

-

-fi

-

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs fifos directory" >&5

-$as_echo_n "checking for autofs fifos directory... " >&6; }

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fifodir" >&5

-$as_echo "$fifodir" >&6; }

-

-

-#

-# The user can specify --with-flagdir=PATH to specify where autofs flag file goes

-#

-if test -z "$flagdir"; then

-  for flag_d in /run /var/run /tmp; do

-    if test -z "$flagdir"; then

-      if test -d "$flag_d"; then

-        flagdir="$flag_d"

-      fi

-    fi

-  done

-fi

-

-# Check whether --with-flagdir was given.

-if test "${with_flagdir+set}" = set; then :

-  withval=$with_flagdir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

-	then

-		:

-	else

-		flagdir="${withval}"

-	fi

-

-fi

-

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs flag file directory" >&5

-$as_echo_n "checking for autofs flag file directory... " >&6; }

-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $flagdir" >&5

-$as_echo "$flagdir" >&6; }

-

-

-#

-# Use libtirpc

-#

-

@@ -2563,111 +2412,46 @@ $as_echo "no" >&6; }

 	fi

 fi

-# Check whether --with-libtirpc was given.

-if test "${with_libtirpc+set}" = set; then :

-  withval=$with_libtirpc;

-fi

-

-if test "x$with_libtirpc" = "xyes"; then

-

-pkg_failed=no

-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIRPC" >&5

-$as_echo_n "checking for TIRPC... " >&6; }

+#

+# Check for systemd unit files direectory exists if unit file installation

+# is requested

+#

-if test -n "$TIRPC_CFLAGS"; then

-    pkg_cv_TIRPC_CFLAGS="$TIRPC_CFLAGS"

- elif test -n "$PKG_CONFIG"; then

-    if test -n "$PKG_CONFIG" && \

-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5

-  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5

-  ac_status=$?

-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

-  test $ac_status = 0; }; then

-  pkg_cv_TIRPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null`

-		      test "x$?" != "x0" && pkg_failed=yes

-else

-  pkg_failed=yes

-fi

- else

-    pkg_failed=untried

-fi

-if test -n "$TIRPC_LIBS"; then

-    pkg_cv_TIRPC_LIBS="$TIRPC_LIBS"

- elif test -n "$PKG_CONFIG"; then

-    if test -n "$PKG_CONFIG" && \

-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5

-  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5

-  ac_status=$?

-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

-  test $ac_status = 0; }; then

-  pkg_cv_TIRPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null`

-		      test "x$?" != "x0" && pkg_failed=yes

+# Check whether --with-systemd was given.

+if test "${with_systemd+set}" = set; then :

+  withval=$with_systemd; if test "$withval" = yes; then

+  if test -z "$systemddir"; then

+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking location of the systemd unit files directory" >&5

+$as_echo_n "checking location of the systemd unit files directory... " >&6; }

+    for systemd_d in /usr/lib/systemd/system /usr/lib64/systemd/system /lib/systemd/system /lib64/systemd/system; do

+      if test -z "$systemddir"; then

+        if test -d "$systemd_d"; then

+          systemddir="$systemd_d"

+        fi

+      fi

+    done

+  fi

+  WITH_SYSTEMD=0

+  if test -n "$systemddir"; then

+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $systemddir" >&5

+$as_echo "$systemddir" >&6; }

+    WITH_SYSTEMD=1

+  else

+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5

+$as_echo "not found" >&6; }

+  fi

 else

-  pkg_failed=yes

+ if test "$withval" != no; then

+  systemddir=$withval

+  WITH_SYSTEMD=1

+ fi

 fi

- else

-    pkg_failed=untried

 fi

-if test $pkg_failed = yes; then

-   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

-        _pkg_short_errors_supported=yes

-else

-        _pkg_short_errors_supported=no

-fi

-        if test $_pkg_short_errors_supported = yes; then

-	        TIRPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1`

-        else

-	        TIRPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1`

-        fi

-	# Put the nasty error message in config.log where it belongs

-	echo "$TIRPC_PKG_ERRORS" >&5

-

-	as_fn_error $? "Package requirements (libtirpc) were not met:

-

-$TIRPC_PKG_ERRORS

-

-Consider adjusting the PKG_CONFIG_PATH environment variable if you

-installed software in a non-standard prefix.

-

-Alternatively, you may set the environment variables TIRPC_CFLAGS

-and TIRPC_LIBS to avoid the need to call pkg-config.

-See the pkg-config man page for more details." "$LINENO" 5

-elif test $pkg_failed = untried; then

-     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

-$as_echo "no" >&6; }

-	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it

-is in your PATH or set the PKG_CONFIG environment variable to the full

-path to pkg-config.

-

-Alternatively, you may set the environment variables TIRPC_CFLAGS

-and TIRPC_LIBS to avoid the need to call pkg-config.

-See the pkg-config man page for more details.

-

-To get pkg-config, see <http://pkg-config.freedesktop.org/>.

-See \`config.log' for more details" "$LINENO" 5; }

-else

-	TIRPC_CFLAGS=$pkg_cv_TIRPC_CFLAGS

-	TIRPC_LIBS=$pkg_cv_TIRPC_LIBS

-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

-$as_echo "yes" >&6; }

-

-

-$as_echo "#define WITH_LIBTIRPC 1" >>confdefs.h

-

-

-$as_echo "#define TIRPC_WORKAROUND 1" >>confdefs.h

-

-

-fi

-  ac_ext=c

+ac_ext=c

 ac_cpp='$CPP $CPPFLAGS'

 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'

 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'

@@ -3457,7 +3241,391 @@ ac_link='$CC -o conftest$ac_exeext $CFLA

 ac_compiler_gnu=$ac_cv_c_compiler_gnu

-for ac_func in getrpcbyname getservbyname

+

+pkg_failed=no

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for systemd" >&5

+$as_echo_n "checking for systemd... " >&6; }

+

+if test -n "$systemd_CFLAGS"; then

+    pkg_cv_systemd_CFLAGS="$systemd_CFLAGS"

+ elif test -n "$PKG_CONFIG"; then

+    if test -n "$PKG_CONFIG" && \

+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5

+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; then

+  pkg_cv_systemd_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes

+else

+  pkg_failed=yes

+fi

+ else

+    pkg_failed=untried

+fi

+if test -n "$systemd_LIBS"; then

+    pkg_cv_systemd_LIBS="$systemd_LIBS"

+ elif test -n "$PKG_CONFIG"; then

+    if test -n "$PKG_CONFIG" && \

+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5

+  ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; then

+  pkg_cv_systemd_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes

+else

+  pkg_failed=yes

+fi

+ else

+    pkg_failed=untried

+fi

+

+

+

+if test $pkg_failed = yes; then

+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

+        _pkg_short_errors_supported=yes

+else

+        _pkg_short_errors_supported=no

+fi

+        if test $_pkg_short_errors_supported = yes; then

+	        systemd_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`

+        else

+	        systemd_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`

+        fi

+	# Put the nasty error message in config.log where it belongs

+	echo "$systemd_PKG_ERRORS" >&5

+

+

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sm_notify in -lsystemd" >&5

+$as_echo_n "checking for sm_notify in -lsystemd... " >&6; }

+if ${ac_cv_lib_systemd_sm_notify+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lsystemd  $LIBS"

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char sm_notify ();

+int

+main ()

+{

+return sm_notify ();

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_c_try_link "$LINENO"; then :

+  ac_cv_lib_systemd_sm_notify=yes

+else

+  ac_cv_lib_systemd_sm_notify=no

+fi

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_sm_notify" >&5

+$as_echo "$ac_cv_lib_systemd_sm_notify" >&6; }

+if test "x$ac_cv_lib_systemd_sm_notify" = xyes; then :

+  systemd_LIBS="-lsystemd"

+fi

+

+

+

+elif test $pkg_failed = untried; then

+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+

+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sm_notify in -lsystemd" >&5

+$as_echo_n "checking for sm_notify in -lsystemd... " >&6; }

+if ${ac_cv_lib_systemd_sm_notify+:} false; then :

+  $as_echo_n "(cached) " >&6

+else

+  ac_check_lib_save_LIBS=$LIBS

+LIBS="-lsystemd  $LIBS"

+cat confdefs.h - <<_ACEOF >conftest.$ac_ext

+/* end confdefs.h.  */

+

+/* Override any GCC internal prototype to avoid an error.

+   Use char because int might match the return type of a GCC

+   builtin and then its argument prototype would still apply.  */

+#ifdef __cplusplus

+extern "C"

+#endif

+char sm_notify ();

+int

+main ()

+{

+return sm_notify ();

+  ;

+  return 0;

+}

+_ACEOF

+if ac_fn_c_try_link "$LINENO"; then :

+  ac_cv_lib_systemd_sm_notify=yes

+else

+  ac_cv_lib_systemd_sm_notify=no

+fi

+rm -f core conftest.err conftest.$ac_objext \

+    conftest$ac_exeext conftest.$ac_ext

+LIBS=$ac_check_lib_save_LIBS

+fi

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_systemd_sm_notify" >&5

+$as_echo "$ac_cv_lib_systemd_sm_notify" >&6; }

+if test "x$ac_cv_lib_systemd_sm_notify" = xyes; then :

+  systemd_LIBS="-lsystemd"

+fi

+

+

+

+else

+	systemd_CFLAGS=$pkg_cv_systemd_CFLAGS

+	systemd_LIBS=$pkg_cv_systemd_LIBS

+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+$as_echo "yes" >&6; }

+

+fi

+

+#

+# Location of system config script directory?

+#

+if test -z "$confdir"; then

+  for conf_d in /etc/sysconfig /etc/defaults /etc/conf.d /etc/default; do

+    if test -z "$confdir"; then

+      if test -d "$conf_d"; then

+	confdir="$conf_d"

+      fi

+    fi

+  done

+fi

+

+# Check whether --with-confdir was given.

+if test "${with_confdir+set}" = set; then :

+  withval=$with_confdir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

+	then

+		:

+	else

+		confdir="${withval}"

+	fi

+

+fi

+

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs configuration file directory" >&5

+$as_echo_n "checking for autofs configuration file directory... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $confdir" >&5

+$as_echo "$confdir" >&6; }

+

+

+#

+# The user can specify --with-mapsdir=PATH to specify autofs maps go

+#

+if test -z "$mapdir"; then

+  for map_d in /etc/autofs /etc; do

+    if test -z "$mapdir"; then

+      if test -d "$map_d"; then

+	mapdir="$map_d"

+      fi

+    fi

+  done

+fi

+

+# Check whether --with-mapdir was given.

+if test "${with_mapdir+set}" = set; then :

+  withval=$with_mapdir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

+	then

+		:

+	else

+		mapdir="${withval}"

+	fi

+

+fi

+

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs maps directory" >&5

+$as_echo_n "checking for autofs maps directory... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $mapdir" >&5

+$as_echo "$mapdir" >&6; }

+

+

+#

+# The user can specify --with-fifodir=PATH to specify where autofs fifos go

+#

+if test -z "$fifodir"; then

+  for fifo_d in /run /var/run /tmp; do

+    if test -z "$fifodir"; then

+      if test -d "$fifo_d"; then

+        fifodir="$fifo_d"

+      fi

+    fi

+  done

+fi

+

+# Check whether --with-fifodir was given.

+if test "${with_fifodir+set}" = set; then :

+  withval=$with_fifodir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

+	then

+		:

+	else

+		fifodir="${withval}"

+	fi

+

+fi

+

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs fifos directory" >&5

+$as_echo_n "checking for autofs fifos directory... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $fifodir" >&5

+$as_echo "$fifodir" >&6; }

+

+

+#

+# The user can specify --with-flagdir=PATH to specify where autofs flag file goes

+#

+if test -z "$flagdir"; then

+  for flag_d in /run /var/run /tmp; do

+    if test -z "$flagdir"; then

+      if test -d "$flag_d"; then

+        flagdir="$flag_d"

+      fi

+    fi

+  done

+fi

+

+# Check whether --with-flagdir was given.

+if test "${with_flagdir+set}" = set; then :

+  withval=$with_flagdir; if test -z "$withval" -o "$withval" = "yes" -o "$withval" = "no"

+	then

+		:

+	else

+		flagdir="${withval}"

+	fi

+

+fi

+

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autofs flag file directory" >&5

+$as_echo_n "checking for autofs flag file directory... " >&6; }

+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $flagdir" >&5

+$as_echo "$flagdir" >&6; }

+

+

+#

+# Use libtirpc

+#

+

+# Check whether --with-libtirpc was given.

+if test "${with_libtirpc+set}" = set; then :

+  withval=$with_libtirpc;

+fi

+

+if test "x$with_libtirpc" = "xyes"; then

+

+pkg_failed=no

+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIRPC" >&5

+$as_echo_n "checking for TIRPC... " >&6; }

+

+if test -n "$TIRPC_CFLAGS"; then

+    pkg_cv_TIRPC_CFLAGS="$TIRPC_CFLAGS"

+ elif test -n "$PKG_CONFIG"; then

+    if test -n "$PKG_CONFIG" && \

+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5

+  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; then

+  pkg_cv_TIRPC_CFLAGS=`$PKG_CONFIG --cflags "libtirpc" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes

+else

+  pkg_failed=yes

+fi

+ else

+    pkg_failed=untried

+fi

+if test -n "$TIRPC_LIBS"; then

+    pkg_cv_TIRPC_LIBS="$TIRPC_LIBS"

+ elif test -n "$PKG_CONFIG"; then

+    if test -n "$PKG_CONFIG" && \

+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libtirpc\""; } >&5

+  ($PKG_CONFIG --exists --print-errors "libtirpc") 2>&5

+  ac_status=$?

+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

+  test $ac_status = 0; }; then

+  pkg_cv_TIRPC_LIBS=`$PKG_CONFIG --libs "libtirpc" 2>/dev/null`

+		      test "x$?" != "x0" && pkg_failed=yes

+else

+  pkg_failed=yes

+fi

+ else

+    pkg_failed=untried

+fi

+

+

+

+if test $pkg_failed = yes; then

+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+

+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then

+        _pkg_short_errors_supported=yes

+else

+        _pkg_short_errors_supported=no

+fi

+        if test $_pkg_short_errors_supported = yes; then

+	        TIRPC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libtirpc" 2>&1`

+        else

+	        TIRPC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libtirpc" 2>&1`

+        fi

+	# Put the nasty error message in config.log where it belongs

+	echo "$TIRPC_PKG_ERRORS" >&5

+

+	as_fn_error $? "Package requirements (libtirpc) were not met:

+

+$TIRPC_PKG_ERRORS

+

+Consider adjusting the PKG_CONFIG_PATH environment variable if you

+installed software in a non-standard prefix.

+

+Alternatively, you may set the environment variables TIRPC_CFLAGS

+and TIRPC_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details." "$LINENO" 5

+elif test $pkg_failed = untried; then

+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

+$as_echo "no" >&6; }

+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it

+is in your PATH or set the PKG_CONFIG environment variable to the full

+path to pkg-config.

+

+Alternatively, you may set the environment variables TIRPC_CFLAGS

+and TIRPC_LIBS to avoid the need to call pkg-config.

+See the pkg-config man page for more details.

+

+To get pkg-config, see <http://pkg-config.freedesktop.org/>.

+See \`config.log' for more details" "$LINENO" 5; }

+else

+	TIRPC_CFLAGS=$pkg_cv_TIRPC_CFLAGS

+	TIRPC_LIBS=$pkg_cv_TIRPC_LIBS

+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5

+$as_echo "yes" >&6; }

+

+

+$as_echo "#define WITH_LIBTIRPC 1" >>confdefs.h

+

+

+$as_echo "#define TIRPC_WORKAROUND 1" >>confdefs.h

+

+

+fi

+  for ac_func in getrpcbyname getservbyname

 do :

   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

--- autofs-5.1.4.orig/configure.in

+++ autofs-5.1.4/configure.in

@@ -48,6 +48,7 @@ AF_INIT_D()

 AC_SUBST(initdir)

 AF_PID_D()

 AC_SUBST(piddir)

+PKG_PROG_PKG_CONFIG()

 #

 # Check for systemd unit files direectory exists if unit file installation

@@ -55,6 +56,12 @@ AC_SUBST(piddir)

 #

 AF_WITH_SYSTEMD()

 AC_SUBST(systemddir)

+AC_SUBST(WITH_SYSTEMD)

+PKG_CHECK_MODULES([systemd],[libsystemd],,

+[

+  AC_CHECK_LIB(systemd, sm_notify, systemd_LIBS="-lsystemd")

+  AC_SUBST(systemd_LIBS)

+])

 #

 # Location of system config script directory?

@@ -127,7 +134,6 @@ AC_SUBST(flagdir)

 #

 # Use libtirpc

 #

-PKG_PROG_PKG_CONFIG()

 AC_ARG_WITH([libtirpc], AS_HELP_STRING([--with-libtirpc], [use libtirpc if available]))

 if test "x$with_libtirpc" = "xyes"; then

   PKG_CHECK_MODULES([TIRPC],[libtirpc],[