@@ -81,7 +81,7 @@ dnl there is now a CREATE_PREFIX_TARGET_H in this file as a shorthand for

 dnl PREFIX_CONFIG_H from a target.h file, however w/o the target.h ever created

 dnl (the prefix is a bit different, since we add an extra -target- and -host-)

 dnl 

-dnl @version: $Id: aclocal.m4,v 1.20 2004/02/18 03:15:05 kojm Exp $

+dnl @version: $Id: aclocal.m4,v 1.21 2004/02/20 22:29:45 kojm Exp $

 dnl @author Guido Draheim <guidod@gmx.de>                 STATUS: used often

 AC_DEFUN([AC_CREATE_TARGET_H],

@@ -4041,7 +4041,7 @@ dnl      AC_COMPILE_CHECK_SIZEOF(ptrdiff_t, $headers)

 dnl      AC_COMPILE_CHECK_SIZEOF(off_t, $headers)

 dnl

 dnl @author Kaveh Ghazi <ghazi@caip.rutgers.edu>

-dnl @version $Id: aclocal.m4,v 1.20 2004/02/18 03:15:05 kojm Exp $

+dnl @version $Id: aclocal.m4,v 1.21 2004/02/20 22:29:45 kojm Exp $

 dnl

 AC_DEFUN([AC_COMPILE_CHECK_SIZEOF],

 [changequote(<<, >>)dnl

@@ -1004,6 +1004,7 @@ Optional Features:

   --disable-cr      Don't link with C reentrant library (BSD)

   --disable-urandom       Disable test for /dev/urandom

   --enable-id-check	  Use id utility instead of /etc/passwd parsing

+  --enable-yp-check	  Use ypmatch utility instead of /etc/passwd parsing

   --disable-clamav	  Disable test for clamav user/group

   --disable-clamuko	  Don't include Clamuko code /Linux/

   --enable-debug	  Enable debug messages.

@@ -4541,7 +4542,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

 case $host in

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 4544 "configure"' > conftest.$ac_ext

+  echo '#line 4545 "configure"' > conftest.$ac_ext

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -5077,7 +5078,7 @@ chmod -w .

 save_CFLAGS="$CFLAGS"

 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"

 compiler_c_o=no

-if { (eval echo configure:5080: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

+if { (eval echo configure:5081: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

   # The compiler can only warn and ignore the option if not recognized

   # So say no if there are warnings

   if test -s out/conftest.err; then

@@ -6870,7 +6871,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 6873 "configure"

+#line 6874 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -6968,7 +6969,7 @@ else

     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<EOF

-#line 6971 "configure"

+#line 6972 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -9169,6 +9170,14 @@ else

   use_id="no"

 fi;

+# Check whether --enable-yp-check or --disable-yp-check was given.

+if test "${enable_yp_check+set}" = set; then

+  enableval="$enable_yp_check"

+  use_yp="yes"

+else

+  use_yp="no"

+fi;

+

 # Check whether --with-user or --without-user was given.

 if test "${with_user+set}" = set; then

@@ -10013,6 +10022,12 @@ fi

         clamavgroup=`/usr/bin/nidump group . |grep ${clamav_group}`

     fi

+    if test "$use_yp" = "yes"

+    then

+        clamavuser=`ypmatch ${clamav_user} passwd`

+        clamavgroup=`ypmatch ${clamav_group} group`

+    fi

+

     if test -z "$clamavuser" || test -z "$clamavgroup"

     then

         echo "ERROR: User \"$clamav_user\" (and/or group \"$clamav_group\") doesn't exist. Please create it. You can omit this check with the --disable-clamav option."