<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[50665] branches/images-and-archives/base</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/50665">50665</a></dd>
<dt>Author</dt> <dd>blb@macports.org</dd>
<dt>Date</dt> <dd>2009-05-05 23:51:18 -0700 (Tue, 05 May 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge from trunk</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchesimagesandarchivesbaseaclocalm4">branches/images-and-archives/base/aclocal.m4</a></li>
<li><a href="#branchesimagesandarchivesbaseconfigure">branches/images-and-archives/base/configure</a></li>
<li><a href="#branchesimagesandarchivesbaseconfigureac">branches/images-and-archives/base/configure.ac</a></li>
<li><a href="#branchesimagesandarchivesbasedocmacportsconfin">branches/images-and-archives/base/doc/macports.conf.in</a></li>
<li><a href="#branchesimagesandarchivesbasedocportfile7">branches/images-and-archives/base/doc/portfile.7</a></li>
<li><a href="#branchesimagesandarchivesbasesrcconfighin">branches/images-and-archives/base/src/config.h.in</a></li>
<li><a href="#branchesimagesandarchivesbasesrcmacports10macportstcl">branches/images-and-archives/base/src/macports1.0/macports.tcl</a></li>
<li><a href="#branchesimagesandarchivesbasesrcport10port_autoconftclin">branches/images-and-archives/base/src/port1.0/port_autoconf.tcl.in</a></li>
<li><a href="#branchesimagesandarchivesbasesrcport10portinstalltcl">branches/images-and-archives/base/src/port1.0/portinstall.tcl</a></li>
<li><a href="#branchesimagesandarchivesbasesrcport10portmaintcl">branches/images-and-archives/base/src/port1.0/portmain.tcl</a></li>
<li><a href="#branchesimagesandarchivesbaseteststestmacportsconf">branches/images-and-archives/base/tests/test-macports.conf</a></li>
</ul>

<h3>Property Changed</h3>
<ul>
<li><a href="#branchesimagesandarchivesbase">branches/images-and-archives/base/</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchesimagesandarchivesbase"></a>
<div class="propset"><h4>Property changes: branches/images-and-archives/base</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:50249-50562
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><span class="cx">   + /branches/gsoc08-privileges/base:37343-46937
</span><span class="cx">/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
</span><span class="cx">/trunk/base:50249-50664
</span><span class="cx">/users/perry/base-bugs_and_notes:45682-46060
</span><span class="cx">/users/perry/base-select:44044-44692
</span><a id="branchesimagesandarchivesbaseaclocalm4"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/aclocal.m4 (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/aclocal.m4        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/aclocal.m4        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -572,111 +572,6 @@
</span><span class="cx">         AC_SUBST([MD5_LIBS])
</span><span class="cx"> ])
</span><span class="cx"> 
</span><del>-dnl This macro checks for X11 presence. If the libraries are
-dnl present, so must the headers be. If nothing is present,
-dnl print a warning
-
-# MP_CHECK_X11
-# ---------------------
-AC_DEFUN([MP_CHECK_X11], [
-
-        # work around symbolic X11 link in /usr/include by providing explicit defaults
-        case &quot;$host&quot; in
-            *-*-darwin9*)
-                if test &quot;x$x_includes&quot; = xNONE &amp;&amp; test &quot;x$x_libraries&quot; = xNONE; then
-                    x_includes=&quot;/usr/X11/include&quot;
-                    x_libraries=&quot;/usr/X11/lib&quot;
-                fi
-                ;;
-            *-*-darwin*)
-                if test &quot;x$x_includes&quot; = xNONE &amp;&amp; test &quot;x$x_libraries&quot; = xNONE; then
-                    x_includes=&quot;/usr/X11R6/include&quot;
-                    x_libraries=&quot;/usr/X11R6/lib&quot;
-                fi
-                ;;
-        esac
-
-        AC_PATH_X
-        AC_PATH_XTRA
-
-        # Check for libX11
-        AC_CHECK_LIB([X11], [XOpenDisplay],[
-                has_x_runtime=yes
-                ], [ has_x_runtime=no ], [$X_LIBS])
-
-#         echo &quot;------done---------&quot;
-#         echo &quot;x_includes=${x_includes}&quot;
-#         echo &quot;x_libraries=${x_libraries}&quot;
-#         echo &quot;no_x=${no_x}&quot;
-#         echo &quot;X_CFLAGS=${X_CFLAGS}&quot;
-#         echo &quot;X_LIBS=${X_LIBS}&quot;
-#         echo &quot;X_DISPLAY_MISSING=${X_DISPLAY_MISSING}&quot;
-#         echo &quot;has_x_runtime=${has_x_runtime}&quot;
-#         echo &quot;host_os=${host_os}&quot;
-#         echo &quot;------done---------&quot;
-
-        state=
-
-        case &quot;__${has_x_runtime}__${no_x}__&quot; in
-                &quot;__no__yes__&quot;)
-                # either the user said --without-x, or it was not found
-                # at all (runtime or headers)
-                        AC_MSG_WARN([X11 not available. You will not be able to use ports that use X11])
-                        state=0
-                        ;
-                &quot;__yes__yes__&quot;)
-                        state=1
-                        ;
-                &quot;__yes____&quot;)
-                        state=2
-                        ;
-                *)
-                        state=3
-                        ;
-        esac
-
-        case $host_os in
-                darwin*)        
-                        case $state in
-                                1)
-                                        cat &lt;&lt;EOF;
-Please install the X11 SDK packages from the
-Xcode Developer Tools CD
-EOF
-                                        AC_MSG_ERROR([Broken X11 install. No X11 headers])
-
-                                        ;
-                                3)
-                                        cat &lt;&lt;EOF;
-Unknown configuration problem. Please install the X11 runtime
-and/or X11 SDK  packages from the Xcode Developer Tools CD
-EOF
-                                        AC_MSG_ERROR([Broken X11 install])
-                                        ;
-                        esac
-                        ;
-                *)        
-                        case $state in
-                                1)
-                                        cat &lt;&lt;EOF;
-Please install the X11 developer headers for your platform
-EOF
-                                        AC_MSG_ERROR([Broken X11 install. No X11 headers])
-
-                                        ;
-                                3)
-                                        cat &lt;&lt;EOF;
-Unknown configuration problem. Please install the X11
-implementation for your platform
-EOF
-                                        AC_MSG_ERROR([Broken X11 install])
-                                        ;
-                        esac
-                        ;
-        esac
-
-])
-
</del><span class="cx"> # MP_PROG_XAR
</span><span class="cx"> #---------------------------------------
</span><span class="cx"> AC_DEFUN([MP_PROG_XAR],[
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseconfigure"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/configure (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/configure        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/configure        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -673,12 +673,6 @@
</span><span class="cx"> TCL_BIN_DIR
</span><span class="cx"> TCL_VERSION
</span><span class="cx"> READLINE_LIBS
</span><del>-x11prefix
-X_EXTRA_LIBS
-X_LIBS
-X_PRE_LIBS
-X_CFLAGS
-XMKMF
</del><span class="cx"> MD5_LIBS
</span><span class="cx"> READLINK_IS_NOT_P1003_1A
</span><span class="cx"> CPP
</span><span class="lines">@@ -819,8 +813,6 @@
</span><span class="cx"> with_universal_target
</span><span class="cx"> with_universal_sysroot
</span><span class="cx"> with_universal_archs
</span><del>-with_x11_prefix
-with_x
</del><span class="cx"> enable_readline
</span><span class="cx"> with_tcl
</span><span class="cx"> with_tclinclude
</span><span class="lines">@@ -855,8 +847,7 @@
</span><span class="cx"> XAR
</span><span class="cx"> OPEN
</span><span class="cx"> OBJCPP
</span><del>-CPP
-XMKMF'
</del><ins>+CPP'
</ins><span class="cx"> ac_subdirs_all='src/thread2.6
</span><span class="cx"> src/sqlite-3.1.3'
</span><span class="cx"> 
</span><span class="lines">@@ -1467,10 +1458,6 @@
</span><span class="cx"> 
</span><span class="cx">   cat &lt;&lt;\_ACEOF
</span><span class="cx"> 
</span><del>-X features:
-  --x-includes=DIR    X include files are in DIR
-  --x-libraries=DIR   X library files are in DIR
-
</del><span class="cx"> System types:
</span><span class="cx">   --build=BUILD     configure for building on BUILD [guessed]
</span><span class="cx">   --host=HOST       cross-compile to build programs to run on HOST [BUILD]
</span><span class="lines">@@ -1520,9 +1507,6 @@
</span><span class="cx">                           Universal SDK sysroot (with complete path)
</span><span class="cx">   --with-universal-archs=&quot;CPU&quot;
</span><span class="cx">                           Universal CPU architectures (space separated)
</span><del>-  --with-x11-prefix=PREFIX
-                          use PREFIX as the X11 base dir (default autodetect)
-  --with-x                use the X Window System
</del><span class="cx">   --with-tcl              directory containing tcl configuration (tclConfig.sh)
</span><span class="cx">   --with-tclinclude       directory containing the public Tcl header files.
</span><span class="cx">   --with-tclpackage       Tcl package installation directory.
</span><span class="lines">@@ -1558,7 +1542,6 @@
</span><span class="cx">   OPEN        path to open command
</span><span class="cx">   OBJCPP      Objective C preprocessor
</span><span class="cx">   CPP         C preprocessor
</span><del>-  XMKMF       Path to xmkmf, Makefile generator for X Window System
</del><span class="cx"> 
</span><span class="cx"> Use these variables to override the choices made by `configure' or to help
</span><span class="cx"> it to find libraries and programs with nonstandard names/locations.
</span><span class="lines">@@ -9402,23 +9385,6 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-
-# Check whether --with-x11-prefix was given.
-if test &quot;${with_x11_prefix+set}&quot; = set; then
-  withval=$with_x11_prefix;  x11prefix=&quot;$withval&quot;
-fi
-
-case &quot;$x11prefix&quot; in
-  &quot;&quot;)
-    # default to traditional value
-    x11prefix=/usr/X11R6
-    ;;
-  *)
-    x_includes=$x11prefix/include
-    x_libraries=$x11prefix/lib
-    ;;
-esac
-
</del><span class="cx"> # Check for md5 implementation
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="lines">@@ -9925,1573 +9891,7 @@
</span><span class="cx">         fi
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-# Check for X11 and paraphernalia
</del><span class="cx"> 
</span><del>-
-        # work around symbolic X11 link in /usr/include by providing explicit defaults
-        case &quot;$host&quot; in
-            *-*-darwin9*)
-                if test &quot;x$x_includes&quot; = xNONE &amp;&amp; test &quot;x$x_libraries&quot; = xNONE; then
-                    x_includes=&quot;/usr/X11/include&quot;
-                    x_libraries=&quot;/usr/X11/lib&quot;
-                fi
-                ;;
-            *-*-darwin*)
-                if test &quot;x$x_includes&quot; = xNONE &amp;&amp; test &quot;x$x_libraries&quot; = xNONE; then
-                    x_includes=&quot;/usr/X11R6/include&quot;
-                    x_libraries=&quot;/usr/X11R6/lib&quot;
-                fi
-                ;;
-        esac
-
-        { $as_echo &quot;$as_me:$LINENO: checking for X&quot; &gt;&amp;5
-$as_echo_n &quot;checking for X... &quot; &gt;&amp;6; }
-
-
-# Check whether --with-x was given.
-if test &quot;${with_x+set}&quot; = set; then
-  withval=$with_x;
-fi
-
-# $have_x is `yes', `no', `disabled', or empty when we do not yet know.
-if test &quot;x$with_x&quot; = xno; then
-  # The user explicitly disabled X.
-  have_x=disabled
-else
-  case $x_includes,$x_libraries in #(
-    *\'*) { { $as_echo &quot;$as_me:$LINENO: error: cannot use X directory names containing '&quot; &gt;&amp;5
-$as_echo &quot;$as_me: error: cannot use X directory names containing '&quot; &gt;&amp;2;}
-   { (exit 1); exit 1; }; };; #(
-    *,NONE | NONE,*) if test &quot;${ac_cv_have_x+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  # One or both of the vars are not set, and there is no cached value.
-ac_x_includes=no ac_x_libraries=no
-rm -f -r conftest.dir
-if mkdir conftest.dir; then
-  cd conftest.dir
-  cat &gt;Imakefile &lt;&lt;'_ACEOF'
-incroot:
-        @echo incroot='${INCROOT}'
-usrlibdir:
-        @echo usrlibdir='${USRLIBDIR}'
-libdir:
-        @echo libdir='${LIBDIR}'
-_ACEOF
-  if (export CC; ${XMKMF-xmkmf}) &gt;/dev/null 2&gt;/dev/null &amp;&amp; test -f Makefile; then
-    # GNU make sometimes prints &quot;make[1]: Entering...&quot;, which would confuse us.
-    for ac_var in incroot usrlibdir libdir; do
-      eval &quot;ac_im_$ac_var=\`\${MAKE-make} $ac_var 2&gt;/dev/null | sed -n 's/^$ac_var=//p'\`&quot;
-    done
-    # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
-    for ac_extension in a so sl dylib la dll; do
-      if test ! -f &quot;$ac_im_usrlibdir/libX11.$ac_extension&quot; &amp;&amp;
-         test -f &quot;$ac_im_libdir/libX11.$ac_extension&quot;; then
-        ac_im_usrlibdir=$ac_im_libdir; break
-      fi
-    done
-    # Screen out bogus values from the imake configuration.  They are
-    # bogus both because they are the default anyway, and because
-    # using them would break gcc on systems where it needs fixed includes.
-    case $ac_im_incroot in
-        /usr/include) ac_x_includes= ;;
-        *) test -f &quot;$ac_im_incroot/X11/Xos.h&quot; &amp;&amp; ac_x_includes=$ac_im_incroot;;
-    esac
-    case $ac_im_usrlibdir in
-        /usr/lib | /usr/lib64 | /lib | /lib64) ;;
-        *) test -d &quot;$ac_im_usrlibdir&quot; &amp;&amp; ac_x_libraries=$ac_im_usrlibdir ;;
-    esac
-  fi
-  cd ..
-  rm -f -r conftest.dir
-fi
-
-# Standard set of common directories for X headers.
-# Check X11 before X11Rn because it is often a symlink to the current release.
-ac_x_header_dirs='
-/usr/X11/include
-/usr/X11R6/include
-/usr/X11R5/include
-/usr/X11R4/include
-
-/usr/include/X11
-/usr/include/X11R6
-/usr/include/X11R5
-/usr/include/X11R4
-
-/usr/local/X11/include
-/usr/local/X11R6/include
-/usr/local/X11R5/include
-/usr/local/X11R4/include
-
-/usr/local/include/X11
-/usr/local/include/X11R6
-/usr/local/include/X11R5
-/usr/local/include/X11R4
-
-/usr/X386/include
-/usr/x386/include
-/usr/XFree86/include/X11
-
-/usr/include
-/usr/local/include
-/usr/unsupported/include
-/usr/athena/include
-/usr/local/x11r5/include
-/usr/lpp/Xamples/include
-
-/usr/openwin/include
-/usr/openwin/share/include'
-
-if test &quot;$ac_x_includes&quot; = no; then
-  # Guess where to find include files, by looking for Xlib.h.
-  # First, try using that file with no special directory specified.
-  cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-#include &lt;X11/Xlib.h&gt;
-_ACEOF
-if { (ac_try=&quot;$ac_cpp conftest.$ac_ext&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_cpp conftest.$ac_ext&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &gt;/dev/null &amp;&amp; {
-         test -z &quot;$ac_c_preproc_warn_flag$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       }; then
-  # We can compile using X headers with no special include directory.
-ac_x_includes=
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-  for ac_dir in $ac_x_header_dirs; do
-  if test -r &quot;$ac_dir/X11/Xlib.h&quot;; then
-    ac_x_includes=$ac_dir
-    break
-  fi
-done
-fi
-
-rm -f conftest.err conftest.$ac_ext
-fi # $ac_x_includes = no
-
-if test &quot;$ac_x_libraries&quot; = no; then
-  # Check for the libraries.
-  # See if we find them without any special options.
-  # Don't add to $LIBS permanently.
-  ac_save_LIBS=$LIBS
-  LIBS=&quot;-lX11 $LIBS&quot;
-  cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-#include &lt;X11/Xlib.h&gt;
-int
-main ()
-{
-XrmInitialize ()
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  LIBS=$ac_save_LIBS
-# We can link X programs with no special library path.
-ac_x_libraries=
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        LIBS=$ac_save_LIBS
-for ac_dir in `$as_echo &quot;$ac_x_includes $ac_x_header_dirs&quot; | sed s/include/lib/g`
-do
-  # Don't even attempt the hair of trying to link an X program!
-  for ac_extension in a so sl dylib la dll; do
-    if test -r &quot;$ac_dir/libX11.$ac_extension&quot;; then
-      ac_x_libraries=$ac_dir
-      break 2
-    fi
-  done
-done
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi # $ac_x_libraries = no
-
-case $ac_x_includes,$ac_x_libraries in #(
-  no,* | *,no | *\'*)
-    # Didn't find X, or a directory has &quot;'&quot; in its name.
-    ac_cv_have_x=&quot;have_x=no&quot;;; #(
-  *)
-    # Record where we found X for the cache.
-    ac_cv_have_x=&quot;have_x=yes\
-        ac_x_includes='$ac_x_includes'\
-        ac_x_libraries='$ac_x_libraries'&quot;
-esac
-fi
-;; #(
-    *) have_x=yes;;
-  esac
-  eval &quot;$ac_cv_have_x&quot;
-fi # $with_x != no
-
-if test &quot;$have_x&quot; != yes; then
-  { $as_echo &quot;$as_me:$LINENO: result: $have_x&quot; &gt;&amp;5
-$as_echo &quot;$have_x&quot; &gt;&amp;6; }
-  no_x=yes
-else
-  # If each of the values was on the command line, it overrides each guess.
-  test &quot;x$x_includes&quot; = xNONE &amp;&amp; x_includes=$ac_x_includes
-  test &quot;x$x_libraries&quot; = xNONE &amp;&amp; x_libraries=$ac_x_libraries
-  # Update the cache value to reflect the command line values.
-  ac_cv_have_x=&quot;have_x=yes\
-        ac_x_includes='$x_includes'\
-        ac_x_libraries='$x_libraries'&quot;
-  { $as_echo &quot;$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes&quot; &gt;&amp;5
-$as_echo &quot;libraries $x_libraries, headers $x_includes&quot; &gt;&amp;6; }
-fi
-
-        if test &quot;$no_x&quot; = yes; then
-  # Not all programs may use this symbol, but it does not hurt to define it.
-
-cat &gt;&gt;confdefs.h &lt;&lt;\_ACEOF
-#define X_DISPLAY_MISSING 1
-_ACEOF
-
-  X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS=
-else
-  if test -n &quot;$x_includes&quot;; then
-    X_CFLAGS=&quot;$X_CFLAGS -I$x_includes&quot;
-  fi
-
-  # It would also be nice to do this for all -L options, not just this one.
-  if test -n &quot;$x_libraries&quot;; then
-    X_LIBS=&quot;$X_LIBS -L$x_libraries&quot;
-    # For Solaris; some versions of Sun CC require a space after -R and
-    # others require no space.  Words are not sufficient . . . .
-    { $as_echo &quot;$as_me:$LINENO: checking whether -R must be followed by a space&quot; &gt;&amp;5
-$as_echo_n &quot;checking whether -R must be followed by a space... &quot; &gt;&amp;6; }
-    ac_xsave_LIBS=$LIBS; LIBS=&quot;$LIBS -R$x_libraries&quot;
-    ac_xsave_c_werror_flag=$ac_c_werror_flag
-    ac_c_werror_flag=yes
-    cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo &quot;$as_me:$LINENO: result: no&quot; &gt;&amp;5
-$as_echo &quot;no&quot; &gt;&amp;6; }
-       X_LIBS=&quot;$X_LIBS -R$x_libraries&quot;
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        LIBS=&quot;$ac_xsave_LIBS -R $x_libraries&quot;
-       cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  { $as_echo &quot;$as_me:$LINENO: result: yes&quot; &gt;&amp;5
-$as_echo &quot;yes&quot; &gt;&amp;6; }
-          X_LIBS=&quot;$X_LIBS -R $x_libraries&quot;
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        { $as_echo &quot;$as_me:$LINENO: result: neither works&quot; &gt;&amp;5
-$as_echo &quot;neither works&quot; &gt;&amp;6; }
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    ac_c_werror_flag=$ac_xsave_c_werror_flag
-    LIBS=$ac_xsave_LIBS
-  fi
-
-  # Check for system-dependent libraries X programs must link with.
-  # Do this before checking for the system-independent R6 libraries
-  # (-lICE), since we may need -lsocket or whatever for X linking.
-
-  if test &quot;$ISC&quot; = yes; then
-    X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -lnsl_s -linet&quot;
-  else
-    # Martyn Johnson says this is needed for Ultrix, if the X
-    # libraries were built with DECnet support.  And Karl Berry says
-    # the Alpha needs dnet_stub (dnet does not exist).
-    ac_xsave_LIBS=&quot;$LIBS&quot;; LIBS=&quot;$LIBS $X_LIBS -lX11&quot;
-    cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  :
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        { $as_echo &quot;$as_me:$LINENO: checking for dnet_ntoa in -ldnet&quot; &gt;&amp;5
-$as_echo_n &quot;checking for dnet_ntoa in -ldnet... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_dnet_dnet_ntoa+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-ldnet  $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dnet_dnet_ntoa=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_dnet_dnet_ntoa=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_dnet_dnet_ntoa&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_dnet_dnet_ntoa&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -ldnet&quot;
-fi
-
-    if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      { $as_echo &quot;$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub&quot; &gt;&amp;5
-$as_echo_n &quot;checking for dnet_ntoa in -ldnet_stub... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_dnet_stub_dnet_ntoa+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-ldnet_stub  $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char dnet_ntoa ();
-int
-main ()
-{
-return dnet_ntoa ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_dnet_stub_dnet_ntoa=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_dnet_stub_dnet_ntoa=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_dnet_stub_dnet_ntoa&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_dnet_stub_dnet_ntoa&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -ldnet_stub&quot;
-fi
-
-    fi
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-    LIBS=&quot;$ac_xsave_LIBS&quot;
-
-    # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
-    # to get the SysV transport functions.
-    # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4)
-    # needs -lnsl.
-    # The nsl library prevents programs from opening the X display
-    # on Irix 5.2, according to T.E. Dickey.
-    # The functions gethostbyname, getservbyname, and inet_addr are
-    # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    { $as_echo &quot;$as_me:$LINENO: checking for gethostbyname&quot; &gt;&amp;5
-$as_echo_n &quot;checking for gethostbyname... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_func_gethostbyname+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-/* Define gethostbyname to an innocuous variant, in case &lt;limits.h&gt; declares gethostbyname.
-   For example, HP-UX 11i &lt;limits.h&gt; declares gettimeofday.  */
-#define gethostbyname innocuous_gethostbyname
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char gethostbyname (); below.
-    Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since
-    &lt;limits.h&gt; exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include &lt;limits.h&gt;
-#else
-# include &lt;assert.h&gt;
-#endif
-
-#undef gethostbyname
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char gethostbyname ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_gethostbyname || defined __stub___gethostbyname
-choke me
-#endif
-
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_gethostbyname=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_func_gethostbyname=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_func_gethostbyname&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_func_gethostbyname&quot; &gt;&amp;6; }
-
-    if test $ac_cv_func_gethostbyname = no; then
-      { $as_echo &quot;$as_me:$LINENO: checking for gethostbyname in -lnsl&quot; &gt;&amp;5
-$as_echo_n &quot;checking for gethostbyname in -lnsl... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_nsl_gethostbyname+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lnsl  $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_nsl_gethostbyname=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_nsl_gethostbyname=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_nsl_gethostbyname&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_nsl_gethostbyname&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -lnsl&quot;
-fi
-
-      if test $ac_cv_lib_nsl_gethostbyname = no; then
-        { $as_echo &quot;$as_me:$LINENO: checking for gethostbyname in -lbsd&quot; &gt;&amp;5
-$as_echo_n &quot;checking for gethostbyname in -lbsd... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_bsd_gethostbyname+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lbsd  $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char gethostbyname ();
-int
-main ()
-{
-return gethostbyname ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_bsd_gethostbyname=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_bsd_gethostbyname=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_bsd_gethostbyname&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_bsd_gethostbyname&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -lbsd&quot;
-fi
-
-      fi
-    fi
-
-    # lieder@skyler.mavd.honeywell.com says without -lsocket,
-    # socket/setsockopt and other routines are undefined under SCO ODT
-    # 2.0.  But -lsocket is broken on IRIX 5.2 (and is not necessary
-    # on later versions), says Simon Leinen: it contains gethostby*
-    # variants that don't use the name server (or something).  -lsocket
-    # must be given before -lnsl if both are needed.  We assume that
-    # if connect needs -lnsl, so does gethostbyname.
-    { $as_echo &quot;$as_me:$LINENO: checking for connect&quot; &gt;&amp;5
-$as_echo_n &quot;checking for connect... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_func_connect+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-/* Define connect to an innocuous variant, in case &lt;limits.h&gt; declares connect.
-   For example, HP-UX 11i &lt;limits.h&gt; declares gettimeofday.  */
-#define connect innocuous_connect
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char connect (); below.
-    Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since
-    &lt;limits.h&gt; exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include &lt;limits.h&gt;
-#else
-# include &lt;assert.h&gt;
-#endif
-
-#undef connect
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char connect ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_connect || defined __stub___connect
-choke me
-#endif
-
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_connect=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_func_connect=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_func_connect&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_func_connect&quot; &gt;&amp;6; }
-
-    if test $ac_cv_func_connect = no; then
-      { $as_echo &quot;$as_me:$LINENO: checking for connect in -lsocket&quot; &gt;&amp;5
-$as_echo_n &quot;checking for connect in -lsocket... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_socket_connect+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lsocket $X_EXTRA_LIBS $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char connect ();
-int
-main ()
-{
-return connect ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_socket_connect=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_socket_connect=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_socket_connect&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_socket_connect&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_socket_connect&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;-lsocket $X_EXTRA_LIBS&quot;
-fi
-
-    fi
-
-    # Guillermo Gomez says -lposix is necessary on A/UX.
-    { $as_echo &quot;$as_me:$LINENO: checking for remove&quot; &gt;&amp;5
-$as_echo_n &quot;checking for remove... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_func_remove+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-/* Define remove to an innocuous variant, in case &lt;limits.h&gt; declares remove.
-   For example, HP-UX 11i &lt;limits.h&gt; declares gettimeofday.  */
-#define remove innocuous_remove
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char remove (); below.
-    Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since
-    &lt;limits.h&gt; exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include &lt;limits.h&gt;
-#else
-# include &lt;assert.h&gt;
-#endif
-
-#undef remove
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char remove ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_remove || defined __stub___remove
-choke me
-#endif
-
-int
-main ()
-{
-return remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_remove=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_func_remove=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_func_remove&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_func_remove&quot; &gt;&amp;6; }
-
-    if test $ac_cv_func_remove = no; then
-      { $as_echo &quot;$as_me:$LINENO: checking for remove in -lposix&quot; &gt;&amp;5
-$as_echo_n &quot;checking for remove in -lposix... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_posix_remove+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lposix  $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char remove ();
-int
-main ()
-{
-return remove ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_posix_remove=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_posix_remove=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_posix_remove&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_posix_remove&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_posix_remove&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -lposix&quot;
-fi
-
-    fi
-
-    # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    { $as_echo &quot;$as_me:$LINENO: checking for shmat&quot; &gt;&amp;5
-$as_echo_n &quot;checking for shmat... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_func_shmat+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-/* Define shmat to an innocuous variant, in case &lt;limits.h&gt; declares shmat.
-   For example, HP-UX 11i &lt;limits.h&gt; declares gettimeofday.  */
-#define shmat innocuous_shmat
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shmat (); below.
-    Prefer &lt;limits.h&gt; to &lt;assert.h&gt; if __STDC__ is defined, since
-    &lt;limits.h&gt; exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include &lt;limits.h&gt;
-#else
-# include &lt;assert.h&gt;
-#endif
-
-#undef shmat
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char shmat ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined __stub_shmat || defined __stub___shmat
-choke me
-#endif
-
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_func_shmat=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_func_shmat=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_func_shmat&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_func_shmat&quot; &gt;&amp;6; }
-
-    if test $ac_cv_func_shmat = no; then
-      { $as_echo &quot;$as_me:$LINENO: checking for shmat in -lipc&quot; &gt;&amp;5
-$as_echo_n &quot;checking for shmat in -lipc... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_ipc_shmat+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lipc  $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char shmat ();
-int
-main ()
-{
-return shmat ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_ipc_shmat=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_ipc_shmat=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_ipc_shmat&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_ipc_shmat&quot; = x&quot;&quot;yes; then
-  X_EXTRA_LIBS=&quot;$X_EXTRA_LIBS -lipc&quot;
-fi
-
-    fi
-  fi
-
-  # Check for libraries that X11R6 Xt/Xaw programs need.
-  ac_save_LDFLAGS=$LDFLAGS
-  test -n &quot;$x_libraries&quot; &amp;&amp; LDFLAGS=&quot;$LDFLAGS -L$x_libraries&quot;
-  # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
-  # check for ICE first), but we must link in the order -lSM -lICE or
-  # we get undefined symbols.  So assume we have SM if we have ICE.
-  # These have to be linked with before -lX11, unlike the other
-  # libraries we check for below, so use a different variable.
-  # John Interrante, Karl Berry
-  { $as_echo &quot;$as_me:$LINENO: checking for IceConnectionNumber in -lICE&quot; &gt;&amp;5
-$as_echo_n &quot;checking for IceConnectionNumber in -lICE... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_ICE_IceConnectionNumber+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lICE $X_EXTRA_LIBS $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char IceConnectionNumber ();
-int
-main ()
-{
-return IceConnectionNumber ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_ICE_IceConnectionNumber=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_ICE_IceConnectionNumber=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_ICE_IceConnectionNumber&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_ICE_IceConnectionNumber&quot; = x&quot;&quot;yes; then
-  X_PRE_LIBS=&quot;$X_PRE_LIBS -lSM -lICE&quot;
-fi
-
-  LDFLAGS=$ac_save_LDFLAGS
-
-fi
-
-
-        # Check for libX11
-        { $as_echo &quot;$as_me:$LINENO: checking for XOpenDisplay in -lX11&quot; &gt;&amp;5
-$as_echo_n &quot;checking for XOpenDisplay in -lX11... &quot; &gt;&amp;6; }
-if test &quot;${ac_cv_lib_X11_XOpenDisplay+set}&quot; = set; then
-  $as_echo_n &quot;(cached) &quot; &gt;&amp;6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS=&quot;-lX11 $X_LIBS $LIBS&quot;
-cat &gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h &gt;&gt;conftest.$ac_ext
-cat &gt;&gt;conftest.$ac_ext &lt;&lt;_ACEOF
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern &quot;C&quot;
-#endif
-char XOpenDisplay ();
-int
-main ()
-{
-return XOpenDisplay ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try=&quot;$ac_link&quot;
-case &quot;(($ac_try&quot; in
-  *\&quot;* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo=&quot;\&quot;\$as_me:$LINENO: $ac_try_echo\&quot;&quot;
-$as_echo &quot;$ac_try_echo&quot;) &gt;&amp;5
-  (eval &quot;$ac_link&quot;) 2&gt;conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 &gt;conftest.err
-  rm -f conftest.er1
-  cat conftest.err &gt;&amp;5
-  $as_echo &quot;$as_me:$LINENO: \$? = $ac_status&quot; &gt;&amp;5
-  (exit $ac_status); } &amp;&amp; {
-         test -z &quot;$ac_c_werror_flag&quot; ||
-         test ! -s conftest.err
-       } &amp;&amp; test -s conftest$ac_exeext &amp;&amp; {
-         test &quot;$cross_compiling&quot; = yes ||
-         $as_test_x conftest$ac_exeext
-       }; then
-  ac_cv_lib_X11_XOpenDisplay=yes
-else
-  $as_echo &quot;$as_me: failed program was:&quot; &gt;&amp;5
-sed 's/^/| /' conftest.$ac_ext &gt;&amp;5
-
-        ac_cv_lib_X11_XOpenDisplay=no
-fi
-
-rm -rf conftest.dSYM
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay&quot; &gt;&amp;5
-$as_echo &quot;$ac_cv_lib_X11_XOpenDisplay&quot; &gt;&amp;6; }
-if test &quot;x$ac_cv_lib_X11_XOpenDisplay&quot; = x&quot;&quot;yes; then
-
-                has_x_runtime=yes
-
-else
-   has_x_runtime=no
-fi
-
-
-#         echo &quot;------done---------&quot;
-#         echo &quot;x_includes=${x_includes}&quot;
-#         echo &quot;x_libraries=${x_libraries}&quot;
-#         echo &quot;no_x=${no_x}&quot;
-#         echo &quot;X_CFLAGS=${X_CFLAGS}&quot;
-#         echo &quot;X_LIBS=${X_LIBS}&quot;
-#         echo &quot;X_DISPLAY_MISSING=${X_DISPLAY_MISSING}&quot;
-#         echo &quot;has_x_runtime=${has_x_runtime}&quot;
-#         echo &quot;host_os=${host_os}&quot;
-#         echo &quot;------done---------&quot;
-
-        state=
-
-        case &quot;__${has_x_runtime}__${no_x}__&quot; in
-                &quot;__no__yes__&quot;)
-                # either the user said --without-x, or it was not found
-                # at all (runtime or headers)
-                        { $as_echo &quot;$as_me:$LINENO: WARNING: X11 not available. You will not be able to use ports that use X11&quot; &gt;&amp;5
-$as_echo &quot;$as_me: WARNING: X11 not available. You will not be able to use ports that use X11&quot; &gt;&amp;2;}
-                        state=0
-                        ;
-                &quot;__yes__yes__&quot;)
-                        state=1
-                        ;
-                &quot;__yes____&quot;)
-                        state=2
-                        ;
-                *)
-                        state=3
-                        ;
-        esac
-
-        case $host_os in
-                darwin*)
-                        case $state in
-                                1)
-                                        cat &lt;&lt;EOF;
-Please install the X11 SDK packages from the
-Xcode Developer Tools CD
-EOF
-                                        { { $as_echo &quot;$as_me:$LINENO: error: Broken X11 install. No X11 headers&quot; &gt;&amp;5
-$as_echo &quot;$as_me: error: Broken X11 install. No X11 headers&quot; &gt;&amp;2;}
-   { (exit 1); exit 1; }; }
-
-                                        ;
-                                3)
-                                        cat &lt;&lt;EOF;
-Unknown configuration problem. Please install the X11 runtime
-and/or X11 SDK  packages from the Xcode Developer Tools CD
-EOF
-                                        { { $as_echo &quot;$as_me:$LINENO: error: Broken X11 install&quot; &gt;&amp;5
-$as_echo &quot;$as_me: error: Broken X11 install&quot; &gt;&amp;2;}
-   { (exit 1); exit 1; }; }
-                                        ;
-                        esac
-                        ;
-                *)
-                        case $state in
-                                1)
-                                        cat &lt;&lt;EOF;
-Please install the X11 developer headers for your platform
-EOF
-                                        { { $as_echo &quot;$as_me:$LINENO: error: Broken X11 install. No X11 headers&quot; &gt;&amp;5
-$as_echo &quot;$as_me: error: Broken X11 install. No X11 headers&quot; &gt;&amp;2;}
-   { (exit 1); exit 1; }; }
-
-                                        ;
-                                3)
-                                        cat &lt;&lt;EOF;
-Unknown configuration problem. Please install the X11
-implementation for your platform
-EOF
-                                        { { $as_echo &quot;$as_me:$LINENO: error: Broken X11 install&quot; &gt;&amp;5
-$as_echo &quot;$as_me: error: Broken X11 install&quot; &gt;&amp;2;}
-   { (exit 1); exit 1; }; }
-                                        ;
-                        esac
-                        ;
-        esac
-
-
-
-{ $as_echo &quot;$as_me:$LINENO: checking for X11 prefix&quot; &gt;&amp;5
-$as_echo_n &quot;checking for X11 prefix... &quot; &gt;&amp;6; }
-X_INCLUDES_PREFIX=`echo &quot;$x_includes&quot; | sed &quot;s,/include,,&quot;`
-X_LIBRARIES_PREFIX=`echo &quot;$x_libraries&quot; | sed &quot;s,/lib,,&quot;`
-if test &quot;x$have_x&quot; = &quot;xyes&quot; -a &quot;x$X_INCLUDES_PREFIX&quot; = &quot;x$X_LIBRARIES_PREFIX&quot; -a &quot;x$X_LIBRARIES_PREFIX&quot; != x; then
-    x11prefix=$X_LIBRARIES_PREFIX
-fi
-{ $as_echo &quot;$as_me:$LINENO: result: $x11prefix&quot; &gt;&amp;5
-$as_echo &quot;$x11prefix&quot; &gt;&amp;6; }
-
-
</del><span class="cx"> # Check for readline
</span><span class="cx"> # Check whether --enable-readline was given.
</span><span class="cx"> if test &quot;${enable_readline+set}&quot; = set; then
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseconfigureac"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/configure.ac (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/configure.ac        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/configure.ac        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -173,32 +173,9 @@
</span><span class="cx"> AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv])
</span><span class="cx"> MP_CHECK_READLINK_IS_P1003_1A
</span><span class="cx"> 
</span><del>-AC_ARG_WITH(x11-prefix, [AC_HELP_STRING([--with-x11-prefix=PREFIX], [use PREFIX as the X11 base dir (default autodetect)])], [ x11prefix=&quot;$withval&quot; ] )
-case &quot;$x11prefix&quot; in
-  &quot;&quot;)
-    # default to traditional value
-    x11prefix=/usr/X11R6
-    ;;
-  *)
-    x_includes=$x11prefix/include
-    x_libraries=$x11prefix/lib
-    ;;
-esac
-
</del><span class="cx"> # Check for md5 implementation
</span><span class="cx"> MP_LIB_MD5
</span><del>-# Check for X11 and paraphernalia
-MP_CHECK_X11
</del><span class="cx"> 
</span><del>-AC_MSG_CHECKING(for X11 prefix)
-X_INCLUDES_PREFIX=`echo &quot;$x_includes&quot; | sed &quot;s,/include,,&quot;`
-X_LIBRARIES_PREFIX=`echo &quot;$x_libraries&quot; | sed &quot;s,/lib,,&quot;`
-if test &quot;x$have_x&quot; = &quot;xyes&quot; -a &quot;x$X_INCLUDES_PREFIX&quot; = &quot;x$X_LIBRARIES_PREFIX&quot; -a &quot;x$X_LIBRARIES_PREFIX&quot; != x; then
-    x11prefix=$X_LIBRARIES_PREFIX
-fi
-AC_MSG_RESULT([$x11prefix])
-AC_SUBST(x11prefix)
-
</del><span class="cx"> # Check for readline
</span><span class="cx"> AC_ARG_ENABLE(readline, AC_HELP_STRING([--enable-readline], [Enable addition of readline support, if readline present.]),
</span><span class="cx"> [
</span></span></pre></div>
<a id="branchesimagesandarchivesbasedocmacportsconfin"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/doc/macports.conf.in (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/doc/macports.conf.in        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/doc/macports.conf.in        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -16,11 +16,8 @@
</span><span class="cx"> 
</span><span class="cx"> # PATH settings that are used for external tools (configure, make, etc.) while installing ports. The default
</span><span class="cx"> # paths are given in the example; it need not be uncommented.  Customizing binpath is intended for advanced users only.
</span><del>-#binpath                @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin:@x11prefix@/bin
</del><ins>+#binpath                @prefix_expanded@/bin:@prefix_expanded@/sbin:/bin:/sbin:/usr/bin:/usr/sbin
</ins><span class="cx"> 
</span><del>-# Directory containing the X11 installation.
-x11prefix                @x11prefix@
-
</del><span class="cx"> # Directory containing Applications from ports.
</span><span class="cx"> applications_dir        @MPAPPLICATIONSDIR@
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesimagesandarchivesbasedocportfile7"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/doc/portfile.7 (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/doc/portfile.7        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/doc/portfile.7        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -479,12 +479,6 @@
</span><span class="cx"> .br
</span><span class="cx"> .Sy Default:
</span><span class="cx"> .Em ${prefix}/Library/Frameworks
</span><del>-.It Ic x11prefix
-Absolute path to X11 (eg
-.Pa /usr/X11R6 )
-.br
-.Sy Type:
-.Em read-only
</del><span class="cx"> .El
</span><span class="cx"> .Sh DEPENDENCY OPTIONS
</span><span class="cx"> Port dependencies should refer to other MacPort ports
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcconfighin"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/config.h.in (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/config.h.in        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/src/config.h.in        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -286,9 +286,6 @@
</span><span class="cx"> /* Attribute to mark unused variables */
</span><span class="cx"> #undef UNUSED
</span><span class="cx"> 
</span><del>-/* Define to 1 if the X Window System is missing or not being used. */
-#undef X_DISPLAY_MISSING
-
</del><span class="cx"> /* Define to `int' if &lt;sys/types.h&gt; does not define. */
</span><span class="cx"> #undef pid_t
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcmacports10macportstcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/macports1.0/macports.tcl (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/macports1.0/macports.tcl        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/src/macports1.0/macports.tcl        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> namespace eval macports {
</span><span class="cx">     namespace export bootstrap_options user_options portinterp_options open_mports ui_priorities
</span><span class="cx">     variable bootstrap_options &quot;\
</span><del>-        portdbpath libpath binpath auto_path extra_env sources_conf prefix x11prefix portdbformat \
</del><ins>+        portdbpath libpath binpath auto_path extra_env sources_conf prefix portdbformat \
</ins><span class="cx">         portarchivepath portarchivetype portautoclean \
</span><span class="cx">         porttrace portverbose destroot_umask variants_conf rsync_server rsync_options \
</span><span class="cx">         rsync_dir startupitem_type place_worksymlink xcodeversion xcodebuildcmd \
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx">         macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip&quot;
</span><span class="cx">     variable user_options &quot;submitter_name submitter_email submitter_key&quot;
</span><span class="cx">     variable portinterp_options &quot;\
</span><del>-        portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen x11prefix portsharepath \
</del><ins>+        portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \
</ins><span class="cx">         registry.path registry.format portarchivepath \
</span><span class="cx">         portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
</span><span class="cx">         rsync_options rsync_dir startupitem_type place_worksymlink \
</span><span class="lines">@@ -338,7 +338,6 @@
</span><span class="cx">     global macports::prefix
</span><span class="cx">     global macports::macportsuser
</span><span class="cx">     global macports::prefix_frozen
</span><del>-    global macports::x11prefix
</del><span class="cx">     global macports::rsync_dir
</span><span class="cx">     global macports::rsync_options
</span><span class="cx">     global macports::rsync_server
</span><span class="lines">@@ -582,7 +581,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if {![info exists binpath]} {
</span><del>-        set env(PATH) &quot;${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin:${x11prefix}/bin&quot;
</del><ins>+        set env(PATH) &quot;${prefix}/bin:${prefix}/sbin:/bin:/sbin:/usr/bin:/usr/sbin&quot;
</ins><span class="cx">     } else {
</span><span class="cx">         set env(PATH) &quot;$binpath&quot;
</span><span class="cx">     }
</span><span class="lines">@@ -1165,7 +1164,6 @@
</span><span class="cx">     set depline [lindex [split $depspec :] 1]
</span><span class="cx">     set prefix [_mportkey $mport prefix]
</span><span class="cx">     set frameworks_dir [_mportkey $mport frameworks_dir]
</span><del>-    set x11prefix [_mportkey $mport x11prefix]
</del><span class="cx">     
</span><span class="cx">     if {[info exists env(DYLD_FRAMEWORK_PATH)]} {
</span><span class="cx">         lappend search_path $env(DYLD_FRAMEWORK_PATH)
</span><span class="lines">@@ -1178,7 +1176,7 @@
</span><span class="cx">     if {[info exists env(DYLD_LIBRARY_PATH)]} {
</span><span class="cx">         lappend search_path $env(DYLD_LIBRARY_PATH)
</span><span class="cx">     }
</span><del>-    lappend search_path /lib /usr/lib ${x11prefix}/lib ${prefix}/lib
</del><ins>+    lappend search_path /lib /usr/lib ${prefix}/lib
</ins><span class="cx">     if {[info exists env(DYLD_FALLBACK_LIBRARY_PATH)]} {
</span><span class="cx">         lappend search_path $env(DYLD_FALLBACK_LIBRARY_PATH)
</span><span class="cx">     }
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcport10port_autoconftclin"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/port1.0/port_autoconf.tcl.in (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/port1.0/port_autoconf.tcl.in        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/src/port1.0/port_autoconf.tcl.in        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -47,5 +47,4 @@
</span><span class="cx">         variable install_group &quot;@DSTGRP@&quot;
</span><span class="cx">         variable prefix &quot;@prefix_expanded@&quot;
</span><span class="cx">         variable macportsuser &quot;@RUNUSR@&quot;
</span><del>-        variable x11prefix &quot;@x11prefix@&quot;
</del><span class="cx"> }
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcport10portinstalltcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/port1.0/portinstall.tcl (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/port1.0/portinstall.tcl        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/src/port1.0/portinstall.tcl        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -101,16 +101,8 @@
</span><span class="cx">     foreach name [readdir .] {
</span><span class="cx">         set element [file join $cwd $name]
</span><span class="cx"> 
</span><del>-        # XXX jpm's cross-platform code to find file separator
-        # replace with [file seperator] with tcl 8.4
</del><span class="cx">         if {![info exists root]} {
</span><del>-            if {[string match [file tail &quot;/monkey&quot;] &quot;monkey&quot;]} {
-                set root &quot;/&quot;
-            } elseif {[string match [file tail &quot;:monkey&quot;] &quot;monkey&quot;]} {
-                set root &quot;:&quot; 
-            } else {
-                set root &quot;\\&quot;
-            }
</del><ins>+            set root [file separator]
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         set imagedir [registry_prop_retr $regref imagedir]
</span><span class="lines">@@ -155,7 +147,7 @@
</span><span class="cx">         registry_prop_store $regref description $description
</span><span class="cx">     }
</span><span class="cx">     if {[info exists long_description]} {
</span><del>-        registry_prop_store $regref long_description ${long_description}
</del><ins>+        registry_prop_store $regref long_description [string map {\n \\n} ${long_description}]
</ins><span class="cx">     }
</span><span class="cx">     if {[info exists homepage]} {
</span><span class="cx">         registry_prop_store $regref homepage ${homepage}
</span></span></pre></div>
<a id="branchesimagesandarchivesbasesrcport10portmaintcl"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/src/port1.0/portmain.tcl (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/src/port1.0/portmain.tcl        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/src/port1.0/portmain.tcl        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -59,7 +59,6 @@
</span><span class="cx"> default workpath {[getportworkpath_from_buildpath $portbuildpath]}
</span><span class="cx"> default worksymlink {[file join $portpath work]}
</span><span class="cx"> default prefix /opt/local
</span><del>-default x11prefix /usr/X11R6
</del><span class="cx"> default applications_dir /Applications/MacPorts
</span><span class="cx"> default frameworks_dir {${prefix}/Library/Frameworks}
</span><span class="cx"> default destdir destroot
</span></span></pre></div>
<a id="branchesimagesandarchivesbaseteststestmacportsconf"></a>
<div class="modfile"><h4>Modified: branches/images-and-archives/base/tests/test-macports.conf (50664 => 50665)</h4>
<pre class="diff"><span>
<span class="info">--- branches/images-and-archives/base/tests/test-macports.conf        2009-05-06 06:43:49 UTC (rev 50664)
+++ branches/images-and-archives/base/tests/test-macports.conf        2009-05-06 06:51:18 UTC (rev 50665)
</span><span class="lines">@@ -11,9 +11,6 @@
</span><span class="cx"> # NOTE: sqlite not yet supported.
</span><span class="cx"> portdbformat                flat
</span><span class="cx"> 
</span><del>-# Directory containing the X11 installation.
-x11prefix                /tmp/macports-tests/usr/X11R6
-
</del><span class="cx"> # Where to find the sources list.
</span><span class="cx"> sources_conf                /tmp/macports-tests/opt/local/etc/macports/sources.conf
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>