diff -Naur fam-oss-2.6.4/Makefile.in fam-oss-2.6.4-new//Makefile.in
--- fam-oss-2.6.4/Makefile.in	Sat May 20 07:23:23 2000
+++ fam-oss-2.6.4-new//Makefile.in	Tue May 30 18:40:00 2000
@@ -62,8 +62,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -73,13 +77,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -Naur fam-oss-2.6.4/acconfig.h fam-oss-2.6.4-new//acconfig.h
--- fam-oss-2.6.4/acconfig.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//acconfig.h	Tue May 30 16:26:19 2000
@@ -5,6 +5,9 @@
 **  "autoheader" and "configure" to generate config.h.
 */
 
+/*  Define whether we are on Sun */
+#undef HAVE_SUN
+
 /*  Define if the C++ compiler supports a built-in bool type.  */
 #undef HAVE_BOOL
 
@@ -94,6 +97,9 @@
 */
 #undef CONFIG_SOCKLEN_T
 
+/*  Sun doesn't have u_int32_t, it has uint32_t :) --cK */
+#undef CONFIG_U_INT32_T
+
 /*  why do I have to have these?  PACKAGE and VERSION are defined by
     AM_INIT_AUTOMAKE, and the examples don't say anything about having
     to mess with these things elsewhere. */
diff -Naur fam-oss-2.6.4/aclocal.m4 fam-oss-2.6.4-new//aclocal.m4
--- fam-oss-2.6.4/aclocal.m4	Sat May 20 07:23:21 2000
+++ fam-oss-2.6.4-new//aclocal.m4	Tue May 30 16:28:50 2000
@@ -125,7 +125,20 @@
 done<<>>dnl>>)
 changequote([,]))])
 
+# Define a conditional.
 
+AC_DEFUN(AM_CONDITIONAL,
+[AC_SUBST($1_TRUE)
+AC_SUBST($1_FALSE)
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi])
+
+
 # serial 40 AC_PROG_LIBTOOL
 AC_DEFUN(AC_PROG_LIBTOOL,
 [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
@@ -139,7 +152,7 @@
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || AC_MSG_ERROR([libtool configure failed])
 
 # Reload cache, that may have been modified by ltconfig
@@ -171,6 +184,11 @@
 AC_REQUIRE([AC_PROG_LN_S])dnl
 dnl
 
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
@@ -189,7 +207,7 @@
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
   echo '[#]line __oline__ "configure"' > conftest.$ac_ext
@@ -405,7 +423,6 @@
   AC_MSG_RESULT(no)
 fi
 test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_SUBST(LD)
 AC_PROG_LD_GNU
 ])
 
@@ -451,14 +468,13 @@
 fi])
 NM="$ac_cv_path_NM"
 AC_MSG_RESULT([$NM])
-AC_SUBST(NM)
 ])
 
 # AC_CHECK_LIBM - check for math library
 AC_DEFUN(AC_CHECK_LIBM,
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
-case "$host" in
+case "$lt_target" in
 *-*-beos* | *-*-cygwin*)
   # These system don't have libm
   ;;
diff -Naur fam-oss-2.6.4/build/Makefile.in fam-oss-2.6.4-new//build/Makefile.in
--- fam-oss-2.6.4/build/Makefile.in	Sat May 20 07:24:35 2000
+++ fam-oss-2.6.4-new//build/Makefile.in	Tue May 30 18:40:00 2000
@@ -57,8 +57,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -68,13 +72,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -96,9 +98,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps build/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu build/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -197,6 +199,11 @@
 subdir = build
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu build/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Naur fam-oss-2.6.4/build/rpm/Makefile.am fam-oss-2.6.4-new//build/rpm/Makefile.am
--- fam-oss-2.6.4/build/rpm/Makefile.am	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//build/rpm/Makefile.am	Tue May 30 16:26:19 2000
@@ -30,6 +30,6 @@
 	ls -1 *.rpm
 
 clean-local:
-	test ! -e $(RPMROOT) || rm -rf $(RPMROOT)
+	test ! -f $(RPMROOT) || rm -rf $(RPMROOT)
 
 EXTRA_DIST = fam.spec
diff -Naur fam-oss-2.6.4/build/rpm/Makefile.in fam-oss-2.6.4-new//build/rpm/Makefile.in
--- fam-oss-2.6.4/build/rpm/Makefile.in	Sat May 20 07:24:39 2000
+++ fam-oss-2.6.4-new//build/rpm/Makefile.in	Tue May 30 18:40:00 2000
@@ -60,8 +60,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -71,13 +75,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -105,9 +107,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps build/rpm/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu build/rpm/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -120,6 +122,11 @@
 subdir = build/rpm
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu build/rpm/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
@@ -216,7 +223,7 @@
 	ls -1 *.rpm
 
 clean-local:
-	test ! -e $(RPMROOT) || rm -rf $(RPMROOT)
+	test ! -f $(RPMROOT) || rm -rf $(RPMROOT)
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur fam-oss-2.6.4/config.h.in fam-oss-2.6.4-new//config.h.in
--- fam-oss-2.6.4/config.h.in	Sat May 20 06:50:17 2000
+++ fam-oss-2.6.4-new//config.h.in	Tue May 30 16:26:20 2000
@@ -1,5 +1,8 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/*  Define whether we are on Sun */
+#undef HAVE_SUN
+
 /*  Define if the C++ compiler supports a built-in bool type.  */
 #undef HAVE_BOOL
 
@@ -70,6 +73,9 @@
 */
 #undef CONFIG_SOCKLEN_T
 
+/*  Sun doesn't have u_int32_t, it has uint32_t :) --cK */
+#undef CONFIG_U_INT32_T
+
 /* Name of package */
 #undef PACKAGE
 
diff -Naur fam-oss-2.6.4/configure fam-oss-2.6.4-new//configure
--- fam-oss-2.6.4/configure	Sat May 20 07:23:25 2000
+++ fam-oss-2.6.4-new//configure	Tue May 30 16:28:54 2000
@@ -533,6 +533,7 @@
 fi
 
 
+
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -552,6 +553,96 @@
 ac_config_sub=$ac_aux_dir/config.sub
 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 
