configure: allow exact PID file prefix to be specified

configure

@@ -635,6 +635,7 @@ MODULES_LIBS
 SELECT_TYPE
 PROGRAM_PREFIX
 PKGRUNDIR
+pkgrundir
 moduledir
 MODULE_DIR
 helpdir
@@ -659,7 +660,6 @@ PKGLIBEXECDIR
 pkglibexecdir
 PKGLOCALSTATEDIR
 pkglocalstatedir
-pkgrundir
 rundir
 pkglibdir
 LEXLIB
@@ -751,6 +751,7 @@ with_logdir
 with_helpdir
 with_moduledir
 with_rundir
+with_pkgrundir
 with_program_prefix
 with_custom_branding
 with_custom_version
@@ -1416,7 +1417,8 @@ Optional Packages:
   --with-logdir=DIR       Directory where to write logfiles.
   --with-helpdir=DIR      Directory to install help files.
   --with-moduledir=DIR    Directory to install modules.
-  --with-rundir=DIR       Directory in which to store pidfile.
+  --with-rundir=DIR       Directory to use as prefix for pidfile.
+  --with-pkgrundir=DIR    Directory in which to store pidfile.
   --with-program-prefix=  If set, programs installed into PATH will be
                           installed with names prefixed by this prefix.
   --with-custom-branding=NAME
@@ -5438,7 +5440,6 @@ pkglibdir='${libdir}/${PACKAGE_TARNAME}'
 
 
 
-
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $pkglocalstatedir`
@@ -7732,8 +7733,8 @@ _ACEOF
 
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether or modify rundir" >&5
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to modify rundir" >&5
-$as_echo_n "checking whether or modify rundir... " >&6; }
+$as_echo_n "checking whether to modify rundir... " >&6; }
 
 # Check whether --with-rundir was given.
 if test "${with_rundir+set}" = set; then :
@@ -7752,6 +7753,22 @@ fi
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to modify pkgrundir" >&5
+$as_echo_n "checking whether to modify pkgrundir... " >&6; }
+
+# Check whether --with-pkgrundir was given.
+if test "${with_pkgrundir+set}" = set; then :
+  withval=$with_pkgrundir; { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	pkgrundir=`echo $withval | sed 's/\/$//'`
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
   last_ac_define_dir=`eval echo $pkgrundir`
@@ -7775,6 +7792,7 @@ _ACEOF
 
 
 
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for program prefix" >&5
 $as_echo_n "checking for program prefix... " >&6; }
 

configure.ac

@@ -243,7 +243,6 @@ AS_IF([test "x$enable_fhs_paths" = "xyes"],
 pkglibdir='${libdir}/${PACKAGE_TARNAME}'
 AC_SUBST([pkglibdir])
 AC_SUBST([rundir])
-AC_SUBST([pkgrundir])
 AC_SUBST([pkglocalstatedir])
 AC_DEFINE_DIR([PKGLOCALSTATEDIR], [pkglocalstatedir], [[Directory in which to store state, such as ban database]])
 AC_SUBST([pkglibexecdir])
@@ -684,21 +683,40 @@ AC_ARG_WITH(moduledir,
 AC_DEFINE_DIR(MODULE_DIR, moduledir, [Prefix where modules are installed.])
 AC_SUBST_DIR([moduledir])
 
+dnl **********************************************************************
 dnl Check for --with-rundir
+dnl **********************************************************************
 
-AC_MSG_CHECKING([whether or modify rundir])
+AC_MSG_CHECKING([whether to modify rundir])
 AC_ARG_WITH([rundir],
 	[AC_HELP_STRING([--with-rundir=DIR],
-		[Directory in which to store pidfile.])],
+		[Directory to use as prefix for pidfile.])],
 	[AC_MSG_RESULT([yes])
 	rundir=`echo $withval | sed 's/\/$//'`],
 	[AC_MSG_RESULT([no])
 	AS_IF([test "x$enable_fhs_paths" = "xyes"],
 		[rundir='${prefix}/run'],
 		[rundir='${sysconfdir}'])])
-AC_SUBST([rundir])
+
+dnl **********************************************************************
+dnl Check for --with-pkgrundir
+dnl **********************************************************************
+
+AC_MSG_CHECKING([whether to modify pkgrundir])
+AC_ARG_WITH([pkgrundir],
+	[AC_HELP_STRING([--with-pkgrundir=DIR],
+		[Directory in which to store pidfile.])],
+	[AC_MSG_RESULT([yes])
+	pkgrundir=`echo $withval | sed 's/\/$//'`],
+	[AC_MSG_RESULT([no])])
+
+AC_SUBST([pkgrundir])
 AC_DEFINE_DIR([PKGRUNDIR], [pkgrundir], [Directory to store pidfile in.])
 
+dnl **********************************************************************
+dnl Check for --with-program-prefix
+dnl **********************************************************************
+
 dnl Installed utility program prefixes (does not affect binaries
 dnl installed into pkglibexecdir)
 AC_MSG_CHECKING([for program prefix])