To: vim-dev@vim.org Subject: Patch 7.2.183 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 7.2.183 Problem: Configure problem for sys/sysctl.h on OpenBSD. (Dasn) Solution: Add separate check for this header file. Also switch to newer version of autoconf. Files: src/auto/configure, src/configure.in *** ../vim-7.2.182/src/auto/configure 2009-05-14 22:19:19.000000000 +0200 --- src/auto/configure 2009-05-16 13:32:16.000000000 +0200 *************** *** 1,6 **** #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.62. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. --- 1,6 ---- #! /bin/sh # Guess values for system-dependent variables and create Makefiles. ! # Generated by GNU Autoconf 2.63. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. *************** *** 635,772 **** # include #endif" ! ac_subst_vars='SHELL ! PATH_SEPARATOR ! PACKAGE_NAME ! PACKAGE_TARNAME ! PACKAGE_VERSION ! PACKAGE_STRING ! PACKAGE_BUGREPORT ! exec_prefix ! prefix ! program_transform_name ! bindir ! sbindir ! libexecdir ! datarootdir ! datadir ! sysconfdir ! sharedstatedir ! localstatedir ! includedir ! oldincludedir ! docdir ! infodir ! htmldir ! dvidir ! pdfdir ! psdir ! libdir ! localedir ! mandir ! DEFS ! ECHO_C ! ECHO_N ! ECHO_T ! LIBS ! build_alias ! host_alias ! target_alias ! SET_MAKE ! CC ! CFLAGS ! LDFLAGS ! CPPFLAGS ! ac_ct_CC ! EXEEXT ! OBJEXT ! CPP ! GREP ! EGREP ! AWK ! STRIP ! CPP_MM ! OS_EXTRA_SRC ! OS_EXTRA_OBJ ! VIMNAME ! EXNAME ! VIEWNAME ! line_break ! dovimdiff ! dogvimdiff ! compiledby ! vi_cv_path_mzscheme ! MZSCHEME_SRC ! MZSCHEME_OBJ ! MZSCHEME_PRO ! MZSCHEME_LIBS ! MZSCHEME_CFLAGS ! vi_cv_path_perl ! vi_cv_perllib ! shrpenv ! PERL_SRC ! PERL_OBJ ! PERL_PRO ! PERL_CFLAGS ! PERL_LIBS ! vi_cv_path_python ! PYTHON_CONFDIR ! PYTHON_LIBS ! PYTHON_GETPATH_CFLAGS ! PYTHON_CFLAGS ! PYTHON_SRC ! PYTHON_OBJ ! vi_cv_path_tcl ! TCL_SRC ! TCL_OBJ ! TCL_PRO ! TCL_CFLAGS ! TCL_LIBS ! vi_cv_path_ruby ! RUBY_SRC ! RUBY_OBJ ! RUBY_PRO ! RUBY_CFLAGS ! RUBY_LIBS ! WORKSHOP_SRC ! WORKSHOP_OBJ ! NETBEANS_SRC ! NETBEANS_OBJ ! SNIFF_SRC ! SNIFF_OBJ ! xmkmfpath ! XMKMF ! X_CFLAGS ! X_PRE_LIBS ! X_LIBS ! X_EXTRA_LIBS ! X_LIB ! GTK_CONFIG ! GTK12_CONFIG ! PKG_CONFIG ! GTK_CFLAGS ! GTK_LIBS ! GTK_LIBNAME ! GNOME_LIBS ! GNOME_LIBDIR ! GNOME_INCLUDEDIR ! GNOME_CONFIG ! MOTIF_LIBNAME ! NARROW_PROTO ! GUI_INC_LOC ! GUI_LIB_LOC ! GUITYPE ! GUI_X_LIBS ! HANGULIN_SRC ! HANGULIN_OBJ ! TAGPRG ! INSTALL_LANGS ! INSTALL_TOOL_LANGS ! MSGFMT ! MAKEMO ! DEPEND_CFLAGS_FILTER LIBOBJS ! LTLIBOBJS' ac_subst_files='' ac_user_opts=' enable_option_checking --- 635,772 ---- # include #endif" ! ac_subst_vars='LTLIBOBJS LIBOBJS ! DEPEND_CFLAGS_FILTER ! MAKEMO ! MSGFMT ! INSTALL_TOOL_LANGS ! INSTALL_LANGS ! TAGPRG ! HANGULIN_OBJ ! HANGULIN_SRC ! GUI_X_LIBS ! GUITYPE ! GUI_LIB_LOC ! GUI_INC_LOC ! NARROW_PROTO ! MOTIF_LIBNAME ! GNOME_CONFIG ! GNOME_INCLUDEDIR ! GNOME_LIBDIR ! GNOME_LIBS ! GTK_LIBNAME ! GTK_LIBS ! GTK_CFLAGS ! PKG_CONFIG ! GTK12_CONFIG ! GTK_CONFIG ! X_LIB ! X_EXTRA_LIBS ! X_LIBS ! X_PRE_LIBS ! X_CFLAGS ! XMKMF ! xmkmfpath ! SNIFF_OBJ ! SNIFF_SRC ! NETBEANS_OBJ ! NETBEANS_SRC ! WORKSHOP_OBJ ! WORKSHOP_SRC ! RUBY_LIBS ! RUBY_CFLAGS ! RUBY_PRO ! RUBY_OBJ ! RUBY_SRC ! vi_cv_path_ruby ! TCL_LIBS ! TCL_CFLAGS ! TCL_PRO ! TCL_OBJ ! TCL_SRC ! vi_cv_path_tcl ! PYTHON_OBJ ! PYTHON_SRC ! PYTHON_CFLAGS ! PYTHON_GETPATH_CFLAGS ! PYTHON_LIBS ! PYTHON_CONFDIR ! vi_cv_path_python ! PERL_LIBS ! PERL_CFLAGS ! PERL_PRO ! PERL_OBJ ! PERL_SRC ! shrpenv ! vi_cv_perllib ! vi_cv_path_perl ! MZSCHEME_CFLAGS ! MZSCHEME_LIBS ! MZSCHEME_PRO ! MZSCHEME_OBJ ! MZSCHEME_SRC ! vi_cv_path_mzscheme ! compiledby ! dogvimdiff ! dovimdiff ! line_break ! VIEWNAME ! EXNAME ! VIMNAME ! OS_EXTRA_OBJ ! OS_EXTRA_SRC ! CPP_MM ! STRIP ! AWK ! EGREP ! GREP ! CPP ! OBJEXT ! EXEEXT ! ac_ct_CC ! CPPFLAGS ! LDFLAGS ! CFLAGS ! CC ! SET_MAKE ! target_alias ! host_alias ! build_alias ! LIBS ! ECHO_T ! ECHO_N ! ECHO_C ! DEFS ! mandir ! localedir ! libdir ! psdir ! pdfdir ! dvidir ! htmldir ! infodir ! docdir ! oldincludedir ! includedir ! localstatedir ! sharedstatedir ! sysconfdir ! datadir ! datarootdir ! libexecdir ! sbindir ! bindir ! program_transform_name ! prefix ! exec_prefix ! PACKAGE_BUGREPORT ! PACKAGE_STRING ! PACKAGE_VERSION ! PACKAGE_TARNAME ! PACKAGE_NAME ! PATH_SEPARATOR ! SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking *************** *** 1253,1261 **** if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; ! fatal) { $as_echo "$as_me: error: Unrecognized options: $ac_unrecognized_opts" >&2 { (exit 1); exit 1; }; } ;; ! *) $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi --- 1253,1261 ---- if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; ! fatal) { $as_echo "$as_me: error: unrecognized options: $ac_unrecognized_opts" >&2 { (exit 1); exit 1; }; } ;; ! *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi *************** *** 1308,1314 **** ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ! { $as_echo "$as_me: error: Working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 --- 1308,1314 ---- ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || ! { $as_echo "$as_me: error: working directory cannot be determined" >&2 { (exit 1); exit 1; }; } test "X$ac_ls_di" = "X$ac_pwd_ls_di" || { $as_echo "$as_me: error: pwd does not report name of working directory" >&2 *************** *** 1587,1593 **** if $ac_init_version; then cat <<\_ACEOF configure ! generated by GNU Autoconf 2.62 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. --- 1587,1593 ---- if $ac_init_version; then cat <<\_ACEOF configure ! generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. *************** *** 1601,1607 **** running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.62. Invocation command line was $ $0 $@ --- 1601,1607 ---- running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was ! generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ *************** *** 1724,1731 **** case $ac_val in #( *${as_nl}*) case $ac_var in #( ! *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( --- 1724,1731 ---- case $ac_val in #( *${as_nl}*) case $ac_var in #( ! *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( *************** *** 1928,1933 **** --- 1928,1935 ---- fi done if $ac_cache_corrupted; then + { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} { { $as_echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 *************** *** 2084,2095 **** else case $cross_compiling:$ac_tool_warned in yes:) ! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ! whose name does not start with the host triplet. If you think this ! configuration is useful to you, please write to autoconf@gnu.org." >&5 ! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ! whose name does not start with the host triplet. If you think this ! configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC --- 2086,2093 ---- else case $cross_compiling:$ac_tool_warned in yes:) ! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC *************** *** 2288,2299 **** else case $cross_compiling:$ac_tool_warned in yes:) ! { $as_echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools ! whose name does not start with the host triplet. If you think this ! configuration is useful to you, please write to autoconf@gnu.org." >&5 ! $as_echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools ! whose name does not start with the host triplet. If you think this ! configuration is useful to you, please write to autoconf@gnu.org." >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC --- 2286,2293 ---- else case $cross_compiling:$ac_tool_warned in yes:) ! { $as_echo "$as_me:$LINENO: WARNING: using cross tools not prefixed with host triplet" >&5 ! $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} ac_tool_warned=yes ;; esac CC=$ac_ct_CC *************** *** 2303,2313 **** fi ! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; } # Provide some information about the compiler. $as_echo "$as_me:$LINENO: checking for C compiler version" >&5 --- 2297,2309 ---- fi ! test -z "$CC" && { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ! { { $as_echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&5 $as_echo "$as_me: error: no acceptable C compiler found in \$PATH See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; }; } # Provide some information about the compiler. $as_echo "$as_me:$LINENO: checking for C compiler version" >&5 *************** *** 2437,2447 **** $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 $as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} ! { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext --- 2433,2445 ---- $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: C compiler cannot create executables See \`config.log' for more details." >&5 $as_echo "$as_me: error: C compiler cannot create executables See \`config.log' for more details." >&2;} ! { (exit 77); exit 77; }; }; } fi ac_exeext=$ac_cv_exeext *************** *** 2469,2481 **** if test "$cross_compiling" = maybe; then cross_compiling=yes else ! { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 $as_echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; } fi fi fi --- 2467,2481 ---- if test "$cross_compiling" = maybe; then cross_compiling=yes else ! { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ! { { $as_echo "$as_me:$LINENO: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&5 $as_echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'. See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; }; } fi fi fi *************** *** 2518,2528 **** esac done else ! { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext --- 2518,2530 ---- esac done else ! { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ! { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&5 $as_echo "$as_me: error: cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; }; } fi rm -f conftest$ac_cv_exeext *************** *** 2576,2586 **** $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext --- 2578,2590 ---- $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 + { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 + $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { { $as_echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&5 $as_echo "$as_me: error: cannot compute suffix of object files: cannot compile See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext *************** *** 3148,3158 **** if $ac_preproc_ok; then : else ! { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; } fi ac_ext=c --- 3152,3164 ---- if $ac_preproc_ok; then : else ! { { $as_echo "$as_me:$LINENO: error: in \`$ac_pwd':" >&5 ! $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} ! { { $as_echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&5 $as_echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check See \`config.log' for more details." >&2;} ! { (exit 1); exit 1; }; }; } fi ac_ext=c *************** *** 4016,4023 **** $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 4022,4030 ---- $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 4154,4160 **** $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; } fi ! if test $ac_cv_header_Carbon_Carbon_h = yes; then CARBON=yes fi --- 4161,4167 ---- $as_echo "$ac_cv_header_Carbon_Carbon_h" >&6; } fi ! if test "x$ac_cv_header_Carbon_Carbon_h" = x""yes; then CARBON=yes fi *************** *** 4484,4490 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } ! if test $ac_cv_lib_selinux_is_selinux_enabled = yes; then LIBS="$LIBS -lselinux" cat >>confdefs.h <<\_ACEOF #define HAVE_SELINUX 1 --- 4491,4497 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_selinux_is_selinux_enabled" >&5 $as_echo "$ac_cv_lib_selinux_is_selinux_enabled" >&6; } ! if test "x$ac_cv_lib_selinux_is_selinux_enabled" = x""yes; then LIBS="$LIBS -lselinux" cat >>confdefs.h <<\_ACEOF #define HAVE_SELINUX 1 *************** *** 5891,5897 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } ! if test $ac_cv_lib_socket_socket = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF --- 5898,5904 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_socket" >&5 $as_echo "$ac_cv_lib_socket_socket" >&6; } ! if test "x$ac_cv_lib_socket_socket" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 _ACEOF *************** *** 5966,5972 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } ! if test $ac_cv_lib_nsl_gethostbyname = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 _ACEOF --- 5973,5979 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } ! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 _ACEOF *************** *** 6203,6210 **** have_x=disabled else case $x_includes,$x_libraries in #( ! *\'*) { { $as_echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 ! $as_echo "$as_me: error: Cannot use X directory names containing '" >&2;} { (exit 1); exit 1; }; };; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then $as_echo_n "(cached) " >&6 --- 6210,6217 ---- have_x=disabled else case $x_includes,$x_libraries in #( ! *\'*) { { $as_echo "$as_me:$LINENO: error: cannot use X directory names containing '" >&5 ! $as_echo "$as_me: error: cannot use X directory names containing '" >&2;} { (exit 1); exit 1; }; };; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then $as_echo_n "(cached) " >&6 *************** *** 6242,6248 **** *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in ! /usr/lib | /lib) ;; *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi --- 6249,6255 ---- *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in ! /usr/lib | /usr/lib64 | /lib | /lib64) ;; *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi *************** *** 6682,6688 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } ! if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi --- 6689,6695 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } ! if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi *************** *** 6752,6758 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } ! if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi --- 6759,6765 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 $as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } ! if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi *************** *** 6924,6930 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } ! if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi --- 6931,6937 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 $as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } ! if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi *************** *** 6994,7000 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } ! if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi --- 7001,7007 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 $as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } ! if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi *************** *** 7160,7166 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 $as_echo "$ac_cv_lib_socket_connect" >&6; } ! if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi --- 7167,7173 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 $as_echo "$ac_cv_lib_socket_connect" >&6; } ! if test "x$ac_cv_lib_socket_connect" = x""yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi *************** *** 7319,7325 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 $as_echo "$ac_cv_lib_posix_remove" >&6; } ! if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi --- 7326,7332 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 $as_echo "$ac_cv_lib_posix_remove" >&6; } ! if test "x$ac_cv_lib_posix_remove" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi *************** *** 7478,7484 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } ! if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi --- 7485,7491 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 $as_echo "$ac_cv_lib_ipc_shmat" >&6; } ! if test "x$ac_cv_lib_ipc_shmat" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi *************** *** 7559,7565 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } ! if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi --- 7566,7572 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 $as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } ! if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi *************** *** 7727,7733 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } ! if test $ac_cv_lib_Xdmcp__XdmcpAuthDoIt = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp" fi --- 7734,7740 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&5 $as_echo "$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" >&6; } ! if test "x$ac_cv_lib_Xdmcp__XdmcpAuthDoIt" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lXdmcp" fi *************** *** 7797,7803 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; } ! if test $ac_cv_lib_ICE_IceOpenConnection = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE" fi --- 7804,7810 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceOpenConnection" >&5 $as_echo "$ac_cv_lib_ICE_IceOpenConnection" >&6; } ! if test "x$ac_cv_lib_ICE_IceOpenConnection" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lSM -lICE" fi *************** *** 7868,7874 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } ! if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then X_PRE_LIBS="$X_PRE_LIBS -lXpm" fi --- 7875,7881 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&5 $as_echo "$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6; } ! if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = x""yes; then X_PRE_LIBS="$X_PRE_LIBS -lXpm" fi *************** *** 9251,9257 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } ! if test $ac_cv_lib_Xext_XShapeQueryExtension = yes; then GUI_X_LIBS="-lXext" fi --- 9258,9264 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5 $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; } ! if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then GUI_X_LIBS="-lXext" fi *************** *** 9320,9326 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5 $as_echo "$ac_cv_lib_w_wslen" >&6; } ! if test $ac_cv_lib_w_wslen = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lw" fi --- 9327,9333 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_w_wslen" >&5 $as_echo "$ac_cv_lib_w_wslen" >&6; } ! if test "x$ac_cv_lib_w_wslen" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lw" fi *************** *** 9389,9395 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5 $as_echo "$ac_cv_lib_dl_dlsym" >&6; } ! if test $ac_cv_lib_dl_dlsym = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl" fi --- 9396,9402 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlsym" >&5 $as_echo "$ac_cv_lib_dl_dlsym" >&6; } ! if test "x$ac_cv_lib_dl_dlsym" = x""yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldl" fi *************** *** 9458,9464 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } ! if test $ac_cv_lib_Xmu_XmuCreateStippledPixmap = yes; then GUI_X_LIBS="-lXmu $GUI_X_LIBS" fi --- 9465,9471 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&5 $as_echo "$ac_cv_lib_Xmu_XmuCreateStippledPixmap" >&6; } ! if test "x$ac_cv_lib_Xmu_XmuCreateStippledPixmap" = x""yes; then GUI_X_LIBS="-lXmu $GUI_X_LIBS" fi *************** *** 9528,9534 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5 $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; } ! if test $ac_cv_lib_Xp_XpEndJob = yes; then GUI_X_LIBS="-lXp $GUI_X_LIBS" fi --- 9535,9541 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_Xp_XpEndJob" >&5 $as_echo "$ac_cv_lib_Xp_XpEndJob" >&6; } ! if test "x$ac_cv_lib_Xp_XpEndJob" = x""yes; then GUI_X_LIBS="-lXp $GUI_X_LIBS" fi *************** *** 9699,9706 **** $as_echo "$ac_res" >&6; } fi ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 9706,9714 ---- $as_echo "$ac_res" >&6; } fi ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 9852,9859 **** $as_echo "$ac_res" >&6; } fi ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 9860,9868 ---- $as_echo "$ac_res" >&6; } fi ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 10098,10105 **** $as_echo "$ac_res" >&6; } fi ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 10107,10115 ---- $as_echo "$ac_res" >&6; } fi ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 10539,10545 **** $as_echo "$ac_cv_header_elf_h" >&6; } fi ! if test $ac_cv_header_elf_h = yes; then HAS_ELF=1 fi --- 10549,10555 ---- $as_echo "$ac_cv_header_elf_h" >&6; } fi ! if test "x$ac_cv_header_elf_h" = x""yes; then HAS_ELF=1 fi *************** *** 10605,10611 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 $as_echo "$ac_cv_lib_elf_main" >&6; } ! if test $ac_cv_lib_elf_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBELF 1 _ACEOF --- 10615,10621 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_elf_main" >&5 $as_echo "$ac_cv_lib_elf_main" >&6; } ! if test "x$ac_cv_lib_elf_main" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBELF 1 _ACEOF *************** *** 10679,10686 **** $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF --- 10689,10697 ---- $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 _ACEOF *************** *** 10966,10972 **** - for ac_header in stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \ termcap.h fcntl.h sgtty.h sys/ioctl.h sys/time.h sys/types.h termio.h \ iconv.h langinfo.h math.h unistd.h stropts.h errno.h \ --- 10977,10982 ---- *************** *** 10974,10980 **** sys/stream.h termios.h libc.h sys/statfs.h \ poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ libgen.h util/debug.h util/msg18n.h frame.h \ ! sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then --- 10984,10990 ---- sys/stream.h termios.h libc.h sys/statfs.h \ poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ libgen.h util/debug.h util/msg18n.h frame.h \ ! sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h do as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then *************** *** 11108,11115 **** $as_echo "$ac_res" >&6; } fi ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 11118,11126 ---- $as_echo "$ac_res" >&6; } fi ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 11172,11179 **** $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 11183,11256 ---- $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then ! cat >>confdefs.h <<_ACEOF ! #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ! _ACEOF ! ! fi ! ! done ! ! ! ! for ac_header in sys/sysctl.h ! do ! as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ! { $as_echo "$as_me:$LINENO: checking for $ac_header" >&5 ! $as_echo_n "checking for $ac_header... " >&6; } ! if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then ! $as_echo_n "(cached) " >&6 ! else ! cat >conftest.$ac_ext <<_ACEOF ! /* confdefs.h. */ ! _ACEOF ! cat confdefs.h >>conftest.$ac_ext ! cat >>conftest.$ac_ext <<_ACEOF ! /* end confdefs.h. */ ! #if defined HAVE_SYS_PARAM_H ! # include ! #endif ! ! #include <$ac_header> ! _ACEOF ! rm -f conftest.$ac_objext ! if { (ac_try="$ac_compile" ! case "(($ac_try" in ! *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; ! *) ac_try_echo=$ac_try;; ! esac ! eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" ! $as_echo "$ac_try_echo") >&5 ! (eval "$ac_compile") 2>conftest.er1 ! ac_status=$? ! grep -v '^ *+' conftest.er1 >conftest.err ! rm -f conftest.er1 ! cat conftest.err >&5 ! $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 ! (exit $ac_status); } && { ! test -z "$ac_c_werror_flag" || ! test ! -s conftest.err ! } && test -s conftest.$ac_objext; then ! eval "$as_ac_Header=yes" ! else ! $as_echo "$as_me: failed program was:" >&5 ! sed 's/^/| /' conftest.$ac_ext >&5 ! ! eval "$as_ac_Header=no" ! fi ! ! rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext ! fi ! ac_res=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 ! $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 11372,11379 **** $as_echo "$ac_res" >&6; } fi ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 11449,11457 ---- $as_echo "$ac_res" >&6; } fi ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 11770,11776 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 $as_echo "$ac_cv_type_mode_t" >&6; } ! if test $ac_cv_type_mode_t = yes; then : else --- 11848,11854 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 $as_echo "$ac_cv_type_mode_t" >&6; } ! if test "x$ac_cv_type_mode_t" = x""yes; then : else *************** *** 11874,11880 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 $as_echo "$ac_cv_type_off_t" >&6; } ! if test $ac_cv_type_off_t = yes; then : else --- 11952,11958 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 $as_echo "$ac_cv_type_off_t" >&6; } ! if test "x$ac_cv_type_off_t" = x""yes; then : else *************** *** 11978,11984 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 $as_echo "$ac_cv_type_pid_t" >&6; } ! if test $ac_cv_type_pid_t = yes; then : else --- 12056,12062 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 $as_echo "$ac_cv_type_pid_t" >&6; } ! if test "x$ac_cv_type_pid_t" = x""yes; then : else *************** *** 12082,12088 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 $as_echo "$ac_cv_type_size_t" >&6; } ! if test $ac_cv_type_size_t = yes; then : else --- 12160,12166 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 $as_echo "$ac_cv_type_size_t" >&6; } ! if test "x$ac_cv_type_size_t" = x""yes; then : else *************** *** 12286,12292 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 $as_echo "$ac_cv_type_ino_t" >&6; } ! if test $ac_cv_type_ino_t = yes; then : else --- 12364,12370 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 $as_echo "$ac_cv_type_ino_t" >&6; } ! if test "x$ac_cv_type_ino_t" = x""yes; then : else *************** *** 12390,12396 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 $as_echo "$ac_cv_type_dev_t" >&6; } ! if test $ac_cv_type_dev_t = yes; then : else --- 12468,12474 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_type_dev_t" >&5 $as_echo "$ac_cv_type_dev_t" >&6; } ! if test "x$ac_cv_type_dev_t" = x""yes; then : else *************** *** 12680,12687 **** $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! if test `eval 'as_val=${'$as_ac_Lib'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 _ACEOF --- 12758,12766 ---- $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_Lib'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_LIB${libname}" | $as_tr_cpp` 1 _ACEOF *************** *** 13929,13936 **** $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! if test `eval 'as_val=${'$as_ac_var'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF --- 14008,14016 ---- $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_var'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF *************** *** 14313,14319 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5 $as_echo "$ac_cv_lib_m_strtod" >&6; } ! if test $ac_cv_lib_m_strtod = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF --- 14393,14399 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_m_strtod" >&5 $as_echo "$ac_cv_lib_m_strtod" >&6; } ! if test "x$ac_cv_lib_m_strtod" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF *************** *** 14473,14479 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5 $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; } ! if test $ac_cv_lib_posix1e_acl_get_file = yes; then LIBS="$LIBS -lposix1e" else { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 --- 14553,14559 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_posix1e_acl_get_file" >&5 $as_echo "$ac_cv_lib_posix1e_acl_get_file" >&6; } ! if test "x$ac_cv_lib_posix1e_acl_get_file" = x""yes; then LIBS="$LIBS -lposix1e" else { $as_echo "$as_me:$LINENO: checking for acl_get_file in -lacl" >&5 *************** *** 14541,14547 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5 $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } ! if test $ac_cv_lib_acl_acl_get_file = yes; then LIBS="$LIBS -lacl" { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5 $as_echo_n "checking for fgetxattr in -lattr... " >&6; } --- 14621,14627 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_acl_acl_get_file" >&5 $as_echo "$ac_cv_lib_acl_acl_get_file" >&6; } ! if test "x$ac_cv_lib_acl_acl_get_file" = x""yes; then LIBS="$LIBS -lacl" { $as_echo "$as_me:$LINENO: checking for fgetxattr in -lattr" >&5 $as_echo_n "checking for fgetxattr in -lattr... " >&6; } *************** *** 14608,14614 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5 $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } ! if test $ac_cv_lib_attr_fgetxattr = yes; then LIBS="$LIBS -lattr" fi --- 14688,14694 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_attr_fgetxattr" >&5 $as_echo "$ac_cv_lib_attr_fgetxattr" >&6; } ! if test "x$ac_cv_lib_attr_fgetxattr" = x""yes; then LIBS="$LIBS -lattr" fi *************** *** 15746,15752 **** fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } ! if test $ac_cv_lib_xpg4__xpg4_setrunelocale = yes; then LIBS="$LIBS -lxpg4" fi --- 15826,15832 ---- fi { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_xpg4__xpg4_setrunelocale" >&5 $as_echo "$ac_cv_lib_xpg4__xpg4_setrunelocale" >&6; } ! if test "x$ac_cv_lib_xpg4__xpg4_setrunelocale" = x""yes; then LIBS="$LIBS -lxpg4" fi *************** *** 16045,16052 **** $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! if test `eval 'as_val=${'$as_ac_var'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF --- 16125,16133 ---- $as_echo "$as_val"'` { $as_echo "$as_me:$LINENO: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } ! as_val=`eval 'as_val=${'$as_ac_var'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF *************** *** 16246,16252 **** $as_echo "$ac_cv_header_dlfcn_h" >&6; } fi ! if test $ac_cv_header_dlfcn_h = yes; then DLL=dlfcn.h else if test "${ac_cv_header_dl_h+set}" = set; then --- 16327,16333 ---- $as_echo "$ac_cv_header_dlfcn_h" >&6; } fi ! if test "x$ac_cv_header_dlfcn_h" = x""yes; then DLL=dlfcn.h else if test "${ac_cv_header_dl_h+set}" = set; then *************** *** 16376,16382 **** $as_echo "$ac_cv_header_dl_h" >&6; } fi ! if test $ac_cv_header_dl_h = yes; then DLL=dl.h fi --- 16457,16463 ---- $as_echo "$ac_cv_header_dl_h" >&6; } fi ! if test "x$ac_cv_header_dl_h" = x""yes; then DLL=dl.h fi *************** *** 16895,16902 **** $as_echo "$ac_res" >&6; } fi ! if test `eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` = yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF --- 16976,16984 ---- $as_echo "$ac_res" >&6; } fi ! as_val=`eval 'as_val=${'$as_ac_Header'} ! $as_echo "$as_val"'` ! if test "x$as_val" = x""yes; then cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF *************** *** 16986,16993 **** case $ac_val in #( *${as_nl}*) case $ac_var in #( ! *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 ! $as_echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( --- 17068,17075 ---- case $ac_val in #( *${as_nl}*) case $ac_var in #( ! *_cv_*) { $as_echo "$as_me:$LINENO: WARNING: cache variable $ac_var contains a newline" >&5 ! $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; esac case $ac_var in #( _ | IFS | as_nl) ;; #( *************** *** 17379,17385 **** # values after options handling. ac_log=" This file was extended by $as_me, which was ! generated by GNU Autoconf 2.62. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS --- 17461,17467 ---- # values after options handling. ac_log=" This file was extended by $as_me, which was ! generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS *************** *** 17392,17397 **** --- 17474,17488 ---- _ACEOF + case $ac_config_files in *" + "*) set x $ac_config_files; shift; ac_config_files=$*;; + esac + + case $ac_config_headers in *" + "*) set x $ac_config_headers; shift; ac_config_headers=$*;; + esac + + cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 # Files that config.status was made for. config_files="$ac_config_files" *************** *** 17404,17419 **** \`$as_me' instantiates files from templates according to the current configuration. ! Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit ! -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions ! --file=FILE[:TEMPLATE] instantiate the configuration file FILE ! --header=FILE[:TEMPLATE] instantiate the configuration header FILE Configuration files: --- 17495,17511 ---- \`$as_me' instantiates files from templates according to the current configuration. ! Usage: $0 [OPTION]... [FILE]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit ! -q, --quiet, --silent ! do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions ! --file=FILE[:TEMPLATE] instantiate the configuration file FILE ! --header=FILE[:TEMPLATE] instantiate the configuration header FILE Configuration files: *************** *** 17428,17434 **** cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.62, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2008 Free Software Foundation, Inc. --- 17520,17526 ---- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ config.status ! configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" Copyright (C) 2008 Free Software Foundation, Inc. *************** *** 17625,17631 **** $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` = $ac_delim_num; then break elif $ac_last_try; then { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 --- 17717,17724 ---- $as_echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} { (exit 1); exit 1; }; } ! ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` ! if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then { { $as_echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 *************** *** 17830,17838 **** } split(mac1, mac2, "(") #) macro = mac2[1] if (D_is_set[macro]) { # Preserve the white space surrounding the "#". - prefix = substr(line, 1, index(line, defundef) - 1) print prefix "define", macro P[macro] D[macro] next } else { --- 17923,17931 ---- } split(mac1, mac2, "(") #) macro = mac2[1] + prefix = substr(line, 1, index(line, defundef) - 1) if (D_is_set[macro]) { # Preserve the white space surrounding the "#". print prefix "define", macro P[macro] D[macro] next } else { *************** *** 17840,17846 **** # in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. if (defundef == "undef") { ! print "/*", line, "*/" next } } --- 17933,17939 ---- # in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. if (defundef == "undef") { ! print "/*", prefix defundef, macro, "*/" next } } *************** *** 17864,17871 **** esac case $ac_mode$ac_tag in :[FHL]*:*);; ! :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 ! $as_echo "$as_me: error: Invalid tag $ac_tag." >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; --- 17957,17964 ---- esac case $ac_mode$ac_tag in :[FHL]*:*);; ! :L* | :C*:*) { { $as_echo "$as_me:$LINENO: error: invalid tag $ac_tag" >&5 ! $as_echo "$as_me: error: invalid tag $ac_tag" >&2;} { (exit 1); exit 1; }; };; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; *************** *** 18183,18190 **** $ac_cs_success || { (exit 1); exit 1; } fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ! { $as_echo "$as_me:$LINENO: WARNING: Unrecognized options: $ac_unrecognized_opts" >&5 ! $as_echo "$as_me: WARNING: Unrecognized options: $ac_unrecognized_opts" >&2;} fi --- 18276,18283 ---- $ac_cs_success || { (exit 1); exit 1; } fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then ! { $as_echo "$as_me:$LINENO: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 ! $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} fi *** ../vim-7.2.182/src/configure.in 2009-05-14 22:19:19.000000000 +0200 --- src/configure.in 2009-05-16 13:32:00.000000000 +0200 *************** *** 2100,2106 **** sys/stream.h termios.h libc.h sys/statfs.h \ poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ libgen.h util/debug.h util/msg18n.h frame.h \ ! sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h) dnl sys/ptem.h depends on sys/stream.h on Solaris AC_CHECK_HEADERS(sys/ptem.h, [], [], --- 2100,2106 ---- sys/stream.h termios.h libc.h sys/statfs.h \ poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \ libgen.h util/debug.h util/msg18n.h frame.h \ ! sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h) dnl sys/ptem.h depends on sys/stream.h on Solaris AC_CHECK_HEADERS(sys/ptem.h, [], [], *************** *** 2108,2113 **** --- 2108,2119 ---- # include #endif]) + dnl sys/sysctl.h depends on sys/param.h on OpenBSD + AC_CHECK_HEADERS(sys/sysctl.h, [], [], + [#if defined HAVE_SYS_PARAM_H + # include + #endif]) + dnl pthread_np.h may exist but can only be used after including pthread.h AC_MSG_CHECKING([for pthread_np.h]) *** ../vim-7.2.182/src/version.c 2009-05-17 23:25:16.000000000 +0200 --- src/version.c 2009-05-21 15:16:01.000000000 +0200 *************** *** 678,679 **** --- 678,681 ---- { /* Add new patch number below this line */ + /**/ + 183, /**/ -- CART DRIVER: Bring out your dead! There are legs stick out of windows and doors. Two MEN are fighting in the mud - covered from head to foot in it. Another MAN is on his hands in knees shovelling mud into his mouth. We just catch sight of a MAN falling into a well. "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ download, build and distribute -- http://www.A-A-P.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///