+
+# Do some error checking and defaulting for the host and target type.
+# The inputs are:
+#    configure --host=HOST --target=TARGET --build=BUILD NONOPT
+#
+# The rules are:
+# 1. You are not allowed to specify --host, --target, and nonopt at the
+#    same time.
+# 2. Host defaults to nonopt.
+# 3. If nonopt is not specified, then host defaults to the current host,
+#    as determined by config.guess.
+# 4. Target and build default to nonopt.
+# 5. If nonopt is not specified, then target and build default to host.
+
+# The aliases save the names the user supplied, while $host etc.
+# will get canonicalized.
+case $host---$target---$nonopt in
+NONE---*---* | *---NONE---* | *---*---NONE) ;;
+*) { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } ;;
+esac
+
+
+# Make sure we can run config.sub.
+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
+else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
+fi
+
+echo $ac_n "checking host system type""... $ac_c" 1>&6
+echo "configure:585: checking host system type" >&5
+
+host_alias=$host
+case "$host_alias" in
+NONE)
+  case $nonopt in
+  NONE)
+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
+    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
+    fi ;;
+  *) host_alias=$nonopt ;;
+  esac ;;
+esac
+
+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
+host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$host" 1>&6
+
+echo $ac_n "checking target system type""... $ac_c" 1>&6
+echo "configure:606: checking target system type" >&5
+
+target_alias=$target
+case "$target_alias" in
+NONE)
+  case $nonopt in
+  NONE) target_alias=$host_alias ;;
+  *) target_alias=$nonopt ;;
+  esac ;;
+esac
+
+target=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $target_alias`
+target_cpu=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+target_vendor=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$target" 1>&6
+
+echo $ac_n "checking build system type""... $ac_c" 1>&6
+echo "configure:624: checking build system type" >&5
+
+build_alias=$build
+case "$build_alias" in
+NONE)
+  case $nonopt in
+  NONE) build_alias=$host_alias ;;
+  *) build_alias=$nonopt ;;
+  esac ;;
+esac
+
+build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+echo "$ac_t""$build" 1>&6
+
+test "$host_alias" != "$target_alias" &&
+  test "$program_prefix$program_suffix$program_transform_name" = \
+    NONENONEs,x,x, &&
+  program_prefix=${target_alias}-
+
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -564,7 +655,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:568: checking for a BSD compatible install" >&5
+echo "configure:659: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -617,7 +708,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6
-echo "configure:621: checking whether build environment is sane" >&5
+echo "configure:712: checking whether build environment is sane" >&5
 # Just in case
 sleep 1
 echo timestamp > conftestfile
@@ -674,7 +765,7 @@
 test "$program_transform_name" = "" && program_transform_name="s,x,x,"
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:678: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:769: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -720,7 +811,7 @@
 
 missing_dir=`cd $ac_aux_dir && pwd`
 echo $ac_n "checking for working aclocal""... $ac_c" 1>&6
-echo "configure:724: checking for working aclocal" >&5
+echo "configure:815: checking for working aclocal" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -733,7 +824,7 @@
 fi
 
 echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
-echo "configure:737: checking for working autoconf" >&5
+echo "configure:828: checking for working autoconf" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -746,7 +837,7 @@
 fi
 
 echo $ac_n "checking for working automake""... $ac_c" 1>&6
-echo "configure:750: checking for working automake" >&5
+echo "configure:841: checking for working automake" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -759,7 +850,7 @@
 fi
 
 echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
-echo "configure:763: checking for working autoheader" >&5
+echo "configure:854: checking for working autoheader" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -772,7 +863,7 @@
 fi
 
 echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
-echo "configure:776: checking for working makeinfo" >&5
+echo "configure:867: checking for working makeinfo" >&5
 # Run test in a subshell; some versions of sh will print an error if
 # an executable is not found, even if stderr is redirected.
 # Redirect stdin to placate older versions of autoconf.  Sigh.
@@ -790,6 +881,25 @@
 
 
 
+case "$target" in
+     *-sun-*)
+	cat >> confdefs.h <<\EOF
+#define HAVE_SUN 1
+EOF
+
+	
+
+if true; then
+  NEED_SUNLIBS_TRUE=
+  NEED_SUNLIBS_FALSE='#'
+else
+  NEED_SUNLIBS_TRUE='#'
+  NEED_SUNLIBS_FALSE=
+fi
+	;;
+     *) ;;
+esac
+
 FAMPROTOINC='-I$(top_srcdir)/include'
 
 
@@ -815,7 +925,7 @@
     # Extract the first word of "CC", so it can be a program name with args.
 set dummy CC; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:819: checking for $ac_word" >&5
+echo "configure:929: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -853,7 +963,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:857: checking for $ac_word" >&5
+echo "configure:967: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -885,7 +995,7 @@
 
 
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:889: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
+echo "configure:999: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5
 
 ac_ext=C
 # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -896,12 +1006,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 900 "configure"
+#line 1010 "configure"
 #include "confdefs.h"
 
 int main(){return(0);}
 EOF
-if { (eval echo configure:905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cxx_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -927,12 +1037,12 @@
   { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:931: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1041: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6
 cross_compiling=$ac_cv_prog_cxx_cross
 
 echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6
-echo "configure:936: checking whether we are using GNU C++" >&5
+echo "configure:1046: checking whether we are using GNU C++" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -941,7 +1051,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1055: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gxx=yes
 else
   ac_cv_prog_gxx=no
@@ -960,7 +1070,7 @@
 ac_save_CXXFLAGS="$CXXFLAGS"
 CXXFLAGS=
 echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6
-echo "configure:964: checking whether ${CXX-g++} accepts -g" >&5
+echo "configure:1074: checking whether ${CXX-g++} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -992,7 +1102,7 @@
 fi
 
 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6
-echo "configure:996: checking how to run the C++ preprocessor" >&5
+echo "configure:1106: checking how to run the C++ preprocessor" >&5
 if test -z "$CXXCPP"; then
 if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1005,12 +1115,12 @@
 cross_compiling=$ac_cv_prog_cxx_cross
   CXXCPP="${CXX-g++} -E"
   cat > conftest.$ac_ext <<EOF
-#line 1009 "configure"
+#line 1119 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   :
@@ -1037,7 +1147,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1041: checking for $ac_word" >&5
+echo "configure:1151: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1077,7 +1187,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:1081: checking for a BSD compatible install" >&5
+echo "configure:1191: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1130,7 +1240,7 @@
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:1134: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:1244: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1225,55 +1335,10 @@
   enable_fast_install=yes
 fi
 
-
-# Make sure we can run config.sub.
-if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
-else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
-fi
-
-echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:1236: checking host system type" >&5
-
-host_alias=$host
-case "$host_alias" in
-NONE)
-  case $nonopt in
-  NONE)
-    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-    else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-    fi ;;
-  *) host_alias=$nonopt ;;
-  esac ;;
-esac
-
-host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
-host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$host" 1>&6
-
-echo $ac_n "checking build system type""... $ac_c" 1>&6
-echo "configure:1257: checking build system type" >&5
-
-build_alias=$build
-case "$build_alias" in
-NONE)
-  case $nonopt in
-  NONE) build_alias=$host_alias ;;
-  *) build_alias=$nonopt ;;
-  esac ;;
-esac
-
-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-echo "$ac_t""$build" 1>&6
-
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1277: checking for $ac_word" >&5
+echo "configure:1342: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1303,7 +1368,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1307: checking for $ac_word" >&5
+echo "configure:1372: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1354,7 +1419,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1358: checking for $ac_word" >&5
+echo "configure:1423: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1386,7 +1451,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1390: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1455: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
@@ -1397,12 +1462,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1401 "configure"
+#line 1466 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1428,12 +1493,12 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1432: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1497: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1437: checking whether we are using GNU C" >&5
+echo "configure:1502: checking whether we are using GNU C" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1442,7 +1507,7 @@
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1446: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1461,7 +1526,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1465: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1530: checking whether ${CC-cc} accepts -g" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1504,7 +1569,7 @@
 if test "$ac_cv_prog_gcc" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:1508: checking for ld used by GCC" >&5
+echo "configure:1573: checking for ld used by GCC" >&5
   ac_prog=`($CC -print-prog-name=ld) 2>&5`
   case "$ac_prog" in
     # Accept absolute paths.
@@ -1528,10 +1593,10 @@
   esac
 elif test "$with_gnu_ld" = yes; then
   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:1532: checking for GNU ld" >&5
+echo "configure:1597: checking for GNU ld" >&5
 else
   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
-echo "configure:1535: checking for non-GNU ld" >&5
+echo "configure:1600: checking for non-GNU ld" >&5
 fi
 if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1565,9 +1630,8 @@
   echo "$ac_t""no" 1>&6
 fi
 test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
-
 echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
-echo "configure:1571: checking if the linker ($LD) is GNU ld" >&5
+echo "configure:1635: checking if the linker ($LD) is GNU ld" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1583,7 +1647,7 @@
 
 
 echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
-echo "configure:1587: checking for BSD-compatible nm" >&5
+echo "configure:1651: checking for BSD-compatible nm" >&5
 if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1618,9 +1682,8 @@
 NM="$ac_cv_path_NM"
 echo "$ac_t""$NM" 1>&6
 
-
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:1624: checking whether ln -s works" >&5
+echo "configure:1687: checking whether ln -s works" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1641,6 +1704,11 @@
 fi
 
 
+case "$target" in
+NONE) lt_target="$host" ;;
+*) lt_target="$target" ;;
+esac
+
 # Check for any special flags to pass to ltconfig.
 libtool_flags="--cache-file=$cache_file"
 test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
@@ -1661,11 +1729,11 @@
 
 # Some flags need to be propagated to the compiler or linker for good
 # libtool support.
-case "$host" in
+case "$lt_target" in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 1668 "configure"' > conftest.$ac_ext
-  if { (eval echo configure:1669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  echo '#line 1736 "configure"' > conftest.$ac_ext
+  if { (eval echo configure:1737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
     case "`/usr/bin/file conftest.o`" in
     *32-bit*)
       LD="${LD-ld} -32"
@@ -1686,19 +1754,19 @@
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
-echo "configure:1690: checking whether the C compiler needs -belf" >&5
+echo "configure:1758: checking whether the C compiler needs -belf" >&5
 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1695 "configure"
+#line 1763 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   lt_cv_cc_needs_belf=yes
 else
@@ -1776,7 +1844,7 @@
 LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
 DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
 ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \
 || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
 
 # Reload cache, that may have been modified by ltconfig
@@ -1802,7 +1870,7 @@
 # Extract the first word of "tar", so it can be a program name with args.
 set dummy tar; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1806: checking for $ac_word" >&5
+echo "configure:1874: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1838,7 +1906,7 @@
 # Extract the first word of "ldconfig", so it can be a program name with args.
 set dummy ldconfig; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1842: checking for $ac_word" >&5
+echo "configure:1910: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_LDCONFIG'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1881,7 +1949,7 @@
 
     IMON_FUNCS=IMonIrix
                     cat > conftest.$ac_ext <<EOF
-#line 1885 "configure"
+#line 1953 "configure"
 #include "confdefs.h"
 #include <sys/imon.h>
 EOF
@@ -1899,17 +1967,17 @@
 if test "$have_imon" != "yes"; then
     ac_safe=`echo "linux/imon.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for linux/imon.h""... $ac_c" 1>&6
-echo "configure:1903: checking for linux/imon.h" >&5
+echo "configure:1971: checking for linux/imon.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1908 "configure"
+#line 1976 "configure"
 #include "confdefs.h"
 #include <linux/imon.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1913: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1951,17 +2019,17 @@
 
 ac_safe=`echo "sys/statvfs.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/statvfs.h""... $ac_c" 1>&6
-echo "configure:1955: checking for sys/statvfs.h" >&5
+echo "configure:2023: checking for sys/statvfs.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1960 "configure"
+#line 2028 "configure"
 #include "confdefs.h"
 #include <sys/statvfs.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1965: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1991,17 +2059,17 @@
 
 ac_safe=`echo "sys/syssgi.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/syssgi.h""... $ac_c" 1>&6
-echo "configure:1995: checking for sys/syssgi.h" >&5
+echo "configure:2063: checking for sys/syssgi.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2000 "configure"
+#line 2068 "configure"
 #include "confdefs.h"
 #include <sys/syssgi.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2005: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2073: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2031,17 +2099,17 @@
 
 ac_safe=`echo "sys/fs/nfs_clnt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/fs/nfs_clnt.h""... $ac_c" 1>&6
-echo "configure:2035: checking for sys/fs/nfs_clnt.h" >&5
+echo "configure:2103: checking for sys/fs/nfs_clnt.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2040 "configure"
+#line 2108 "configure"
 #include "confdefs.h"
 #include <sys/fs/nfs_clnt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -2079,16 +2147,16 @@
 fi
 
 echo $ac_n "checking SGI_NOHANG""... $ac_c" 1>&6
-echo "configure:2083: checking SGI_NOHANG" >&5
+echo "configure:2151: checking SGI_NOHANG" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2085 "configure"
+#line 2153 "configure"
 #include "confdefs.h"
 #include <sys/syssgi.h>
 int main() {
 int i = SGI_NOHANG; 
 ; return 0; }
 EOF
-if { (eval echo configure:2092: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_sgi_nohang=yes
 else
@@ -2112,12 +2180,12 @@
 echo "$ac_t""$have_sgi_nohang" 1>&6
 
 echo $ac_n "checking for _daemonize""... $ac_c" 1>&6
-echo "configure:2116: checking for _daemonize" >&5
+echo "configure:2184: checking for _daemonize" >&5
 if eval "test \"`echo '$''{'ac_cv_func__daemonize'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2121 "configure"
