 @@ -1,17 +1,17 @@
-$NetBSD: patch-aa,v 1.22 2011/09/22 01:20:20 christos Exp $
+$NetBSD: patch-aa,v 1.23 2011/11/29 19:26:28 bouyer Exp $
---- configure.orig	2011-09-06 07:41:25.000000000 -0400
+--- configure.orig	2011-09-06 13:41:25.000000000 +0200
-+++ configure	2011-09-21 10:55:42.000000000 -0400
++++ configure	2011-11-29 18:59:56.000000000 +0100
 @@ -1,60 +1,81 @@
  #! /bin/sh
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.61.
 +# Generated by GNU Autoconf 2.64.
+ #
  # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
 -# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software
 +# Foundation, Inc.
 +#
  # This configure script is free software; the Free Software Foundation
  # gives unlimited permission to copy, distribute and modify it.
 @@ -39505,43 +39505,36 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 +        ;;
 +    esac
 +    ;;
 +*:*)
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +    atalk_libname="lib"
 +    ;;
 +esac
 -        [ -n "$atalk_libname" ] || { { echo "$as_me:$LINENO: error: internal error, atalk_libname undefined" >&5
 -echo "$as_me: error: internal error, atalk_libname undefined" >&2;}
 -   { (exit 1); exit 1; }; }
+-
 -	if test "x$zeroconf" != "xno"; then
 -		savedcppflags="$CPPFLAGS"
 -		savedldflags="$LDFLAGS"
 -		if test "x$zeroconf" = "xyes" -o "x$zeroconf" = "xtry"; then
 -			zeroconf_dir="/usr"
 -		else
 -			zeroconf_dir="$zeroconf"
 -		fi
 +netatalk_cv_admin_group=yes
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for administrative group support" >&5
 +$as_echo_n "checking for administrative group support... " >&6; }
 +# Check whether --enable-admin-group was given.
 +if test "${enable_admin_group+set}" = set; then :
 +  enableval=$enable_admin_group;
 +        if test x"$enableval" = x"no"; then
 -    # mDNS support using Avahi
 -    if test "${ac_cv_header_avahi_client_client_h+set}" = set; then
 -  { echo "$as_me:$LINENO: checking for avahi-client/client.h" >&5
 -echo $ECHO_N "checking for avahi-client/client.h... $ECHO_C" >&6; }
 -if test "${ac_cv_header_avahi_client_client_h+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_header_avahi_client_client_h" >&5
 -echo "${ECHO_T}$ac_cv_header_avahi_client_client_h" >&6; }
 -else
 -  # Is the header compilable?
 -{ echo "$as_me:$LINENO: checking avahi-client/client.h usability" >&5
 @@ -39566,39 +39559,45 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
-+$as_echo "#define ADMIN_GRP 0" >>confdefs.h
++netatalk_cv_admin_group=yes
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for administrative group support" >&5
 +$as_echo_n "checking for administrative group support... " >&6; }
 +# Check whether --enable-admin-group was given.
 +if test "${enable_admin_group+set}" = set; then :
 +  enableval=$enable_admin_group;
 +        if test x"$enableval" = x"no"; then
 -	ac_header_compiler=no
 -fi
-+		netatalk_cv_admin_group=no
++$as_echo "#define ADMIN_GRP 0" >>confdefs.h
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +	else
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6; }
-+$as_echo "#define ADMIN_GRP 1" >>confdefs.h
++		netatalk_cv_admin_group=no
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +	else
 -# Is the header present?
 -{ echo "$as_me:$LINENO: checking avahi-client/client.h presence" >&5
 -echo $ECHO_N "checking avahi-client/client.h presence... $ECHO_C" >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 -#include <avahi-client/client.h>
 -_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 @@ -39608,26 +39607,28 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null && {
 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
 +$as_echo "#define ADMIN_GRP 1" >>confdefs.h
++
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +        fi
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -  ac_header_preproc=no
++
 +$as_echo "#define ADMIN_GRP 1" >>confdefs.h
++
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 @@ -39695,27 +39696,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
  else
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lavahi-client  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +LIBS="-lafsauthent  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-@@ -28490,4215 +13833,2927 @@
+@@ -28490,4215 +13833,2919 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char avahi_client_new ();
 +char pioctl ();
  int
  main ()
+ {
 -return avahi_client_new ();
 +return pioctl ();
+   ;
    return 0;
+ }
 @@ -40405,37 +40406,37 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -_ACEOF
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
++
  fi
 -done
 +# Check whether --enable-largefile was given.
 +if test "${enable_largefile+set}" = set; then :
 +  enableval=$enable_largefile;
 +fi
 +if test "$enable_largefile" != no; then
 +            wx_largefile=no
 -		if test x"$ac_cv_header_security_pam_appl_h" = x"no" -a x"$ac_cv_header_pam_pam_appl_h" = x"no"; then
 -			pam_found=no
 -		else
 -			{ echo "$as_me:$LINENO: checking for pam_set_item in -lpam" >&5
 -echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6; }
 -if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +if test "$enable_largefile" != no; then
 +            wx_largefile=no
++
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 +$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
 +if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lpam  $LIBS"
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
 @@ -40479,53 +40480,51 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  ac_cv_lib_pam_pam_set_item=yes
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_sys_file_offset_bits=64
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
+-
 -	ac_cv_lib_pam_pam_set_item=no
--fi
++  ac_cv_sys_file_offset_bits=no
  fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
-+  ac_cv_sys_file_offset_bits=no
+-fi
  fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_set_item" >&5
 -echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6; }
 -if test $ac_cv_lib_pam_pam_set_item = yes; then
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -				PAM_LIBS="$PAM_LDFLAGS -lpam"
 -				pam_found="yes"
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5
 +$as_echo "$ac_cv_sys_file_offset_bits" >&6; }
 -		fi
 -		CFLAGS="$savedCFLAGS"
 -		LDFLAGS="$savedLDFLAGS"
 -		LIBS="$savedLIBS"
 -	fi
 +    if test "$ac_cv_sys_file_offset_bits" != no; then
 +        wx_largefile=yes
 -	netatalk_cv_install_pam=yes
 -	if test x"$pam_found" = "xyes" -a "x$PAMDIR" = "xNONE"; then
 -		{ echo "$as_me:$LINENO: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&5
 -echo "$as_me: WARNING: PAM support can be compiled, but the install location for the netatalk.pamd file could not be determined. Either install this file by hand or specify the install path." >&2;}
 -		netatalk_cv_install_pam=no
 -    else
 -                { echo "$as_me:$LINENO: checking for includable common PAM config" >&5
 -echo $ECHO_N "checking for includable common PAM config... $ECHO_C" >&6; }
 -        pampath="${PAMDIR}etc/pam.d"
 -                if test -f "$pampath/common-auth" ; then
 -           PAM_DIRECTIVE=include
 -           PAM_AUTH=common-auth
 -           PAM_ACCOUNT=common-account
 @@ -40540,503 +40539,507 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -                elif test -f "$pampath/system" ; then
 -           PAM_DIRECTIVE=include
 -           PAM_AUTH=system
 -           PAM_ACCOUNT=system
 -           PAM_PASSWORD=system
 -           PAM_SESSION=system
 -                else
 -           PAM_DIRECTIVE=required
 -           PAM_AUTH=pam_unix.so
 -           PAM_ACCOUNT=pam_unix.so
 -           PAM_PASSWORD="pam_unix.so use_authtok"
 -           PAM_SESSION=pam_unix.so
 -        fi
 +cat >>confdefs.h <<_ACEOF
 +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
 +_ACEOF
 -        if test "x$PAM_DIRECTIVE" != "xrequired" ; then
 -            { echo "$as_me:$LINENO: result: yes ($PAM_DIRECTIVE $PAM_AUTH)" >&5
 -echo "${ECHO_T}yes ($PAM_DIRECTIVE $PAM_AUTH)" >&6; }
 -        else
 -            { echo "$as_me:$LINENO: result: no (using defaut pam_unix.so)" >&5
 -echo "${ECHO_T}no (using defaut pam_unix.so)" >&6; }
 -        fi
 -	fi
 +    fi
 -	{ echo "$as_me:$LINENO: checking whether to enable PAM support" >&5
 -echo $ECHO_N "checking whether to enable PAM support... $ECHO_C" >&6; }
 -	if test "x$pam_found" = "xno"; then
 -		netatalk_cv_install_pam=no
 -		if test "x$require_pam" = "xyes"; then
 -			{ { echo "$as_me:$LINENO: error: PAM support missing" >&5
 -echo "$as_me: error: PAM support missing" >&2;}
 -   { (exit 1); exit 1; }; }
 -		else
 -			{ echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 -		fi
 -		:
 -	else
 -		{ echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 +    if test "x$wx_largefile" != "xyes"; then
 -	use_pam_so=yes
 -	compile_pam=yes
 -	netatalk_cv_use_pam=yes
 +    if test "$ac_cv_sys_file_offset_bits" != no; then
 +        wx_largefile=yes
 -cat >>confdefs.h <<\_ACEOF
 -#define USE_PAM 1
 +cat >>confdefs.h <<_ACEOF
 +#define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits
  _ACEOF
 +    fi
 -	fi
+-
+-
 -  ac_new_flags=""
 -  for i in $PAM_LIBS; do
 -    case $i in
 -    -L/usr/lib|-L/usr/lib/|-L/usr|-L/usr/) ;;
 -    *) ac_new_flags="$ac_new_flags $i" ;;
 -    esac
 -  done
 -  PAM_LIBS=$ac_new_flags
