1.1 --- a/configure	Tue May 29 21:33:49 2012 +0200
     1.2 +++ b/configure	Tue May 29 21:35:17 2012 +0200
     1.3 @@ -606,6 +606,7 @@
     1.4  am__EXEEXT_TRUE
     1.5  LTLIBOBJS
     1.6  LIBOBJS
     1.7 +with_piddir
     1.8  with_confdir
     1.9  with_spooldir
    1.10  with_logdir
    1.11 @@ -715,6 +716,7 @@
    1.12  with_logdir
    1.13  with_spooldir
    1.14  with_confdir
    1.15 +with_piddir
    1.16  '
    1.17        ac_precious_vars='build_alias
    1.18  host_alias
    1.19 @@ -1361,6 +1363,7 @@
    1.20    --with-logdir=DIR       set log directory /var/log/masqmail
    1.21    --with-spooldir=DIR     set spool directory /var/spool/masqmail
    1.22    --with-confdir=DIR      directory for configuration /etc/masqmail
    1.23 +  --with-piddir=DIR       directory for pid files /var/run
    1.24  
    1.25  Some influential environment variables:
    1.26    CC          C compiler command
    1.27 @@ -4244,6 +4247,7 @@
    1.28  
    1.29  
    1.30  
    1.31 +
    1.32  if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
    1.33  	if test -n "$ac_tool_prefix"; then
    1.34    # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
    1.35 @@ -4372,6 +4376,7 @@
    1.36    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1.37    test $ac_status = 0; }; then
    1.38    pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0" 2>/dev/null`
    1.39 +		      test "x$?" != "x0" && pkg_failed=yes
    1.40  else
    1.41    pkg_failed=yes
    1.42  fi
    1.43 @@ -4388,6 +4393,7 @@
    1.44    $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
    1.45    test $ac_status = 0; }; then
    1.46    pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0" 2>/dev/null`
    1.47 +		      test "x$?" != "x0" && pkg_failed=yes
    1.48  else
    1.49    pkg_failed=yes
    1.50  fi
    1.51 @@ -4407,9 +4413,9 @@
    1.52          _pkg_short_errors_supported=no
    1.53  fi
    1.54          if test $_pkg_short_errors_supported = yes; then
    1.55 -	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0" 2>&1`
    1.56 +	        GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0" 2>&1`
    1.57          else
    1.58 -	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0" 2>&1`
    1.59 +	        GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0" 2>&1`
    1.60          fi
    1.61  	# Put the nasty error message in config.log where it belongs
    1.62  	echo "$GLIB_PKG_ERRORS" >&5
    1.63 @@ -5288,6 +5294,22 @@
    1.64  
    1.65  
    1.66  
    1.67 +
    1.68 +# Check whether --with-piddir was given.
    1.69 +if test "${with_piddir+set}" = set; then :
    1.70 +  withval=$with_piddir;
    1.71 +else
    1.72 +  with_piddir='/var/run'
    1.73 +
    1.74 +fi
    1.75 +
    1.76 +
    1.77 +cat >>confdefs.h <<_ACEOF
    1.78 +#define PID_DIR "${with_piddir}"
    1.79 +_ACEOF
    1.80 +
    1.81 +
    1.82 +
    1.83  test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    1.84  
    1.85