+#line 2189 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _daemonize(); below.  */
@@ -2143,7 +2211,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func__daemonize=yes"
 else
@@ -2171,7 +2239,7 @@
 
 
 echo $ac_n "checking getgrmember""... $ac_c" 1>&6
-echo "configure:2175: checking getgrmember" >&5
+echo "configure:2243: checking getgrmember" >&5
 if eval "test \"`echo '$''{'fam_cv_have_getgrmember'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2179,7 +2247,7 @@
   fam_cv_have_getgrmember=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2183 "configure"
+#line 2251 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
@@ -2189,7 +2257,7 @@
 int main(void) { getgrmember(NULL, NULL, 0, 0); return 0; }
 
 EOF
-if { (eval echo configure:2193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fam_cv_have_getgrmember=yes
 else
@@ -2222,19 +2290,19 @@
 
 
 echo $ac_n "checking for stat.st_fstype string""... $ac_c" 1>&6
-echo "configure:2226: checking for stat.st_fstype string" >&5
+echo "configure:2294: checking for stat.st_fstype string" >&5
 if eval "test \"`echo '$''{'fam_cv_stat_st_fstype_is_string'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2231 "configure"
+#line 2299 "configure"
 #include "confdefs.h"
 #include <sys/stat.h>
 int main() {
 struct stat st; char *s = st.st_fstype; 
 ; return 0; }
 EOF
-if { (eval echo configure:2238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_cv_stat_st_fstype_is_string=yes
 else
@@ -2262,9 +2330,9 @@
 
 
 echo $ac_n "checking for mountlist struct""... $ac_c" 1>&6
-echo "configure:2266: checking for mountlist struct" >&5
+echo "configure:2334: checking for mountlist struct" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2268 "configure"
+#line 2336 "configure"
 #include "confdefs.h"
 
 typedef int fhandle_t;
@@ -2275,7 +2343,7 @@
 mountlist ml; char *h = ml.ml_name; 
 ; return 0; }
 EOF
-if { (eval echo configure:2279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_mountlist_struct=yes
 else
@@ -2302,16 +2370,16 @@
 
 
     echo $ac_n "checking for mountlist pointer""... $ac_c" 1>&6
-echo "configure:2306: checking for mountlist pointer" >&5
+echo "configure:2374: checking for mountlist pointer" >&5
     cat > conftest.$ac_ext <<EOF
-#line 2308 "configure"
+#line 2376 "configure"
 #include "confdefs.h"
 #include <rpcsvc/mount.h>
 int main() {
 mountlist ml; char *h = ml->ml_hostname; 
 ; return 0; }
 EOF
-if { (eval echo configure:2315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2383: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_mountlist_ptr=yes
 else
@@ -2343,16 +2411,35 @@
 
 
     echo $ac_n "checking mntent.h for MNTTYPE_NFS""... $ac_c" 1>&6
-echo "configure:2347: checking mntent.h for MNTTYPE_NFS" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 2349 "configure"
+echo "configure:2415: checking mntent.h for MNTTYPE_NFS" >&5
+    case "$target" in
+	*-sun-*) cat > conftest.$ac_ext <<EOF
+#line 2418 "configure"
+#include "confdefs.h"
+#include <sys/mntent.h>
+int main() {
+const char *foo = MNTTYPE_NFS;
+; return 0; }
+EOF
+if { (eval echo configure:2425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  fam_have_decl_in_mntent=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  fam_have_decl_in_mntent=no
+fi
+rm -f conftest* ;; 
+   	*) cat > conftest.$ac_ext <<EOF
+#line 2436 "configure"
 #include "confdefs.h"
 #include <mntent.h>
 int main() {
 const char *foo = MNTTYPE_NFS;
 ; return 0; }
 EOF
-if { (eval echo configure:2356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_have_decl_in_mntent=yes
 else
@@ -2361,7 +2448,8 @@
   rm -rf conftest*
   fam_have_decl_in_mntent=no
 fi
-rm -f conftest*
+rm -f conftest* ;;
+    esac   
     echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
     if test "$fam_have_decl_in_mntent" = "yes"; then
 	:
@@ -2371,16 +2459,35 @@
 
 
     echo $ac_n "checking mntent.h for MNTTYPE_NFS2""... $ac_c" 1>&6
-echo "configure:2375: checking mntent.h for MNTTYPE_NFS2" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 2377 "configure"
+echo "configure:2463: checking mntent.h for MNTTYPE_NFS2" >&5
+    case "$target" in
+	*-sun-*) cat > conftest.$ac_ext <<EOF
+#line 2466 "configure"
+#include "confdefs.h"
+#include <sys/mntent.h>
+int main() {
+const char *foo = MNTTYPE_NFS2;
+; return 0; }
+EOF
+if { (eval echo configure:2473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  fam_have_decl_in_mntent=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  fam_have_decl_in_mntent=no
+fi
+rm -f conftest* ;; 
+   	*) cat > conftest.$ac_ext <<EOF
+#line 2484 "configure"
 #include "confdefs.h"
 #include <mntent.h>
 int main() {
 const char *foo = MNTTYPE_NFS2;
 ; return 0; }
 EOF
-if { (eval echo configure:2384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2491: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_have_decl_in_mntent=yes
 else
@@ -2389,7 +2496,8 @@
   rm -rf conftest*
   fam_have_decl_in_mntent=no
 fi
-rm -f conftest*
+rm -f conftest* ;;
+    esac   
     echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
     if test "$fam_have_decl_in_mntent" = "yes"; then
 	cat >> confdefs.h <<\EOF
@@ -2402,16 +2510,35 @@
 
 
     echo $ac_n "checking mntent.h for MNTTYPE_NFS3""... $ac_c" 1>&6
-echo "configure:2406: checking mntent.h for MNTTYPE_NFS3" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 2408 "configure"
+echo "configure:2514: checking mntent.h for MNTTYPE_NFS3" >&5
+    case "$target" in
+	*-sun-*) cat > conftest.$ac_ext <<EOF
+#line 2517 "configure"
+#include "confdefs.h"
+#include <sys/mntent.h>
+int main() {
+const char *foo = MNTTYPE_NFS3;
+; return 0; }
+EOF
+if { (eval echo configure:2524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  fam_have_decl_in_mntent=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  fam_have_decl_in_mntent=no
+fi
+rm -f conftest* ;; 
+   	*) cat > conftest.$ac_ext <<EOF
+#line 2535 "configure"
 #include "confdefs.h"
 #include <mntent.h>
 int main() {
 const char *foo = MNTTYPE_NFS3;
 ; return 0; }
 EOF
-if { (eval echo configure:2415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_have_decl_in_mntent=yes
 else
@@ -2420,7 +2547,8 @@
   rm -rf conftest*
   fam_have_decl_in_mntent=no
 fi
-rm -f conftest*
+rm -f conftest* ;;
+    esac   
     echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
     if test "$fam_have_decl_in_mntent" = "yes"; then
 	cat >> confdefs.h <<\EOF
@@ -2433,16 +2561,35 @@
 
 
     echo $ac_n "checking mntent.h for MNTTYPE_CACHEFS""... $ac_c" 1>&6
-echo "configure:2437: checking mntent.h for MNTTYPE_CACHEFS" >&5
-    cat > conftest.$ac_ext <<EOF
-#line 2439 "configure"
+echo "configure:2565: checking mntent.h for MNTTYPE_CACHEFS" >&5
+    case "$target" in
+	*-sun-*) cat > conftest.$ac_ext <<EOF
+#line 2568 "configure"
+#include "confdefs.h"
+#include <sys/mntent.h>
+int main() {
+const char *foo = MNTTYPE_CACHEFS;
+; return 0; }
+EOF
+if { (eval echo configure:2575: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  fam_have_decl_in_mntent=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  fam_have_decl_in_mntent=no
+fi
+rm -f conftest* ;; 
+   	*) cat > conftest.$ac_ext <<EOF
+#line 2586 "configure"
 #include "confdefs.h"
 #include <mntent.h>
 int main() {
 const char *foo = MNTTYPE_CACHEFS;
 ; return 0; }
 EOF
-if { (eval echo configure:2446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_have_decl_in_mntent=yes
 else
@@ -2451,7 +2598,8 @@
   rm -rf conftest*
   fam_have_decl_in_mntent=no
 fi
-rm -f conftest*
+rm -f conftest* ;;
+    esac   
     echo "$ac_t""$fam_have_decl_in_mntent" 1>&6
     if test "$fam_have_decl_in_mntent" = "yes"; then
 	cat >> confdefs.h <<\EOF
@@ -2464,19 +2612,19 @@
 
 
 echo $ac_n "checking netinet/in.h for bindresvport()""... $ac_c" 1>&6
-echo "configure:2468: checking netinet/in.h for bindresvport()" >&5
+echo "configure:2616: checking netinet/in.h for bindresvport()" >&5
 if eval "test \"`echo '$''{'fam_cv_bindresvport_in_in_h'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2473 "configure"
+#line 2621 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 int main() {
 int p = 0; struct sockaddr_in s; bindresvport(p, &s); 
 ; return 0; }
 EOF
-if { (eval echo configure:2480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_cv_bindresvport_in_in_h=yes
 else
@@ -2502,19 +2650,19 @@
 fi
 
 echo $ac_n "checking for prmap_sgi_t""... $ac_c" 1>&6
-echo "configure:2506: checking for prmap_sgi_t" >&5
+echo "configure:2654: checking for prmap_sgi_t" >&5
 if eval "test \"`echo '$''{'fam_cv_have_prmap_sgi_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2511 "configure"
+#line 2659 "configure"
 #include "confdefs.h"
 #include <sys/procfs.h>
 int main() {
 prmap_sgi_t f; f.pr_lockcnt = 0; 
 ; return 0; }
 EOF
-if { (eval echo configure:2518: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_cv_have_prmap_sgi_t=yes
 else
@@ -2540,12 +2688,12 @@
 fi
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:2544: checking for socklen_t" >&5
+echo "configure:2692: checking for socklen_t" >&5
 if eval "test \"`echo '$''{'fam_cv_have_socklen_t'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2549 "configure"
+#line 2697 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -2553,7 +2701,7 @@
 socklen_t len; struct sockaddr s; accept(0, &s, &len); 
 ; return 0; }
 EOF
-if { (eval echo configure:2557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_cv_have_socklen_t=yes
 else
@@ -2578,20 +2726,59 @@
 
 fi
 
+echo $ac_n "checking for u_int32_t""... $ac_c" 1>&6
+echo "configure:2731: checking for u_int32_t" >&5
+if eval "test \"`echo '$''{'fam_cv_have_u_int32_t'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 2736 "configure"
+#include "confdefs.h"
+#include <sys/types.h>
+#include <sys/socket.h>
+int main() {
+u_int32_t dummy;
+; return 0; }
+EOF
+if { (eval echo configure:2744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  fam_cv_have_u_int32_t=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  fam_cv_have_u_int32_t="no -- using uint32_t"
+fi
+rm -f conftest*
+fi
+
+echo "$ac_t""$fam_cv_have_u_int32_t" 1>&6
+if test "$fam_cv_have_u_int32_t" = "yes"; then
+    cat >> confdefs.h <<\EOF
+#define CONFIG_U_INT32_T u_int32_t
+EOF
+
+else
+    cat >> confdefs.h <<\EOF
+#define CONFIG_U_INT32_T uint32_t
+EOF
+
+fi
+
 echo $ac_n "checking for built-in bool""... $ac_c" 1>&6
-echo "configure:2583: checking for built-in bool" >&5
+echo "configure:2770: checking for built-in bool" >&5
 if eval "test \"`echo '$''{'fam_cv_have_bool'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 2588 "configure"
+#line 2775 "configure"
 #include "confdefs.h"
 
 int main() {
 bool foo = true; if(foo) foo = false; 
 ; return 0; }
 EOF
-if { (eval echo configure:2595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2782: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   fam_cv_have_bool=yes
 else
@@ -2618,7 +2805,7 @@
 
 
 echo $ac_n "checking for C++ namespace support""... $ac_c" 1>&6
-echo "configure:2622: checking for C++ namespace support" >&5
+echo "configure:2809: checking for C++ namespace support" >&5
 if eval "test \"`echo '$''{'fam_cv_have_namespace'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2626,14 +2813,14 @@
   fam_cv_have_namespace=no
 else
   cat > conftest.$ac_ext <<EOF
-#line 2630 "configure"
+#line 2817 "configure"
 #include "confdefs.h"
 #ifdef __cplusplus
 extern "C" void exit(int);
 #endif
 namespace foo { int bar(void) { return 0; } } int main(void) { return foo::bar(); } 
 EOF
-if { (eval echo configure:2637: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:2824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   fam_cv_have_namespace=yes
 else
@@ -2674,7 +2861,7 @@
 # Extract the first word of "echo", so it can be a program name with args.
 set dummy echo; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2678: checking for $ac_word" >&5
+echo "configure:2865: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ECHO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -2707,7 +2894,7 @@
 fi
 
 echo $ac_n "checking for echo -e flag""... $ac_c" 1>&6
-echo "configure:2711: checking for echo -e flag" >&5
+echo "configure:2898: checking for echo -e flag" >&5
 if test "`$ECHO -e foo`" = 'foo'; then
     ECHO="$ECHO -e"
 fi
@@ -2876,6 +3063,21 @@
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@host@%$host%g
+s%@host_alias@%$host_alias%g
+s%@host_cpu@%$host_cpu%g
+s%@host_vendor@%$host_vendor%g
+s%@host_os@%$host_os%g
+s%@target@%$target%g
+s%@target_alias@%$target_alias%g
+s%@target_cpu@%$target_cpu%g
+s%@target_vendor@%$target_vendor%g
+s%@target_os@%$target_os%g
+s%@build@%$build%g
+s%@build_alias@%$build_alias%g
+s%@build_cpu@%$build_cpu%g
+s%@build_vendor@%$build_vendor%g
+s%@build_os@%$build_os%g
 s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
 s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
 s%@INSTALL_DATA@%$INSTALL_DATA%g
@@ -2887,24 +3089,14 @@
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@MAKEINFO@%$MAKEINFO%g
 s%@SET_MAKE@%$SET_MAKE%g
+s%@NEED_SUNLIBS_TRUE@%$NEED_SUNLIBS_TRUE%g
+s%@NEED_SUNLIBS_FALSE@%$NEED_SUNLIBS_FALSE%g
 s%@FAMPROTOINC@%$FAMPROTOINC%g
 s%@FAM_CONF@%$FAM_CONF%g
 s%@CXX@%$CXX%g
 s%@CXXCPP@%$CXXCPP%g
 s%@RANLIB@%$RANLIB%g
-s%@host@%$host%g
-s%@host_alias@%$host_alias%g
-s%@host_cpu@%$host_cpu%g
-s%@host_vendor@%$host_vendor%g
-s%@host_os@%$host_os%g
-s%@build@%$build%g
-s%@build_alias@%$build_alias%g
-s%@build_cpu@%$build_cpu%g
-s%@build_vendor@%$build_vendor%g
-s%@build_os@%$build_os%g
 s%@CC@%$CC%g
-s%@LD@%$LD%g
-s%@NM@%$NM%g
 s%@LN_S@%$LN_S%g
 s%@LIBTOOL@%$LIBTOOL%g
 s%@TAR@%$TAR%g
diff -Naur fam-oss-2.6.4/configure.in fam-oss-2.6.4-new//configure.in
--- fam-oss-2.6.4/configure.in	Sat May 20 07:23:17 2000
+++ fam-oss-2.6.4-new//configure.in	Tue May 30 16:26:20 2000
@@ -34,11 +34,23 @@
 dnl define([AC_CACHE_SAVE], )dnl
 
 AC_INIT(libfam/fam.c++)
+
+dnl  Get target types etc
+AC_CANONICAL_SYSTEM
+
 AM_INIT_AUTOMAKE(fam, oss-2.6.4)
 
 dnl  Put configuration #defines in config.h.
 AM_CONFIG_HEADER(config.h)
 
+case "$target" in
+     *-sun-*)
+	AC_DEFINE(HAVE_SUN, 1)
+	AM_CONDITIONAL(NEED_SUNLIBS, true)
+	;;
+     *) ;;
+esac
+
 dnl
 dnl  We want to include our header in $(top_srcdir)/include
 dnl
@@ -285,7 +297,10 @@
 dnl FAM_DECL_IN_MNTENT(mntent def to check, [action-if-true [,action-if-false]])
 AC_DEFUN(FAM_DECL_IN_MNTENT, [
     AC_MSG_CHECKING([mntent.h for $1])
-    AC_TRY_COMPILE([#include <mntent.h>], [const char *foo = $1;], fam_have_decl_in_mntent=yes, fam_have_decl_in_mntent=no)
+    case "$target" in
+	*-sun-*) AC_TRY_COMPILE([#include <sys/mntent.h>], [const char *foo = $1;], fam_have_decl_in_mntent=yes, fam_have_decl_in_mntent=no) ;; 
+   	*) AC_TRY_COMPILE([#include <mntent.h>], [const char *foo = $1;], fam_have_decl_in_mntent=yes, fam_have_decl_in_mntent=no) ;;
+    esac   
     AC_MSG_RESULT($fam_have_decl_in_mntent)
     if test "$fam_have_decl_in_mntent" = "yes"; then
 	ifelse([$2], , :, [$2])
@@ -334,6 +349,17 @@
 else
     AC_DEFINE(CONFIG_SOCKLEN_T, int)
 fi
+
+dnl
+dnl  Test for u_int32_t --cK
+dnl
+AC_CACHE_CHECK([for u_int32_t], fam_cv_have_u_int32_t, AC_TRY_COMPILE([#include <sys/types.h>
+#include <sys/socket.h>], [u_int32_t dummy;], fam_cv_have_u_int32_t=yes, fam_cv_have_u_int32_t="no -- using uint32_t"))
+if test "$fam_cv_have_u_int32_t" = "yes"; then
+    AC_DEFINE(CONFIG_U_INT32_T, u_int32_t)
+else
+    AC_DEFINE(CONFIG_U_INT32_T, uint32_t)
+fi
 
 dnl
 dnl  Test for built-in C++ bool type
diff -Naur fam-oss-2.6.4/fam/ClientConnection.c++ fam-oss-2.6.4-new//fam/ClientConnection.c++
--- fam-oss-2.6.4/fam/ClientConnection.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/ClientConnection.c++	Tue May 30 16:26:20 2000
@@ -57,7 +57,7 @@
 }
 
 void
-ClientConnection::send_sockaddr_un(const sockaddr_un &sun)
+ClientConnection::send_sockaddr_un(const sockaddr_un &ssun)
 {
-    mprintf("%s", sun.sun_path);
+    mprintf("%s", ssun.sun_path);
 }
diff -Naur fam-oss-2.6.4/fam/ClientConnection.h fam-oss-2.6.4-new//fam/ClientConnection.h
--- fam-oss-2.6.4/fam/ClientConnection.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/ClientConnection.h	Tue May 30 16:26:20 2000
@@ -49,7 +49,7 @@
     ClientConnection(int fd, InputHandler, UnblockHandler, void *closure);
 
     void send_event(const Event&, Request, const char *name);
-    void send_sockaddr_un(const sockaddr_un &sun);
+    void send_sockaddr_un(const sockaddr_un &ssun);
 
 protected:
 
diff -Naur fam-oss-2.6.4/fam/Directory.c++ fam-oss-2.6.4-new//fam/Directory.c++
--- fam-oss-2.6.4/fam/Directory.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/Directory.c++	Tue May 30 16:26:20 2000
@@ -26,7 +26,13 @@
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
+
+#ifdef HAVE_SUN
+#include <dirent.h>
+#else
 #include <sys/dir.h>
+#endif
+
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <unistd.h>
diff -Naur fam-oss-2.6.4/fam/DirectoryScanner.c++ fam-oss-2.6.4-new//fam/DirectoryScanner.c++
--- fam-oss-2.6.4/fam/DirectoryScanner.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/DirectoryScanner.c++	Tue May 30 16:26:20 2000
@@ -100,7 +100,11 @@
     
     while (dir && ready)
     {
+#ifdef HAVE_SUN
+	struct dirent *dp = readdir(dir);
+#else
 	struct direct *dp = readdir(dir);
+#endif
 	if (dp == NULL)
 	{   closedir(dir);
 	    dir = NULL;
diff -Naur fam-oss-2.6.4/fam/DirectoryScanner.h fam-oss-2.6.4-new//fam/DirectoryScanner.h
--- fam-oss-2.6.4/fam/DirectoryScanner.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/DirectoryScanner.h	Tue May 30 16:26:20 2000
@@ -27,7 +27,12 @@
 
 #include <stddef.h>
 #include <sys/types.h>
+
+#ifdef HAVE_SUN
+#include <dirent.h>
+#else
 #include <sys/dir.h>
+#endif
 
 #include "Event.h"
 
diff -Naur fam-oss-2.6.4/fam/FileSystem.c++ fam-oss-2.6.4-new//fam/FileSystem.c++
--- fam-oss-2.6.4/fam/FileSystem.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/FileSystem.c++	Tue May 30 16:26:21 2000
@@ -22,7 +22,16 @@
 
 #include "FileSystem.h"
 
+#ifdef HAVE_SUN
+#include <stdio.h>
+#include <sys/mntent.h>
+#include <sys/mnttab.h>
+#define mnt_dir mnt_mountp
+#define mnt_fsname mnt_special
+#else
 #include <mntent.h>
+#endif
+
 #include <string.h>
 
 #include "Event.h"
diff -Naur fam-oss-2.6.4/fam/FileSystem.h fam-oss-2.6.4-new//fam/FileSystem.h
--- fam-oss-2.6.4/fam/FileSystem.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/FileSystem.h	Tue May 30 16:26:21 2000
@@ -27,7 +27,12 @@
 #include "Request.h"
 #include "Set.h"
 
+#ifdef HAVE_SUN
+struct mnttab;
+#define mntent mnttab
+#else
 struct mntent;
+#endif
 struct stat;
 
 //  FileSystem is the abstract base class for a per-filesystem object.
diff -Naur fam-oss-2.6.4/fam/FileSystemTable.c++ fam-oss-2.6.4-new//fam/FileSystemTable.c++
--- fam-oss-2.6.4/fam/FileSystemTable.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/FileSystemTable.c++	Tue May 30 16:26:21 2000
@@ -23,7 +23,17 @@
 #include <stddef.h>
 #include "FileSystemTable.h"
 
+#ifdef HAVE_SUN
+#include <stdio.h>
+#include <sys/mntent.h>
+#include <sys/mnttab.h>
+#define mnt_dir mnt_mountp
+#define mnt_fsname mnt_special
+#define mnt_type mnt_fstype
+#else
 #include <mntent.h>
+#endif
+
 #include <stdlib.h>
 #include <string.h>
 
@@ -106,7 +116,13 @@
 
     //  Read /etc/mtab.
     Cred::SuperUser.become_user();
+
+#ifdef HAVE_SUN
+    FILE *mtab = fopen(mtab_name, "r+");
+#else
     FILE *mtab = setmntent(mtab_name, "r+");
+#endif
+
     if(mtab == NULL)
     {
         Log::error("couldn't open %s for input", mtab_name);
@@ -114,8 +130,14 @@
         return;
     }
     root = NULL;
+#ifdef HAVE_SUN
+    struct mnttab mmp;
+    struct mnttab *mp = &mmp;
+    for ( ; (getmntent(mtab, mp) == 0); )
+#else
     for (mntent *mp; ((mp = getmntent(mtab)) != NULL); )
-    {
+#endif
+      {
 	FileSystem *fs = fs_by_name ? fs_by_name->find(mp->mnt_dir) : NULL;
 	if (fs && fs->matches(*mp))
 	{
@@ -172,7 +194,11 @@
 	if (!strcmp(mp->mnt_dir, "/"))
 	    root = fs;
     }
+#ifdef HAVE_SUN
+    fclose(mtab);
+#else
     endmntent(mtab);
+#endif
 
     if(root == NULL)
     {
diff -Naur fam-oss-2.6.4/fam/FileSystemTable.h fam-oss-2.6.4-new//fam/FileSystemTable.h
--- fam-oss-2.6.4/fam/FileSystemTable.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/FileSystemTable.h	Tue May 30 16:26:21 2000
@@ -27,6 +27,10 @@
 #include "SmallTable.h"
 #include "StringTable.h"
 
+#ifdef HAVE_SUN
+#define MOUNTED MNTTAB
+#endif
+
 class Cred;
 class Event;
 class FileSystem;
diff -Naur fam-oss-2.6.4/fam/Listener.c++ fam-oss-2.6.4-new//fam/Listener.c++
--- fam-oss-2.6.4/fam/Listener.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/Listener.c++	Tue May 30 16:26:21 2000
@@ -36,6 +36,10 @@
 #include <sys/un.h>
 #include <unistd.h>
 
+#ifdef HAVE_SUN
+#include <stdlib.h>
+#endif
+
 #include <errno.h>
 
 #include "Log.h"
@@ -53,7 +57,7 @@
     NegotiatingClient(int fd, uid_t u, struct sockaddr_un *s);
     int sock;
     uid_t uid;
-    struct sockaddr_un sun;
+    struct sockaddr_un ssun;
 };
 
 BTree<int, NegotiatingClient *> negotiating_clients;
@@ -202,15 +206,15 @@
     //  requested user and pass the name back to the client.
 
     char *tmpfile = tempnam("/tmp", ".fam");
-    sockaddr_un sun = { AF_UNIX, "" };
-    if(strlen(tmpfile) >= (sizeof(sun.sun_path) - 1))
+    sockaddr_un ssun = { AF_UNIX, "" };
+    if(strlen(tmpfile) >= (sizeof(ssun.sun_path) - 1))
     {
         Log::error("tmpnam() too long for sun_path (%d >= %d)!",
-                   strlen(tmpfile), sizeof(sun.sun_path) - 1);
+                   strlen(tmpfile), sizeof(ssun.sun_path) - 1);
         free(tmpfile);
         return;
     }
-    strcpy(sun.sun_path, tmpfile);
+    strcpy(ssun.sun_path, tmpfile);
     free(tmpfile);
 
     int client_sock = socket(PF_UNIX, SOCK_STREAM, 0);
@@ -220,22 +224,22 @@
     }
 
     Log::debug("client %s said uid %d; creating %s",
-               inet_client.name(), uid, sun.sun_path);
+               inet_client.name(), uid, ssun.sun_path);
 
-    unlink(sun.sun_path);
-    if (bind(client_sock, (sockaddr *) &sun, sizeof sun) != 0)
+    unlink(ssun.sun_path);
+    if (bind(client_sock, (sockaddr *) &ssun, sizeof ssun) != 0)
     {   Log::perror("localclient bind");
 	close(client_sock);
         return;
     }
 
-    if (chmod(sun.sun_path, 0600) != 0)
+    if (chmod(ssun.sun_path, 0600) != 0)
     {   Log::perror("localclient chmod");
 	close(client_sock);
         return;
     }
 
-    if (chown(sun.sun_path, uid, -1) != 0)
+    if (chown(ssun.sun_path, uid, -1) != 0)
     {   Log::perror("localclient chown");
 	close(client_sock);
         return;
@@ -243,7 +247,7 @@
 
     //  Since we're going to start listening on this socket, set a task
     //  to clean it up if we don't receive a connection within 60 seconds.
-    NegotiatingClient *nc = new NegotiatingClient(client_sock, uid, &sun);
+    NegotiatingClient *nc = new NegotiatingClient(client_sock, uid, &ssun);
     negotiating_clients.insert(client_sock, nc);
     timeval nto;
     gettimeofday(&nto, NULL);
@@ -258,9 +262,9 @@
 
     Scheduler::install_read_handler(client_sock, accept_localclient, NULL);
     Log::debug("listening for requests for uid %d on descriptor %d (%s)",
-               uid, client_sock, sun.sun_path);
+               uid, client_sock, ssun.sun_path);
 
-    inet_client.send_sockaddr_un(sun);
+    inet_client.send_sockaddr_un(ssun);
 }
 
 void
@@ -271,9 +275,9 @@
 
     // Get the new socket.
 
-    struct sockaddr_un sun = { AF_UNIX, "" };
-    CONFIG_SOCKLEN_T sunlen = sizeof(sun);
-    int client_fd = accept(ofd, (struct sockaddr *) &sun, &sunlen);
+    struct sockaddr_un ssun = { AF_UNIX, "" };
+    CONFIG_SOCKLEN_T sunlen = sizeof(ssun);
+    int client_fd = accept(ofd, (struct sockaddr *) &ssun, &sunlen);
     if (client_fd < 0)
     {
 	Log::perror("failed to accept new client");
@@ -284,9 +288,9 @@
     Scheduler::remove_onetime_task(cleanup_negotiation, nc);
 
     Log::debug("client fd %d is local/trusted (socket %s, uid %d).",
-               client_fd, nc->sun.sun_path, nc->uid);
+               client_fd, nc->ssun.sun_path, nc->uid);
     Cred cred(nc->uid, client_fd);
-    new LocalClient(client_fd, &(nc->sun), cred);
+    new LocalClient(client_fd, &(nc->ssun), cred);
     // We don't need a reference to this object.  The constructor
     // takes care of registering it with the Scheduler.
 
@@ -333,7 +337,7 @@
 void
 Listener::dirty_ugly_hack()
 {
-    static sockaddr_un sun = { AF_UNIX, "/tmp/.fam_socket" };
+    static sockaddr_un ssun = { AF_UNIX, "/tmp/.fam_socket" };
 
     int sock = socket(PF_UNIX, SOCK_STREAM, 0);
     if (sock < 0)
@@ -342,10 +346,10 @@
     }
     
     struct stat sb;
-    if (lstat(sun.sun_path, &sb) == 0 &&
+    if (lstat(ssun.sun_path, &sb) == 0 &&
 	sb.st_uid == 0 && S_ISSOCK(sb.st_mode))
     {
-	if (connect(sock, (sockaddr *) &sun, sizeof sun) == 0)
+	if (connect(sock, (sockaddr *) &ssun, sizeof ssun) == 0)
 	{   
 	    // Another fam is listening to /tmp/.fam_socket.
 	    // Pass our rendezvous fd to the other fam and
@@ -370,13 +374,13 @@
     //  We were unable to connect to another fam.
     //	We'll create our own dirty ugly hack socket and accept connections.
 
-    (void) unlink(sun.sun_path);
-    if (bind(sock, (sockaddr *) &sun, sizeof sun) != 0)
+    (void) unlink(ssun.sun_path);
+    if (bind(sock, (sockaddr *) &ssun, sizeof ssun) != 0)
     {   Log::perror("bind");
 	exit(1);
     }
 
-    if (chmod(sun.sun_path, 0700) != 0)
+    if (chmod(ssun.sun_path, 0700) != 0)
     {   Log::perror("chmod");
 	exit(1);
     }
@@ -399,9 +403,9 @@
     
     //  Accept a new ugly connection.
 
-    struct sockaddr_un sun;
-    CONFIG_SOCKLEN_T sunlen = sizeof sun;
-    int sock = accept(ugly, (struct sockaddr *)(&sun), &sunlen);
+    struct sockaddr_un ssun;
+    CONFIG_SOCKLEN_T sunlen = sizeof ssun;
+    int sock = accept(ugly, (struct sockaddr *)(&ssun), &sunlen);
     if (sock < 0)
     {   Log::perror("accept");
 	return;
@@ -445,8 +449,8 @@
 NegotiatingClient::NegotiatingClient(int fd, uid_t u, struct sockaddr_un *sunp)
     : sock(fd), uid(u)
 {
-    sun.sun_family = AF_UNIX;
-    strcpy(sun.sun_path, sunp->sun_path);
+    ssun.sun_family = AF_UNIX;
+    strcpy(ssun.sun_path, sunp->sun_path);
 }
 
 static void
@@ -468,7 +472,7 @@
     uid_t preveuid = geteuid();
     if (preveuid) seteuid(0);
     seteuid(nc->uid);
-    unlink(nc->sun.sun_path);
+    unlink(nc->ssun.sun_path);
     if (nc->uid) seteuid(0);
     seteuid(preveuid);
 
diff -Naur fam-oss-2.6.4/fam/LocalClient.c++ fam-oss-2.6.4-new//fam/LocalClient.c++
--- fam-oss-2.6.4/fam/LocalClient.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/LocalClient.c++	Tue May 30 16:26:21 2000
@@ -33,13 +33,13 @@
 : TCP_Client(LOCALHOST(), fd, cred)
 {
     assert(cred.is_valid());
-    sun.sun_family = AF_UNIX;
-    strncpy(sun.sun_path, addr->sun_path, sizeof(sun.sun_path));
-    sun.sun_path[sizeof(sun.sun_path) - 1] = '\0';
+    ssun.sun_family = AF_UNIX;
+    strncpy(ssun.sun_path, addr->sun_path, sizeof(ssun.sun_path));
+    ssun.sun_path[sizeof(ssun.sun_path) - 1] = '\0';
 }
 
 LocalClient::~LocalClient()
 {
     if (geteuid() != cred.uid()) cred.become_user();
-    unlink(sun.sun_path);
+    unlink(ssun.sun_path);
 }
diff -Naur fam-oss-2.6.4/fam/LocalClient.h fam-oss-2.6.4-new//fam/LocalClient.h
--- fam-oss-2.6.4/fam/LocalClient.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/LocalClient.h	Tue May 30 16:26:21 2000
@@ -38,7 +38,7 @@
 
 private:
 
-    struct sockaddr_un sun;
+    struct sockaddr_un ssun;
 
 };
 
diff -Naur fam-oss-2.6.4/fam/Log.c++ fam-oss-2.6.4-new//fam/Log.c++
--- fam-oss-2.6.4/fam/Log.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/Log.c++	Tue May 30 16:26:21 2000
@@ -253,6 +253,8 @@
 //  New back end for assert() will log to syslog, put core file
 //  in known directory.
 
+// I'm taking this out on Solaris ... -- cK
+#ifndef HAVE_SUN
 void __assert(const char *msg, const char *file, int line)
 {
     char *dirname = new char[strlen(Log::getName()) + 20];
@@ -272,6 +274,7 @@
     delete[] dirname;
     abort();
 }
+#endif /* HAVE_SUN */
 
 #endif /* !NDEBUG */
 
diff -Naur fam-oss-2.6.4/fam/Makefile.am fam-oss-2.6.4-new//fam/Makefile.am
--- fam-oss-2.6.4/fam/Makefile.am	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/Makefile.am	Tue May 30 18:36:48 2000
@@ -76,7 +76,11 @@
 
 EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
 
+if NEED_SUNLIBS
+fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a -lsocket -lnsl
+else
 fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a
+endif
 
 CLEANFILES += @MKDEPFILE@ ii_files/*.ii
-sinclude @MKDEPFILE@
+sinclude: @MKDEPFILE@
diff -Naur fam-oss-2.6.4/fam/Makefile.in fam-oss-2.6.4-new//fam/Makefile.in
--- fam-oss-2.6.4/fam/Makefile.in	Sat May 20 07:24:21 2000
+++ fam-oss-2.6.4-new//fam/Makefile.in	Tue May 30 18:40:00 2000
@@ -62,8 +62,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -73,13 +77,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -105,9 +107,9 @@
 
 
 EXTRA_fam_SOURCES = IMonIrix.c++ IMonLinux.c++ IMonNone.c++
+@NEED_SUNLIBS_TRUE@fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a -lsocket -lnsl
+@NEED_SUNLIBS_FALSE@fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a
 
-fam_LDADD = -lrpcsvc $(top_srcdir)/support/libsupport.a
-
 CLEANFILES =  @MKDEPFILE@ ii_files/*.ii
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -126,7 +128,10 @@
 NFSFileSystem.o NetConnection.o Pollster.o RPC_TCP_Connector.o \
 Scanner.o Scheduler.o ServerConnection.o ServerHost.o ServerHostRef.o \
 TCP_Client.o main.o timeval.o @IMON_FUNCS@.o
-fam_DEPENDENCIES =  $(top_srcdir)/support/libsupport.a
+@NEED_SUNLIBS_TRUE@fam_DEPENDENCIES =  \
+@NEED_SUNLIBS_TRUE@$(top_srcdir)/support/libsupport.a
+@NEED_SUNLIBS_FALSE@fam_DEPENDENCIES =  \
+@NEED_SUNLIBS_FALSE@$(top_srcdir)/support/libsupport.a
 fam_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
@@ -372,7 +377,7 @@
 distclean-generic clean-generic maintainer-clean-generic clean \
 mostlyclean distclean maintainer-clean
 
-sinclude @MKDEPFILE@
+sinclude: @MKDEPFILE@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur fam-oss-2.6.4/fam/NFSFileSystem.c++ fam-oss-2.6.4-new//fam/NFSFileSystem.c++
--- fam-oss-2.6.4/fam/NFSFileSystem.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/NFSFileSystem.c++	Tue May 30 16:26:22 2000
@@ -24,7 +24,20 @@
 #include "NFSFileSystem.h"
 
 #include <assert.h>
+
+#ifdef HAVE_SUN
+#include <stdlib.h>
+#include <stdio.h>
+#include <sys/mntent.h>
+#include <sys/mnttab.h>
+#define mnt_dir mnt_mountp
+#define mnt_fsname mnt_special
+#define mnt_opts mnt_mntopts
+#define NAME_MAX FILENAME_MAX
+#else
 #include <mntent.h>
+#endif
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
diff -Naur fam-oss-2.6.4/fam/NetConnection.c++ fam-oss-2.6.4-new//fam/NetConnection.c++
--- fam-oss-2.6.4/fam/NetConnection.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/NetConnection.c++	Tue May 30 16:26:22 2000
@@ -33,6 +33,10 @@
 #include <unistd.h>
 #include <netinet/in.h>
 
+#ifdef HAVE_SUN
+#include <sys/filio.h>
+#endif
+
 #include "Log.h"
 #include "Scheduler.h"
 
diff -Naur fam-oss-2.6.4/fam/NetConnection.h fam-oss-2.6.4-new//fam/NetConnection.h
--- fam-oss-2.6.4/fam/NetConnection.h	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/NetConnection.h	Tue May 30 16:26:22 2000
@@ -76,7 +76,7 @@
 private:
 
     enum { MAXMSGSIZE = PATH_MAX + 40 };
-    typedef u_int32_t Length;
+    typedef CONFIG_U_INT32_T Length;
     typedef struct msgList_s {
         char msg[MAXMSGSIZE+5];  //  + 4 for 32-bit length, + 1 for overflow
         int len;
diff -Naur fam-oss-2.6.4/fam/RPC_TCP_Connector.c++ fam-oss-2.6.4-new//fam/RPC_TCP_Connector.c++
--- fam-oss-2.6.4/fam/RPC_TCP_Connector.c++	Sat May 20 06:46:31 2000
+++ fam-oss-2.6.4-new//fam/RPC_TCP_Connector.c++	Tue May 30 16:26:22 2000
@@ -31,6 +31,11 @@
 #include <string.h>
 #include <netdb.h>  // for rresvport
 
+#ifdef HAVE_SUN
+#include <sys/filio.h>
+#include <rpc/clnt_soc.h>
+#endif
+
 #include "Log.h"
 #include "Scheduler.h"
 #include "Cred.h"  // for Cred::SuperUser
@@ -101,7 +106,11 @@
         deactivate();
 	return;
     }
+#ifdef HAVE_SUN
+    rc = connect(fd, (sockaddr *)&address, sizeof address);
+#else
     rc = connect(fd, (const sockaddr *)&address, sizeof address);
+#endif
     if (rc == 0)
     {   sockfd = fd;
 	write_handler(fd, this);
@@ -123,7 +132,11 @@
     (void) Scheduler::remove_write_handler(fd);
     RPC_TCP_Connector *conn = (RPC_TCP_Connector *) closure;
     assert(fd == conn->sockfd);
+#ifdef HAVE_SUN
+    int rc = connect(fd, (sockaddr *)(&conn->address), sizeof conn->address);
+#else
     int rc = connect(fd, (const sockaddr *)(&conn->address), sizeof conn->address);
+#endif
     if (rc < 0 && errno != EISCONN)
     {
 	Log::perror("connect");
diff -Naur fam-oss-2.6.4/fam/Scheduler.h fam-oss-2.6.4-new//fam/Scheduler.h
--- fam-oss-2.6.4/fam/Scheduler.h	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//fam/Scheduler.h	Tue May 30 16:26:22 2000
@@ -23,6 +23,10 @@
 #ifndef Scheduler_included
 #define Scheduler_included
 
+#include "config.h"
+#ifdef HAVE_SUN
+#include <memory.h>
+#endif
 #include <sys/time.h>
 
 #include "Boolean.h"
diff -Naur fam-oss-2.6.4/fam/ServerHost.h fam-oss-2.6.4-new//fam/ServerHost.h
--- fam-oss-2.6.4/fam/ServerHost.h	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//fam/ServerHost.h	Tue May 30 16:26:22 2000
@@ -23,6 +23,11 @@
 #ifndef ServerHost_included
 #define ServerHost_included
 
+#include "config.h"
+#ifdef HAVE_SUN
+#include <stdio.h>
+#endif
+
 #include <limits.h>
 #include "Boolean.h"
 #include "ClientInterest.h"
@@ -101,7 +106,11 @@
     private:
 
 	Request myrequest;
+#ifdef HAVE_SUN
+	char mypath[FILENAME_MAX];
+#else
 	char mypath[NAME_MAX];
+#endif
 
     };
 
diff -Naur fam-oss-2.6.4/fam/TCP_Client.h fam-oss-2.6.4-new//fam/TCP_Client.h
--- fam-oss-2.6.4/fam/TCP_Client.h	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//fam/TCP_Client.h	Tue May 30 16:26:22 2000
@@ -53,7 +53,7 @@
     virtual void enqueue_scanner(Scanner *);
     virtual void suggest_insecure_compat(const char *path);
 
-    void send_sockaddr_un(sockaddr_un &sun) { conn.send_sockaddr_un(sun); }
+    void send_sockaddr_un(sockaddr_un &ssun) { conn.send_sockaddr_un(ssun); }
 
 protected:
     Cred cred;  //  if !is_valid, we believe the uid/gid in each client request.
diff -Naur fam-oss-2.6.4/include/Makefile.in fam-oss-2.6.4-new//include/Makefile.in
--- fam-oss-2.6.4/include/Makefile.in	Sat May 20 07:24:12 2000
+++ fam-oss-2.6.4-new//include/Makefile.in	Tue May 30 18:40:01 2000
@@ -57,8 +57,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -68,13 +72,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -99,9 +101,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps include/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -155,6 +157,11 @@
 subdir = include
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu include/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Naur fam-oss-2.6.4/libfam/Client.c++ fam-oss-2.6.4-new//libfam/Client.c++
--- fam-oss-2.6.4/libfam/Client.c++	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//libfam/Client.c++	Tue May 30 16:26:22 2000
@@ -37,8 +37,9 @@
 
 #include "fam.h"
 #include "Client.h"
+#include "config.h"
 
-static void getword(const char *p, u_int32_t *l);
+static void getword(const char *p, CONFIG_U_INT32_T *l);
 
 Client::Client(long host, unsigned int prog, int vers)
     : sock(0), haveCompleteEvent(false), userData(NULL), endExist(NULL),
@@ -95,7 +96,11 @@
         sock = -2;
         return;
     }
+#ifdef HAVE_SUN
+    if (connect(insock, (struct sockaddr *)&sin, sizeof(sin)) < 0)
+#else
     if (connect(insock, (const struct sockaddr *)&sin, sizeof(sin)) < 0)
+#endif
     {
         close(insock);
         sock = -3;
@@ -114,13 +119,13 @@
     //  fam, and use that for communicating.  The "N" message with a group
     //  list (sort of) is how we tell fam we're version 2.
     char msg[200];
-    snprintf(msg + sizeof(u_int32_t), sizeof(msg) - sizeof(u_int32_t),
+    snprintf(msg + sizeof(CONFIG_U_INT32_T), sizeof(msg) - sizeof(CONFIG_U_INT32_T),
              "N0 %d %d sockmeister%c0\n", geteuid(), getegid(), '\0');
-    int len = strlen(msg + sizeof(u_int32_t)) + 1;
-    len += (strlen(msg + sizeof(u_int32_t) + len) + 1);
-    u_int32_t nmsglen = htonl(len);
-    memcpy(msg, &nmsglen, sizeof(u_int32_t));
-    len += sizeof(u_int32_t);
+    int len = strlen(msg + sizeof(CONFIG_U_INT32_T)) + 1;
+    len += (strlen(msg + sizeof(CONFIG_U_INT32_T) + len) + 1);
+    CONFIG_U_INT32_T nmsglen = htonl(len);
+    memcpy(msg, &nmsglen, sizeof(CONFIG_U_INT32_T));
+    len += sizeof(CONFIG_U_INT32_T);
     if (write(insock, msg, len) != len)
     {
         close(insock);
@@ -128,16 +133,16 @@
         return;
     }
 
-    struct sockaddr_un sun;
-    memset(&sun, 0, sizeof sun);
-    sun.sun_family = AF_UNIX;
+    struct sockaddr_un ssun;
+    memset(&ssun, 0, sizeof ssun);
+    ssun.sun_family = AF_UNIX;
 
     //  We will block here, waiting for response from fam.
     unsigned int nread = 0;
-    char inbuf[sizeof(sun.sun_path)];
-    while(nread < sizeof(u_int32_t))
+    char inbuf[sizeof(ssun.sun_path)];
+    while(nread < sizeof(CONFIG_U_INT32_T))
     {
-        int rv = read(insock, inbuf + nread, sizeof(u_int32_t) - nread);
+        int rv = read(insock, inbuf + nread, sizeof(CONFIG_U_INT32_T) - nread);
         if (rv <= 0)
         {
             close(insock);
@@ -146,10 +151,10 @@
         }
         nread += rv;
     }
-    u_int32_t mlen;
+    CONFIG_U_INT32_T mlen;
     memcpy(&mlen, inbuf, sizeof(mlen));
     mlen = ntohl(mlen);
-    if (mlen >= sizeof(sun.sun_path))
+    if (mlen >= sizeof(ssun.sun_path))
     {
         close(insock);
         sock = -8;
@@ -168,8 +173,8 @@
         }
         nread += rv;
     }
-    strncpy(sun.sun_path, inbuf, mlen);
-    sun.sun_path[mlen] = '\0';
+    strncpy(ssun.sun_path, inbuf, mlen);
+    ssun.sun_path[mlen] = '\0';
 
     //  When we connected to the inet socket and told fam our UID, fam
     //  created a new UNIX domain socket and sent its name to us.  Now
@@ -181,7 +186,11 @@
         sock = -10;
         return;
     }
-    if (connect(sock, (const struct sockaddr *)&sun, sizeof(sun)) < 0)
+#ifdef HAVE_SUN
+    if (connect(sock, (struct sockaddr *)&ssun, sizeof(ssun)) < 0)
+#else
+    if (connect(sock, (const struct sockaddr *)&ssun, sizeof(ssun)) < 0)
+#endif
     {
         close(sock);
         close(insock);
@@ -203,11 +212,11 @@
 Client::writeToServer(char *buf, int nbytes)
 {
     if (!connected()) return -1;
-    char msgHeader[sizeof(u_int32_t)];
+    char msgHeader[sizeof(CONFIG_U_INT32_T)];
     nbytes = htonl(nbytes);
-    memcpy(msgHeader, &nbytes, sizeof(u_int32_t));
+    memcpy(msgHeader, &nbytes, sizeof(CONFIG_U_INT32_T));
     nbytes = ntohl(nbytes);
-    if(write(sock, msgHeader, sizeof(u_int32_t)) != sizeof(u_int32_t))
+    if(write(sock, msgHeader, sizeof(CONFIG_U_INT32_T)) != sizeof(CONFIG_U_INT32_T))
     {
         return -1;
     }
@@ -232,10 +241,10 @@
     }
     //  readEvent(true) blocks until we have a complete event or EOF.
 
-    u_int32_t msglen;
+    CONFIG_U_INT32_T msglen;
     getword(inbuf, &msglen);
 
-    char *p = inbuf + sizeof (u_int32_t), *q;
+    char *p = inbuf + sizeof (CONFIG_U_INT32_T), *q;
     int limit;
     // 
     char code, changeInfo[100];
@@ -326,7 +335,7 @@
     //  Now that we've copied the contents out of this message, slide the
     //  contents of the buffer over.  Crude, but easier than letting the
     //  buffer wrap.
-    msglen += sizeof(u_int32_t);  //  include the size now; less math
+    msglen += sizeof(CONFIG_U_INT32_T);  //  include the size now; less math
     memmove(inbuf, inbuf + msglen, inend - inbuf - msglen);
     inend -= msglen;
     checkBufferForEvent();
@@ -405,8 +414,8 @@
 {
     if (!connected()) return;
     haveCompleteEvent = false;
-    u_int32_t msglen = 0;
-    if ((inend - inbuf) <= (int)sizeof(u_int32_t)) return;
+    CONFIG_U_INT32_T msglen = 0;
+    if ((inend - inbuf) <= (int)sizeof(CONFIG_U_INT32_T)) return;
     getword(inbuf, &msglen);
     if((msglen == 0) || (msglen > MAXMSGSIZ))
     {
@@ -416,7 +425,7 @@
         return;
     }
 
-    if (inend - inbuf >= (int)msglen + (int)sizeof(u_int32_t))
+    if (inend - inbuf >= (int)msglen + (int)sizeof(CONFIG_U_INT32_T))
     {
         haveCompleteEvent = true;
     }
@@ -434,8 +443,8 @@
 
 
 static void
-getword(const char *p, u_int32_t *l)
+getword(const char *p, CONFIG_U_INT32_T *l)
 {
-    memcpy(l, p, sizeof(u_int32_t));
+    memcpy(l, p, sizeof(CONFIG_U_INT32_T));
     *l = ntohl(*l);
 }
diff -Naur fam-oss-2.6.4/libfam/Makefile.in fam-oss-2.6.4-new//libfam/Makefile.in
--- fam-oss-2.6.4/libfam/Makefile.in	Sat May 20 07:24:17 2000
+++ fam-oss-2.6.4-new//libfam/Makefile.in	Tue May 30 18:40:01 2000
@@ -62,8 +62,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -73,13 +77,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -Naur fam-oss-2.6.4/libfam/fam.c++ fam-oss-2.6.4-new//libfam/fam.c++
--- fam-oss-2.6.4/libfam/fam.c++	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//libfam/fam.c++	Tue May 30 16:26:22 2000
@@ -35,6 +35,10 @@
 #include "fam.h"
 #include "Client.h"
 
+#ifdef HAVE_SUN
+#include <rpc/rpcent.h>
+#endif
+
 //#define DEBUG
 
 
diff -Naur fam-oss-2.6.4/man/Makefile.in fam-oss-2.6.4-new//man/Makefile.in
--- fam-oss-2.6.4/man/Makefile.in	Sat May 20 07:24:28 2000
+++ fam-oss-2.6.4-new//man/Makefile.in	Tue May 30 18:40:01 2000
@@ -60,8 +60,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -71,13 +75,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -106,9 +108,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps man/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu man/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -195,6 +197,11 @@
 subdir = man
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu man/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Naur fam-oss-2.6.4/support/Makefile.am fam-oss-2.6.4-new//support/Makefile.am
--- fam-oss-2.6.4/support/Makefile.am	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//support/Makefile.am	Tue May 30 18:39:42 2000
@@ -12,4 +12,4 @@
 libsupport_a_LIBADD       = @snprintf_o@ @foo_o@
 
 CLEANFILES += @MKDEPFILE@ ii_files/*.ii
-sinclude @MKDEPFILE@
+sinclude: @MKDEPFILE@
diff -Naur fam-oss-2.6.4/support/Makefile.in fam-oss-2.6.4-new//support/Makefile.in
--- fam-oss-2.6.4/support/Makefile.in	Sat May 20 07:24:14 2000
+++ fam-oss-2.6.4-new//support/Makefile.in	Tue May 30 18:40:01 2000
@@ -62,8 +62,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -73,13 +77,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -322,7 +324,7 @@
 mostlyclean-generic distclean-generic clean-generic \
 maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
-sinclude @MKDEPFILE@
+sinclude: @MKDEPFILE@
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Naur fam-oss-2.6.4/test/Makefile.am fam-oss-2.6.4-new//test/Makefile.am
--- fam-oss-2.6.4/test/Makefile.am	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//test/Makefile.am	Tue May 30 16:26:23 2000
@@ -2,6 +2,9 @@
 
 noinst_PROGRAMS = test
 test_SOURCES = test.c++
+if NEED_SUNLIBS
+test_LDADD = ../libfam/libfam.la -lsocket
+else
 test_LDADD = ../libfam/libfam.la
-
+endif
 CLEANFILES += ii_files/*.ii
diff -Naur fam-oss-2.6.4/test/Makefile.in fam-oss-2.6.4-new//test/Makefile.in
--- fam-oss-2.6.4/test/Makefile.in	Sat May 20 07:24:30 2000
+++ fam-oss-2.6.4-new//test/Makefile.in	Tue May 30 18:40:02 2000
@@ -62,8 +62,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -73,13 +77,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -100,8 +102,8 @@
 
 noinst_PROGRAMS = test
 test_SOURCES = test.c++
-test_LDADD = ../libfam/libfam.la
-
+@NEED_SUNLIBS_TRUE@test_LDADD = ../libfam/libfam.la -lsocket
+@NEED_SUNLIBS_FALSE@test_LDADD = ../libfam/libfam.la
 CLEANFILES =  ii_files/*.ii
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
@@ -114,7 +116,8 @@
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 test_OBJECTS =  test.o
-test_DEPENDENCIES =  ../libfam/libfam.la
+@NEED_SUNLIBS_TRUE@test_DEPENDENCIES =  ../libfam/libfam.la
+@NEED_SUNLIBS_FALSE@test_DEPENDENCIES =  ../libfam/libfam.la
 test_LDFLAGS = 
 CXXFLAGS = @CXXFLAGS@
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
diff -Naur fam-oss-2.6.4/test/test.c++ fam-oss-2.6.4-new//test/test.c++
--- fam-oss-2.6.4/test/test.c++	Sat May 20 06:46:32 2000
+++ fam-oss-2.6.4-new//test/test.c++	Tue May 30 16:26:23 2000
@@ -8,6 +8,11 @@
 //#include <fcntl.h>
 #include "fam.h"
 //#include "Boolean.h"
+
+#include "config.h"
+#ifdef HAVE_SUN
+#include <memory.h>
+#endif
 /* 
 
 FILE test.c - simple fam test program
diff -Naur fam-oss-2.6.4/util/Makefile.in fam-oss-2.6.4-new//util/Makefile.in
--- fam-oss-2.6.4/util/Makefile.in	Sat May 20 07:24:05 2000
+++ fam-oss-2.6.4-new//util/Makefile.in	Tue May 30 18:40:02 2000
@@ -57,8 +57,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -68,13 +72,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -96,9 +98,9 @@
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
+	cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
 	cd $(top_builddir) \
 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -197,6 +199,11 @@
 subdir = util
 
 distdir: $(DISTFILES)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(top_distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu util/Makefile
 	@for file in $(DISTFILES); do \
 	  d=$(srcdir); \
 	  if test -d $$d/$$file; then \
diff -Naur fam-oss-2.6.4/util/editconf/Makefile.in fam-oss-2.6.4-new//util/editconf/Makefile.in
--- fam-oss-2.6.4/util/editconf/Makefile.in	Sat May 20 07:24:06 2000
+++ fam-oss-2.6.4-new//util/editconf/Makefile.in	Tue May 30 18:40:02 2000
@@ -62,8 +62,12 @@
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_alias = @build_alias@
+build_triplet = @build@
 host_alias = @host_alias@
 host_triplet = @host@
+target_alias = @target_alias@
+target_triplet = @target@
 AS = @AS@
 CC = @CC@
 CXX = @CXX@
@@ -73,13 +77,11 @@
 FAMPROTOINC = @FAMPROTOINC@
 FAM_CONF = @FAM_CONF@
 IMON_FUNCS = @IMON_FUNCS@
-LD = @LD@
 LDCONFIG = @LDCONFIG@
 LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 MAKEINFO = @MAKEINFO@
 MKDEPFILE = @MKDEPFILE@
-NM = @NM@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