+-
+-
 -  ac_new_flags=""
 -  for i in $PAM_CFLAGS; do
 -    case $i in
 -    -I/usr/include|-I/usr/include/) ;;
 -    *) ac_new_flags="$ac_new_flags $i" ;;
 -    esac
 -  done
 -  PAM_CFLAGS=$ac_new_flags
+-
 +    if test "x$wx_largefile" != "xyes"; then
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 +$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
 +if test "${ac_cv_sys_large_files+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 -cat >>confdefs.h <<\_ACEOF
 -#define USE_PAM 1
 -_ACEOF
 +          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#define _LARGE_FILES 1
 +                          #include <sys/types.h>
 +int
 +main ()
 +{
 +typedef struct {
 +    unsigned int field: sizeof(off_t) == 8;
 +} wxlf;
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_compile "$LINENO"; then :
 +  ac_cv_sys_large_files=1
 +else
 +  ac_cv_sys_large_files=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -	fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5
 +$as_echo "$ac_cv_sys_large_files" >&6; }
 -  ac_new_flags=""
 -  for i in $PAM_LIBS; do
 -    case $i in
 -    -L/usr/lib|-L/usr/lib/|-L/usr|-L/usr/) ;;
 -    *) ac_new_flags="$ac_new_flags $i" ;;
 -    esac
 -  done
 -  PAM_LIBS=$ac_new_flags
 +    if test "$ac_cv_sys_large_files" != no; then
 +        wx_largefile=yes
 +cat >>confdefs.h <<_ACEOF
 +#define _LARGE_FILES $ac_cv_sys_large_files
 +_ACEOF
 -  ac_new_flags=""
 -  for i in $PAM_CFLAGS; do
 -    case $i in
 -    -I/usr/include|-I/usr/include/) ;;
 -    *) ac_new_flags="$ac_new_flags $i" ;;
 -    esac
 -  done
 -  PAM_CFLAGS=$ac_new_flags
 +    fi
 +    fi
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit off_t" >&5
 +$as_echo_n "checking for 64 bit off_t... " >&6; }
 +if test "${netatalk_cv_SIZEOF_OFF_T+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +    if test "$cross_compiling" = yes; then :
 +  netatalk_cv_SIZEOF_OFF_T=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +#include <stdio.h>
 +#include <stdlib.h>
 +#include <sys/stat.h>
 +main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  netatalk_cv_SIZEOF_OFF_T=yes
 +else
 +  netatalk_cv_SIZEOF_OFF_T=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $netatalk_cv_SIZEOF_OFF_T" >&5
 +$as_echo "$netatalk_cv_SIZEOF_OFF_T" >&6; }
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if large file support is available" >&5
 +$as_echo_n "checking if large file support is available... " >&6; }
 +    if test "x$netatalk_cv_SIZEOF_OFF_T" != "xno"; then
 +$as_echo "#define HAVE_LARGEFILE_SUPPORT /**/" >>confdefs.h
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +        :
 +    else
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +        as_fn_error "AFP 3.x support requires Large File Support." "$LINENO" 5
 +    fi
 +fi
 +        savedcflags="$CFLAGS"
 +        savedldflags="$LDFLAGS"
 +	ICONV_CFLAGS=""
 +	ICONV_LIBS=""
 -netatalk_cv_use_shadowpw=no
 -# Check whether --with-shadow was given.
 -if test "${with_shadow+set}" = set; then
 -  withval=$with_shadow; netatalk_cv_use_shadowpw="$withval"
-+# Check whether --with-libiconv was given.
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64 bit off_t" >&5
-+if test "${with_libiconv+set}" = set; then :
++$as_echo_n "checking for 64 bit off_t... " >&6; }
-+  withval=$with_libiconv;  case "$withval" in
++if test "${netatalk_cv_SIZEOF_OFF_T+set}" = set; then :
-+	  no)
++  $as_echo_n "(cached) " >&6
 +	    ;;
 +	  yes)
 +	    ;;
 +	  *)
 +	    ICONV_CFLAGS="-I$withval/include"
 +	    ICONV_LIBS="-L$withval/$atalk_libname"
 +	    ;;
 +	  esac
  else
 -  netatalk_cv_use_shadowpw=auto
 +  withval="no"
 -fi
  fi
 -if test "x$netatalk_cv_use_shadowpw" != "xno"; then
 -    if test "${ac_cv_header_shadow_h+set}" = set; then
 -  { echo "$as_me:$LINENO: checking for shadow.h" >&5
 -echo $ECHO_N "checking for shadow.h... $ECHO_C" >&6; }
 -if test "${ac_cv_header_shadow_h+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5
 -echo "${ECHO_T}$ac_cv_header_shadow_h" >&6; }
