c5187b0dbf
- fix uri list locking (again).
- check for stale SASL credentials upon connect fail.
- add "forcestart" and "forcerestart" init script options to allow use of
5.0.3 strartup behavior if required.
- always read entire file map into cache to speed lookups.
- make MAX_ERR_BUF and PARSE_MAX_BUF use easier to audit.
- make some easy alloca replacements.
- update to configure libtirpc if present.
- update to provide ipv6 name and address support.
- update to provide ipv6 address parsing.
3263 lines
91 KiB
Diff
3263 lines
91 KiB
Diff
autofs-5.0.4 - configure libtirpc
|
||
|
||
From: Ian Kent <raven@themaw.net>
|
||
|
||
With NFS over ipv6 on the way we need to update autofs to use the
|
||
libtirpc library as it provides ipv6 functionality. This change adds
|
||
configure checks to look for libtirpc (if it has been requested with
|
||
--with-libtirpc) and checks whether it has been built with ipv6
|
||
support and uses it if so.
|
||
---
|
||
|
||
CHANGELOG | 1
|
||
Makefile.conf.in | 3
|
||
Makefile.rules | 5
|
||
aclocal.m4 | 81 +
|
||
autofs.spec | 2
|
||
configure | 2584 +++++++++++++++++++++++++++-------------------------
|
||
configure.in | 6
|
||
daemon/automount.c | 13
|
||
include/config.h.in | 6
|
||
9 files changed, 1489 insertions(+), 1212 deletions(-)
|
||
|
||
|
||
--- autofs-5.0.4.orig/Makefile.conf.in
|
||
+++ autofs-5.0.4/Makefile.conf.in
|
||
@@ -49,6 +49,9 @@ YACC = @PATH_YACC@
|
||
RPCGEN = @PATH_RPCGEN@
|
||
RANLIB = @PATH_RANLIB@
|
||
|
||
+# Use libtirpc if requested and available
|
||
+TIRPCLIB = @TIRPCLIB@
|
||
+
|
||
# Use dmalloc for memory debuging
|
||
DMALLOCLIB = @DMALLOCLIB@
|
||
|
||
--- autofs-5.0.4.orig/Makefile.rules
|
||
+++ autofs-5.0.4/Makefile.rules
|
||
@@ -47,6 +47,11 @@ SOLDFLAGS = -shared
|
||
CFLAGS += -D_REENTRANT -D_FILE_OFFSET_BITS=64
|
||
LDFLAGS += -lpthread
|
||
|
||
+ifdef TIRPCLIB
|
||
+CFLAGS += -I/usr/include/tirpc
|
||
+LDFLAGS += $(TIRPCLIB)
|
||
+endif
|
||
+
|
||
ifdef DMALLOCLIB
|
||
LDFLAGS += $(DMALLOCLIB)
|
||
endif
|
||
--- autofs-5.0.4.orig/aclocal.m4
|
||
+++ autofs-5.0.4/aclocal.m4
|
||
@@ -304,3 +304,84 @@ fi
|
||
LIBS="$af_check_ldap_parse_page_control_save_libs"
|
||
])
|
||
|
||
+dnl --------------------------------------------------------------------------
|
||
+dnl AF_CHECK_LIBTIRPC_IPV6
|
||
+dnl
|
||
+dnl Use libtirpc for rpc transport
|
||
+dnl --------------------------------------------------------------------------
|
||
+AC_DEFUN([AF_CHECK_LIBTIRPC_IPV6],
|
||
+[AC_MSG_CHECKING(if libtirpc has IPv6 support)
|
||
+
|
||
+# save current flags
|
||
+af_check_libtirpc_ipv6_save_cflags="$CFLAGS"
|
||
+af_check_libtirpc_ipv6_save_ldflags="$LDFLAGS"
|
||
+CFLAGS="$CFLAGS -I/usr/include/tirpc"
|
||
+LDFLAGS="$LDFLAGS -ltirpc"
|
||
+
|
||
+AC_TRY_LINK(
|
||
+ [ #define INET6
|
||
+ #include <rpc/rpc.h> ],
|
||
+ [ CLIENT *cl;
|
||
+ struct sockaddr_in addr;
|
||
+ int fd;
|
||
+ unsigned long ul; struct timeval t; unsigned int ui;
|
||
+ cl = clntudp6_bufcreate(&addr,ul,ul,t,&fd,ui,ui); ],
|
||
+ [ af_have_libtirpc_ipv6=yes
|
||
+ AC_MSG_RESULT(yes) ],
|
||
+ [ AC_MSG_RESULT(no) ])
|
||
+
|
||
+if test "$af_have_libtirpc_ipv6" = "yes"; then
|
||
+ AC_DEFINE(INET6,1, [Use IPv6 with libtirpc])
|
||
+fi
|
||
+
|
||
+# restore flags
|
||
+CFLAGS="$af_check_libtirpc_ipv6_save_cflags"
|
||
+LDFLAGS="$af_check_libtirpc_ipv6_save_ldflags"
|
||
+])
|
||
+
|
||
+dnl --------------------------------------------------------------------------
|
||
+dnl AF_CHECK_LIBTIRPC
|
||
+dnl
|
||
+dnl Use libtirpc for rpc transport
|
||
+dnl --------------------------------------------------------------------------
|
||
+AC_DEFUN([AF_CHECK_LIBTIRPC],
|
||
+[
|
||
+# save current flags
|
||
+af_check_libtirpc_save_cflags="$CFLAGS"
|
||
+af_check_libtirpc_save_ldflags="$LDFLAGS"
|
||
+CFLAGS="$CFLAGS -I/usr/include/tirpc"
|
||
+LDFLAGS="$LDFLAGS -ltirpc"
|
||
+
|
||
+AC_TRY_LINK(
|
||
+ [ #include <rpc/rpc.h> ],
|
||
+ [ CLIENT *cl;
|
||
+ struct sockaddr_in addr;
|
||
+ int fd;
|
||
+ unsigned long ul; struct timeval t; unsigned int ui;
|
||
+ cl = clntudp_bufcreate(&addr,ul,ul,t,&fd,ui,ui); ],
|
||
+ [ af_have_libtirpc=yes
|
||
+ AC_MSG_RESULT(yes) ],
|
||
+ [ AC_MSG_RESULT(no) ])
|
||
+
|
||
+if test "$af_have_libtirpc" = "yes"; then
|
||
+ AC_DEFINE(TIRPC_WORKAROUND,1, [Use libtirpc tsd usage workaround])
|
||
+ TIRPCLIB="-ltirpc"
|
||
+fi
|
||
+
|
||
+# restore flags
|
||
+CFLAGS="$af_check_libtirpc_save_cflags"
|
||
+LDFLAGS="$af_check_libtirpc_save_ldflags"
|
||
+])
|
||
+
|
||
+AC_DEFUN([AM_WITH_LIBTIRPC],
|
||
+[AC_MSG_CHECKING([if libtirpc is requested and available])
|
||
+AC_ARG_WITH(libtirpc,
|
||
+[ --with-libtirpc use libtirpc if available],
|
||
+[if test "$withval" = yes; then
|
||
+ AF_CHECK_LIBTIRPC()
|
||
+ AF_CHECK_LIBTIRPC_IPV6()
|
||
+else
|
||
+ AC_MSG_RESULT(no)
|
||
+fi], [AC_MSG_RESULT(no)])
|
||
+])
|
||
+
|
||
--- autofs-5.0.4.orig/autofs.spec
|
||
+++ autofs-5.0.4/autofs.spec
|
||
@@ -57,7 +57,7 @@ inkludera n<>tfilsystem, CD-ROM, floppydi
|
||
echo %{version}-%{release} > .version
|
||
|
||
%build
|
||
-CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy
|
||
+CFLAGS="$RPM_OPT_FLAGS -Wall" ./configure --libdir=%{_libdir} --disable-mount-locking --enable-ignore-busy --with-libtirpc
|
||
CFLAGS="$RPM_OPT_FLAGS -Wall" make initdir=/etc/rc.d/init.d DONTSTRIP=1
|
||
|
||
%install
|
||
--- autofs-5.0.4.orig/configure
|
||
+++ autofs-5.0.4/configure
|
||
@@ -656,6 +656,14 @@ confdir
|
||
mapdir
|
||
fifodir
|
||
flagdir
|
||
+CC
|
||
+CFLAGS
|
||
+LDFLAGS
|
||
+CPPFLAGS
|
||
+ac_ct_CC
|
||
+EXEEXT
|
||
+OBJEXT
|
||
+TIRPCLIB
|
||
DMALLOCLIB
|
||
MOUNT
|
||
HAVE_MOUNT
|
||
@@ -676,13 +684,6 @@ PATH_RANLIB
|
||
RPCGEN
|
||
PATH_RPCGEN
|
||
XML_CONFIG
|
||
-CC
|
||
-CFLAGS
|
||
-LDFLAGS
|
||
-CPPFLAGS
|
||
-ac_ct_CC
|
||
-EXEEXT
|
||
-OBJEXT
|
||
LIBNSL
|
||
LIBRESOLV
|
||
HAVE_HESIOD
|
||
@@ -1297,6 +1298,7 @@ Optional Packages:
|
||
--with-mapdir=PATH look in PATH for mount maps used by the automounter
|
||
--with-fifodir=PATH use PATH as the directory for fifos used by the automounter
|
||
--with-flagdir=PATH use PATH as the directory for the flag file used by the automounter
|
||
+ --with-libtirpc use libtirpc if available
|
||
--with-dmalloc use dmalloc, as in
|
||
http://www.dmalloc.com/dmalloc.tar.gz
|
||
--with-hesiod=DIR enable Hesiod support (libs and includes in DIR)
|
||
@@ -1908,60 +1910,32 @@ echo "${ECHO_T}$flagdir" >&6; }
|
||
|
||
|
||
#
|
||
-# Optional include dmalloc
|
||
-#
|
||
-{ echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5
|
||
-echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6; }
|
||
-
|
||
-# Check whether --with-dmalloc was given.
|
||
-if test "${with_dmalloc+set}" = set; then
|
||
- withval=$with_dmalloc; if test "$withval" = yes; then
|
||
- { echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6; }
|
||
-
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define WITH_DMALLOC 1
|
||
-_ACEOF
|
||
-
|
||
- DMALLOCLIB="-ldmallocth"
|
||
- LDFLAGS="$LDFLAGS -g"
|
||
-else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
-fi
|
||
-else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
-fi
|
||
-
|
||
-
|
||
-
|
||
-
|
||
-#
|
||
-# Programs needed for various system functions or modules
|
||
+# Use libtirpc
|
||
#
|
||
-for ac_prog in mount
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
+ac_ext=c
|
||
+ac_cpp='$CPP $CPPFLAGS'
|
||
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
+if test -n "$ac_tool_prefix"; then
|
||
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_MOUNT+set}" = set; then
|
||
+if test "${ac_cv_prog_CC+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $MOUNT in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_MOUNT="$MOUNT" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ if test -n "$CC"; then
|
||
+ ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
+else
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_MOUNT="$as_dir/$ac_word$ac_exec_ext"
|
||
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -1969,61 +1943,39 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
-esac
|
||
fi
|
||
-MOUNT=$ac_cv_path_MOUNT
|
||
-if test -n "$MOUNT"; then
|
||
- { echo "$as_me:$LINENO: result: $MOUNT" >&5
|
||
-echo "${ECHO_T}$MOUNT" >&6; }
|
||
+fi
|
||
+CC=$ac_cv_prog_CC
|
||
+if test -n "$CC"; then
|
||
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
||
+echo "${ECHO_T}$CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$MOUNT" && break
|
||
-done
|
||
-test -n "$MOUNT" || MOUNT="/bin/mount"
|
||
-
|
||
-if test -n "$MOUNT"; then
|
||
-
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define HAVE_MOUNT 1
|
||
-_ACEOF
|
||
-
|
||
-
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_MOUNT "$MOUNT"
|
||
-_ACEOF
|
||
-
|
||
- HAVE_MOUNT=1
|
||
-else
|
||
- HAVE_MOUNT=0
|
||
fi
|
||
-
|
||
-for ac_prog in umount
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
+if test -z "$ac_cv_prog_CC"; then
|
||
+ ac_ct_CC=$CC
|
||
+ # Extract the first word of "gcc", so it can be a program name with args.
|
||
+set dummy gcc; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_UMOUNT+set}" = set; then
|
||
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $UMOUNT in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_UMOUNT="$UMOUNT" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ if test -n "$ac_ct_CC"; then
|
||
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
+else
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_UMOUNT="$as_dir/$ac_word$ac_exec_ext"
|
||
+ ac_cv_prog_ac_ct_CC="gcc"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2031,61 +1983,56 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
-esac
|
||
fi
|
||
-UMOUNT=$ac_cv_path_UMOUNT
|
||
-if test -n "$UMOUNT"; then
|
||
- { echo "$as_me:$LINENO: result: $UMOUNT" >&5
|
||
-echo "${ECHO_T}$UMOUNT" >&6; }
|
||
+fi
|
||
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
+if test -n "$ac_ct_CC"; then
|
||
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
+echo "${ECHO_T}$ac_ct_CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
-
|
||
- test -n "$UMOUNT" && break
|
||
-done
|
||
-test -n "$UMOUNT" || UMOUNT="/bin/umount"
|
||
-
|
||
-if test -n "$UMOUNT"; then
|
||
-
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define HAVE_UMOUNT 1
|
||
-_ACEOF
|
||
-
|
||
-
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_UMOUNT "$UMOUNT"
|
||
-_ACEOF
|
||
-
|
||
- HAVE_UMOUNT=1
|
||
+ if test "x$ac_ct_CC" = x; then
|
||
+ CC=""
|
||
+ else
|
||
+ case $cross_compiling:$ac_tool_warned in
|
||
+yes:)
|
||
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
+whose name does not start with the host triplet. If you think this
|
||
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
+whose name does not start with the host triplet. If you think this
|
||
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
+ac_tool_warned=yes ;;
|
||
+esac
|
||
+ CC=$ac_ct_CC
|
||
+ fi
|
||
else
|
||
- HAVE_UMOUNT=0
|
||
+ CC="$ac_cv_prog_CC"
|
||
fi
|
||
|
||
-for ac_prog in fsck.ext2 e2fsck
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
+if test -z "$CC"; then
|
||
+ if test -n "$ac_tool_prefix"; then
|
||
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
||
+set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_E2FSCK+set}" = set; then
|
||
+if test "${ac_cv_prog_CC+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $E2FSCK in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_E2FSCK="$E2FSCK" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ if test -n "$CC"; then
|
||
+ ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
+else
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_E2FSCK="$as_dir/$ac_word$ac_exec_ext"
|
||
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2093,60 +2040,44 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
-esac
|
||
fi
|
||
-E2FSCK=$ac_cv_path_E2FSCK
|
||
-if test -n "$E2FSCK"; then
|
||
- { echo "$as_me:$LINENO: result: $E2FSCK" >&5
|
||
-echo "${ECHO_T}$E2FSCK" >&6; }
|
||
+fi
|
||
+CC=$ac_cv_prog_CC
|
||
+if test -n "$CC"; then
|
||
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
||
+echo "${ECHO_T}$CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$E2FSCK" && break
|
||
-done
|
||
-
|
||
-if test -n "$E2FSCK"; then
|
||
-
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define HAVE_E2FSCK 1
|
||
-_ACEOF
|
||
-
|
||
-
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_E2FSCK "$E2FSCK"
|
||
-_ACEOF
|
||
-
|
||
- HAVE_E2FSCK=1
|
||
-else
|
||
- HAVE_E2FSCK=0
|
||
+ fi
|
||
fi
|
||
-
|
||
-for ac_prog in fsck.ext3 e3fsck
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
+if test -z "$CC"; then
|
||
+ # Extract the first word of "cc", so it can be a program name with args.
|
||
+set dummy cc; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_E3FSCK+set}" = set; then
|
||
+if test "${ac_cv_prog_CC+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $E3FSCK in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_E3FSCK="$E3FSCK" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ if test -n "$CC"; then
|
||
+ ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
+else
|
||
+ ac_prog_rejected=no
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_E3FSCK="$as_dir/$ac_word$ac_exec_ext"
|
||
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
||
+ ac_prog_rejected=yes
|
||
+ continue
|
||
+ fi
|
||
+ ac_cv_prog_CC="cc"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2154,60 +2085,53 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
-esac
|
||
+if test $ac_prog_rejected = yes; then
|
||
+ # We found a bogon in the path, so make sure we never use it.
|
||
+ set dummy $ac_cv_prog_CC
|
||
+ shift
|
||
+ if test $# != 0; then
|
||
+ # We chose a different compiler from the bogus one.
|
||
+ # However, it has the same basename, so the bogon will be chosen
|
||
+ # first if we set CC to just the basename; use the full file name.
|
||
+ shift
|
||
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
|
||
+ fi
|
||
fi
|
||
-E3FSCK=$ac_cv_path_E3FSCK
|
||
-if test -n "$E3FSCK"; then
|
||
- { echo "$as_me:$LINENO: result: $E3FSCK" >&5
|
||
-echo "${ECHO_T}$E3FSCK" >&6; }
|
||
+fi
|
||
+fi
|
||
+CC=$ac_cv_prog_CC
|
||
+if test -n "$CC"; then
|
||
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
||
+echo "${ECHO_T}$CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$E3FSCK" && break
|
||
-done
|
||
-
|
||
-if test -n "$E3FSCK"; then
|
||
-
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define HAVE_E3FSCK 1
|
||
-_ACEOF
|
||
-
|
||
-
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_E3FSCK "$E3FSCK"
|
||
-_ACEOF
|
||
-
|
||
- HAVE_E3FSCK=1
|
||
-else
|
||
- HAVE_E3FSCK=0
|
||
fi
|
||
-
|
||
-for ac_prog in modprobe
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
+if test -z "$CC"; then
|
||
+ if test -n "$ac_tool_prefix"; then
|
||
+ for ac_prog in cl.exe
|
||
+ do
|
||
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_MODPROBE+set}" = set; then
|
||
+if test "${ac_cv_prog_CC+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $MODPROBE in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_MODPROBE="$MODPROBE" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ if test -n "$CC"; then
|
||
+ ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
+else
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_MODPROBE="$as_dir/$ac_word$ac_exec_ext"
|
||
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2215,61 +2139,43 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
-esac
|
||
fi
|
||
-MODPROBE=$ac_cv_path_MODPROBE
|
||
-if test -n "$MODPROBE"; then
|
||
- { echo "$as_me:$LINENO: result: $MODPROBE" >&5
|
||
-echo "${ECHO_T}$MODPROBE" >&6; }
|
||
+fi
|
||
+CC=$ac_cv_prog_CC
|
||
+if test -n "$CC"; then
|
||
+ { echo "$as_me:$LINENO: result: $CC" >&5
|
||
+echo "${ECHO_T}$CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$MODPROBE" && break
|
||
-done
|
||
-
|
||
-if test -n "$MODPROBE"; then
|
||
-
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define HAVE_MODPROBE 1
|
||
-_ACEOF
|
||
-
|
||
-
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_MODPROBE "$MODPROBE"
|
||
-_ACEOF
|
||
-
|
||
- HAVE_MODPROBE=1
|
||
-else
|
||
- HAVE_MODPROBE=0
|
||
+ test -n "$CC" && break
|
||
+ done
|
||
fi
|
||
-
|
||
-
|
||
-for ac_prog in flex lex
|
||
+if test -z "$CC"; then
|
||
+ ac_ct_CC=$CC
|
||
+ for ac_prog in cl.exe
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_LEX+set}" = set; then
|
||
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $LEX in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_LEX="$LEX" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ if test -n "$ac_ct_CC"; then
|
||
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
+else
|
||
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_LEX="$as_dir/$ac_word$ac_exec_ext"
|
||
+ ac_cv_prog_ac_ct_CC="$ac_prog"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2277,434 +2183,872 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
-esac
|
||
fi
|
||
-LEX=$ac_cv_path_LEX
|
||
-if test -n "$LEX"; then
|
||
- { echo "$as_me:$LINENO: result: $LEX" >&5
|
||
-echo "${ECHO_T}$LEX" >&6; }
|
||
+fi
|
||
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
+if test -n "$ac_ct_CC"; then
|
||
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
+echo "${ECHO_T}$ac_ct_CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$LEX" && break
|
||
-done
|
||
-
|
||
-if test -n "$LEX"; then
|
||
-
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_LEX "$LEX"
|
||
-_ACEOF
|
||
-
|
||
- PATH_LEX="$LEX"
|
||
-else
|
||
- { { echo "$as_me:$LINENO: error: required program LEX not found" >&5
|
||
-echo "$as_me: error: required program LEX not found" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-fi
|
||
-
|
||
-for ac_prog in bison
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_YACC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- case $YACC in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_YACC="$YACC" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
+ test -n "$ac_ct_CC" && break
|
||
done
|
||
-IFS=$as_save_IFS
|
||
|
||
- ;;
|
||
+ if test "x$ac_ct_CC" = x; then
|
||
+ CC=""
|
||
+ else
|
||
+ case $cross_compiling:$ac_tool_warned in
|
||
+yes:)
|
||
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
+whose name does not start with the host triplet. If you think this
|
||
+configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
+whose name does not start with the host triplet. If you think this
|
||
+configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
+ac_tool_warned=yes ;;
|
||
esac
|
||
+ CC=$ac_ct_CC
|
||
+ fi
|
||
fi
|
||
-YACC=$ac_cv_path_YACC
|
||
-if test -n "$YACC"; then
|
||
- { echo "$as_me:$LINENO: result: $YACC" >&5
|
||
-echo "${ECHO_T}$YACC" >&6; }
|
||
-else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+
|
||
fi
|
||
|
||
|
||
- test -n "$YACC" && break
|
||
-done
|
||
+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||
+See \`config.log' for more details." >&5
|
||
+echo "$as_me: error: no acceptable C compiler found in \$PATH
|
||
+See \`config.log' for more details." >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
|
||
-if test -n "$YACC"; then
|
||
+# Provide some information about the compiler.
|
||
+echo "$as_me:$LINENO: checking for C compiler version" >&5
|
||
+ac_compiler=`set X $ac_compile; echo $2`
|
||
+{ (ac_try="$ac_compiler --version >&5"
|
||
+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_compiler --version >&5") 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }
|
||
+{ (ac_try="$ac_compiler -v >&5"
|
||
+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_compiler -v >&5") 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }
|
||
+{ (ac_try="$ac_compiler -V >&5"
|
||
+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_compiler -V >&5") 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }
|
||
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_YACC "$YACC"
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
|
||
- PATH_YACC="$YACC"
|
||
-else
|
||
- { { echo "$as_me:$LINENO: error: required program YACC not found" >&5
|
||
-echo "$as_me: error: required program YACC not found" >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-fi
|
||
+int
|
||
+main ()
|
||
+{
|
||
|
||
-for ac_prog in ranlib
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_RANLIB+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- case $RANLIB in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+ac_clean_files_save=$ac_clean_files
|
||
+ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
||
+# Try to create an executable without -o first, disregard a.out.
|
||
+# It will help us diagnose broken compilers, and finding out an intuition
|
||
+# of exeext.
|
||
+{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
||
+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
||
+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||
+#
|
||
+# List of possible output files, starting from the most likely.
|
||
+# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
||
+# only as a last resort. b.out is created by i960 compilers.
|
||
+ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
||
+#
|
||
+# The IRIX 6 linker writes into existing files which may not be
|
||
+# executable, retaining their permissions. Remove them first so a
|
||
+# subsequent execution test works.
|
||
+ac_rmfiles=
|
||
+for ac_file in $ac_files
|
||
do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
+ case $ac_file in
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
||
+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
||
+ esac
|
||
done
|
||
-IFS=$as_save_IFS
|
||
+rm -f $ac_rmfiles
|
||
|
||
- ;;
|
||
+if { (ac_try="$ac_link_default"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
esac
|
||
-fi
|
||
-RANLIB=$ac_cv_path_RANLIB
|
||
-if test -n "$RANLIB"; then
|
||
- { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
||
-echo "${ECHO_T}$RANLIB" >&6; }
|
||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+ (eval "$ac_link_default") 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; then
|
||
+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
||
+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
||
+# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
||
+# so that the user can short-circuit this test for compilers unknown to
|
||
+# Autoconf.
|
||
+for ac_file in $ac_files ''
|
||
+do
|
||
+ test -f "$ac_file" || continue
|
||
+ case $ac_file in
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
||
+ ;;
|
||
+ [ab].out )
|
||
+ # We found the default executable, but exeext='' is most
|
||
+ # certainly right.
|
||
+ break;;
|
||
+ *.* )
|
||
+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
||
+ then :; else
|
||
+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
+ fi
|
||
+ # We set ac_cv_exeext here because the later test for it is not
|
||
+ # safe: cross compilers may not add the suffix if given an `-o'
|
||
+ # argument, so we may need to know it at that point already.
|
||
+ # Even if this section looks crufty: it has the advantage of
|
||
+ # actually working.
|
||
+ break;;
|
||
+ * )
|
||
+ break;;
|
||
+ esac
|
||
+done
|
||
+test "$ac_cv_exeext" = no && ac_cv_exeext=
|
||
+
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ ac_file=''
|
||
fi
|
||
|
||
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
||
+echo "${ECHO_T}$ac_file" >&6; }
|
||
+if test -z "$ac_file"; then
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
- test -n "$RANLIB" && break
|
||
-done
|
||
-
|
||
-if test -n "$RANLIB"; then
|
||
+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
||
+See \`config.log' for more details." >&5
|
||
+echo "$as_me: error: C compiler cannot create executables
|
||
+See \`config.log' for more details." >&2;}
|
||
+ { (exit 77); exit 77; }; }
|
||
+fi
|
||
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_RANLIB "$RANLIB"
|
||
-_ACEOF
|
||
+ac_exeext=$ac_cv_exeext
|
||
|
||
- PATH_RANLIB="$RANLIB"
|
||
-else
|
||
- { { echo "$as_me:$LINENO: error: required program RANLIB not found" >&5
|
||
-echo "$as_me: error: required program RANLIB not found" >&2;}
|
||
+# Check that the compiler produces executables we can run. If not, either
|
||
+# the compiler is broken, or we cross compile.
|
||
+{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
||
+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
||
+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
||
+# If not cross compiling, check that we can run a simple program.
|
||
+if test "$cross_compiling" != yes; then
|
||
+ if { ac_try='./$ac_file'
|
||
+ { (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_try") 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; }; then
|
||
+ cross_compiling=no
|
||
+ else
|
||
+ if test "$cross_compiling" = maybe; then
|
||
+ cross_compiling=yes
|
||
+ else
|
||
+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||
+If you meant to cross compile, use \`--host'.
|
||
+See \`config.log' for more details." >&5
|
||
+echo "$as_me: error: cannot run C compiled programs.
|
||
+If you meant to cross compile, use \`--host'.
|
||
+See \`config.log' for more details." >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
+ fi
|
||
+ fi
|
||
fi
|
||
+{ echo "$as_me:$LINENO: result: yes" >&5
|
||
+echo "${ECHO_T}yes" >&6; }
|
||
|
||
-for ac_prog in rpcgen
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_RPCGEN+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- case $RPCGEN in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_RPCGEN="$RPCGEN" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $searchpath
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_RPCGEN="$as_dir/$ac_word$ac_exec_ext"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
-done
|
||
-IFS=$as_save_IFS
|
||
+rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
||
+ac_clean_files=$ac_clean_files_save
|
||
+# Check that the compiler produces executables we can run. If not, either
|
||
+# the compiler is broken, or we cross compile.
|
||
+{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
||
+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
||
+{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
||
+echo "${ECHO_T}$cross_compiling" >&6; }
|
||
|
||
- ;;
|
||
+{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
||
+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
||
+if { (ac_try="$ac_link"
|
||
+case "(($ac_try" in
|
||
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
|
||
+ *) ac_try_echo=$ac_try;;
|
||
esac
|
||
-fi
|
||
-RPCGEN=$ac_cv_path_RPCGEN
|
||
-if test -n "$RPCGEN"; then
|
||
- { echo "$as_me:$LINENO: result: $RPCGEN" >&5
|
||
-echo "${ECHO_T}$RPCGEN" >&6; }
|
||
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
|
||
+ (eval "$ac_link") 2>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; then
|
||
+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
|
||
+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
||
+# work properly (i.e., refer to `conftest.exe'), while it won't with
|
||
+# `rm'.
|
||
+for ac_file in conftest.exe conftest conftest.*; do
|
||
+ test -f "$ac_file" || continue
|
||
+ case $ac_file in
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
||
+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
+ break;;
|
||
+ * ) break;;
|
||
+ esac
|
||
+done
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||
+See \`config.log' for more details." >&5
|
||
+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
||
+See \`config.log' for more details." >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
+rm -f conftest$ac_cv_exeext
|
||
+{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
||
+echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
||
|
||
- test -n "$RPCGEN" && break
|
||
-done
|
||
+rm -f conftest.$ac_ext
|
||
+EXEEXT=$ac_cv_exeext
|
||
+ac_exeext=$EXEEXT
|
||
+{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
||
+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_objext+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
|
||
-if test -n "$RPCGEN"; then
|
||
+int
|
||
+main ()
|
||
+{
|
||
|
||
-cat >>confdefs.h <<_ACEOF
|
||
-#define PATH_RPCGEN "$RPCGEN"
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
_ACEOF
|
||
-
|
||
- PATH_RPCGEN="$RPCGEN"
|
||
+rm -f conftest.o conftest.obj
|
||
+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>&5
|
||
+ ac_status=$?
|
||
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
+ (exit $ac_status); }; then
|
||
+ for ac_file in conftest.o conftest.obj conftest.*; do
|
||
+ test -f "$ac_file" || continue;
|
||
+ case $ac_file in
|
||
+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
||
+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
||
+ break;;
|
||
+ esac
|
||
+done
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: required program RPCGEN not found" >&5
|
||
-echo "$as_me: error: required program RPCGEN not found" >&2;}
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
||
+See \`config.log' for more details." >&5
|
||
+echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
||
+See \`config.log' for more details." >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
+rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||
+fi
|
||
+{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
||
+echo "${ECHO_T}$ac_cv_objext" >&6; }
|
||
+OBJEXT=$ac_cv_objext
|
||
+ac_objext=$OBJEXT
|
||
+{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
||
+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
|
||
-#
|
||
-# Newer mounts have the -s (sloppy) option to ignore unknown options,
|
||
-# good for portability
|
||
-#
|
||
-if test -n "$MOUNT" ; then
|
||
- { echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
|
||
-echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6; }
|
||
- if "$MOUNT" -s > /dev/null 2>&1 ; then
|
||
+int
|
||
+main ()
|
||
+{
|
||
+#ifndef __GNUC__
|
||
+ choke me
|
||
+#endif
|
||
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define HAVE_SLOPPY_MOUNT 1
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
_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_compiler_gnu=yes
|
||
+else
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
- { 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; }
|
||
- fi
|
||
+ ac_compiler_gnu=no
|
||
fi
|
||
|
||
-# LDAP SASL auth need libxml
|
||
-for ac_prog in xml2-config
|
||
-do
|
||
- # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_prog; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_path_XML_CONFIG+set}" = set; then
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
||
+
|
||
+fi
|
||
+{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
||
+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
||
+GCC=`test $ac_compiler_gnu = yes && echo yes`
|
||
+ac_test_CFLAGS=${CFLAGS+set}
|
||
+ac_save_CFLAGS=$CFLAGS
|
||
+{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||
+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_prog_cc_g+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- case $XML_CONFIG in
|
||
- [\\/]* | ?:[\\/]*)
|
||
- ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
|
||
- ;;
|
||
- *)
|
||
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
-done
|
||
-IFS=$as_save_IFS
|
||
+ ac_save_c_werror_flag=$ac_c_werror_flag
|
||
+ ac_c_werror_flag=yes
|
||
+ ac_cv_prog_cc_g=no
|
||
+ CFLAGS="-g"
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
|
||
- ;;
|
||
+int
|
||
+main ()
|
||
+{
|
||
+
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_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
|
||
-fi
|
||
-XML_CONFIG=$ac_cv_path_XML_CONFIG
|
||
-if test -n "$XML_CONFIG"; then
|
||
- { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
|
||
-echo "${ECHO_T}$XML_CONFIG" >&6; }
|
||
+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_cv_prog_cc_g=yes
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
-fi
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
+ CFLAGS=""
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
|
||
- test -n "$XML_CONFIG" && break
|
||
-done
|
||
-test -n "$XML_CONFIG" || XML_CONFIG="no"
|
||
+int
|
||
+main ()
|
||
+{
|
||
|
||
-{ echo "$as_me:$LINENO: checking for libxml2" >&5
|
||
-echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; }
|
||
-if test "$XML_CONFIG" = "no"
|
||
-then
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
-echo "${ECHO_T}no" >&6; }
|
||
- HAVE_LIBXML=0
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_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
|
||
+ :
|
||
else
|
||
- { echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6; }
|
||
- HAVE_LIBXML=1
|
||
- XML_LIBS=`$XML_CONFIG --libs`
|
||
- XML_FLAGS=`$XML_CONFIG --cflags`
|
||
- XML_VER=`$XML_CONFIG --version`
|
||
- XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
|
||
- if test $XML_MAJOR -le 99
|
||
- then
|
||
- XML_MINOR=`echo $XML_VER|cut -d\. -f2`
|
||
- if test $XML_MINOR -le 99
|
||
- then
|
||
- XML_REV=`echo $XML_VER|cut -d\. -f3`
|
||
- if test $XML_REV -le 99; then
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-cat >>confdefs.h <<\_ACEOF
|
||
-#define LIBXML2_WORKAROUND 1
|
||
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
||
+ CFLAGS="-g"
|
||
+ cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+
|
||
+int
|
||
+main ()
|
||
+{
|
||
+
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_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_cv_prog_cc_g=yes
|
||
+else
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+
|
||
+fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
+ ac_c_werror_flag=$ac_save_c_werror_flag
|
||
+fi
|
||
+{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
||
+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
||
+if test "$ac_test_CFLAGS" = set; then
|
||
+ CFLAGS=$ac_save_CFLAGS
|
||
+elif test $ac_cv_prog_cc_g = yes; then
|
||
+ if test "$GCC" = yes; then
|
||
+ CFLAGS="-g -O2"
|
||
+ else
|
||
+ CFLAGS="-g"
|
||
+ fi
|
||
+else
|
||
+ if test "$GCC" = yes; then
|
||
+ CFLAGS="-O2"
|
||
+ else
|
||
+ CFLAGS=
|
||
+ fi
|
||
+fi
|
||
+{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
||
+echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_prog_cc_c89+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ ac_cv_prog_cc_c89=no
|
||
+ac_save_CC=$CC
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+#include <stdarg.h>
|
||
+#include <stdio.h>
|
||
+#include <sys/types.h>
|
||
+#include <sys/stat.h>
|
||
+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
||
+struct buf { int x; };
|
||
+FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
||
+static char *e (p, i)
|
||
+ char **p;
|
||
+ int i;
|
||
+{
|
||
+ return p[i];
|
||
+}
|
||
+static char *f (char * (*g) (char **, int), char **p, ...)
|
||
+{
|
||
+ char *s;
|
||
+ va_list v;
|
||
+ va_start (v,p);
|
||
+ s = g (p, va_arg (v,int));
|
||
+ va_end (v);
|
||
+ return s;
|
||
+}
|
||
+
|
||
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
||
+ function prototypes and stuff, but not '\xHH' hex character constants.
|
||
+ These don't provoke an error unfortunately, instead are silently treated
|
||
+ as 'x'. The following induces an error, until -std is added to get
|
||
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
||
+ array size at least. It's necessary to write '\x00'==0 to get something
|
||
+ that's true only with -std. */
|
||
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
||
+
|
||
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
|
||
+ inside strings and character constants. */
|
||
+#define FOO(x) 'x'
|
||
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
|
||
+
|
||
+int test (int i, double x);
|
||
+struct s1 {int (*f) (int a);};
|
||
+struct s2 {int (*f) (double a);};
|
||
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
||
+int argc;
|
||
+char **argv;
|
||
+int
|
||
+main ()
|
||
+{
|
||
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
|
||
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
||
+do
|
||
+ CC="$ac_save_CC $ac_arg"
|
||
+ 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_cv_prog_cc_c89=$ac_arg
|
||
+else
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+
|
||
+fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext
|
||
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
|
||
+done
|
||
+rm -f conftest.$ac_ext
|
||
+CC=$ac_save_CC
|
||
+
|
||
+fi
|
||
+# AC_CACHE_VAL
|
||
+case "x$ac_cv_prog_cc_c89" in
|
||
+ x)
|
||
+ { echo "$as_me:$LINENO: result: none needed" >&5
|
||
+echo "${ECHO_T}none needed" >&6; } ;;
|
||
+ xno)
|
||
+ { echo "$as_me:$LINENO: result: unsupported" >&5
|
||
+echo "${ECHO_T}unsupported" >&6; } ;;
|
||
+ *)
|
||
+ CC="$CC $ac_cv_prog_cc_c89"
|
||
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
||
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
||
+esac
|
||
|
||
- fi
|
||
- fi
|
||
- fi
|
||
-fi
|
||
|
||
-#
|
||
-# glibc/libc 6 new libraries
|
||
-#
|
||
ac_ext=c
|
||
ac_cpp='$CPP $CPPFLAGS'
|
||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||
ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
-if test -n "$ac_tool_prefix"; then
|
||
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
|
||
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- if test -n "$CC"; then
|
||
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
+
|
||
+
|
||
+{ echo "$as_me:$LINENO: checking if libtirpc is requested and available" >&5
|
||
+echo $ECHO_N "checking if libtirpc is requested and available... $ECHO_C" >&6; }
|
||
+
|
||
+# Check whether --with-libtirpc was given.
|
||
+if test "${with_libtirpc+set}" = set; then
|
||
+ withval=$with_libtirpc; if test "$withval" = yes; then
|
||
+
|
||
+# save current flags
|
||
+af_check_libtirpc_save_cflags="$CFLAGS"
|
||
+af_check_libtirpc_save_ldflags="$LDFLAGS"
|
||
+CFLAGS="$CFLAGS -I/usr/include/tirpc"
|
||
+LDFLAGS="$LDFLAGS -ltirpc"
|
||
+
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+ #include <rpc/rpc.h>
|
||
+int
|
||
+main ()
|
||
+{
|
||
+ CLIENT *cl;
|
||
+ struct sockaddr_in addr;
|
||
+ int fd;
|
||
+ unsigned long ul; struct timeval t; unsigned int ui;
|
||
+ cl = clntudp_bufcreate(&addr,ul,ul,t,&fd,ui,ui);
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+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
|
||
+ 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_exeext &&
|
||
+ $as_test_x conftest$ac_exeext; then
|
||
+ af_have_libtirpc=yes
|
||
+ { echo "$as_me:$LINENO: result: yes" >&5
|
||
+echo "${ECHO_T}yes" >&6; }
|
||
else
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
-done
|
||
-IFS=$as_save_IFS
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
+
|
||
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
+
|
||
+if test "$af_have_libtirpc" = "yes"; then
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define TIRPC_WORKAROUND 1
|
||
+_ACEOF
|
||
+
|
||
+ TIRPCLIB="-ltirpc"
|
||
fi
|
||
-CC=$ac_cv_prog_CC
|
||
-if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+
|
||
+# restore flags
|
||
+CFLAGS="$af_check_libtirpc_save_cflags"
|
||
+LDFLAGS="$af_check_libtirpc_save_ldflags"
|
||
+
|
||
+ { echo "$as_me:$LINENO: checking if libtirpc has IPv6 support" >&5
|
||
+echo $ECHO_N "checking if libtirpc has IPv6 support... $ECHO_C" >&6; }
|
||
+
|
||
+# save current flags
|
||
+af_check_libtirpc_ipv6_save_cflags="$CFLAGS"
|
||
+af_check_libtirpc_ipv6_save_ldflags="$LDFLAGS"
|
||
+CFLAGS="$CFLAGS -I/usr/include/tirpc"
|
||
+LDFLAGS="$LDFLAGS -ltirpc"
|
||
+
|
||
+cat >conftest.$ac_ext <<_ACEOF
|
||
+/* confdefs.h. */
|
||
+_ACEOF
|
||
+cat confdefs.h >>conftest.$ac_ext
|
||
+cat >>conftest.$ac_ext <<_ACEOF
|
||
+/* end confdefs.h. */
|
||
+ #define INET6
|
||
+ #include <rpc/rpc.h>
|
||
+int
|
||
+main ()
|
||
+{
|
||
+ CLIENT *cl;
|
||
+ struct sockaddr_in addr;
|
||
+ int fd;
|
||
+ unsigned long ul; struct timeval t; unsigned int ui;
|
||
+ cl = clntudp6_bufcreate(&addr,ul,ul,t,&fd,ui,ui);
|
||
+ ;
|
||
+ return 0;
|
||
+}
|
||
+_ACEOF
|
||
+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
|
||
+ 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_exeext &&
|
||
+ $as_test_x conftest$ac_exeext; then
|
||
+ af_have_libtirpc_ipv6=yes
|
||
+ { echo "$as_me:$LINENO: result: yes" >&5
|
||
+echo "${ECHO_T}yes" >&6; }
|
||
else
|
||
- { echo "$as_me:$LINENO: result: no" >&5
|
||
+ echo "$as_me: failed program was:" >&5
|
||
+sed 's/^/| /' conftest.$ac_ext >&5
|
||
+
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
|
||
+ conftest$ac_exeext conftest.$ac_ext
|
||
|
||
-fi
|
||
-if test -z "$ac_cv_prog_CC"; then
|
||
- ac_ct_CC=$CC
|
||
- # Extract the first word of "gcc", so it can be a program name with args.
|
||
-set dummy gcc; ac_word=$2
|
||
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- if test -n "$ac_ct_CC"; then
|
||
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
-else
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
-do
|
||
- IFS=$as_save_IFS
|
||
- test -z "$as_dir" && as_dir=.
|
||
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_prog_ac_ct_CC="gcc"
|
||
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
- break 2
|
||
- fi
|
||
-done
|
||
-done
|
||
-IFS=$as_save_IFS
|
||
+if test "$af_have_libtirpc_ipv6" = "yes"; then
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define INET6 1
|
||
+_ACEOF
|
||
|
||
fi
|
||
+
|
||
+# restore flags
|
||
+CFLAGS="$af_check_libtirpc_ipv6_save_cflags"
|
||
+LDFLAGS="$af_check_libtirpc_ipv6_save_ldflags"
|
||
+
|
||
+else
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
-if test -n "$ac_ct_CC"; then
|
||
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
- if test "x$ac_ct_CC" = x; then
|
||
- CC=""
|
||
- else
|
||
- case $cross_compiling:$ac_tool_warned in
|
||
-yes:)
|
||
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
-ac_tool_warned=yes ;;
|
||
-esac
|
||
- CC=$ac_ct_CC
|
||
- fi
|
||
+
|
||
+
|
||
+
|
||
+#
|
||
+# Optional include dmalloc
|
||
+#
|
||
+{ echo "$as_me:$LINENO: checking if malloc debugging is wanted" >&5
|
||
+echo $ECHO_N "checking if malloc debugging is wanted... $ECHO_C" >&6; }
|
||
+
|
||
+# Check whether --with-dmalloc was given.
|
||
+if test "${with_dmalloc+set}" = set; then
|
||
+ withval=$with_dmalloc; if test "$withval" = yes; then
|
||
+ { echo "$as_me:$LINENO: result: yes" >&5
|
||
+echo "${ECHO_T}yes" >&6; }
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define WITH_DMALLOC 1
|
||
+_ACEOF
|
||
+
|
||
+ DMALLOCLIB="-ldmallocth"
|
||
+ LDFLAGS="$LDFLAGS -g"
|
||
else
|
||
- CC="$ac_cv_prog_CC"
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+fi
|
||
+else
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
-if test -z "$CC"; then
|
||
- if test -n "$ac_tool_prefix"; then
|
||
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
|
||
-set dummy ${ac_tool_prefix}cc; ac_word=$2
|
||
+
|
||
+
|
||
+
|
||
+#
|
||
+# Programs needed for various system functions or modules
|
||
+#
|
||
+for ac_prog in mount
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
+if test "${ac_cv_path_MOUNT+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- if test -n "$CC"; then
|
||
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
-else
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
+ case $MOUNT in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_MOUNT="$MOUNT" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_prog_CC="${ac_tool_prefix}cc"
|
||
+ ac_cv_path_MOUNT="$as_dir/$ac_word$ac_exec_ext"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2712,44 +3056,61 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-fi
|
||
-CC=$ac_cv_prog_CC
|
||
-if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+MOUNT=$ac_cv_path_MOUNT
|
||
+if test -n "$MOUNT"; then
|
||
+ { echo "$as_me:$LINENO: result: $MOUNT" >&5
|
||
+echo "${ECHO_T}$MOUNT" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- fi
|
||
+ test -n "$MOUNT" && break
|
||
+done
|
||
+test -n "$MOUNT" || MOUNT="/bin/mount"
|
||
+
|
||
+if test -n "$MOUNT"; then
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define HAVE_MOUNT 1
|
||
+_ACEOF
|
||
+
|
||
+
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_MOUNT "$MOUNT"
|
||
+_ACEOF
|
||
+
|
||
+ HAVE_MOUNT=1
|
||
+else
|
||
+ HAVE_MOUNT=0
|
||
fi
|
||
-if test -z "$CC"; then
|
||
- # Extract the first word of "cc", so it can be a program name with args.
|
||
-set dummy cc; ac_word=$2
|
||
+
|
||
+for ac_prog in umount
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
+if test "${ac_cv_path_UMOUNT+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- if test -n "$CC"; then
|
||
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
-else
|
||
- ac_prog_rejected=no
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
+ case $UMOUNT in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_UMOUNT="$UMOUNT" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
|
||
- ac_prog_rejected=yes
|
||
- continue
|
||
- fi
|
||
- ac_cv_prog_CC="cc"
|
||
+ ac_cv_path_UMOUNT="$as_dir/$ac_word$ac_exec_ext"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2757,53 +3118,61 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
-if test $ac_prog_rejected = yes; then
|
||
- # We found a bogon in the path, so make sure we never use it.
|
||
- set dummy $ac_cv_prog_CC
|
||
- shift
|
||
- if test $# != 0; then
|
||
- # We chose a different compiler from the bogus one.
|
||
- # However, it has the same basename, so the bogon will be chosen
|
||
- # first if we set CC to just the basename; use the full file name.
|
||
- shift
|
||
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
|
||
- fi
|
||
-fi
|
||
-fi
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-CC=$ac_cv_prog_CC
|
||
-if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+UMOUNT=$ac_cv_path_UMOUNT
|
||
+if test -n "$UMOUNT"; then
|
||
+ { echo "$as_me:$LINENO: result: $UMOUNT" >&5
|
||
+echo "${ECHO_T}$UMOUNT" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
+ test -n "$UMOUNT" && break
|
||
+done
|
||
+test -n "$UMOUNT" || UMOUNT="/bin/umount"
|
||
+
|
||
+if test -n "$UMOUNT"; then
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define HAVE_UMOUNT 1
|
||
+_ACEOF
|
||
+
|
||
+
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_UMOUNT "$UMOUNT"
|
||
+_ACEOF
|
||
+
|
||
+ HAVE_UMOUNT=1
|
||
+else
|
||
+ HAVE_UMOUNT=0
|
||
fi
|
||
-if test -z "$CC"; then
|
||
- if test -n "$ac_tool_prefix"; then
|
||
- for ac_prog in cl.exe
|
||
- do
|
||
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
|
||
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
|
||
+
|
||
+for ac_prog in fsck.ext2 e2fsck
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_CC+set}" = set; then
|
||
+if test "${ac_cv_path_E2FSCK+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- if test -n "$CC"; then
|
||
- ac_cv_prog_CC="$CC" # Let the user override the test.
|
||
-else
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
+ case $E2FSCK in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_E2FSCK="$E2FSCK" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
|
||
+ ac_cv_path_E2FSCK="$as_dir/$ac_word$ac_exec_ext"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2811,43 +3180,60 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-fi
|
||
-CC=$ac_cv_prog_CC
|
||
-if test -n "$CC"; then
|
||
- { echo "$as_me:$LINENO: result: $CC" >&5
|
||
-echo "${ECHO_T}$CC" >&6; }
|
||
+E2FSCK=$ac_cv_path_E2FSCK
|
||
+if test -n "$E2FSCK"; then
|
||
+ { echo "$as_me:$LINENO: result: $E2FSCK" >&5
|
||
+echo "${ECHO_T}$E2FSCK" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$CC" && break
|
||
- done
|
||
+ test -n "$E2FSCK" && break
|
||
+done
|
||
+
|
||
+if test -n "$E2FSCK"; then
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define HAVE_E2FSCK 1
|
||
+_ACEOF
|
||
+
|
||
+
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_E2FSCK "$E2FSCK"
|
||
+_ACEOF
|
||
+
|
||
+ HAVE_E2FSCK=1
|
||
+else
|
||
+ HAVE_E2FSCK=0
|
||
fi
|
||
-if test -z "$CC"; then
|
||
- ac_ct_CC=$CC
|
||
- for ac_prog in cl.exe
|
||
+
|
||
+for ac_prog in fsck.ext3 e3fsck
|
||
do
|
||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
set dummy $ac_prog; ac_word=$2
|
||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
|
||
+if test "${ac_cv_path_E3FSCK+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- if test -n "$ac_ct_CC"; then
|
||
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
|
||
-else
|
||
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
-for as_dir in $PATH
|
||
+ case $E3FSCK in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_E3FSCK="$E3FSCK" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
do
|
||
IFS=$as_save_IFS
|
||
test -z "$as_dir" && as_dir=.
|
||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
- ac_cv_prog_ac_ct_CC="$ac_prog"
|
||
+ ac_cv_path_E3FSCK="$as_dir/$ac_word$ac_exec_ext"
|
||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
break 2
|
||
fi
|
||
@@ -2855,655 +3241,436 @@ done
|
||
done
|
||
IFS=$as_save_IFS
|
||
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-fi
|
||
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
|
||
-if test -n "$ac_ct_CC"; then
|
||
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
|
||
-echo "${ECHO_T}$ac_ct_CC" >&6; }
|
||
+E3FSCK=$ac_cv_path_E3FSCK
|
||
+if test -n "$E3FSCK"; then
|
||
+ { echo "$as_me:$LINENO: result: $E3FSCK" >&5
|
||
+echo "${ECHO_T}$E3FSCK" >&6; }
|
||
else
|
||
{ echo "$as_me:$LINENO: result: no" >&5
|
||
echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
|
||
- test -n "$ac_ct_CC" && break
|
||
+ test -n "$E3FSCK" && break
|
||
done
|
||
|
||
- if test "x$ac_ct_CC" = x; then
|
||
- CC=""
|
||
- else
|
||
- case $cross_compiling:$ac_tool_warned in
|
||
-yes:)
|
||
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&5
|
||
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
|
||
-whose name does not start with the host triplet. If you think this
|
||
-configuration is useful to you, please write to autoconf@gnu.org." >&2;}
|
||
-ac_tool_warned=yes ;;
|
||
-esac
|
||
- CC=$ac_ct_CC
|
||
- fi
|
||
-fi
|
||
-
|
||
-fi
|
||
-
|
||
-
|
||
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: no acceptable C compiler found in \$PATH
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
-
|
||
-# Provide some information about the compiler.
|
||
-echo "$as_me:$LINENO: checking for C compiler version" >&5
|
||
-ac_compiler=`set X $ac_compile; echo $2`
|
||
-{ (ac_try="$ac_compiler --version >&5"
|
||
-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_compiler --version >&5") 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }
|
||
-{ (ac_try="$ac_compiler -v >&5"
|
||
-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_compiler -v >&5") 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }
|
||
-{ (ac_try="$ac_compiler -V >&5"
|
||
-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_compiler -V >&5") 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }
|
||
+if test -n "$E3FSCK"; then
|
||
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define HAVE_E3FSCK 1
|
||
_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
|
||
-int
|
||
-main ()
|
||
-{
|
||
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_E3FSCK "$E3FSCK"
|
||
_ACEOF
|
||
-ac_clean_files_save=$ac_clean_files
|
||
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
|
||
-# Try to create an executable without -o first, disregard a.out.
|
||
-# It will help us diagnose broken compilers, and finding out an intuition
|
||
-# of exeext.
|
||
-{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
|
||
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; }
|
||
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
|
||
-#
|
||
-# List of possible output files, starting from the most likely.
|
||
-# The algorithm is not robust to junk in `.', hence go to wildcards (a.*)
|
||
-# only as a last resort. b.out is created by i960 compilers.
|
||
-ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out'
|
||
-#
|
||
-# The IRIX 6 linker writes into existing files which may not be
|
||
-# executable, retaining their permissions. Remove them first so a
|
||
-# subsequent execution test works.
|
||
-ac_rmfiles=
|
||
-for ac_file in $ac_files
|
||
-do
|
||
- case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
||
- * ) ac_rmfiles="$ac_rmfiles $ac_file";;
|
||
- esac
|
||
-done
|
||
-rm -f $ac_rmfiles
|
||
|
||
-if { (ac_try="$ac_link_default"
|
||
-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_default") 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; then
|
||
- # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
|
||
-# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
|
||
-# in a Makefile. We should not override ac_cv_exeext if it was cached,
|
||
-# so that the user can short-circuit this test for compilers unknown to
|
||
-# Autoconf.
|
||
-for ac_file in $ac_files ''
|
||
+ HAVE_E3FSCK=1
|
||
+else
|
||
+ HAVE_E3FSCK=0
|
||
+fi
|
||
+
|
||
+for ac_prog in modprobe
|
||
do
|
||
- test -f "$ac_file" || continue
|
||
- case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj )
|
||
- ;;
|
||
- [ab].out )
|
||
- # We found the default executable, but exeext='' is most
|
||
- # certainly right.
|
||
- break;;
|
||
- *.* )
|
||
- if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
|
||
- then :; else
|
||
- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
- fi
|
||
- # We set ac_cv_exeext here because the later test for it is not
|
||
- # safe: cross compilers may not add the suffix if given an `-o'
|
||
- # argument, so we may need to know it at that point already.
|
||
- # Even if this section looks crufty: it has the advantage of
|
||
- # actually working.
|
||
- break;;
|
||
- * )
|
||
- break;;
|
||
- esac
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_path_MODPROBE+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ case $MODPROBE in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_MODPROBE="$MODPROBE" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
+ ac_cv_path_MODPROBE="$as_dir/$ac_word$ac_exec_ext"
|
||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ break 2
|
||
+ fi
|
||
done
|
||
-test "$ac_cv_exeext" = no && ac_cv_exeext=
|
||
+done
|
||
+IFS=$as_save_IFS
|
||
|
||
+ ;;
|
||
+esac
|
||
+fi
|
||
+MODPROBE=$ac_cv_path_MODPROBE
|
||
+if test -n "$MODPROBE"; then
|
||
+ { echo "$as_me:$LINENO: result: $MODPROBE" >&5
|
||
+echo "${ECHO_T}$MODPROBE" >&6; }
|
||
else
|
||
- ac_file=''
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
fi
|
||
|
||
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
|
||
-echo "${ECHO_T}$ac_file" >&6; }
|
||
-if test -z "$ac_file"; then
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
|
||
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: C compiler cannot create executables
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 77); exit 77; }; }
|
||
-fi
|
||
+ test -n "$MODPROBE" && break
|
||
+done
|
||
|
||
-ac_exeext=$ac_cv_exeext
|
||
+if test -n "$MODPROBE"; then
|
||
|
||
-# Check that the compiler produces executables we can run. If not, either
|
||
-# the compiler is broken, or we cross compile.
|
||
-{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5
|
||
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; }
|
||
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
|
||
-# If not cross compiling, check that we can run a simple program.
|
||
-if test "$cross_compiling" != yes; then
|
||
- if { ac_try='./$ac_file'
|
||
- { (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_try") 2>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; }; then
|
||
- cross_compiling=no
|
||
- else
|
||
- if test "$cross_compiling" = maybe; then
|
||
- cross_compiling=yes
|
||
- else
|
||
- { { echo "$as_me:$LINENO: error: cannot run C compiled programs.
|
||
-If you meant to cross compile, use \`--host'.
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot run C compiled programs.
|
||
-If you meant to cross compile, use \`--host'.
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
- fi
|
||
- fi
|
||
-fi
|
||
-{ echo "$as_me:$LINENO: result: yes" >&5
|
||
-echo "${ECHO_T}yes" >&6; }
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define HAVE_MODPROBE 1
|
||
+_ACEOF
|
||
|
||
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
|
||
-ac_clean_files=$ac_clean_files_save
|
||
-# Check that the compiler produces executables we can run. If not, either
|
||
-# the compiler is broken, or we cross compile.
|
||
-{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
|
||
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; }
|
||
-{ echo "$as_me:$LINENO: result: $cross_compiling" >&5
|
||
-echo "${ECHO_T}$cross_compiling" >&6; }
|
||
|
||
-{ echo "$as_me:$LINENO: checking for suffix of executables" >&5
|
||
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; }
|
||
-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>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; then
|
||
- # If both `conftest.exe' and `conftest' are `present' (well, observable)
|
||
-# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
|
||
-# work properly (i.e., refer to `conftest.exe'), while it won't with
|
||
-# `rm'.
|
||
-for ac_file in conftest.exe conftest conftest.*; do
|
||
- test -f "$ac_file" || continue
|
||
- case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;;
|
||
- *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
|
||
- break;;
|
||
- * ) break;;
|
||
- esac
|
||
-done
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_MODPROBE "$MODPROBE"
|
||
+_ACEOF
|
||
+
|
||
+ HAVE_MODPROBE=1
|
||
else
|
||
- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
|
||
-See \`config.log' for more details." >&2;}
|
||
- { (exit 1); exit 1; }; }
|
||
+ HAVE_MODPROBE=0
|
||
fi
|
||
|
||
-rm -f conftest$ac_cv_exeext
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
|
||
-echo "${ECHO_T}$ac_cv_exeext" >&6; }
|
||
|
||
-rm -f conftest.$ac_ext
|
||
-EXEEXT=$ac_cv_exeext
|
||
-ac_exeext=$EXEEXT
|
||
-{ echo "$as_me:$LINENO: checking for suffix of object files" >&5
|
||
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_objext+set}" = set; then
|
||
+for ac_prog in flex lex
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_path_LEX+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-
|
||
-int
|
||
-main ()
|
||
-{
|
||
+ case $LEX in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_LEX="$LEX" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
+ ac_cv_path_LEX="$as_dir/$ac_word$ac_exec_ext"
|
||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ break 2
|
||
+ fi
|
||
+done
|
||
+done
|
||
+IFS=$as_save_IFS
|
||
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_ACEOF
|
||
-rm -f conftest.o conftest.obj
|
||
-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>&5
|
||
- ac_status=$?
|
||
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||
- (exit $ac_status); }; then
|
||
- for ac_file in conftest.o conftest.obj conftest.*; do
|
||
- test -f "$ac_file" || continue;
|
||
- case $ac_file in
|
||
- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;;
|
||
- *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
|
||
- break;;
|
||
- esac
|
||
-done
|
||
+fi
|
||
+LEX=$ac_cv_path_LEX
|
||
+if test -n "$LEX"; then
|
||
+ { echo "$as_me:$LINENO: result: $LEX" >&5
|
||
+echo "${ECHO_T}$LEX" >&6; }
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+fi
|
||
|
||
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
|
||
-See \`config.log' for more details." >&5
|
||
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
|
||
-See \`config.log' for more details." >&2;}
|
||
+
|
||
+ test -n "$LEX" && break
|
||
+done
|
||
+
|
||
+if test -n "$LEX"; then
|
||
+
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_LEX "$LEX"
|
||
+_ACEOF
|
||
+
|
||
+ PATH_LEX="$LEX"
|
||
+else
|
||
+ { { echo "$as_me:$LINENO: error: required program LEX not found" >&5
|
||
+echo "$as_me: error: required program LEX not found" >&2;}
|
||
{ (exit 1); exit 1; }; }
|
||
fi
|
||
|
||
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
|
||
+for ac_prog in bison
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_path_YACC+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ case $YACC in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_YACC="$YACC" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
+ ac_cv_path_YACC="$as_dir/$ac_word$ac_exec_ext"
|
||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ break 2
|
||
+ fi
|
||
+done
|
||
+done
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+ ;;
|
||
+esac
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
|
||
-echo "${ECHO_T}$ac_cv_objext" >&6; }
|
||
-OBJEXT=$ac_cv_objext
|
||
-ac_objext=$OBJEXT
|
||
-{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
|
||
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+YACC=$ac_cv_path_YACC
|
||
+if test -n "$YACC"; then
|
||
+ { echo "$as_me:$LINENO: result: $YACC" >&5
|
||
+echo "${ECHO_T}$YACC" >&6; }
|
||
else
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+fi
|
||
|
||
-int
|
||
-main ()
|
||
-{
|
||
-#ifndef __GNUC__
|
||
- choke me
|
||
-#endif
|
||
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_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_compiler_gnu=yes
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+ test -n "$YACC" && break
|
||
+done
|
||
|
||
- ac_compiler_gnu=no
|
||
-fi
|
||
+if test -n "$YACC"; then
|
||
|
||
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_YACC "$YACC"
|
||
+_ACEOF
|
||
|
||
+ PATH_YACC="$YACC"
|
||
+else
|
||
+ { { echo "$as_me:$LINENO: error: required program YACC not found" >&5
|
||
+echo "$as_me: error: required program YACC not found" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
|
||
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; }
|
||
-GCC=`test $ac_compiler_gnu = yes && echo yes`
|
||
-ac_test_CFLAGS=${CFLAGS+set}
|
||
-ac_save_CFLAGS=$CFLAGS
|
||
-{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
|
||
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_cc_g+set}" = set; then
|
||
+
|
||
+for ac_prog in ranlib
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_path_RANLIB+set}" = set; then
|
||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
else
|
||
- ac_save_c_werror_flag=$ac_c_werror_flag
|
||
- ac_c_werror_flag=yes
|
||
- ac_cv_prog_cc_g=no
|
||
- CFLAGS="-g"
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-
|
||
-int
|
||
-main ()
|
||
-{
|
||
+ case $RANLIB in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_RANLIB="$RANLIB" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
+ ac_cv_path_RANLIB="$as_dir/$ac_word$ac_exec_ext"
|
||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ break 2
|
||
+ fi
|
||
+done
|
||
+done
|
||
+IFS=$as_save_IFS
|
||
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_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_cv_prog_cc_g=yes
|
||
+fi
|
||
+RANLIB=$ac_cv_path_RANLIB
|
||
+if test -n "$RANLIB"; then
|
||
+ { echo "$as_me:$LINENO: result: $RANLIB" >&5
|
||
+echo "${ECHO_T}$RANLIB" >&6; }
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+fi
|
||
|
||
- CFLAGS=""
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
|
||
-int
|
||
-main ()
|
||
-{
|
||
+ test -n "$RANLIB" && break
|
||
+done
|
||
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_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
|
||
- :
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+if test -n "$RANLIB"; then
|
||
|
||
- ac_c_werror_flag=$ac_save_c_werror_flag
|
||
- CFLAGS="-g"
|
||
- cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_RANLIB "$RANLIB"
|
||
_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
|
||
-int
|
||
-main ()
|
||
-{
|
||
+ PATH_RANLIB="$RANLIB"
|
||
+else
|
||
+ { { echo "$as_me:$LINENO: error: required program RANLIB not found" >&5
|
||
+echo "$as_me: error: required program RANLIB not found" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
+fi
|
||
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
-_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;;
|
||
+for ac_prog in rpcgen
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_path_RPCGEN+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ case $RPCGEN in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_RPCGEN="$RPCGEN" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $searchpath
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
+ ac_cv_path_RPCGEN="$as_dir/$ac_word$ac_exec_ext"
|
||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ break 2
|
||
+ fi
|
||
+done
|
||
+done
|
||
+IFS=$as_save_IFS
|
||
+
|
||
+ ;;
|
||
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_cv_prog_cc_g=yes
|
||
+fi
|
||
+RPCGEN=$ac_cv_path_RPCGEN
|
||
+if test -n "$RPCGEN"; then
|
||
+ { echo "$as_me:$LINENO: result: $RPCGEN" >&5
|
||
+echo "${ECHO_T}$RPCGEN" >&6; }
|
||
else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+fi
|
||
|
||
|
||
-fi
|
||
+ test -n "$RPCGEN" && break
|
||
+done
|
||
|
||
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-fi
|
||
+if test -n "$RPCGEN"; then
|
||
|
||
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
-fi
|
||
+cat >>confdefs.h <<_ACEOF
|
||
+#define PATH_RPCGEN "$RPCGEN"
|
||
+_ACEOF
|
||
|
||
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
|
||
- ac_c_werror_flag=$ac_save_c_werror_flag
|
||
-fi
|
||
-{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; }
|
||
-if test "$ac_test_CFLAGS" = set; then
|
||
- CFLAGS=$ac_save_CFLAGS
|
||
-elif test $ac_cv_prog_cc_g = yes; then
|
||
- if test "$GCC" = yes; then
|
||
- CFLAGS="-g -O2"
|
||
- else
|
||
- CFLAGS="-g"
|
||
- fi
|
||
+ PATH_RPCGEN="$RPCGEN"
|
||
else
|
||
- if test "$GCC" = yes; then
|
||
- CFLAGS="-O2"
|
||
- else
|
||
- CFLAGS=
|
||
- fi
|
||
+ { { echo "$as_me:$LINENO: error: required program RPCGEN not found" >&5
|
||
+echo "$as_me: error: required program RPCGEN not found" >&2;}
|
||
+ { (exit 1); exit 1; }; }
|
||
fi
|
||
-{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5
|
||
-echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; }
|
||
-if test "${ac_cv_prog_cc_c89+set}" = set; then
|
||
- echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
-else
|
||
- ac_cv_prog_cc_c89=no
|
||
-ac_save_CC=$CC
|
||
-cat >conftest.$ac_ext <<_ACEOF
|
||
-/* confdefs.h. */
|
||
-_ACEOF
|
||
-cat confdefs.h >>conftest.$ac_ext
|
||
-cat >>conftest.$ac_ext <<_ACEOF
|
||
-/* end confdefs.h. */
|
||
-#include <stdarg.h>
|
||
-#include <stdio.h>
|
||
-#include <sys/types.h>
|
||
-#include <sys/stat.h>
|
||
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
|
||
-struct buf { int x; };
|
||
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
|
||
-static char *e (p, i)
|
||
- char **p;
|
||
- int i;
|
||
-{
|
||
- return p[i];
|
||
-}
|
||
-static char *f (char * (*g) (char **, int), char **p, ...)
|
||
-{
|
||
- char *s;
|
||
- va_list v;
|
||
- va_start (v,p);
|
||
- s = g (p, va_arg (v,int));
|
||
- va_end (v);
|
||
- return s;
|
||
-}
|
||
|
||
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
|
||
- function prototypes and stuff, but not '\xHH' hex character constants.
|
||
- These don't provoke an error unfortunately, instead are silently treated
|
||
- as 'x'. The following induces an error, until -std is added to get
|
||
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
|
||
- array size at least. It's necessary to write '\x00'==0 to get something
|
||
- that's true only with -std. */
|
||
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
|
||
|
||
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
|
||
- inside strings and character constants. */
|
||
-#define FOO(x) 'x'
|
||
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
|
||
+#
|
||
+# Newer mounts have the -s (sloppy) option to ignore unknown options,
|
||
+# good for portability
|
||
+#
|
||
+if test -n "$MOUNT" ; then
|
||
+ { echo "$as_me:$LINENO: checking if mount accepts the -s option" >&5
|
||
+echo $ECHO_N "checking if mount accepts the -s option... $ECHO_C" >&6; }
|
||
+ if "$MOUNT" -s > /dev/null 2>&1 ; then
|
||
|
||
-int test (int i, double x);
|
||
-struct s1 {int (*f) (int a);};
|
||
-struct s2 {int (*f) (double a);};
|
||
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
|
||
-int argc;
|
||
-char **argv;
|
||
-int
|
||
-main ()
|
||
-{
|
||
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
|
||
- ;
|
||
- return 0;
|
||
-}
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define HAVE_SLOPPY_MOUNT 1
|
||
_ACEOF
|
||
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
|
||
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
|
||
-do
|
||
- CC="$ac_save_CC $ac_arg"
|
||
- 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_cv_prog_cc_c89=$ac_arg
|
||
-else
|
||
- echo "$as_me: failed program was:" >&5
|
||
-sed 's/^/| /' conftest.$ac_ext >&5
|
||
-
|
||
|
||
+ { 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; }
|
||
+ fi
|
||
fi
|
||
|
||
-rm -f core conftest.err conftest.$ac_objext
|
||
- test "x$ac_cv_prog_cc_c89" != "xno" && break
|
||
+# LDAP SASL auth need libxml
|
||
+for ac_prog in xml2-config
|
||
+do
|
||
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
|
||
+set dummy $ac_prog; ac_word=$2
|
||
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
|
||
+if test "${ac_cv_path_XML_CONFIG+set}" = set; then
|
||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
||
+else
|
||
+ case $XML_CONFIG in
|
||
+ [\\/]* | ?:[\\/]*)
|
||
+ ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
|
||
+ ;;
|
||
+ *)
|
||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
+for as_dir in $PATH
|
||
+do
|
||
+ IFS=$as_save_IFS
|
||
+ test -z "$as_dir" && as_dir=.
|
||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
||
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
|
||
+ ac_cv_path_XML_CONFIG="$as_dir/$ac_word$ac_exec_ext"
|
||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
+ break 2
|
||
+ fi
|
||
done
|
||
-rm -f conftest.$ac_ext
|
||
-CC=$ac_save_CC
|
||
+done
|
||
+IFS=$as_save_IFS
|
||
|
||
-fi
|
||
-# AC_CACHE_VAL
|
||
-case "x$ac_cv_prog_cc_c89" in
|
||
- x)
|
||
- { echo "$as_me:$LINENO: result: none needed" >&5
|
||
-echo "${ECHO_T}none needed" >&6; } ;;
|
||
- xno)
|
||
- { echo "$as_me:$LINENO: result: unsupported" >&5
|
||
-echo "${ECHO_T}unsupported" >&6; } ;;
|
||
- *)
|
||
- CC="$CC $ac_cv_prog_cc_c89"
|
||
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
|
||
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
|
||
+ ;;
|
||
esac
|
||
+fi
|
||
+XML_CONFIG=$ac_cv_path_XML_CONFIG
|
||
+if test -n "$XML_CONFIG"; then
|
||
+ { echo "$as_me:$LINENO: result: $XML_CONFIG" >&5
|
||
+echo "${ECHO_T}$XML_CONFIG" >&6; }
|
||
+else
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+fi
|
||
|
||
|
||
-ac_ext=c
|
||
-ac_cpp='$CPP $CPPFLAGS'
|
||
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||
+ test -n "$XML_CONFIG" && break
|
||
+done
|
||
+test -n "$XML_CONFIG" || XML_CONFIG="no"
|
||
+
|
||
+{ echo "$as_me:$LINENO: checking for libxml2" >&5
|
||
+echo $ECHO_N "checking for libxml2... $ECHO_C" >&6; }
|
||
+if test "$XML_CONFIG" = "no"
|
||
+then
|
||
+ { echo "$as_me:$LINENO: result: no" >&5
|
||
+echo "${ECHO_T}no" >&6; }
|
||
+ HAVE_LIBXML=0
|
||
+else
|
||
+ { echo "$as_me:$LINENO: result: yes" >&5
|
||
+echo "${ECHO_T}yes" >&6; }
|
||
+ HAVE_LIBXML=1
|
||
+ XML_LIBS=`$XML_CONFIG --libs`
|
||
+ XML_FLAGS=`$XML_CONFIG --cflags`
|
||
+ XML_VER=`$XML_CONFIG --version`
|
||
+ XML_MAJOR=`echo $XML_VER|cut -d\. -f1`
|
||
+ if test $XML_MAJOR -le 99
|
||
+ then
|
||
+ XML_MINOR=`echo $XML_VER|cut -d\. -f2`
|
||
+ if test $XML_MINOR -le 99
|
||
+ then
|
||
+ XML_REV=`echo $XML_VER|cut -d\. -f3`
|
||
+ if test $XML_REV -le 99; then
|
||
+
|
||
+cat >>confdefs.h <<\_ACEOF
|
||
+#define LIBXML2_WORKAROUND 1
|
||
+_ACEOF
|
||
|
||
+ fi
|
||
+ fi
|
||
+ fi
|
||
+fi
|
||
|
||
+#
|
||
+# glibc/libc 6 new libraries
|
||
+#
|
||
{ echo "$as_me:$LINENO: checking for yp_match in -lnsl" >&5
|
||
echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6; }
|
||
if test "${ac_cv_lib_nsl_yp_match+set}" = set; then
|
||
@@ -6280,6 +6447,14 @@ confdir!$confdir$ac_delim
|
||
mapdir!$mapdir$ac_delim
|
||
fifodir!$fifodir$ac_delim
|
||
flagdir!$flagdir$ac_delim
|
||
+CC!$CC$ac_delim
|
||
+CFLAGS!$CFLAGS$ac_delim
|
||
+LDFLAGS!$LDFLAGS$ac_delim
|
||
+CPPFLAGS!$CPPFLAGS$ac_delim
|
||
+ac_ct_CC!$ac_ct_CC$ac_delim
|
||
+EXEEXT!$EXEEXT$ac_delim
|
||
+OBJEXT!$OBJEXT$ac_delim
|
||
+TIRPCLIB!$TIRPCLIB$ac_delim
|
||
DMALLOCLIB!$DMALLOCLIB$ac_delim
|
||
MOUNT!$MOUNT$ac_delim
|
||
HAVE_MOUNT!$HAVE_MOUNT$ac_delim
|
||
@@ -6300,13 +6475,6 @@ PATH_RANLIB!$PATH_RANLIB$ac_delim
|
||
RPCGEN!$RPCGEN$ac_delim
|
||
PATH_RPCGEN!$PATH_RPCGEN$ac_delim
|
||
XML_CONFIG!$XML_CONFIG$ac_delim
|
||
-CC!$CC$ac_delim
|
||
-CFLAGS!$CFLAGS$ac_delim
|
||
-LDFLAGS!$LDFLAGS$ac_delim
|
||
-CPPFLAGS!$CPPFLAGS$ac_delim
|
||
-ac_ct_CC!$ac_ct_CC$ac_delim
|
||
-EXEEXT!$EXEEXT$ac_delim
|
||
-OBJEXT!$OBJEXT$ac_delim
|
||
LIBNSL!$LIBNSL$ac_delim
|
||
LIBRESOLV!$LIBRESOLV$ac_delim
|
||
HAVE_HESIOD!$HAVE_HESIOD$ac_delim
|
||
@@ -6330,7 +6498,7 @@ LIBOBJS!$LIBOBJS$ac_delim
|
||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||
_ACEOF
|
||
|
||
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 90; then
|
||
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 91; then
|
||
break
|
||
elif $ac_last_try; then
|
||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||
--- autofs-5.0.4.orig/configure.in
|
||
+++ autofs-5.0.4/configure.in
|
||
@@ -113,6 +113,12 @@ AC_MSG_RESULT([$flagdir])
|
||
AC_SUBST(flagdir)
|
||
|
||
#
|
||
+# Use libtirpc
|
||
+#
|
||
+AM_WITH_LIBTIRPC()
|
||
+AC_SUBST(TIRPCLIB)
|
||
+
|
||
+#
|
||
# Optional include dmalloc
|
||
#
|
||
AM_WITH_DMALLOC()
|
||
--- autofs-5.0.4.orig/daemon/automount.c
|
||
+++ autofs-5.0.4/daemon/automount.c
|
||
@@ -2057,7 +2057,10 @@ int main(int argc, char *argv[])
|
||
}
|
||
|
||
#ifdef LIBXML2_WORKAROUND
|
||
- void *dh = dlopen("libxml2.so", RTLD_NOW);
|
||
+ void *dh_xml2 = dlopen("libxml2.so", RTLD_NOW);
|
||
+#endif
|
||
+#ifdef TIRPC_WORKAROUND
|
||
+ void *dh_tirpc = dlopen("libitirpc.so", RTLD_NOW);
|
||
#endif
|
||
|
||
if (!master_read_master(master_list, age, 0)) {
|
||
@@ -2090,9 +2093,13 @@ int main(int argc, char *argv[])
|
||
closelog();
|
||
release_flag_file();
|
||
|
||
+#ifdef TIRPC_WORKAROUND
|
||
+ if (dh_tirpc)
|
||
+ dlclose(dh_tirpc);
|
||
+#endif
|
||
#ifdef LIBXML2_WORKAROUND
|
||
- if (dh)
|
||
- dlclose(dh);
|
||
+ if (dh_xml2)
|
||
+ dlclose(dh_xml2);
|
||
#endif
|
||
close_ioctl_ctl();
|
||
|
||
--- autofs-5.0.4.orig/include/config.h.in
|
||
+++ autofs-5.0.4/include/config.h.in
|
||
@@ -66,6 +66,9 @@
|
||
/* Define to 1 if you have the <unistd.h> header file. */
|
||
#undef HAVE_UNISTD_H
|
||
|
||
+/* Use IPv6 with libtirpc */
|
||
+#undef INET6
|
||
+
|
||
/* Use libxml2 tsd usage workaround */
|
||
#undef LIBXML2_WORKAROUND
|
||
|
||
@@ -114,6 +117,9 @@
|
||
/* Define to 1 if you have the ANSI C header files. */
|
||
#undef STDC_HEADERS
|
||
|
||
+/* Use libtirpc tsd usage workaround */
|
||
+#undef TIRPC_WORKAROUND
|
||
+
|
||
/* Define if using the dmalloc debugging malloc package */
|
||
#undef WITH_DMALLOC
|
||
|
||
--- autofs-5.0.4.orig/CHANGELOG
|
||
+++ autofs-5.0.4/CHANGELOG
|
||
@@ -17,6 +17,7 @@
|
||
- always read entire file map into cache to speed lookups.
|
||
- make MAX_ERR_BUF and PARSE_MAX_BUF use easier to audit.
|
||
- make some easy alloca replacements (Valerie Aurora Henson).
|
||
+- update to configure libtirpc if present.
|
||
|
||
4/11/2008 autofs-5.0.4
|
||
-----------------------
|