To: vim-dev@vim.org

Subject: Patch 7.2.183

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

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 <unistd.h>

  #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 <unistd.h>

  #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 ----