--else
++    if test "$cross_compiling" = yes; then :
 +  netatalk_cv_SIZEOF_OFF_T=cross
  else
 -  # Is the header compilable?
 -{ echo "$as_me:$LINENO: checking shadow.h usability" >&5
 -echo $ECHO_N "checking shadow.h usability... $ECHO_C" >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
++  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 -$ac_includes_default
 -#include <shadow.h>
--_ACEOF
++#include <stdio.h>
 +#include <stdlib.h>
 +#include <sys/stat.h>
 +main() { exit((sizeof(off_t) == 8) ? 0 : 1); }
  _ACEOF
 -rm -f conftest.$ac_objext
 -if { (ac_try="$ac_compile"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_compile") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } && {
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
 -  ac_header_compiler=yes
--else
++if ac_fn_c_try_run "$LINENO"; then :
 +  netatalk_cv_SIZEOF_OFF_T=yes
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 +  netatalk_cv_SIZEOF_OFF_T=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
 +fi
 -	ac_header_compiler=no
--fi
+ fi
-+	CFLAGS="$ICONV_CFLAGS $CFLAGS"
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $netatalk_cv_SIZEOF_OFF_T" >&5
-+        LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
++$as_echo "$netatalk_cv_SIZEOF_OFF_T" >&6; }
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
 -echo "${ECHO_T}$ac_header_compiler" >&6; }
-+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv" >&5
++    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if large file support is available" >&5
-+$as_echo_n "checking for libiconv... " >&6; }
++$as_echo_n "checking if large file support is available... " >&6; }
-+if test "${netatalk_cv_iconv+set}" = set; then :
++    if test "x$netatalk_cv_SIZEOF_OFF_T" != "xno"; then
 +  $as_echo_n "(cached) " >&6
 +else
 -# Is the header present?
 -{ echo "$as_me:$LINENO: checking shadow.h presence" >&5
 -echo $ECHO_N "checking shadow.h presence... $ECHO_C" >&6; }
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
-+          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h.  */
  /* end confdefs.h.  */
 -#include <shadow.h>
 -_ACEOF
 -if { (ac_try="$ac_cpp conftest.$ac_ext"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 -  rm -f conftest.er1
 -  cat conftest.err >&5
 -  echo "$as_me:$LINENO: \$? = $ac_status" >&5
 -  (exit $ac_status); } >/dev/null && {
 -	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       }; then
 -  ac_header_preproc=yes
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 +$as_echo "#define HAVE_LARGEFILE_SUPPORT /**/" >>confdefs.h
 -  ac_header_preproc=no
--fi
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-+#include <stdlib.h>
++$as_echo "yes" >&6; }
-+#include <iconv.h>
++        :
 +    else
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +        as_fn_error "AFP 3.x support requires Large File Support." "$LINENO" 5
 +    fi
  fi
 -rm -f conftest.err conftest.$ac_ext
 -{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
 -echo "${ECHO_T}$ac_header_preproc" >&6; }
 +int
 +main ()
 +{
 -# So?  What about this header?
 -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
 -  yes:no: )
 -    { echo "$as_me:$LINENO: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&5
 -echo "$as_me: WARNING: shadow.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the compiler's result" >&5
 -echo "$as_me: WARNING: shadow.h: proceeding with the compiler's result" >&2;}
 -    ac_header_preproc=yes
 -    ;;
 -  no:yes:* )
 -    { echo "$as_me:$LINENO: WARNING: shadow.h: present but cannot be compiled" >&5
 -echo "$as_me: WARNING: shadow.h: present but cannot be compiled" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: shadow.h:     check for missing prerequisite headers?" >&5
 -echo "$as_me: WARNING: shadow.h:     check for missing prerequisite headers?" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: shadow.h: see the Autoconf documentation" >&5
 -echo "$as_me: WARNING: shadow.h: see the Autoconf documentation" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: shadow.h:     section \"Present But Cannot Be Compiled\"" >&5
 -echo "$as_me: WARNING: shadow.h:     section \"Present But Cannot Be Compiled\"" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: shadow.h: proceeding with the preprocessor's result" >&5
 -echo "$as_me: WARNING: shadow.h: proceeding with the preprocessor's result" >&2;}
 -    { echo "$as_me:$LINENO: WARNING: shadow.h: in the future, the compiler will take precedence" >&5
 -echo "$as_me: WARNING: shadow.h: in the future, the compiler will take precedence" >&2;}
 +	iconv_t cd = iconv_open("","");
 +        iconv(cd,NULL,NULL,NULL,NULL);
 +        iconv_close(cd);
 -    ;;
 -esac
 -{ echo "$as_me:$LINENO: checking for shadow.h" >&5
 -echo $ECHO_N "checking for shadow.h... $ECHO_C" >&6; }
 -if test "${ac_cv_header_shadow_h+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  ;
++        savedcflags="$CFLAGS"
-+  return 0;
++        savedldflags="$LDFLAGS"
-+}
++	ICONV_CFLAGS=""
-+_ACEOF
++	ICONV_LIBS=""
 +if ac_fn_c_try_link "$LINENO"; then :
 +  netatalk_cv_iconv=yes
 +# Check whether --with-libiconv was given.
 +if test "${with_libiconv+set}" = set; then :
 +  withval=$with_libiconv;  case "$withval" in
 +	  no)
 +	    ;;
 +	  yes)
 +	    ;;
 +	  *)
 +	    ICONV_CFLAGS="-I$withval/include"
 +	    ICONV_LIBS="-L$withval/$atalk_libname"
 +	    ;;
 +	  esac
  else
 -  ac_cv_header_shadow_h=$ac_header_preproc
-+  netatalk_cv_iconv=no
+-fi
  fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_header_shadow_h" >&5
 -echo "${ECHO_T}$ac_cv_header_shadow_h" >&6; }
 +  withval="no"
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $netatalk_cv_iconv" >&5
 +$as_echo "$netatalk_cv_iconv" >&6; }
 +	if test x"$netatalk_cv_iconv" = x"yes"; then
 +	    ICONV_LIBS="$ICONV_LIBS -liconv"
 +        else
 +	    CFLAGS="$savedcflags"
 +	    LDFLAGS="$savedldflags"
 +	    ICONV_LIBS=""
 +	    ICONV_CFLAGS=""
 +	    if test x"$withval" != x"no"; then
 +	        as_fn_error "libiconv not found" "$LINENO" 5
 +	    fi
 +	fi
 -    if test x"$ac_cv_header_shadow_h" = x"yes"; then
 -	netatalk_cv_use_shadowpw=yes
 +	CFLAGS="$ICONV_CFLAGS $CFLAGS"
 +        LDFLAGS="$LDFLAGS $ICONV_LIBS -liconv"
 -cat >>confdefs.h <<\_ACEOF
 -#define SHADOWPW 1
 -_ACEOF
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libiconv" >&5
 +$as_echo_n "checking for libiconv... " >&6; }
 +if test "${netatalk_cv_iconv+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 -    else
 -      if test "x$shadowpw" = "xyes"; then
 -        { { echo "$as_me:$LINENO: error: shadow support not available" >&5
 -echo "$as_me: error: shadow support not available" >&2;}
 -   { (exit 1); exit 1; }; }
 -      else
 -       	netatalk_cv_use_shadowpw=no
 -      fi
 -    fi
 -fi
