++<<<<<<< TREE
+
+
+
+ for ac_func in $ac_func_list
+do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++=======
+ for ac_func in gethostname \
+ closedir getrusage get_current_dir_name \
+ lrand48 logb frexp fmod cbrt setsid \
+ fpathconf select euidaccess getpagesize setlocale \
+ utimes getrlimit setrlimit setpgid getcwd shutdown getaddrinfo \
+ __fpending strsignal setitimer \
+ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \
+ gai_strerror mkstemp getline getdelim fsync sync \
+ difftime posix_memalign \
+ getpwent endpwent getgrent endgrent \
+ touchlock \
+ cfmakeraw cfsetspeed copysign __executable_start
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+ done
+
+
+ if test $opsys != unixware; then
+ for ac_func in getwd
+ do :
+ ac_fn_c_check_func "$LINENO" "getwd" "ac_cv_func_getwd"
+ if test "x$ac_cv_func_getwd" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define HAVE_GETWD 1
+ _ACEOF
+
+ fi
+ done
+
+ fi
+
+ ## Eric Backus <ericb@lsid.hp.com> says, HP-UX 9.x on HP 700 machines
+ ## has a broken `rint' in some library versions including math library
+ ## version number A.09.05.
+ ## You can fix the math library by installing patch number PHSS_4630.
+ ## But we can fix it more reliably for Emacs by just not using rint.
+ ## We also skip HAVE_RANDOM - see comments in src/conf_post.h.
+ case $opsys in
+ hpux*) : ;;
+ *) for ac_func in random rint
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+ eval as_val=\$$as_ac_var
+ if test "x$as_val" = x""yes; then :
+ cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+
+ fi
+ done
+ ;;
+ esac
++>>>>>>> MERGE-SOURCE
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unwind_init" >&5
$as_echo_n "checking for __builtin_unwind_init... " >&6; }
fi
++<<<<<<< TREE
++=======
+
+ $as_echo "#define AMPERSAND_FULL_NAME 1" >>confdefs.h
+
+
+
+ $as_echo "#define CLASH_DETECTION 1" >>confdefs.h
+
+
+
+
+
+
+ ## Note: PTYs are broken on darwin <6. Use at your own risk.
+
+ $as_echo "#define HAVE_PTYS 1" >>confdefs.h
+
+
+
+ $as_echo "#define HAVE_SOCKETS 1" >>confdefs.h
+
+
+
+
+
+ $as_echo "#define NULL_DEVICE \"/dev/null\"" >>confdefs.h
+
+
+
+ $as_echo "#define SEPCHAR ':'" >>confdefs.h
+
+
+
+ $as_echo "#define subprocesses 1" >>confdefs.h
+
+
+
+ $as_echo "#define USER_FULL_NAME pw->pw_gecos" >>confdefs.h
+
+
+
+
+
+
+ $as_echo "#define IS_DEVICE_SEP(_c_) 0" >>confdefs.h
+
+
+
+ $as_echo "#define IS_DIRECTORY_SEP(_c_) ((_c_) == DIRECTORY_SEP)" >>confdefs.h
+
+
+
+ $as_echo "#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))" >>confdefs.h
+
+
+
+
+
+ case $opsys in
+ aix4-2)
+ if test x$ac_cv_lib_Xmu_XmuConvertStandardSelection != xyes; then
+ $as_echo "#define NO_EDITRES 1" >>confdefs.h
+
+ fi
+ ;;
+
+ hpux*)
+ $as_echo "#define NO_EDITRES 1" >>confdefs.h
+
+ ;;
+ esac
+
+
++>>>>>>> MERGE-SOURCE
case $opsys in
darwin | gnu | hpux* | *bsd )
;;
- gnu) opsysfile= ;;
-
hpux11)
+>>>>>>> MERGE-SOURCE
$as_echo "#define BROKEN_SA_RESTART 1" >>confdefs.h
$as_echo "#define USG_SUBTTY_WORKS 1" >>confdefs.h
++<<<<<<< TREE
+
+ opsysfile="s/hpux10-20.h"
+ ;;
+
+ openbsd) opsysfile="s/netbsd.h" ;;
+
+ sol2-10)
++=======
+ ;;
+
+ irix6-5)
+
+ $as_echo "#define PREFER_VSUSP 1" >>confdefs.h
+
+
+ $as_echo "#define SETPGRP_RELEASES_CTTY 1" >>confdefs.h
+
+ ;;
+
+ sol2-10)
++>>>>>>> MERGE-SOURCE
$as_echo "#define _STRUCTURED_PROC 1" >>confdefs.h
++<<<<<<< TREE
+ opsysfile="s/sol2-6.h"
+ ;;
++=======
+ ;;
++>>>>>>> MERGE-SOURCE
esac
# Set up the CFLAGS for real compilation, so we can substitute it.