1 autofs-5.0.4 - configure libtirpc
3 From: Ian Kent <raven@themaw.net>
5 With NFS over ipv6 on the way we need to update autofs to use the
6 libtirpc library as it provides ipv6 functionality. This change adds
7 configure checks to look for libtirpc (if it has been requested with
8 --with-libtirpc) and checks whether it has been built with ipv6
9 support and uses it if so.
16 configure | 1548 ++++++++++++++++++++++++++++-----------------------
18 daemon/automount.c | 13
19 include/config.h.in | 6
20 8 files changed, 970 insertions(+), 694 deletions(-)
23 diff --git a/Makefile.conf.in b/Makefile.conf.in
24 index ffda2a0..f0287c3 100644
25 --- a/Makefile.conf.in
26 +++ b/Makefile.conf.in
27 @@ -49,6 +49,9 @@ YACC = @PATH_YACC@
28 RPCGEN = @PATH_RPCGEN@
29 RANLIB = @PATH_RANLIB@
31 +# Use libtirpc if requested and available
32 +TIRPCLIB = @TIRPCLIB@
34 # Use dmalloc for memory debuging
35 DMALLOCLIB = @DMALLOCLIB@
37 diff --git a/Makefile.rules b/Makefile.rules
38 index 30716dc..f2ba386 100644
41 @@ -47,6 +47,11 @@ SOLDFLAGS = -shared
42 CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
46 +CFLAGS += -I/usr/include/tirpc
47 +LDFLAGS += $(TIRPCLIB)
51 LDFLAGS += $(DMALLOCLIB)
53 diff --git a/aclocal.m4 b/aclocal.m4
54 index ab11112..5777fcd 100644
57 @@ -304,3 +304,84 @@ fi
58 LIBS="$af_check_ldap_parse_page_control_save_libs"
61 +dnl --------------------------------------------------------------------------
62 +dnl AF_CHECK_LIBTIRPC_IPV6
64 +dnl Use libtirpc for rpc transport
65 +dnl --------------------------------------------------------------------------
66 +AC_DEFUN([AF_CHECK_LIBTIRPC_IPV6],
67 +[AC_MSG_CHECKING(if libtirpc has IPv6 support)
70 +af_check_libtirpc_ipv6_save_cflags="$CFLAGS"
71 +af_check_libtirpc_ipv6_save_ldflags="$LDFLAGS"
72 +CFLAGS="$CFLAGS -I/usr/include/tirpc"
73 +LDFLAGS="$LDFLAGS -ltirpc"
77 + #include <rpc/rpc.h> ],
79 + struct sockaddr_in addr;
81 + unsigned long ul; struct timeval t; unsigned int ui;
82 + cl = clntudp6_bufcreate(&addr,ul,ul,t,&fd,ui,ui); ],
83 + [ af_have_libtirpc_ipv6=yes
84 + AC_MSG_RESULT(yes) ],
85 + [ AC_MSG_RESULT(no) ])
87 +if test "$af_have_libtirpc_ipv6" = "yes"; then
88 + AC_DEFINE(INET6,1, [Use IPv6 with libtirpc])
92 +CFLAGS="$af_check_libtirpc_ipv6_save_cflags"
93 +LDFLAGS="$af_check_libtirpc_ipv6_save_ldflags"
96 +dnl --------------------------------------------------------------------------
97 +dnl AF_CHECK_LIBTIRPC
99 +dnl Use libtirpc for rpc transport
100 +dnl --------------------------------------------------------------------------
101 +AC_DEFUN([AF_CHECK_LIBTIRPC],
103 +# save current flags
104 +af_check_libtirpc_save_cflags="$CFLAGS"
105 +af_check_libtirpc_save_ldflags="$LDFLAGS"
106 +CFLAGS="$CFLAGS -I/usr/include/tirpc"
107 +LDFLAGS="$LDFLAGS -ltirpc"
110 + [ #include <rpc/rpc.h> ],
112 + struct sockaddr_in addr;
114 + unsigned long ul; struct timeval t; unsigned int ui;
115 + cl = clntudp_bufcreate(&addr,ul,ul,t,&fd,ui,ui); ],
116 + [ af_have_libtirpc=yes
117 + AC_MSG_RESULT(yes) ],
118 + [ AC_MSG_RESULT(no) ])
120 +if test "$af_have_libtirpc" = "yes"; then
121 + AC_DEFINE(TIRPC_WORKAROUND,1, [Use libtirpc tsd usage workaround])
126 +CFLAGS="$af_check_libtirpc_save_cflags"
127 +LDFLAGS="$af_check_libtirpc_save_ldflags"
130 +AC_DEFUN([AM_WITH_LIBTIRPC],
131 +[AC_MSG_CHECKING([if libtirpc is requested and available])
132 +AC_ARG_WITH(libtirpc,
133 +[ --with-libtirpc use libtirpc if available],
134 +[if test "$withval" = yes; then
135 + AF_CHECK_LIBTIRPC()
136 + AF_CHECK_LIBTIRPC_IPV6()
139 +fi], [AC_MSG_RESULT(no)])
142 diff --git a/autofs.spec b/autofs.spec
143 index 9fec583..f4b096e 100644
146 @@ -57,7 +57,7 @@ inkludera n
147 echo %{version}-%{release} > .version
150 -CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy
151 +CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy --with-libtirpc
152 CFLAGS="$RPM_OPT_FLAGS -Wall" make initdir=/etc/rc.d/init.d DONTSTRIP=1
155 diff --git a/configure b/configure
156 index afa692c..8a6d944 100755
159 @@ -656,6 +656,14 @@ confdir
174 @@ -676,13 +684,6 @@ PATH_RANLIB
188 @@ -1297,6 +1298,7 @@ Optional Packages:
189 --with-mapdir=PATH look in PATH for mount maps used by the automounter
190 --with-fifodir=PATH use PATH as the directory for fifos used by the automounter
191 --with-flagdir=PATH use PATH as the directory for the flag file used by the automounter
192 + --with-libtirpc use libtirpc if available
193 --with-dmalloc use dmalloc, as in
194 http://www.dmalloc.com/dmalloc.tar.gz
195 --with-hesiod=DIR enable Hesiod support (libs and includes in DIR)
196 @@ -1908,681 +1910,7 @@ echo "${ECHO_T}$flagdir" >&6; }
200 -# Optional include dmalloc
202 -{ echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5
203 -echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6; }
205 -# Check whether --with-dmalloc was given.
206 -if test "${with_dmalloc+set}" = set; then
207 - withval=$with_dmalloc; if test "$withval" = yes; then
208 - { echo "$as_me:$LINENO: result: yes" >&5
209 -echo "${ECHO_T}yes" >&6; }
211 -cat >>confdefs.h <<\_ACEOF
212 -#define WITH_DMALLOC 1
215 - DMALLOCLIB="-ldmallocth"
216 - LDFLAGS="$LDFLAGS -g"
218 - { echo "$as_me:$LINENO: result: no" >&5
219 -echo "${ECHO_T}no" >&6; }
222 - { echo "$as_me:$LINENO: result: no" >&5
223 -echo "${ECHO_T}no" >&6; }
230 -# Programs needed for various system functions or modules
232 -for ac_prog in mount
234 - # Extract the first word of "$ac_prog", so it can be a program name with args.
235 -set dummy $ac_prog; ac_word=$2
236 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
237 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
238 -if test "${ac_cv_path_MOUNT+set}" = set; then
239 - echo $ECHO_N "(cached) $ECHO_C" >&6
243 - ac_cv_path_MOUNT="$MOUNT" # Let the user override the test with a path.
246 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
247 -for as_dir in $searchpath
250 - test -z "$as_dir" && as_dir=.
251 - for ac_exec_ext in '' $ac_executable_extensions; do
252 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
253 - ac_cv_path_MOUNT="$as_dir/$ac_word$ac_exec_ext"
254 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
264 -MOUNT=$ac_cv_path_MOUNT
265 -if test -n "$MOUNT"; then
266 - { echo "$as_me:$LINENO: result: $MOUNT" >&5
267 -echo "${ECHO_T}$MOUNT" >&6; }
269 - { echo "$as_me:$LINENO: result: no" >&5
270 -echo "${ECHO_T}no" >&6; }
274 - test -n "$MOUNT" && break
276 -test -n "$MOUNT" || MOUNT="/bin/mount"
278 -if test -n "$MOUNT"; then
280 -cat >>confdefs.h <<\_ACEOF
281 -#define HAVE_MOUNT 1
285 -cat >>confdefs.h <<_ACEOF
286 -#define PATH_MOUNT "$MOUNT"
294 -for ac_prog in umount
296 - # Extract the first word of "$ac_prog", so it can be a program name with args.
297 -set dummy $ac_prog; ac_word=$2
298 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
299 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
300 -if test "${ac_cv_path_UMOUNT+set}" = set; then
301 - echo $ECHO_N "(cached) $ECHO_C" >&6
305 - ac_cv_path_UMOUNT="$UMOUNT" # Let the user override the test with a path.
308 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
309 -for as_dir in $searchpath
312 - test -z "$as_dir" && as_dir=.
313 - for ac_exec_ext in '' $ac_executable_extensions; do
314 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
315 - ac_cv_path_UMOUNT="$as_dir/$ac_word$ac_exec_ext"
316 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
326 -UMOUNT=$ac_cv_path_UMOUNT
327 -if test -n "$UMOUNT"; then
328 - { echo "$as_me:$LINENO: result: $UMOUNT" >&5
329 -echo "${ECHO_T}$UMOUNT" >&6; }
331 - { echo "$as_me:$LINENO: result: no" >&5
332 -echo "${ECHO_T}no" >&6; }
336 - test -n "$UMOUNT" && break
338 -test -n "$UMOUNT" || UMOUNT="/bin/umount"
340 -if test -n "$UMOUNT"; then
342 -cat >>confdefs.h <<\_ACEOF
343 -#define HAVE_UMOUNT 1
347 -cat >>confdefs.h <<_ACEOF
348 -#define PATH_UMOUNT "$UMOUNT"
356 -for ac_prog in fsck.ext2 e2fsck
358 - # Extract the first word of "$ac_prog", so it can be a program name with args.
359 -set dummy $ac_prog; ac_word=$2
360 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
361 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
362 -if test "${ac_cv_path_E2FSCK+set}" = set; then
363 - echo $ECHO_N "(cached) $ECHO_C" >&6
367 - ac_cv_path_E2FSCK="$E2FSCK" # Let the user override the test with a path.
370 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
371 -for as_dir in $searchpath
374 - test -z "$as_dir" && as_dir=.
375 - for ac_exec_ext in '' $ac_executable_extensions; do
376 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
377 - ac_cv_path_E2FSCK="$as_dir/$ac_word$ac_exec_ext"
378 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
388 -E2FSCK=$ac_cv_path_E2FSCK
389 -if test -n "$E2FSCK"; then
390 - { echo "$as_me:$LINENO: result: $E2FSCK" >&5
391 -echo "${ECHO_T}$E2FSCK" >&6; }
393 - { echo "$as_me:$LINENO: result: no" >&5
394 -echo "${ECHO_T}no" >&6; }
398 - test -n "$E2FSCK" && break
401 -if test -n "$E2FSCK"; then
403 -cat >>confdefs.h <<\_ACEOF
404 -#define HAVE_E2FSCK 1
408 -cat >>confdefs.h <<_ACEOF
409 -#define PATH_E2FSCK "$E2FSCK"
417 -for ac_prog in fsck.ext3 e3fsck
419 - # Extract the first word of "$ac_prog", so it can be a program name with args.
420 -set dummy $ac_prog; ac_word=$2
421 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
422 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
423 -if test "${ac_cv_path_E3FSCK+set}" = set; then
424 - echo $ECHO_N "(cached) $ECHO_C" >&6
428 - ac_cv_path_E3FSCK="$E3FSCK" # Let the user override the test with a path.
431 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
432 -for as_dir in $searchpath
435 - test -z "$as_dir" && as_dir=.
436 - for ac_exec_ext in '' $ac_executable_extensions; do
437 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
438 - ac_cv_path_E3FSCK="$as_dir/$ac_word$ac_exec_ext"
439 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
449 -E3FSCK=$ac_cv_path_E3FSCK
450 -if test -n "$E3FSCK"; then
451 - { echo "$as_me:$LINENO: result: $E3FSCK" >&5
452 -echo "${ECHO_T}$E3FSCK" >&6; }
454 - { echo "$as_me:$LINENO: result: no" >&5
455 -echo "${ECHO_T}no" >&6; }
459 - test -n "$E3FSCK" && break
462 -if test -n "$E3FSCK"; then
464 -cat >>confdefs.h <<\_ACEOF
465 -#define HAVE_E3FSCK 1
469 -cat >>confdefs.h <<_ACEOF
470 -#define PATH_E3FSCK "$E3FSCK"
478 -for ac_prog in modprobe
480 - # Extract the first word of "$ac_prog", so it can be a program name with args.
481 -set dummy $ac_prog; ac_word=$2
482 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
483 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
484 -if test "${ac_cv_path_MODPROBE+set}" = set; then
485 - echo $ECHO_N "(cached) $ECHO_C" >&6
489 - ac_cv_path_MODPROBE="$MODPROBE" # Let the user override the test with a path.
492 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
493 -for as_dir in $searchpath
496 - test -z "$as_dir" && as_dir=.
497 - for ac_exec_ext in '' $ac_executable_extensions; do
498 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
499 - ac_cv_path_MODPROBE="$as_dir/$ac_word$ac_exec_ext"
500 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
510 -MODPROBE=$ac_cv_path_MODPROBE
511 -if test -n "$MODPROBE"; then
512 - { echo "$as_me:$LINENO: result: $MODPROBE" >&5
513 -echo "${ECHO_T}$MODPROBE" >&6; }
515 - { echo "$as_me:$LINENO: result: no" >&5
516 -echo "${ECHO_T}no" >&6; }
520 - test -n "$MODPROBE" && break
523 -if test -n "$MODPROBE"; then
525 -cat >>confdefs.h <<\_ACEOF
526 -#define HAVE_MODPROBE 1
530 -cat >>confdefs.h <<_ACEOF
531 -#define PATH_MODPROBE "$MODPROBE"
540 -for ac_prog in flex lex
542 - # Extract the first word of "$ac_prog", so it can be a program name with args.
543 -set dummy $ac_prog; ac_word=$2
544 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
545 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
546 -if test "${ac_cv_path_LEX+set}" = set; then
547 - echo $ECHO_N "(cached) $ECHO_C" >&6
551 - ac_cv_path_LEX="$LEX" # Let the user override the test with a path.
554 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
555 -for as_dir in $searchpath
558 - test -z "$as_dir" && as_dir=.
559 - for ac_exec_ext in '' $ac_executable_extensions; do
560 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
561 - ac_cv_path_LEX="$as_dir/$ac_word$ac_exec_ext"
562 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
573 -if test -n "$LEX"; then
574 - { echo "$as_me:$LINENO: result: $LEX" >&5
575 -echo "${ECHO_T}$LEX" >&6; }
577 - { echo "$as_me:$LINENO: result: no" >&5
578 -echo "${ECHO_T}no" >&6; }
582 - test -n "$LEX" && break
585 -if test -n "$LEX"; then
587 -cat >>confdefs.h <<_ACEOF
588 -#define PATH_LEX "$LEX"
593 - { { echo "$as_me:$LINENO: error: required program LEX not found" >&5
594 -echo "$as_me: error: required program LEX not found" >&2;}
595 - { (exit 1); exit 1; }; }
598 -for ac_prog in bison
600 - # Extract the first word of "$ac_prog", so it can be a program name with args.
601 -set dummy $ac_prog; ac_word=$2
602 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
603 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
604 -if test "${ac_cv_path_YACC+set}" = set; then
605 - echo $ECHO_N "(cached) $ECHO_C" >&6
609 - ac_cv_path_YACC="$YACC" # Let the user override the test with a path.
612 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
613 -for as_dir in $searchpath
616 - test -z "$as_dir" && as_dir=.
617 - for ac_exec_ext in '' $ac_executable_extensions; do
618 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
619 - ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext"
620 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
630 -YACC=$ac_cv_path_YACC
631 -if test -n "$YACC"; then
632 - { echo "$as_me:$LINENO: result: $YACC" >&5
633 -echo "${ECHO_T}$YACC" >&6; }
635 - { echo "$as_me:$LINENO: result: no" >&5
636 -echo "${ECHO_T}no" >&6; }
640 - test -n "$YACC" && break
643 -if test -n "$YACC"; then
645 -cat >>confdefs.h <<_ACEOF
646 -#define PATH_YACC "$YACC"
651 - { { echo "$as_me:$LINENO: error: required program YACC not found" >&5
652 -echo "$as_me: error: required program YACC not found" >&2;}
653 - { (exit 1); exit 1; }; }
656 -for ac_prog in ranlib
658 - # Extract the first word of "$ac_prog", so it can be a program name with args.
659 -set dummy $ac_prog; ac_word=$2
660 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
661 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
662 -if test "${ac_cv_path_RANLIB+set}" = set; then
663 - echo $ECHO_N "(cached) $ECHO_C" >&6
667 - ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
670 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
671 -for as_dir in $searchpath
674 - test -z "$as_dir" && as_dir=.
675 - for ac_exec_ext in '' $ac_executable_extensions; do
676 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
677 - ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
678 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
688 -RANLIB=$ac_cv_path_RANLIB
689 -if test -n "$RANLIB"; then
690 - { echo "$as_me:$LINENO: result: $RANLIB" >&5
691 -echo "${ECHO_T}$RANLIB" >&6; }
693 - { echo "$as_me:$LINENO: result: no" >&5
694 -echo "${ECHO_T}no" >&6; }
698 - test -n "$RANLIB" && break
701 -if test -n "$RANLIB"; then
703 -cat >>confdefs.h <<_ACEOF
704 -#define PATH_RANLIB "$RANLIB"
707 - PATH_RANLIB="$RANLIB"
709 - { { echo "$as_me:$LINENO: error: required program RANLIB not found" >&5
710 -echo "$as_me: error: required program RANLIB not found" >&2;}
711 - { (exit 1); exit 1; }; }
714 -for ac_prog in rpcgen
716 - # Extract the first word of "$ac_prog", so it can be a program name with args.
717 -set dummy $ac_prog; ac_word=$2
718 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
719 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
720 -if test "${ac_cv_path_RPCGEN+set}" = set; then
721 - echo $ECHO_N "(cached) $ECHO_C" >&6
725 - ac_cv_path_RPCGEN="$RPCGEN" # Let the user override the test with a path.
728 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
729 -for as_dir in $searchpath
732 - test -z "$as_dir" && as_dir=.
733 - for ac_exec_ext in '' $ac_executable_extensions; do
734 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
735 - ac_cv_path_RPCGEN="$as_dir/$ac_word$ac_exec_ext"
736 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
746 -RPCGEN=$ac_cv_path_RPCGEN
747 -if test -n "$RPCGEN"; then
748 - { echo "$as_me:$LINENO: result: $RPCGEN" >&5
749 -echo "${ECHO_T}$RPCGEN" >&6; }
751 - { echo "$as_me:$LINENO: result: no" >&5
752 -echo "${ECHO_T}no" >&6; }
756 - test -n "$RPCGEN" && break
759 -if test -n "$RPCGEN"; then
761 -cat >>confdefs.h <<_ACEOF
762 -#define PATH_RPCGEN "$RPCGEN"
765 - PATH_RPCGEN="$RPCGEN"
767 - { { echo "$as_me:$LINENO: error: required program RPCGEN not found" >&5
768 -echo "$as_me: error: required program RPCGEN not found" >&2;}
769 - { (exit 1); exit 1; }; }
774 -# Newer mounts have the -s (sloppy) option to ignore unknown options,
775 -# good for portability
777 -if test -n "$MOUNT" ; then
778 - { echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
779 -echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6; }
780 - if "$MOUNT" -s > /dev/null 2>&1 ; then
782 -cat >>confdefs.h <<\_ACEOF
783 -#define HAVE_SLOPPY_MOUNT 1
786 - { echo "$as_me:$LINENO: result: yes" >&5
787 -echo "${ECHO_T}yes" >&6; }
789 - { echo "$as_me:$LINENO: result: no" >&5
790 -echo "${ECHO_T}no" >&6; }
794 -# LDAP SASL auth need libxml
795 -for ac_prog in xml2-config
797 - # Extract the first word of "$ac_prog", so it can be a program name with args.
798 -set dummy $ac_prog; ac_word=$2
799 -{ echo "$as_me:$LINENO: checking for $ac_word" >&5
800 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
801 -if test "${ac_cv_path_XML_CONFIG+set}" = set; then
802 - echo $ECHO_N "(cached) $ECHO_C" >&6
804 - case $XML_CONFIG in
806 - ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
809 - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
813 - test -z "$as_dir" && as_dir=.
814 - for ac_exec_ext in '' $ac_executable_extensions; do
815 - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
816 - ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
817 - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
827 -XML_CONFIG=$ac_cv_path_XML_CONFIG
828 -if test -n "$XML_CONFIG"; then
829 - { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
830 -echo "${ECHO_T}$XML_CONFIG" >&6; }
832 - { echo "$as_me:$LINENO: result: no" >&5
833 -echo "${ECHO_T}no" >&6; }
837 - test -n "$XML_CONFIG" && break
839 -test -n "$XML_CONFIG" || XML_CONFIG="no"
841 -{ echo "$as_me:$LINENO: checking for libxml2" >&5
842 -echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; }
843 -if test "$XML_CONFIG" = "no"
845 - { echo "$as_me:$LINENO: result: no" >&5
846 -echo "${ECHO_T}no" >&6; }
849 - { echo "$as_me:$LINENO: result: yes" >&5
850 -echo "${ECHO_T}yes" >&6; }
852 - XML_LIBS=`$XML_CONFIG --libs`
853 - XML_FLAGS=`$XML_CONFIG --cflags`
854 - XML_VER=`$XML_CONFIG --version`
855 - XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
856 - if test $XML_MAJOR -le 99
858 - XML_MINOR=`echo $XML_VER|cut -d\. -f2`
859 - if test $XML_MINOR -le 99
861 - XML_REV=`echo $XML_VER|cut -d\. -f3`
862 - if test $XML_REV -le 99; then
864 -cat >>confdefs.h <<\_ACEOF
865 -#define LIBXML2_WORKAROUND 1
874 -# glibc/libc 6 new libraries
878 ac_cpp='$CPP $CPPFLAGS'
879 @@ -3504,6 +2832,845 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
880 ac_compiler_gnu=$ac_cv_c_compiler_gnu
883 +{ echo "$as_me:$LINENO: checking if libtirpc is requested and available" >&5
884 +echo $ECHO_N "checking if libtirpc is requested and available... $ECHO_C" >&6; }
886 +# Check whether --with-libtirpc was given.
887 +if test "${with_libtirpc+set}" = set; then
888 + withval=$with_libtirpc; if test "$withval" = yes; then
890 +# save current flags
891 +af_check_libtirpc_save_cflags="$CFLAGS"
892 +af_check_libtirpc_save_ldflags="$LDFLAGS"
893 +CFLAGS="$CFLAGS -I/usr/include/tirpc"
894 +LDFLAGS="$LDFLAGS -ltirpc"
896 +cat >conftest.$ac_ext <<_ACEOF
899 +cat confdefs.h >>conftest.$ac_ext
900 +cat >>conftest.$ac_ext <<_ACEOF
901 +/* end confdefs.h. */
902 + #include <rpc/rpc.h>
907 + struct sockaddr_in addr;
909 + unsigned long ul; struct timeval t; unsigned int ui;
910 + cl = clntudp_bufcreate(&addr,ul,ul,t,&fd,ui,ui);
915 +rm -f conftest.$ac_objext conftest$ac_exeext
916 +if { (ac_try="$ac_link"
918 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
919 + *) ac_try_echo=$ac_try;;
921 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
922 + (eval "$ac_link") 2>conftest.er1
924 + grep -v '^ *+' conftest.er1 >conftest.err
926 + cat conftest.err >&5
927 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
928 + (exit $ac_status); } && {
929 + test -z "$ac_c_werror_flag" ||
930 + test ! -s conftest.err
931 + } && test -s conftest$ac_exeext &&
932 + $as_test_x conftest$ac_exeext; then
933 + af_have_libtirpc=yes
934 + { echo "$as_me:$LINENO: result: yes" >&5
935 +echo "${ECHO_T}yes" >&6; }
937 + echo "$as_me: failed program was:" >&5
938 +sed 's/^/| /' conftest.$ac_ext >&5
940 + { echo "$as_me:$LINENO: result: no" >&5
941 +echo "${ECHO_T}no" >&6; }
944 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
945 + conftest$ac_exeext conftest.$ac_ext
947 +if test "$af_have_libtirpc" = "yes"; then
949 +cat >>confdefs.h <<\_ACEOF
950 +#define TIRPC_WORKAROUND 1
957 +CFLAGS="$af_check_libtirpc_save_cflags"
958 +LDFLAGS="$af_check_libtirpc_save_ldflags"
960 + { echo "$as_me:$LINENO: checking if libtirpc has IPv6 support" >&5
961 +echo $ECHO_N "checking if libtirpc has IPv6 support... $ECHO_C" >&6; }
963 +# save current flags
964 +af_check_libtirpc_ipv6_save_cflags="$CFLAGS"
965 +af_check_libtirpc_ipv6_save_ldflags="$LDFLAGS"
966 +CFLAGS="$CFLAGS -I/usr/include/tirpc"
967 +LDFLAGS="$LDFLAGS -ltirpc"
969 +cat >conftest.$ac_ext <<_ACEOF
972 +cat confdefs.h >>conftest.$ac_ext
973 +cat >>conftest.$ac_ext <<_ACEOF
974 +/* end confdefs.h. */
976 + #include <rpc/rpc.h>
981 + struct sockaddr_in addr;
983 + unsigned long ul; struct timeval t; unsigned int ui;
984 + cl = clntudp6_bufcreate(&addr,ul,ul,t,&fd,ui,ui);
989 +rm -f conftest.$ac_objext conftest$ac_exeext
990 +if { (ac_try="$ac_link"
992 + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
993 + *) ac_try_echo=$ac_try;;
995 +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
996 + (eval "$ac_link") 2>conftest.er1
998 + grep -v '^ *+' conftest.er1 >conftest.err
1000 + cat conftest.err >&5
1001 + echo "$as_me:$LINENO: \$? = $ac_status" >&5
1002 + (exit $ac_status); } && {
1003 + test -z "$ac_c_werror_flag" ||
1004 + test ! -s conftest.err
1005 + } && test -s conftest$ac_exeext &&
1006 + $as_test_x conftest$ac_exeext; then
1007 + af_have_libtirpc_ipv6=yes
1008 + { echo "$as_me:$LINENO: result: yes" >&5
1009 +echo "${ECHO_T}yes" >&6; }
1011 + echo "$as_me: failed program was:" >&5
1012 +sed 's/^/| /' conftest.$ac_ext >&5
1014 + { echo "$as_me:$LINENO: result: no" >&5
1015 +echo "${ECHO_T}no" >&6; }
1018 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
1019 + conftest$ac_exeext conftest.$ac_ext
1021 +if test "$af_have_libtirpc_ipv6" = "yes"; then
1023 +cat >>confdefs.h <<\_ACEOF
1030 +CFLAGS="$af_check_libtirpc_ipv6_save_cflags"
1031 +LDFLAGS="$af_check_libtirpc_ipv6_save_ldflags"
1034 + { echo "$as_me:$LINENO: result: no" >&5
1035 +echo "${ECHO_T}no" >&6; }
1038 + { echo "$as_me:$LINENO: result: no" >&5
1039 +echo "${ECHO_T}no" >&6; }
1046 +# Optional include dmalloc
1048 +{ echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5
1049 +echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6; }
1051 +# Check whether --with-dmalloc was given.
1052 +if test "${with_dmalloc+set}" = set; then
1053 + withval=$with_dmalloc; if test "$withval" = yes; then
1054 + { echo "$as_me:$LINENO: result: yes" >&5
1055 +echo "${ECHO_T}yes" >&6; }
1057 +cat >>confdefs.h <<\_ACEOF
1058 +#define WITH_DMALLOC 1
1061 + DMALLOCLIB="-ldmallocth"
1062 + LDFLAGS="$LDFLAGS -g"
1064 + { echo "$as_me:$LINENO: result: no" >&5
1065 +echo "${ECHO_T}no" >&6; }
1068 + { echo "$as_me:$LINENO: result: no" >&5
1069 +echo "${ECHO_T}no" >&6; }
1076 +# Programs needed for various system functions or modules
1078 +for ac_prog in mount
1080 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1081 +set dummy $ac_prog; ac_word=$2
1082 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1083 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1084 +if test "${ac_cv_path_MOUNT+set}" = set; then
1085 + echo $ECHO_N "(cached) $ECHO_C" >&6
1088 + [\\/]* | ?:[\\/]*)
1089 + ac_cv_path_MOUNT="$MOUNT" # Let the user override the test with a path.
1092 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1093 +for as_dir in $searchpath
1096 + test -z "$as_dir" && as_dir=.
1097 + for ac_exec_ext in '' $ac_executable_extensions; do
1098 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1099 + ac_cv_path_MOUNT="$as_dir/$ac_word$ac_exec_ext"
1100 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1110 +MOUNT=$ac_cv_path_MOUNT
1111 +if test -n "$MOUNT"; then
1112 + { echo "$as_me:$LINENO: result: $MOUNT" >&5
1113 +echo "${ECHO_T}$MOUNT" >&6; }
1115 + { echo "$as_me:$LINENO: result: no" >&5
1116 +echo "${ECHO_T}no" >&6; }
1120 + test -n "$MOUNT" && break
1122 +test -n "$MOUNT" || MOUNT="/bin/mount"
1124 +if test -n "$MOUNT"; then
1126 +cat >>confdefs.h <<\_ACEOF
1127 +#define HAVE_MOUNT 1
1131 +cat >>confdefs.h <<_ACEOF
1132 +#define PATH_MOUNT "$MOUNT"
1140 +for ac_prog in umount
1142 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1143 +set dummy $ac_prog; ac_word=$2
1144 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1145 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1146 +if test "${ac_cv_path_UMOUNT+set}" = set; then
1147 + echo $ECHO_N "(cached) $ECHO_C" >&6
1150 + [\\/]* | ?:[\\/]*)
1151 + ac_cv_path_UMOUNT="$UMOUNT" # Let the user override the test with a path.
1154 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1155 +for as_dir in $searchpath
1158 + test -z "$as_dir" && as_dir=.
1159 + for ac_exec_ext in '' $ac_executable_extensions; do
1160 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1161 + ac_cv_path_UMOUNT="$as_dir/$ac_word$ac_exec_ext"
1162 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1172 +UMOUNT=$ac_cv_path_UMOUNT
1173 +if test -n "$UMOUNT"; then
1174 + { echo "$as_me:$LINENO: result: $UMOUNT" >&5
1175 +echo "${ECHO_T}$UMOUNT" >&6; }
1177 + { echo "$as_me:$LINENO: result: no" >&5
1178 +echo "${ECHO_T}no" >&6; }
1182 + test -n "$UMOUNT" && break
1184 +test -n "$UMOUNT" || UMOUNT="/bin/umount"
1186 +if test -n "$UMOUNT"; then
1188 +cat >>confdefs.h <<\_ACEOF
1189 +#define HAVE_UMOUNT 1
1193 +cat >>confdefs.h <<_ACEOF
1194 +#define PATH_UMOUNT "$UMOUNT"
1202 +for ac_prog in fsck.ext2 e2fsck
1204 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1205 +set dummy $ac_prog; ac_word=$2
1206 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1207 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1208 +if test "${ac_cv_path_E2FSCK+set}" = set; then
1209 + echo $ECHO_N "(cached) $ECHO_C" >&6
1212 + [\\/]* | ?:[\\/]*)
1213 + ac_cv_path_E2FSCK="$E2FSCK" # Let the user override the test with a path.
1216 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1217 +for as_dir in $searchpath
1220 + test -z "$as_dir" && as_dir=.
1221 + for ac_exec_ext in '' $ac_executable_extensions; do
1222 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1223 + ac_cv_path_E2FSCK="$as_dir/$ac_word$ac_exec_ext"
1224 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1234 +E2FSCK=$ac_cv_path_E2FSCK
1235 +if test -n "$E2FSCK"; then
1236 + { echo "$as_me:$LINENO: result: $E2FSCK" >&5
1237 +echo "${ECHO_T}$E2FSCK" >&6; }
1239 + { echo "$as_me:$LINENO: result: no" >&5
1240 +echo "${ECHO_T}no" >&6; }
1244 + test -n "$E2FSCK" && break
1247 +if test -n "$E2FSCK"; then
1249 +cat >>confdefs.h <<\_ACEOF
1250 +#define HAVE_E2FSCK 1
1254 +cat >>confdefs.h <<_ACEOF
1255 +#define PATH_E2FSCK "$E2FSCK"
1263 +for ac_prog in fsck.ext3 e3fsck
1265 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1266 +set dummy $ac_prog; ac_word=$2
1267 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1268 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1269 +if test "${ac_cv_path_E3FSCK+set}" = set; then
1270 + echo $ECHO_N "(cached) $ECHO_C" >&6
1273 + [\\/]* | ?:[\\/]*)
1274 + ac_cv_path_E3FSCK="$E3FSCK" # Let the user override the test with a path.
1277 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1278 +for as_dir in $searchpath
1281 + test -z "$as_dir" && as_dir=.
1282 + for ac_exec_ext in '' $ac_executable_extensions; do
1283 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1284 + ac_cv_path_E3FSCK="$as_dir/$ac_word$ac_exec_ext"
1285 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1295 +E3FSCK=$ac_cv_path_E3FSCK
1296 +if test -n "$E3FSCK"; then
1297 + { echo "$as_me:$LINENO: result: $E3FSCK" >&5
1298 +echo "${ECHO_T}$E3FSCK" >&6; }
1300 + { echo "$as_me:$LINENO: result: no" >&5
1301 +echo "${ECHO_T}no" >&6; }
1305 + test -n "$E3FSCK" && break
1308 +if test -n "$E3FSCK"; then
1310 +cat >>confdefs.h <<\_ACEOF
1311 +#define HAVE_E3FSCK 1
1315 +cat >>confdefs.h <<_ACEOF
1316 +#define PATH_E3FSCK "$E3FSCK"
1324 +for ac_prog in modprobe
1326 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1327 +set dummy $ac_prog; ac_word=$2
1328 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1329 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1330 +if test "${ac_cv_path_MODPROBE+set}" = set; then
1331 + echo $ECHO_N "(cached) $ECHO_C" >&6
1334 + [\\/]* | ?:[\\/]*)
1335 + ac_cv_path_MODPROBE="$MODPROBE" # Let the user override the test with a path.
1338 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1339 +for as_dir in $searchpath
1342 + test -z "$as_dir" && as_dir=.
1343 + for ac_exec_ext in '' $ac_executable_extensions; do
1344 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1345 + ac_cv_path_MODPROBE="$as_dir/$ac_word$ac_exec_ext"
1346 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1356 +MODPROBE=$ac_cv_path_MODPROBE
1357 +if test -n "$MODPROBE"; then
1358 + { echo "$as_me:$LINENO: result: $MODPROBE" >&5
1359 +echo "${ECHO_T}$MODPROBE" >&6; }
1361 + { echo "$as_me:$LINENO: result: no" >&5
1362 +echo "${ECHO_T}no" >&6; }
1366 + test -n "$MODPROBE" && break
1369 +if test -n "$MODPROBE"; then
1371 +cat >>confdefs.h <<\_ACEOF
1372 +#define HAVE_MODPROBE 1
1376 +cat >>confdefs.h <<_ACEOF
1377 +#define PATH_MODPROBE "$MODPROBE"
1386 +for ac_prog in flex lex
1388 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1389 +set dummy $ac_prog; ac_word=$2
1390 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1391 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1392 +if test "${ac_cv_path_LEX+set}" = set; then
1393 + echo $ECHO_N "(cached) $ECHO_C" >&6
1396 + [\\/]* | ?:[\\/]*)
1397 + ac_cv_path_LEX="$LEX" # Let the user override the test with a path.
1400 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1401 +for as_dir in $searchpath
1404 + test -z "$as_dir" && as_dir=.
1405 + for ac_exec_ext in '' $ac_executable_extensions; do
1406 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1407 + ac_cv_path_LEX="$as_dir/$ac_word$ac_exec_ext"
1408 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1418 +LEX=$ac_cv_path_LEX
1419 +if test -n "$LEX"; then
1420 + { echo "$as_me:$LINENO: result: $LEX" >&5
1421 +echo "${ECHO_T}$LEX" >&6; }
1423 + { echo "$as_me:$LINENO: result: no" >&5
1424 +echo "${ECHO_T}no" >&6; }
1428 + test -n "$LEX" && break
1431 +if test -n "$LEX"; then
1433 +cat >>confdefs.h <<_ACEOF
1434 +#define PATH_LEX "$LEX"
1439 + { { echo "$as_me:$LINENO: error: required program LEX not found" >&5
1440 +echo "$as_me: error: required program LEX not found" >&2;}
1441 + { (exit 1); exit 1; }; }
1444 +for ac_prog in bison
1446 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1447 +set dummy $ac_prog; ac_word=$2
1448 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1449 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1450 +if test "${ac_cv_path_YACC+set}" = set; then
1451 + echo $ECHO_N "(cached) $ECHO_C" >&6
1454 + [\\/]* | ?:[\\/]*)
1455 + ac_cv_path_YACC="$YACC" # Let the user override the test with a path.
1458 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1459 +for as_dir in $searchpath
1462 + test -z "$as_dir" && as_dir=.
1463 + for ac_exec_ext in '' $ac_executable_extensions; do
1464 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1465 + ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext"
1466 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1476 +YACC=$ac_cv_path_YACC
1477 +if test -n "$YACC"; then
1478 + { echo "$as_me:$LINENO: result: $YACC" >&5
1479 +echo "${ECHO_T}$YACC" >&6; }
1481 + { echo "$as_me:$LINENO: result: no" >&5
1482 +echo "${ECHO_T}no" >&6; }
1486 + test -n "$YACC" && break
1489 +if test -n "$YACC"; then
1491 +cat >>confdefs.h <<_ACEOF
1492 +#define PATH_YACC "$YACC"
1497 + { { echo "$as_me:$LINENO: error: required program YACC not found" >&5
1498 +echo "$as_me: error: required program YACC not found" >&2;}
1499 + { (exit 1); exit 1; }; }
1502 +for ac_prog in ranlib
1504 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1505 +set dummy $ac_prog; ac_word=$2
1506 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1507 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1508 +if test "${ac_cv_path_RANLIB+set}" = set; then
1509 + echo $ECHO_N "(cached) $ECHO_C" >&6
1512 + [\\/]* | ?:[\\/]*)
1513 + ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
1516 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1517 +for as_dir in $searchpath
1520 + test -z "$as_dir" && as_dir=.
1521 + for ac_exec_ext in '' $ac_executable_extensions; do
1522 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1523 + ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
1524 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1534 +RANLIB=$ac_cv_path_RANLIB
1535 +if test -n "$RANLIB"; then
1536 + { echo "$as_me:$LINENO: result: $RANLIB" >&5
1537 +echo "${ECHO_T}$RANLIB" >&6; }
1539 + { echo "$as_me:$LINENO: result: no" >&5
1540 +echo "${ECHO_T}no" >&6; }
1544 + test -n "$RANLIB" && break
1547 +if test -n "$RANLIB"; then
1549 +cat >>confdefs.h <<_ACEOF
1550 +#define PATH_RANLIB "$RANLIB"
1553 + PATH_RANLIB="$RANLIB"
1555 + { { echo "$as_me:$LINENO: error: required program RANLIB not found" >&5
1556 +echo "$as_me: error: required program RANLIB not found" >&2;}
1557 + { (exit 1); exit 1; }; }
1560 +for ac_prog in rpcgen
1562 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1563 +set dummy $ac_prog; ac_word=$2
1564 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1565 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1566 +if test "${ac_cv_path_RPCGEN+set}" = set; then
1567 + echo $ECHO_N "(cached) $ECHO_C" >&6
1570 + [\\/]* | ?:[\\/]*)
1571 + ac_cv_path_RPCGEN="$RPCGEN" # Let the user override the test with a path.
1574 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1575 +for as_dir in $searchpath
1578 + test -z "$as_dir" && as_dir=.
1579 + for ac_exec_ext in '' $ac_executable_extensions; do
1580 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1581 + ac_cv_path_RPCGEN="$as_dir/$ac_word$ac_exec_ext"
1582 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1592 +RPCGEN=$ac_cv_path_RPCGEN
1593 +if test -n "$RPCGEN"; then
1594 + { echo "$as_me:$LINENO: result: $RPCGEN" >&5
1595 +echo "${ECHO_T}$RPCGEN" >&6; }
1597 + { echo "$as_me:$LINENO: result: no" >&5
1598 +echo "${ECHO_T}no" >&6; }
1602 + test -n "$RPCGEN" && break
1605 +if test -n "$RPCGEN"; then
1607 +cat >>confdefs.h <<_ACEOF
1608 +#define PATH_RPCGEN "$RPCGEN"
1611 + PATH_RPCGEN="$RPCGEN"
1613 + { { echo "$as_me:$LINENO: error: required program RPCGEN not found" >&5
1614 +echo "$as_me: error: required program RPCGEN not found" >&2;}
1615 + { (exit 1); exit 1; }; }
1620 +# Newer mounts have the -s (sloppy) option to ignore unknown options,
1621 +# good for portability
1623 +if test -n "$MOUNT" ; then
1624 + { echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
1625 +echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6; }
1626 + if "$MOUNT" -s > /dev/null 2>&1 ; then
1628 +cat >>confdefs.h <<\_ACEOF
1629 +#define HAVE_SLOPPY_MOUNT 1
1632 + { echo "$as_me:$LINENO: result: yes" >&5
1633 +echo "${ECHO_T}yes" >&6; }
1635 + { echo "$as_me:$LINENO: result: no" >&5
1636 +echo "${ECHO_T}no" >&6; }
1640 +# LDAP SASL auth need libxml
1641 +for ac_prog in xml2-config
1643 + # Extract the first word of "$ac_prog", so it can be a program name with args.
1644 +set dummy $ac_prog; ac_word=$2
1645 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5
1646 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
1647 +if test "${ac_cv_path_XML_CONFIG+set}" = set; then
1648 + echo $ECHO_N "(cached) $ECHO_C" >&6
1650 + case $XML_CONFIG in
1651 + [\\/]* | ?:[\\/]*)
1652 + ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
1655 + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
1656 +for as_dir in $PATH
1659 + test -z "$as_dir" && as_dir=.
1660 + for ac_exec_ext in '' $ac_executable_extensions; do
1661 + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1662 + ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1663 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
1673 +XML_CONFIG=$ac_cv_path_XML_CONFIG
1674 +if test -n "$XML_CONFIG"; then
1675 + { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
1676 +echo "${ECHO_T}$XML_CONFIG" >&6; }
1678 + { echo "$as_me:$LINENO: result: no" >&5
1679 +echo "${ECHO_T}no" >&6; }
1683 + test -n "$XML_CONFIG" && break
1685 +test -n "$XML_CONFIG" || XML_CONFIG="no"
1687 +{ echo "$as_me:$LINENO: checking for libxml2" >&5
1688 +echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; }
1689 +if test "$XML_CONFIG" = "no"
1691 + { echo "$as_me:$LINENO: result: no" >&5
1692 +echo "${ECHO_T}no" >&6; }
1695 + { echo "$as_me:$LINENO: result: yes" >&5
1696 +echo "${ECHO_T}yes" >&6; }
1698 + XML_LIBS=`$XML_CONFIG --libs`
1699 + XML_FLAGS=`$XML_CONFIG --cflags`
1700 + XML_VER=`$XML_CONFIG --version`
1701 + XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
1702 + if test $XML_MAJOR -le 99
1704 + XML_MINOR=`echo $XML_VER|cut -d\. -f2`
1705 + if test $XML_MINOR -le 99
1707 + XML_REV=`echo $XML_VER|cut -d\. -f3`
1708 + if test $XML_REV -le 99; then
1710 +cat >>confdefs.h <<\_ACEOF
1711 +#define LIBXML2_WORKAROUND 1
1720 +# glibc/libc 6 new libraries
1722 { echo "$as_me:$LINENO: checking for yp_match in -lnsl" >&5
1723 echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6; }
1724 if test "${ac_cv_lib_nsl_yp_match+set}" = set; then
1725 @@ -6280,6 +6447,14 @@ confdir!$confdir$ac_delim
1726 mapdir!$mapdir$ac_delim
1727 fifodir!$fifodir$ac_delim
1728 flagdir!$flagdir$ac_delim
1730 +CFLAGS!$CFLAGS$ac_delim
1731 +LDFLAGS!$LDFLAGS$ac_delim
1732 +CPPFLAGS!$CPPFLAGS$ac_delim
1733 +ac_ct_CC!$ac_ct_CC$ac_delim
1734 +EXEEXT!$EXEEXT$ac_delim
1735 +OBJEXT!$OBJEXT$ac_delim
1736 +TIRPCLIB!$TIRPCLIB$ac_delim
1737 DMALLOCLIB!$DMALLOCLIB$ac_delim
1738 MOUNT!$MOUNT$ac_delim
1739 HAVE_MOUNT!$HAVE_MOUNT$ac_delim
1740 @@ -6300,13 +6475,6 @@ PATH_RANLIB!$PATH_RANLIB$ac_delim
1741 RPCGEN!$RPCGEN$ac_delim
1742 PATH_RPCGEN!$PATH_RPCGEN$ac_delim
1743 XML_CONFIG!$XML_CONFIG$ac_delim
1745 -CFLAGS!$CFLAGS$ac_delim
1746 -LDFLAGS!$LDFLAGS$ac_delim
1747 -CPPFLAGS!$CPPFLAGS$ac_delim
1748 -ac_ct_CC!$ac_ct_CC$ac_delim
1749 -EXEEXT!$EXEEXT$ac_delim
1750 -OBJEXT!$OBJEXT$ac_delim
1751 LIBNSL!$LIBNSL$ac_delim
1752 LIBRESOLV!$LIBRESOLV$ac_delim
1753 HAVE_HESIOD!$HAVE_HESIOD$ac_delim
1754 @@ -6330,7 +6498,7 @@ LIBOBJS!$LIBOBJS$ac_delim
1755 LTLIBOBJS!$LTLIBOBJS$ac_delim
1758 - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
1759 + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
1761 elif $ac_last_try; then
1762 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
1763 diff --git a/configure.in b/configure.in
1764 index 423f213..d09a2b6 100644
1767 @@ -113,6 +113,12 @@ AC_MSG_RESULT([$flagdir])
1777 # Optional include dmalloc
1780 diff --git a/daemon/automount.c b/daemon/automount.c
1781 index 269fc5b..1ec686b 100644
1782 --- a/daemon/automount.c
1783 +++ b/daemon/automount.c
1784 @@ -2057,7 +2057,10 @@ int main(int argc, char *argv[])
1787 #ifdef LIBXML2_WORKAROUND
1788 - void *dh = dlopen("libxml2.so", RTLD_NOW);
1789 + void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW);
1791 +#ifdef TIRPC_WORKAROUND
1792 + void *dh_tirpc = dlopen("libitirpc.so", RTLD_NOW);
1795 if (!master_read_master(master_list, age, 0)) {
1796 @@ -2090,9 +2093,13 @@ int main(int argc, char *argv[])
1798 release_flag_file();
1800 +#ifdef TIRPC_WORKAROUND
1802 + dlclose(dh_tirpc);
1804 #ifdef LIBXML2_WORKAROUND
1812 diff --git a/include/config.h.in b/include/config.h.in
1813 index d8f1747..31b0d75 100644
1814 --- a/include/config.h.in
1815 +++ b/include/config.h.in
1817 /* Define to 1 if you have the <unistd.h> header file. */
1818 #undef HAVE_UNISTD_H
1820 +/* Use IPv6 with libtirpc */
1823 /* Use libxml2 tsd usage workaround */
1824 #undef LIBXML2_WORKAROUND
1827 /* Define to 1 if you have the ANSI C header files. */
1830 +/* Use libtirpc tsd usage workaround */
1831 +#undef TIRPC_WORKAROUND
1833 /* Define if using the dmalloc debugging malloc package */