-+  ac_new_flags=""
++          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+  for i in $ICONV_CFLAGS; do
++/* end confdefs.h.  */
 +    case $i in
 +    -I/usr/include|-I/usr/include/) ;;
 +    *) ac_new_flags="$ac_new_flags $i" ;;
 +    esac
 +  done
 +  ICONV_CFLAGS=$ac_new_flags
 -{ echo "$as_me:$LINENO: checking whether shadow support should be enabled" >&5
 -echo $ECHO_N "checking whether shadow support should be enabled... $ECHO_C" >&6; }
 -if test "x$netatalk_cv_use_shadowpw" = "xyes"; then
 -	{ echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
--else
++#include <stdlib.h>
 +#include <iconv.h>
++
 +int
 +main ()
 +{
++
 +	iconv_t cd = iconv_open("","");
 +        iconv(cd,NULL,NULL,NULL,NULL);
 +        iconv_close(cd);
++
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  netatalk_cv_iconv=yes
  else
 -	{ echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
--fi
++  netatalk_cv_iconv=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $netatalk_cv_iconv" >&5
 +$as_echo "$netatalk_cv_iconv" >&6; }
-+  ac_new_flags=""
++	if test x"$netatalk_cv_iconv" = x"yes"; then
-+  for i in $ICONV_LIBS; do
++	    ICONV_LIBS="$ICONV_LIBS -liconv"
-+    case $i in
++        else
-+    -L/usr/lib|-L/usr/lib/|-L/usr|-L/usr/) ;;
++	    CFLAGS="$savedcflags"
-+    *) ac_new_flags="$ac_new_flags $i" ;;
++	    LDFLAGS="$savedldflags"
-+    esac
++	    ICONV_LIBS=""
-+  done
++	    ICONV_CFLAGS=""
-+  ICONV_LIBS=$ac_new_flags
++	    if test x"$withval" != x"no"; then
 +	        as_fn_error "libiconv not found" "$LINENO" 5
 +	    fi
 +	fi
 -netatalk_cv_use_shellcheck=yes
 -{ echo "$as_me:$LINENO: checking whether checking for a valid shell should be enabled" >&5
 -echo $ECHO_N "checking whether checking for a valid shell should be enabled... $ECHO_C" >&6; }
 -# Check whether --enable-shell-check was given.
 -if test "${enable_shell_check+set}" = set; then
 -  enableval=$enable_shell_check;
 -	if test "$enableval" = "no"; then
 -cat >>confdefs.h <<\_ACEOF
 -#define DISABLE_SHELLCHECK 1
 -_ACEOF
 +  ac_new_flags=""
 +  for i in $ICONV_CFLAGS; do
 +    case $i in
 +    -I/usr/include|-I/usr/include/) ;;
 +    *) ac_new_flags="$ac_new_flags $i" ;;
 +    esac
 +  done
 +  ICONV_CFLAGS=$ac_new_flags
 -		{ echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 -		netatalk_cv_use_shellcheck=no
 -	else
 -		{ echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 -	fi
 -else
 +  ac_new_flags=""
 +  for i in $ICONV_LIBS; do
 +    case $i in
 +    -L/usr/lib|-L/usr/lib/|-L/usr|-L/usr/) ;;
 +    *) ac_new_flags="$ac_new_flags $i" ;;
 +    esac
 +  done
 +  ICONV_LIBS=$ac_new_flags
 -		{ echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 -fi
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5
 +$as_echo_n "checking for working iconv... " >&6; }
 +if test "${netatalk_cv_HAVE_USABLE_ICONV+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
- else
++else
--		{ echo "$as_me:$LINENO: result: yes" >&5
+-	check=maybe
--echo "${ECHO_T}yes" >&6; }
+-	# Check whether --enable-tcp-wrappers was given.
 -if test "${enable_tcp_wrappers+set}" = set; then
 -  enableval=$enable_tcp_wrappers;
 -			if test "x$enableval" = "xno"; then
 -				wrapcheck=no
 -			else
 -				wrapcheck=yes
 -			fi
 +		if test "$cross_compiling" = yes; then :
 +  netatalk_cv_HAVE_USABLE_ICONV=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +\
 +#include <iconv.h>
 +main() {
 +       iconv_t cd = iconv_open("ASCII", "UTF-8");
 +       if (cd == 0 || cd == (iconv_t)-1) return -1;
 +       return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  netatalk_cv_HAVE_USABLE_ICONV=yes
 +else
 +  netatalk_cv_HAVE_USABLE_ICONV=no
 +fi
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
 +fi
  fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $netatalk_cv_HAVE_USABLE_ICONV" >&5
 +$as_echo "$netatalk_cv_HAVE_USABLE_ICONV" >&6; }
 +	if test x"$netatalk_cv_HAVE_USABLE_ICONV" = x"yes"; then
 -	check=maybe
 -	# Check whether --enable-tcp-wrappers was given.
 -if test "${enable_tcp_wrappers+set}" = set; then
 -  enableval=$enable_tcp_wrappers;
 -			if test "x$enableval" = "xno"; then
 -				wrapcheck=no
 -			else
 -				wrapcheck=yes
 -			fi
 +$as_echo "#define HAVE_USABLE_ICONV 1" >>confdefs.h
 -fi
 +	fi
 +  	if test x"$netatalk_cv_HAVE_USABLE_ICONV" = x"yes"; then
 +    		if test "${am_cv_proto_iconv+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 -	enable=no
 -	netatalk_cv_tcpwrap=no
 -	if test "x$wrapcheck" != "xno"; then
 -		saved_LIBS=$LIBS
 -		W_LIBS="-lwrap"
 -		LIBS="$LIBS $W_LIBS"
 -		cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +$as_echo "#define HAVE_USABLE_ICONV 1" >>confdefs.h
++
 +	fi
++
 +  	if test x"$netatalk_cv_HAVE_USABLE_ICONV" = x"yes"; then
 +    		if test "${am_cv_proto_iconv+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
++
 +      		cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
 - int allow_severity = 0; int deny_severity = 0;
 +\
 +#include <stdlib.h>
 +#include <iconv.h>
 +extern
 +#ifdef __cplusplus
 +"C"
 +#endif
 +#if defined(__STDC__) || defined(__cplusplus)
 +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
 +#else
 @@ -41123,52 +41126,52 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest$ac_exeext &&
 -       $as_test_x conftest$ac_exeext; then
 -  netatalk_cv_tcpwrap=yes
 +	if test x"$netatalk_cv_HAVE_USABLE_ICONV" = x"yes"; then
 +	    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether iconv supports UCS-2-INTERNAL" >&5
 +$as_echo_n "checking whether iconv supports UCS-2-INTERNAL... " >&6; }
 +if test "${netatalk_cv_HAVE_UCS2INTERNAL+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
  else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
 -	netatalk_cv_tcpwrap=no
 -fi
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -	netatalk_cv_tcpwrap=no
 +		if test "$cross_compiling" = yes; then :
 +  netatalk_cv_HAVEUCS2INTERNAL=cross
 +else
 +  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +\
 +#include <iconv.h>
 +int main() {
 +       iconv_t cd = iconv_open("ASCII", "UCS-2-INTERNAL");
 +       if (cd == 0 || cd == (iconv_t)-1) return -1;
 +       return 0;
 +}
++
 +_ACEOF
 +if ac_fn_c_try_run "$LINENO"; then :
 +  netatalk_cv_HAVE_UCS2INTERNAL=yes
 +else
 +  netatalk_cv_HAVE_UCS2INTERNAL=no
-+fi
+ fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-
+-
 +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 +  conftest.$ac_objext conftest.beam conftest.$ac_ext
  fi
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
+-
 -		LIBS=$saved_LIBS
 -	fi
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $netatalk_cv_HAVE_UCS2INTERNAL" >&5
 +$as_echo "$netatalk_cv_HAVE_UCS2INTERNAL" >&6; }
 @@ -41572,143 +41575,142 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 +  USE_TDB_BACKEND_FALSE='#'
  else
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 +  USE_TDB_BACKEND_TRUE='#'
 +  USE_TDB_BACKEND_FALSE=
  fi
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: checking default DID scheme" >&5
 +$as_echo_n "checking default DID scheme... " >&6; }
 -        	if test "x$CUPS_CONFIG" != x; then
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CUPS 1
 -_ACEOF
 +# Check whether --with-cnid-default-backend was given.
 +if test "${with_cnid_default_backend+set}" = set; then :
 +  withval=$with_cnid_default_backend;
 +        if test x"$withval" = x; then
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: ignored" >&5
 +$as_echo "ignored" >&6; }
 +        else
 +            DEFAULT_CNID_SCHEME=$withval
 +            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_CNID_SCHEME" >&5
 +$as_echo "$DEFAULT_CNID_SCHEME" >&6; }
 +        fi
 -cat >>confdefs.h <<\_ACEOF
 -#define HAVE_CUPS 1
 -_ACEOF
 +else
 -	                CUPS_CFLAGS="`$CUPS_CONFIG --cflags`"
 -        	        CUPS_LDFLAGS="`$CUPS_CONFIG --ldflags`"
 -                	CUPS_LIBS="`$CUPS_CONFIG --libs`"
 -			CUPS_VERSION="`$CUPS_CONFIG --version`"
-+else
++        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_CNID_SCHEME" >&5
 +$as_echo "$DEFAULT_CNID_SCHEME" >&6; }
 -cat >>confdefs.h <<_ACEOF
 -#define CUPS_API_VERSION "`$CUPS_CONFIG --api-version`"
 -_ACEOF
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DEFAULT_CNID_SCHEME" >&5
 +$as_echo "$DEFAULT_CNID_SCHEME" >&6; }
 +fi
 +    if test x"$DEFAULT_CNID_SCHEME" = x; then
 +        as_fn_error "No DID schemes compiled in " "$LINENO" 5
 +    fi
 +    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether default CNID scheme has been activated" >&5
 +$as_echo_n "checking whether default CNID scheme has been activated... " >&6; }
 +    found_scheme=no
 +    for scheme in $compiled_backends ; do
 +        if test x"$scheme" = x"$DEFAULT_CNID_SCHEME"; then
 +            found_scheme=yes
 +        fi
 +    done
 +    if test x"$found_scheme" = x"no"; then
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 +$as_echo "no" >&6; }
 +        as_fn_error "Specified default CNID scheme $DEFAULT_CNID_SCHEME was not selected for compilation" "$LINENO" 5
 +    else
 +        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 +$as_echo "yes" >&6; }
 +    fi
 -			{ echo "$as_me:$LINENO: checking CUPS version" >&5
 -echo $ECHO_N "checking CUPS version... $ECHO_C" >&6; }
 -                	{ echo "$as_me:$LINENO: result: $CUPS_VERSION" >&5
 -echo "${ECHO_T}$CUPS_VERSION" >&6; }
 -			netatalk_cv_use_cups=yes
 +cat >>confdefs.h <<_ACEOF
 +#define DEFAULT_CNID_SCHEME "$DEFAULT_CNID_SCHEME"
 +_ACEOF
 -			if test x"$netatalk_cv_HAVE_USABLE_ICONV" = x"no" ; then
 -				{ echo "$as_me:$LINENO: WARNING: *** Warning: iconv not found on your system, using simple ascii mapping***" >&5
 -echo "$as_me: WARNING: *** Warning: iconv not found on your system, using simple ascii mapping***" >&2;}
 -			fi
 -	                spool_required="yes"
 -		elif test x"$enable_cups" = "xyes"; then
 -			{ { echo "$as_me:$LINENO: error: *** CUPS not found. You might need to specify the path to cups-config ***" >&5
 -echo "$as_me: error: *** CUPS not found. You might need to specify the path to cups-config ***" >&2;}
 -   { (exit 1); exit 1; }; }
 -	        fi
 -	fi
 +cat >>confdefs.h <<_ACEOF
 +#define DEFAULT_CNID_SCHEME "$DEFAULT_CNID_SCHEME"
 +_ACEOF
 -	{ echo "$as_me:$LINENO: checking whether CUPS support can be enabled" >&5
 -echo $ECHO_N "checking whether CUPS support can be enabled... $ECHO_C" >&6; }
 -	{ echo "$as_me:$LINENO: result: $netatalk_cv_use_cups" >&5
 -echo "${ECHO_T}$netatalk_cv_use_cups" >&6; }
 -# Check whether --with-spooldir was given.
 -if test "${with_spooldir+set}" = set; then
 -  withval=$with_spooldir;
 +    if test "x$bdb_required" = "xyes"; then
 +	bdb_required=yes
 +    else
 +	bdb_required=no
 +    fi
 -# Check whether --with-spooldir was given.
 -if test "${with_spooldir+set}" = set; then
 -  withval=$with_spooldir;
 -	        if test "$withval" = "no"; then
 -        	       if test x"$spool_required" = x"yes"; then
 -                	       { { echo "$as_me:$LINENO: error: *** CUPS support requires a spooldir ***" >&5
 -echo "$as_me: error: *** CUPS support requires a spooldir ***" >&2;}
 -   { (exit 1); exit 1; }; }
 -	               else
 -cat >>confdefs.h <<\_ACEOF
 -#define DISABLE_SPOOL 1
 -_ACEOF
 +	# Check whether --enable-quota was given.
 +if test "${enable_quota+set}" = set; then :
 +  enableval=$enable_quota;
 +fi
 -                	       { echo "$as_me:$LINENO: result: spool disabled" >&5
 -echo "${ECHO_T}spool disabled" >&6; }
 -               		fi
 -        	elif test "$withval" != "yes"; then
 -			SPOOLDIR="$withval"
 -	                { echo "$as_me:$LINENO: result: spooldir set to $withval" >&5
 -echo "${ECHO_T}spooldir set to $withval" >&6; }
 -        	else
 -			SPOOLDIR="${localstatedir}/spool/netatalk"
 -	                { echo "$as_me:$LINENO: result: spool set to default" >&5
 -echo "${ECHO_T}spool set to default" >&6; }
 -        	fi
 +	# Check whether --enable-quota was given.
 +if test "${enable_quota+set}" = set; then :
 +  enableval=$enable_quota;
 +fi
 +	if test x$enable_quota != xno; then
 +	QUOTA_LIBS=""
 +	netatalk_cv_quotasupport="yes"
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lrpcsvc" >&5
 +$as_echo_n "checking for main in -lrpcsvc... " >&6; }
 +if test "${ac_cv_lib_rpcsvc_main+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
  else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lrpcsvc  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 @@ -41741,106 +41743,100 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 +	for ac_header in rpc/rpc.h rpc/pmap_prot.h rpcsvc/rquota.h
 +do :
 +  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 +eval as_val=\$$as_ac_Header
 +   if test "x$as_val" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 +_ACEOF
 -	 if test x"$spool_required" = x"yes"; then
 -  USE_SPOOLDIR_TRUE=
 -  USE_SPOOLDIR_FALSE='#'
- else
+-else
 -  USE_SPOOLDIR_TRUE='#'
 -  USE_SPOOLDIR_FALSE=
 -fi
 +		QUOTA_LIBS=""
 +		netatalk_cv_quotasupport="no"
 +$as_echo "#define NO_QUOTA_SUPPORT 1" >>confdefs.h
 -{ echo "$as_me:$LINENO: checking to see if we can add '__attribute__((unused))' to CFLAGS" >&5
 -echo $ECHO_N "checking to see if we can add '__attribute__((unused))' to CFLAGS... $ECHO_C" >&6; }
 -if test x$GCC != x ; then
 -  CFLAGS="-D_U_=\"__attribute__((unused))\" $CFLAGS"
 -  { echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 -else
 -  CFLAGS="-D_U_=\"\" $CFLAGS"
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
  fi
 +done
 -{ echo "$as_me:$LINENO: checking whether to use Filesystem Hierarchy Standard (FHS) compatibility" >&5
 -echo $ECHO_N "checking whether to use Filesystem Hierarchy Standard (FHS) compatibility... $ECHO_C" >&6; }
 -# Check whether --enable-fhs was given.
 -if test "${enable_fhs+set}" = set; then
 -  enableval=$enable_fhs;
 -	if test "$enableval" = "yes"; then
 -		uams_path="${libdir}/netatalk"
 -		sysconfdir="/etc"
 -		PKGCONFDIR=${sysconfdir}/netatalk
 -		SERVERTEXT="${PKGCONFDIR}/msg"
 -		use_pam_so=yes
 -		mandir="/usr/share/man"
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getfsquota in -lquota" >&5
 +$as_echo_n "checking for getfsquota in -lquota... " >&6; }
 +if test "${ac_cv_lib_quota_getfsquota+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lquota -lprop -lrpcsvc $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 -cat >>confdefs.h <<\_ACEOF
--#define FHS_COMPATIBILITY 1
+-{ echo "$as_me:$LINENO: checking to see if we can add '__attribute__((unused))' to CFLAGS" >&5
 -echo $ECHO_N "checking to see if we can add '__attribute__((unused))' to CFLAGS... $ECHO_C" >&6; }
 -if test x$GCC != x ; then
 -  CFLAGS="-D_U_=\"__attribute__((unused))\" $CFLAGS"
 -  { echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
 +/* 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 getfsquota ();
 +int
 +main ()
 +{
 +return getfsquota ();
 +  ;
 +  return 0;
 +}
- _ACEOF
++_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_quota_getfsquota=yes
-+else
+ else
 -  CFLAGS="-D_U_=\"\" $CFLAGS"
 -  { echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 +  ac_cv_lib_quota_getfsquota=no
-+fi
+ 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_quota_getfsquota" >&5
 +$as_echo "$ac_cv_lib_quota_getfsquota" >&6; }
 +if test "x$ac_cv_lib_quota_getfsquota" = x""yes; then :
 +  QUOTA_LIBS="-lquota -lprop -lrpcsvc"
 +$as_echo "#define HAVE_LIBQUOTA 1" >>confdefs.h
 -{ echo "$as_me:$LINENO: checking whether to use Filesystem Hierarchy Standard (FHS) compatibility" >&5
 -echo $ECHO_N "checking whether to use Filesystem Hierarchy Standard (FHS) compatibility... $ECHO_C" >&6; }
 -# Check whether --enable-fhs was given.
 -if test "${enable_fhs+set}" = set; then
 -  enableval=$enable_fhs;
 -	if test "$enableval" = "yes"; then
 -		uams_path="${libdir}/netatalk"
 -		sysconfdir="/etc"
 -		PKGCONFDIR=${sysconfdir}/netatalk
 -		SERVERTEXT="${PKGCONFDIR}/msg"
 -		use_pam_so=yes
 -		mandir="/usr/share/man"
+-
 -cat >>confdefs.h <<\_ACEOF
 -#define FHS_COMPATIBILITY 1
 -_ACEOF
 +fi
 -		{ echo "$as_me:$LINENO: result: yes" >&5
 -echo "${ECHO_T}yes" >&6; }
  	else
 -		{ echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
 +		netatalk_cv_quotasupport="no"
++
 +$as_echo "#define NO_QUOTA_SUPPORT 1" >>confdefs.h
++
  	fi
 @@ -46003,27 +45999,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
++
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for set_auth_parameters in -lsecurity" >&5
 +$as_echo_n "checking for set_auth_parameters in -lsecurity... " >&6; }
 +if test "${ac_cv_lib_security_set_auth_parameters+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lsecurity  $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
-@@ -32706,1254 +16761,1024 @@
+@@ -32706,1254 +16753,1024 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char gss_acquire_cred ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_gss_acquire_cred || defined __stub___gss_acquire_cred
 -choke me
 -#endif
+-
 +char set_auth_parameters ();
  int
 @@ -48059,27 +48055,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
  else
 -  ac_func_search_save_LIBS=$LIBS
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lgssapi  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-@@ -33962,104 +17787,89 @@
+@@ -33962,104 +17779,89 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char getproplist ();
 +char gss_display_status ();
  int
  main ()
+ {
 -return getproplist ();
 +return gss_display_status ();
+   ;
    return 0;
+ }
 @@ -48227,27 +48223,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
+-
 -#undef $ac_func
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -34067,98 +17877,196 @@
+@@ -34067,98 +17869,196 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
+-
 +char gss_display_status ();
  int
 @@ -48493,27 +48489,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
++
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_init in -lldap" >&5
 +$as_echo_n "checking for ldap_init in -lldap... " >&6; }
 +if test "${ac_cv_lib_ldap_ldap_init+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lldap  $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
-@@ -34166,95 +18074,139 @@
+@@ -34166,95 +18066,139 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
+-
 +char ldap_init ();
  int
 @@ -48701,27 +48697,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 +	*)
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for acl_get_file in -lacl" >&5
 +$as_echo_n "checking for acl_get_file in -lacl... " >&6; }
 +if test "${ac_cv_lib_acl_acl_get_file+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lacl  $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
-@@ -34262,98 +18214,41 @@
+@@ -34262,98 +18206,41 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
+-
 +char acl_get_file ();
  int
 @@ -48821,27 +48817,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
+-
 -#undef $ac_func
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -34361,296 +18256,215 @@
+@@ -34361,296 +18248,215 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
+-
 +char getxattr ();
  int
 @@ -49265,27 +49261,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
 -    <limits.h> exists even on freestanding compilers.  */
+-
 -#ifdef __STDC__
 -# include <limits.h>
 -#else
 -# include <assert.h>
 -#endif
+-
 -#undef $ac_func
  /* Override any GCC internal prototype to avoid an error.
     Use char because int might match the return type of a GCC
-@@ -34658,57 +18472,70 @@
+@@ -34658,57 +18464,70 @@
  #ifdef __cplusplus
  extern "C"
  #endif
 -char $ac_func ();
 -/* The GNU C library defines this for functions which it implements
 -    to always fail with ENOSYS.  Some functions are actually named
 -    something starting with __ and the normal name is an alias.  */
 -#if defined __stub_$ac_func || defined __stub___$ac_func
 -choke me
 -#endif
+-
 +char getproplist ();
  int
 @@ -49374,27 +49370,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
++
 +	for ac_func in delproplist fdelproplist add_proplist_entry get_proplist_entry
 +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"
 +eval as_val=\$$as_ac_var
 +   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  else
-@@ -34716,97 +18543,91 @@
+@@ -34716,97 +18535,91 @@
  fi
  done
 +	for ac_func in sizeof_proplist_entry
 +do :
 +  ac_fn_c_check_func "$LINENO" "sizeof_proplist_entry" "ac_cv_func_sizeof_proplist_entry"
 +if test "x$ac_cv_func_sizeof_proplist_entry" = x""yes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_SIZEOF_PROPLIST_ENTRY 1
 +_ACEOF
 +else
 +  neta_cv_eas_sys_not_found=yes
 @@ -49543,27 +49539,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -if test `eval echo '${'$as_ac_var'}'` = yes; then
 +    for ac_func in extattr_set_fd extattr_set_file extattr_set_link
 +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"
 +eval as_val=\$$as_ac_var
 +   if test "x$as_val" = x""yes; then :
    cat >>confdefs.h <<_ACEOF
 -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
  _ACEOF
  else
-@@ -34818,24 +18639,18 @@
+@@ -34818,24 +18631,18 @@
    *freebsd4* | *dragonfly* )
 -cat >>confdefs.h <<\_ACEOF
 -#define BROKEN_EXTATTR 1
 -_ACEOF
 +$as_echo "#define BROKEN_EXTATTR 1" >>confdefs.h
    ;;
    *)
 -	{ echo "$as_me:$LINENO: checking for library containing getxattr" >&5
 -echo $ECHO_N "checking for library containing getxattr... $ECHO_C" >&6; }
 @@ -49574,27 +49570,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 +if test "${ac_cv_search_getxattr+set}" = set; then :
 +  $as_echo_n "(cached) " >&6
  else
    ac_func_search_save_LIBS=$LIBS
 -cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  /* Override any GCC internal prototype to avoid an error.
-@@ -34860,3156 +18675,3111 @@
+@@ -34860,3156 +18667,3111 @@
      ac_res=-l$ac_lib
      LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
    fi
 -  rm -f conftest.$ac_objext conftest$ac_exeext
 -if { (ac_try="$ac_link"
 -case "(($ac_try" in
 -  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
 -  *) ac_try_echo=$ac_try;;
 -esac
 -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
 -  (eval "$ac_link") 2>conftest.er1
 -  ac_status=$?
 -  grep -v '^ *+' conftest.er1 >conftest.err
 @@ -55441,43 +55437,43 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 -done
++
++
 +  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
 +    || (rm -f "$cfgfile"; exit 1)
++
 +  mv -f "$cfgfile" "$ofile" ||
 +    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
 +  chmod +x "$ofile"
++
   ;;
      "default":C) chmod a+x distrib/config/netatalk-config contrib/shell_utils/apple_*
   ;;
-@@ -38018,11 +21788,13 @@
+@@ -38018,11 +21780,13 @@
  done # for ac_tag
 -{ (exit 0); exit 0; }
 +as_fn_exit 0
  _ACEOF
 -chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
 +test $ac_write_fail = 0 ||
 +  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -38042,108 +21814,112 @@
+@@ -38042,108 +21806,112 @@
    exec 5>>config.log
    # Use ||, not &&, to avoid exiting from the if with $? = 1, which
    # would make configure fail if this is the last instruction.
 -  $ac_cs_success || { (exit 1); exit 1; }
 +  $ac_cs_success || as_fn_exit $?
 +fi
 +if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 +  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
 +$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
  fi
 @@ -55645,27 +55641,27 @@ $NetBSD: patch-aa,v 1.22 2011/09/22 01:2
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result:          Large file support (>2GB) for AFP3: $wx_largefile" >&5
 +$as_echo "         Large file support (>2GB) for AFP3: $wx_largefile" >&6; }
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result:          Extended Attributes: $neta_cv_eas" >&5
 +$as_echo "         Extended Attributes: $neta_cv_eas" >&6; }
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result:     CNID:" >&5
 +$as_echo "    CNID:" >&6; }
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result:          backends: $compiled_backends" >&5
 +$as_echo "         backends: $compiled_backends" >&6; }
 +	{ $as_echo "$as_me:${as_lineno-$LINENO}: result:     UAMS:" >&5
 +$as_echo "    UAMS:" >&6; }
  	uams_using_options=""
  	if test x"$netatalk_cv_use_pam" != x"no"; then
          	uams_using_options="PAM"
-@@ -38152,76 +21928,76 @@
+@@ -38152,76 +21920,76 @@
          	uams_using_options="$uams_using_options SHADOW"
  	fi
  	if test "x$neta_cv_compile_dhx" = "xyes"; then
 -		{ echo "$as_me:$LINENO: result:          DHX     ($uams_using_options)" >&5
 -echo "${ECHO_T}         DHX     ($uams_using_options)" >&6; }
 +		{ $as_echo "$as_me:${as_lineno-$LINENO}: result:          DHX     ($uams_using_options)" >&5
 +$as_echo "         DHX     ($uams_using_options)" >&6; }
  	fi
          if test "x$neta_cv_compile_dhx2" = "xyes"; then
 -                { echo "$as_me:$LINENO: result:          DHX2    ($uams_using_options)" >&5
 -echo "${ECHO_T}         DHX2    ($uams_using_options)" >&6; }
 +                { $as_echo "$as_me:${as_lineno-$LINENO}: result:          DHX2    ($uams_using_options)" >&5
 +$as_echo "         DHX2    ($uams_using_options)" >&6; }

 @@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.78 2011/09/22 01:20:20 christos Exp $
+# $NetBSD: Makefile,v 1.79 2011/11/29 19:26:28 bouyer Exp $
 DISTNAME=	netatalk-2.2.1
-#PKGREVISION=	2
+PKGREVISION=	1
 CATEGORIES=	net print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=netatalk/}
 EXTRACT_SUFX=	.tar.bz2
 #PATCHFILES=	patch-adv1tov2.c
 PATCH_SITES=	http://svn.macosforge.org/repository/macports/trunk/dports/net/netatalk/files/ \
 		http://mirror.lug.udel.edu/pub/macports/trunk/dports/net/netatalk/files/
 MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://netatalk.sourceforge.net/
 COMMENT=	Netatalk appletalk file and print services
 LICENSE=	gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=	user-destdir

 @@ -1,17 +1,18 @@
-@comment $NetBSD: PLIST,v 1.22 2011/09/22 01:20:20 christos Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/11/29 19:26:28 bouyer Exp $
 bin/add_netatalk_printer
 bin/adv1tov2
 bin/aecho
 bin/afpldaptest
 bin/afppasswd
 bin/apple_dump
 bin/asip-status.pl
 bin/binheader
 bin/cnid2_create
 bin/dbd
 bin/getzones
 bin/hqx2bin
 bin/lp2pap.sh
 bin/macbinary
 bin/macusers
 bin/megatron
 bin/nadheader
 @@ -39,26 +40,27 @@ include/atalk/cnid.h
 include/atalk/compat.h
 include/atalk/ddp.h
 include/atalk/directory.h
 include/atalk/dsi.h
 include/atalk/ea.h
 include/atalk/hash.h
 include/atalk/ldapconfig.h
 include/atalk/list.h
 include/atalk/logger.h
 include/atalk/nbp.h
 include/atalk/netddp.h
 include/atalk/pap.h
 include/atalk/paths.h
 include/atalk/queue.h
 include/atalk/rtmp.h
 include/atalk/server_child.h
 include/atalk/server_ipc.h
 include/atalk/tdb.h
 include/atalk/uam.h
 include/atalk/unicode.h
 include/atalk/unix.h
 include/atalk/util.h
 include/atalk/uuid.h
 include/atalk/vfs.h
 include/atalk/volinfo.h
 include/atalk/volume.h
 include/atalk/zip.h
 @@ -103,55 +105,58 @@ libexec/netatalk/uams/uams_clrtxt.so
 libexec/netatalk/uams/uams_dhx.so
 libexec/netatalk/uams/uams_dhx2.so
 ${PLIST.pam}libexec/netatalk/uams/uams_dhx2_pam.la
 libexec/netatalk/uams/uams_dhx2_passwd.la
 ${PLIST.pam}libexec/netatalk/uams/uams_dhx_pam.la
 libexec/netatalk/uams/uams_dhx_passwd.la
 ${PLIST.gssapi}libexec/netatalk/uams/uams_gss.la
 libexec/netatalk/uams/uams_guest.la
 ${PLIST.pam}libexec/netatalk/uams/uams_pam.la
 libexec/netatalk/uams/uams_passwd.la
 libexec/netatalk/uams/uams_randnum.la
 man/man1/ad.1
 man/man1/aecho.1
 man/man1/afpldaptest.1
 man/man1/afppasswd.1
 man/man1/apple_dump.1
 man/man1/asip-status.pl.1
 man/man1/dbd.1
 man/man1/getzones.1
 man/man1/hqx2bin.1
 man/man1/macbinary.1
 man/man1/macusers.1
 man/man1/megatron.1
 man/man1/nbp.1
 man/man1/nbplkup.1
 man/man1/nbprgstr.1
 man/man1/nbpunrgstr.1
 man/man1/netatalk-config.1
 man/man1/pap.1
 man/man1/papstatus.1
 man/man1/psorder.1
 man/man1/single2bin.1
 man/man1/unbin.1
 man/man1/unhex.1
 man/man1/uniconv.1
 man/man1/unsingle.1
 man/man3/atalk_aton.3
 man/man3/nbp_name.3
 man/man4/atalk.4
 man/man5/AppleVolumes.5
 man/man5/AppleVolumes.default.5
 man/man5/AppleVolumes.system.5
 man/man5/afp_ldap.conf.5
 man/man5/afp_signature.conf.5
 man/man5/afp_voluuid.conf.5
 man/man5/afpd.conf.5
 man/man5/atalkd.conf.5
 man/man5/netatalk.conf.5
 man/man5/papd.conf.5
 man/man8/afpd.8
 man/man8/atalkd.8
 man/man8/cnid_dbd.8
 man/man8/cnid_metad.8
 man/man8/papd.8
 man/man8/papstatus.8
 man/man8/psf.8
 man/man8/timelord.8
 share/aclocal/netatalk.m4

 @@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.42 2011/10/30 10:08:22 marino Exp $
+$NetBSD: distinfo,v 1.43 2011/11/29 19:26:28 bouyer Exp $
 SHA1 (netatalk-2.2.1.tar.bz2) = e588b89eced7769f65e213bc4b1b1e4f8035c8b3
 RMD160 (netatalk-2.2.1.tar.bz2) = bc55a591fe134d3bf05ca442aa5b5246fd766b8c
 Size (netatalk-2.2.1.tar.bz2) = 1227602 bytes
-SHA1 (patch-aa) = ea52eca215c9477b40572fda21655c9bf0b417b1
+SHA1 (patch-aa) = 20df0964b4fcb934ba2072e0aa7df3b75ada5e77
 SHA1 (patch-ac) = 605e87479202cbf093dfbadb25f2972595246d97
 SHA1 (patch-ae) = e114085fbe2abf2fb821f2d2737e877c53e7c151
 SHA1 (patch-af) = 649be7e50210e6e4156aeff74d3fc0effb90f9f2
 SHA1 (patch-ah) = 505680d4085f5e40afb0554b5c748c1f6c68c367
 SHA1 (patch-am) = a4e7fe53eb55ae17eb1888cfb278bc86d383f4fb
 SHA1 (patch-an) = 5472758813b927708ca178809fb89733719e67b4
 SHA1 (patch-ao) = 1b140d7b8fc1df6b44b15a181ddc625744610bb9
 SHA1 (patch-ap) = c5e7cc0e1773d7e60106df7e1f3ded234308bb8c
 SHA1 (patch-aq) = 0793cf5ec158aa27c42b5d8a96651307d7c7c8b6
 SHA1 (patch-ar) = 8c6c6169496b9b2cdec6049d2ee45884d5513d11
 SHA1 (patch-au) = 8505351fee21ac1effa4dc620b8006c572b913c1
 SHA1 (patch-bj) = abbc2809b6b7fe75ec2d2f8f2fa8d6cd9d6de7b0
 SHA1 (patch-macros_quota-check.m4) = 40d1e404905398be03aad6d472bf42af920c7b20
 SHA1 (patch-bk) = c3fb7c3a42f148171fa99b6121b099dd4998947a