Apache Tomcat", string:rcvRes)) + { + # Grep for Apache Tomcat 4.1.0 - 4.1.37, 5.5.0 - 5.5.26, 6.0.0 - 6.0.16 + if(egrep(pattern:"Apache Tomcat/(4\.1(\.[0-2]?[0-9]|\.3[0-7])?|5\.5" + + "(\.[01]?[0-9]|\.2[0-6])?|6\.0(\.[0-9]|\.1[0-6])?)" + + "[^.0-9]", string:rcvRes)){ + security_warning(port); + } + } Property changes on: trunk/openvas-plugins/scripts/secpod_apache_tomcat_xss_n_bypass_vuln_900021.nasl ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Thu Aug 7 17:25:49 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 7 Aug 2008 17:25:49 +0200 (CEST) Subject: [Openvas-commits] r1112 - trunk/openvas-plugins/scripts Message-ID: <20080807152549.B5431404DF@pyrosoma.intevation.org> Author: chandra Date: 2008-08-07 17:25:49 +0200 (Thu, 07 Aug 2008) New Revision: 1112 Added: trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl Log: Script for Xampp Multiple XSS vulnerability Added: trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl =================================================================== --- trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl 2008-08-07 15:25:16 UTC (rev 1111) +++ trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl 2008-08-07 15:25:49 UTC (rev 1112) @@ -0,0 +1,111 @@ +############################################################################## +# +# XAMPP for Linux text Parameter Multiple XSS Vulnerabilities +# +# Copyright: SecPod +# +# Date Written: 2008/08/07 +# +# Revision: 1.2 +# +# Log: schandan +# Issue #0093 +# ------------------------------------------------------------------------ +# This program was written by SecPod and is licensed under the GNU GPL +# license. Please refer to the below link for details, +# http://www.gnu.org/licenses/gpl.html +# This header contains information regarding licensing terms under the GPL, +# and information regarding obtaining source code from the Author. +# Consequently, pursuant to section 3(c) of the GPL, you must accompany the +# information found in this header with any distribution you make of this +# Program. +# ------------------------------------------------------------------------ +############################################################################## + +if(description) +{ + script_id(900023); + script_bugtraq_id(30535); + script_copyright(english:"Copyright (C) 2008 SecPod"); + script_version("$Revision: 1.1 $"); + script_category(ACT_GATHER_INFO); + script_family(english:"CGI abuses : XSS"); + script_name(english:"XAMPP for Linux text Parameter Multiple XSS Vulnerabilities"); + script_summary(english:"Check for the vulnerable version of XAMPP"); + desc["english"] = " + Overview : The host is running Xampp, which is prone to multiple cross site + scripting vulnerabilities. + + Vulnerability Insight : + + The flaw is due the input passed to the parameter text in iart.php and + ming.php files are not santised before being returned to the user. + + Impact : Successful exploitation could allow remote attackers to execute + arbitrary HTML and script code. + + Impact Level : Application + + Affected Software/OS: + Xampp Linux 1.6.7 and prior on Linux (All). + + Solution : No solution/patch is available as on 07th August, 2008. Information + regarding this issue will be updated once the solution details are available. + For updates check, http://www.apachefriends.org/en/xampp-linux.html + + References : http://www.securityfocus.com/archive/1/495096 + + CVSS Score : + CVSS Base Score : 5.8 (AV:N/AC:M/Au:NR/C:P/I:P/A:N) + CVSS Temporal Score : 5.2 + Risk factor : Medium"; + script_description(english:desc["english"]); + script_dependencies("http_version.nasl"); + script_require_ports("Services/www", 80); + exit(0); +} + + + include("http_func.inc"); + include("http_keepalive.inc"); + + port = get_http_port(default:80); + if(!port){ + exit(0); + } + + foreach path (make_list("/xampp", cgi_dirs())) + { + sndReq = http_get(item:string(path, "/start.php"), port:port); + rcvRes = http_keepalive_send_recv(port:port, data:sndReq); + if(rcvRes == NULL){ + exit(0); + } + + if(egrep(pattern:"XAMPP for Linux", string:rcvRes) && + egrep(pattern:"^HTTP/.* 200 OK", string:rcvRes)) + { + if(safe_checks()) + { + if(egrep(pattern:"XAMPP for Linux 1\.([0-5]\..*|6\.[0-7])" + + "($|[^.0-9])", string:rcvRes)){ + security_warning(port); + } + exit(0); + } + + # XSS request sent to parameter text in iart.php + sndReq = http_get(item:string(path, "/iart.php?text=%22%3E%" + + "3E%3C%3C%3E%3E%22%22%3Cscript%3Ealert(document.alert)" + + "%3C/script%3E"), port:port); + rcvRes = http_keepalive_send_recv(port:port, data:sndReq, bodyonly:1); + if(rcvRes == NULL){ + exit(0); + } + + if('<script>alert(document.alert)</script>' >< rcvRes){ + security_warning(port); + } + exit(0); + } + } Property changes on: trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Fri Aug 8 09:36:26 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 09:36:26 +0200 (CEST) Subject: [Openvas-commits] r1113 - in trunk/openvas-client: . include nessus Message-ID: <20080808073626.0DC36406F7@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-08 09:36:23 +0200 (Fri, 08 Aug 2008) New Revision: 1113 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/configure trunk/openvas-client/configure.in trunk/openvas-client/include/config.h.in trunk/openvas-client/nessus/cli.c trunk/openvas-client/nessus/html_graph_output.c trunk/openvas-client/nessus/nessus.c trunk/openvas-client/nessus/report_save.c Log: Removing gd and gdchart according to OpenVAS Change Request #14: http://www.openvas.org/openvas-cr-14.html Second part of patch. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/ChangeLog 2008-08-08 07:36:23 UTC (rev 1113) @@ -1,3 +1,22 @@ +2008-08-08 Michael Wiegand <michael.wiegand at intevation.de> + + Removing gd and gdchart according to OpenVAS Change Request #14: + http://www.openvas.org/openvas-cr-14.html + Second part of patch. + + * nessus/html_graph_output.c, nessus/cli.c, nessus/report_save.c, + nessus/nessus.c: Changed conditional to NO_GDCHART to better adapt + to gdchart oddities. + + * configure.in: Improved header check for headers needed by gdchart; + only set GDC_LIBS when _all_ headers are present. + + * include/config.h.in: Changed conditional to NO_GDCHART; defining + HAVE_LIBFREETYPE as gdchart breaks compilation if it is not set + (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242936). + + * configure: Updated. + 2008-08-06 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Removing gd and gdchart according to OpenVAS Change Request #14: Modified: trunk/openvas-client/configure =================================================================== --- trunk/openvas-client/configure 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/configure 2008-08-08 07:36:23 UTC (rev 1113) @@ -3745,8 +3745,20 @@ done +if test "$ac_cv_header_gdc_h" = "yes" && test "$ac_cv_header_gd_h" = "yes" && test "$ac_cv_header_png_h" = "yes"; then + gdc_lib="-lgd -lpng -lgdc" + cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBFREETYPE 1 +_ACEOF +else + cat >>confdefs.h <<\_ACEOF +#define NO_GDCHART 1 +_ACEOF +fi + + succeeded=no if test -z "$PKG_CONFIG"; then Modified: trunk/openvas-client/configure.in =================================================================== --- trunk/openvas-client/configure.in 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/configure.in 2008-08-08 07:36:23 UTC (rev 1113) @@ -75,6 +75,12 @@ dnl GDChart AC_CHECK_HEADERS([gdc.h gd.h png.h]) +if test "$ac_cv_header_gdc_h" = "yes" && test "$ac_cv_header_gd_h" = "yes" && test "$ac_cv_header_png_h" = "yes"; then + gdc_lib="-lgd -lpng -lgdc" + AC_DEFINE(HAVE_LIBFREETYPE) +else + AC_DEFINE(NO_GDCHART) +fi PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.0, HAVE_GLIB="yes", sweep_config_ok="no") AC_SUBST(GLIB_CFLAGS) Modified: trunk/openvas-client/include/config.h.in =================================================================== --- trunk/openvas-client/include/config.h.in 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/include/config.h.in 2008-08-08 07:36:23 UTC (rev 1113) @@ -224,7 +224,8 @@ #undef HAVE_SETPROCTITLE #undef HAVE__EXIT -#undef HAVE_GDCHART +#undef NO_GDCHART +#undef HAVE_LIBFREETYPE #undef HAVE_PTY_H #undef HAVE_SYS_MMAN_H Modified: trunk/openvas-client/nessus/cli.c =================================================================== --- trunk/openvas-client/nessus/cli.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/cli.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -373,13 +373,13 @@ return; } -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART if(!strncmp(ftype, "html_pie", 8)|| !strncmp(ftype, "html_graph", 10)) { args->output = arglist_to_html_graph; } else -#endif /* HAVE_GDCHART */ +#endif /* NO_GDCHART */ if (!strncmp(ftype, "html", 4)) { args->output = arglist_to_html; } else if (!strcmp(ftype, "latex") || Modified: trunk/openvas-client/nessus/html_graph_output.c =================================================================== --- trunk/openvas-client/nessus/html_graph_output.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/html_graph_output.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -65,13 +65,13 @@ -------------------------------------------------------------------*/ -#ifdef HAVE_GDCHART #include <includes.h> #include "nessus_i18n.h" -#include "gdc.h" -#include "gdchart.h" -#include "gdcpie.h" +#ifndef NO_GDCHART +#include <gdc.h> +#include <gdchart.h> +#include <gdcpie.h> #include "report.h" #include "report_utils.h" #include "error_dlg.h" @@ -1369,4 +1369,4 @@ return 0; } -#endif /* HAVE_GDCHART */ +#endif /* NO_GDCHART */ Modified: trunk/openvas-client/nessus/nessus.c =================================================================== --- trunk/openvas-client/nessus/nessus.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/nessus.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -788,7 +788,7 @@ arglist_to_text(backend_convert(be), out_report); else if(!strcmp(type, "html")) arglist_to_html(backend_convert(be), out_report); -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART else if(!strcmp(type, "html_pie") || !strcmp(type, "html_graph")) arglist_to_html_graph(backend_convert(be), out_report); #endif Modified: trunk/openvas-client/nessus/report_save.c =================================================================== --- trunk/openvas-client/nessus/report_save.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/report_save.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -126,7 +126,7 @@ hosts = backend_convert(be); arglist_to_text(hosts, fname); break; -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART case SAVE_HTML_GRAPH: hosts = backend_convert(be); arglist_to_html_graph(hosts, fname); @@ -231,7 +231,7 @@ gtk_menu_append(GTK_MENU(menu), type); gtk_widget_show(type); -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART type = gtk_menu_item_new_with_label(_("HTML with Pies and Graphs")); gtk_object_set_data(GTK_OBJECT(type), "type", (void *)SAVE_HTML_GRAPH); gtk_menu_append(GTK_MENU(menu), type); From scm-commit at wald.intevation.org Fri Aug 8 10:58:51 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 10:58:51 +0200 (CEST) Subject: [Openvas-commits] r1114 - trunk/doc/website Message-ID: <20080808085851.9AF49406F7@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-08 10:58:50 +0200 (Fri, 08 Aug 2008) New Revision: 1114 Modified: trunk/doc/website/openvas-cr-10.htm4 trunk/doc/website/openvas-cr-11.htm4 trunk/doc/website/openvas-cr-14.htm4 trunk/doc/website/openvas-cr-2.htm4 trunk/doc/website/openvas-cr-3.htm4 trunk/doc/website/openvas-cr-4.htm4 trunk/doc/website/openvas-cr-6.htm4 trunk/doc/website/openvas-cr-7.htm4 trunk/doc/website/openvas-cr-8.htm4 trunk/doc/website/openvas-crs.htm4 Log: Updated status for change requests to reflect the latest round of releases and other work done in the meantime. Modified: trunk/doc/website/openvas-cr-10.htm4 =================================================================== --- trunk/doc/website/openvas-cr-10.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-10.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #10: Remove support for non-SSL connections in OpenVAS-Client</h2> -Status: Voted +2. Implemented with revision 937. +Status: Voted +2. Implemented with revision 937. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-11.htm4 =================================================================== --- trunk/doc/website/openvas-cr-11.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-11.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib</h2> -Status: Voted +2. Implemented with revision 949. +Status: Voted +2. Implemented with revision 949. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-14.htm4 =================================================================== --- trunk/doc/website/openvas-cr-14.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-14.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</h2> -Status: Voted +5. gdchart and gd removed in SVN trunk. +Status: Voted +5. Implemented in SVN trunk, revision 1113. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-2.htm4 =================================================================== --- trunk/doc/website/openvas-cr-2.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-2.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #2: Remove any support for NSR export format of OpenVAS-Client</h2> -Status: Voted +4. Implemented with SVN 673. Release with OpenVAS-Client 1.0.3. +Status: Voted +4. Implemented with SVN 673. Released with OpenVAS-Client 1.0.3. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-3.htm4 =================================================================== --- trunk/doc/website/openvas-cr-3.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-3.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #3: Remove plugin factory from openvas-plugins</h2> -Status: Voted +5. Implemented with SVN 699. Scheduled for openvas-plugins 1.0.1. +Status: Voted +5. Implemented with SVN 699. Released with openvas-plugins 1.0.1. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-4.htm4 =================================================================== --- trunk/doc/website/openvas-cr-4.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-4.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #4: Remove plugin upload feature</h2> -Status: Voted +4. First step (denial of upload) implemented (will be in openvas-server 1.0.1). +Status: Voted +4. First step (denial of upload) implemented and released with OpenVAS-Server 1.0.1. Completion will happen with next protocol version. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-6.htm4 =================================================================== --- trunk/doc/website/openvas-cr-6.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-6.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #6: Remove support of old XML report format</h2> -Status: Voted +2. Implemented with SVN-884. Will be in release 1.0.4. +Status: Voted +2. Implemented with SVN-884. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-7.htm4 =================================================================== --- trunk/doc/website/openvas-cr-7.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-7.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #7: Extend report widget with optional info on NVT name/oid in OpenVAS-Client</h2> -Status: Voted +2. Implemented. Will be in release OpenVAS-Client 1.0.4. +Status: Voted +2. Implemented. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-8.htm4 =================================================================== --- trunk/doc/website/openvas-cr-8.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-8.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #8: Introduce NVT family "Credentials"</h2> -Status: Voted +2. Implemented. Server-side changes released with openvas-plugins 1.0.2, client-side Will be in release OpenVAS-Client 1.0.4. +Status: Voted +2. Implemented. Server-side changes released with openvas-plugins 1.0.2, client-side released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-crs.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -40,7 +40,7 @@ <h3>Overview on change requests so far</h3> <p> -(statis can be: in discussion, accepted, in progress, done) +(Status can be: in discussion, accepted, in progress, done) </p> <ul> @@ -57,7 +57,7 @@ <li> <a href="openvas-cr-11.html">OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib</a> (done) <li> <a href="openvas-cr-12.html">OpenVAS Change Request #12: Replace NTP with OTP</a> (in progress) <li> <a href="openvas-cr-13.html">OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server</a> (accepted) -<li> <a href="openvas-cr-14.html">OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</a> (in progress) +<li> <a href="openvas-cr-14.html">OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</a> (done) <li> <a href="openvas-cr-15.html">OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</a> (accepted) </ul> From scm-commit at wald.intevation.org Fri Aug 8 12:34:37 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 12:34:37 +0200 (CEST) Subject: [Openvas-commits] r1115 - trunk/openvas-client Message-ID: <20080808103437.E782640708@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 12:34:37 +0200 (Fri, 08 Aug 2008) New Revision: 1115 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/VERSION Log: * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-08 08:58:50 UTC (rev 1114) +++ trunk/openvas-client/ChangeLog 2008-08-08 10:34:37 UTC (rev 1115) @@ -1,3 +1,9 @@ +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development + has been branched and the development here lead to a next + major release. + 2008-08-08 Michael Wiegand <michael.wiegand at intevation.de> Removing gd and gdchart according to OpenVAS Change Request #14: Modified: trunk/openvas-client/VERSION =================================================================== --- trunk/openvas-client/VERSION 2008-08-08 08:58:50 UTC (rev 1114) +++ trunk/openvas-client/VERSION 2008-08-08 10:34:37 UTC (rev 1115) @@ -1 +1 @@ -1.0.5.SVN +1.1.0.SVN From scm-commit at wald.intevation.org Fri Aug 8 12:35:47 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 12:35:47 +0200 (CEST) Subject: [Openvas-commits] r1116 - trunk/openvas-server Message-ID: <20080808103547.43E3540708@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 12:35:47 +0200 (Fri, 08 Aug 2008) New Revision: 1116 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/VERSION Log: * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 10:34:37 UTC (rev 1115) +++ trunk/openvas-server/ChangeLog 2008-08-08 10:35:47 UTC (rev 1116) @@ -1,3 +1,9 @@ +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development + has been branched and the development here lead to a next + major release. + 2008-08-07 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Final step of Change Request #4, Modified: trunk/openvas-server/VERSION =================================================================== --- trunk/openvas-server/VERSION 2008-08-08 10:34:37 UTC (rev 1115) +++ trunk/openvas-server/VERSION 2008-08-08 10:35:47 UTC (rev 1116) @@ -1 +1 @@ -1.0.2.SVN +1.1.0.SVN From scm-commit at wald.intevation.org Fri Aug 8 12:37:14 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 12:37:14 +0200 (CEST) Subject: [Openvas-commits] r1117 - trunk/doc/website Message-ID: <20080808103714.8002C4070A@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 12:37:14 +0200 (Fri, 08 Aug 2008) New Revision: 1117 Modified: trunk/doc/website/openvas-crs.htm4 Log: Setting status of #13 and #15 to "in progress". Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2008-08-08 10:35:47 UTC (rev 1116) +++ trunk/doc/website/openvas-crs.htm4 2008-08-08 10:37:14 UTC (rev 1117) @@ -56,9 +56,9 @@ <li> <a href="openvas-cr-10.html">OpenVAS Change Request #10: Remove support for non-SSL connections in OpenVAS-Client</a> (done) <li> <a href="openvas-cr-11.html">OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib</a> (done) <li> <a href="openvas-cr-12.html">OpenVAS Change Request #12: Replace NTP with OTP</a> (in progress) -<li> <a href="openvas-cr-13.html">OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server</a> (accepted) +<li> <a href="openvas-cr-13.html">OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server</a> (in progress) <li> <a href="openvas-cr-14.html">OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</a> (done) -<li> <a href="openvas-cr-15.html">OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</a> (accepted) +<li> <a href="openvas-cr-15.html">OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</a> (in progress) </ul> <h3>How to write a change request</h3> From scm-commit at wald.intevation.org Fri Aug 8 14:57:39 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 14:57:39 +0200 (CEST) Subject: [Openvas-commits] r1118 - in trunk/openvas-server: . doc/ntp openvasd Message-ID: <20080808125739.F3CBF406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 14:57:38 +0200 (Fri, 08 Aug 2008) New Revision: 1118 Removed: trunk/openvas-server/openvasd/detached.c trunk/openvas-server/openvasd/detached.h Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/MANIFEST trunk/openvas-server/doc/ntp/ntp_extensions.txt trunk/openvas-server/openvasd/Makefile trunk/openvas-server/openvasd/attack.c trunk/openvas-server/openvasd/comm.c trunk/openvas-server/openvasd/hosts.c trunk/openvas-server/openvasd/ntp_11.c trunk/openvas-server/openvasd/preferences.c trunk/openvas-server/openvasd/preferences.h trunk/openvas-server/openvasd/utils.c Log: Patch for Change Request #15: http://www.openvas.org/openvas-cr-15.html (OpenVAS Server: Remove features for detached scans) * openvasd/ntp_11.c: Don't include detached.h anymore. (ntp_11_stop_detached_session, ntp_11_list_detached_sessions, extract_detached_session_key_from_session_msg): Removed. (ntp_11_parse_input): Removed handling of STOP_DETACHED and DETACHED_SESSIONS_LIST. (ntp_11_parse_input): Fixed anyway-misplaced ENABLE_SAVE_TESTS conditional. * openvasd/preferences.c (preferences_detached_scan, preferences_detached_scan_email, preferences_continuous_scan, preferences_delay_between_scans): Removed. (preferences_reset_cache): Removed initializing of detached params. * openvasd/preferences.h: Removed protos for preferences_detached_scan, preferences_detached_scan_email, preferences_delay_between_scans and preferences_continuous_scan. * openvasd/attack.c: Removed include for detached.h. (attack_network): Removed handling of "detached" and "continous". (attack_sigterm, arg_addset_value): Removed. * openvasd/hosts.c: Removed include for detached.h. (forward): Removed handling for detached scans. * Makefile: Don't handle detached module. * doc/ntp/ntp_extensions.txt: Removed documentation about the detached functionality. * openvasd/utils.c: Removed include for detached.h. It wasn't required anyway. * openvasd/comm.c: Removed include for detached.h. It wasn't required anyway. (comm_send_preferences): Don't send settings for ntp_detached_sessions anymore. * openvasd/detached.c, openvasd/detached.h: Removed. * MANIFEST: Updated. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/ChangeLog 2008-08-08 12:57:38 UTC (rev 1118) @@ -1,5 +1,49 @@ 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + Patch for Change Request #15: + http://www.openvas.org/openvas-cr-15.html + (OpenVAS Server: Remove features for detached scans) + + * openvasd/ntp_11.c: Don't include detached.h anymore. + (ntp_11_stop_detached_session, ntp_11_list_detached_sessions, + extract_detached_session_key_from_session_msg): Removed. + (ntp_11_parse_input): Removed handling of STOP_DETACHED and DETACHED_SESSIONS_LIST. + (ntp_11_parse_input): Fixed anyway-misplaced ENABLE_SAVE_TESTS conditional. + + * openvasd/preferences.c (preferences_detached_scan, preferences_detached_scan_email, + preferences_continuous_scan, preferences_delay_between_scans): Removed. + (preferences_reset_cache): Removed initializing of detached params. + + * openvasd/preferences.h: Removed protos for preferences_detached_scan, + preferences_detached_scan_email, preferences_delay_between_scans and + preferences_continuous_scan. + + * openvasd/attack.c: Removed include for detached.h. + (attack_network): Removed handling of "detached" and "continous". + (attack_sigterm, arg_addset_value): Removed. + + * openvasd/hosts.c: Removed include for detached.h. + (forward): Removed handling for detached scans. + + * Makefile: Don't handle detached module. + + * doc/ntp/ntp_extensions.txt: Removed documentation about the + detached functionality. + + * openvasd/utils.c: Removed include for detached.h. It wasn't + required anyway. + + * openvasd/comm.c: Removed include for detached.h. It wasn't + required anyway. + (comm_send_preferences): Don't send settings for ntp_detached_sessions + anymore. + + * openvasd/detached.c, openvasd/detached.h: Removed. + + * MANIFEST: Updated. + +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-server/MANIFEST =================================================================== --- trunk/openvas-server/MANIFEST 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/MANIFEST 2008-08-08 12:57:38 UTC (rev 1118) @@ -48,8 +48,6 @@ openvasd/comm.c openvasd/comm.h openvasd-config.in -openvasd/detached.c -openvasd/detached.h openvasd/dirutils.c openvasd/hosts.c openvasd/hosts.h Modified: trunk/openvas-server/doc/ntp/ntp_extensions.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 12:57:38 UTC (rev 1118) @@ -129,50 +129,7 @@ the data it saved. The user sees the attack as if it was happening extremely quickly. -3.4 List of detached sessions ------------------------------ -Detached sessions are sessions that are run detached from the client. -Please read http://www.nessus.org/doc/detached_scan.html for details. - -The message : - -CLIENT <|> DETACHED_SESSIONS_LIST <|> CLIENT - -will make openvasd send the list of detached scans to the client. The format -of the message is identical to the LIST_SESSIONS message, that is : - -SERVER <|> DETACHED_SESSIONS_LIST -name targets -name targets -. -. -. -<|> SERVER - -ie: - -SERVER <|> DETACHED_SESSIONS_LIST -2421 prof.fr.nessus.org -41001 www.nessus.org -. -. -. -<|> SERVER - - - - -3.5 Stopping a detached session -------------------------------- - -A user may want to stop a detached scan. The message which has this -effect is the message : - -CLIENT <|> DETACHED_STOP <|> name <|> CLIENT - -Where <name> is the name sent in a DETACHED_SESSIONS_LIST message. - 3.6 Options ------------ @@ -219,33 +176,6 @@ maximum age of a KB (in seconds) -5. Detached scans ------------------ - -detached_scan - - If set to "yes", openvasd will close the communication and - forward the result of the scan to /dev/null (but will fill the - KBs and will save its sessions) - - -continuous_scan - - If set to "yes", openvasd will restart the scan from scratch - when completed (openvasd runs forever) - -delay_between_scan_loops - - If "continuous_scan" is set to "yes", this value contain the - number of seconds to sleep between two loops - - -detached_scan_email_address - - Contains the email address to send results to. If empty, no - mail will be sent to anyone. - - 6. Per-plugin timeout --------------------- Modified: trunk/openvas-server/openvasd/Makefile =================================================================== --- trunk/openvas-server/openvasd/Makefile 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/Makefile 2008-08-08 12:57:38 UTC (rev 1118) @@ -28,7 +28,6 @@ openvasd.o \ save_tests.o \ save_kb.o \ - detached.o \ pluginlaunch.o \ locks.o \ dirutils.o \ @@ -110,9 +109,6 @@ save_kb.o : save_kb.c save_kb.h $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c save_kb.c -detached.o : detached.c detached.h - $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c detached.c - pluginlaunch.o : pluginlaunch.c $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginlaunch.c Modified: trunk/openvas-server/openvasd/attack.c =================================================================== --- trunk/openvas-server/openvasd/attack.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/attack.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -46,7 +46,6 @@ #include "pluginload.h" #include "save_tests.h" #include "save_kb.h" -#include "detached.h" #include "pluginscheduler.h" #include "pluginlaunch.h" @@ -92,29 +91,6 @@ } -static void -attack_sigterm() -{ - hosts_stop_all(); - wait_for_children1(); -} - - -static void -arg_addset_value(arg, name, type, len, value) - struct arglist *arg; - char * name; - int type, len; - void * value; -{ - if(arg_get_type(arg, name) < 0) - arg_add_value(arg, name, type, len, value); - else - arg_set_value(arg, name, len, value); -} - - - /*------------------------------------------------------- Init. an arglist which can be used by @@ -548,8 +524,6 @@ int restoring = 0; harglst * tested = NULL; int save_session= 0; - int continuous = 0; - int detached = 0; int return_code = 0; char * port_range; plugins_scheduler_t sched; @@ -563,48 +537,9 @@ host_ip.s_addr = 0; preferences = arg_get_value(globals, "preferences"); - detached = preferences_detached_scan(preferences); - if(detached) - { - char *email; - - detached_new_session(globals, arg_get_value(preferences, "TARGET")); - arg_addset_value(preferences, "ntp_keep_communication_alive", ARG_STRING, 0, NULL); - - /* - * Tell the client that the scan is finished (actually, we will - * work hard to test the network, but this lazy client has the right - * to get some rest... - */ - log_write("user %s : running a detached scan\n", (char*)arg_get_value(globals, "user")); - global_socket = (int)arg_get_value(globals, "global_socket"); - comm_terminate(globals); - close_stream_connection(global_socket); - global_socket = -1; - arg_set_value(globals, "global_socket", sizeof(int), (void*)global_socket); - - nessus_signal(SIGTERM, attack_sigterm); - -start_attack_network: - if((email = preferences_detached_scan_email(preferences))) - { - /* - * The user wants to receive the results by e-mail. - */ - if(detached_setup_mail_file(globals, email)) - { - /* - * Could not create the file to store our data - */ - close_stream_connection(global_socket); - return -1; - } - } - else arg_addset_value(globals, "detached_scan_email_address", ARG_STRING, 0, NULL); - } + num_tested = 0; - global_socket = (int)arg_get_value(globals, "global_socket"); plugins = arg_get_value(globals, "plugins"); @@ -612,14 +547,8 @@ rules = arg_get_value(globals, "rules"); rejected_hosts = emalloc(sizeof(struct arglist)); - if(detached) - continuous = preferences_continuous_scan(preferences); - save_session = preferences_save_session(preferences); - if(continuous) - restoring = 0; - else - restoring = ((int)arg_get_value(globals, "RESTORE-SESSION") == 1); + restoring = ((int)arg_get_value(globals, "RESTORE-SESSION") == 1); if(restoring)tested = arg_get_value(globals, "TESTED_HOSTS"); if(save_session)save_tests_init(globals); @@ -902,26 +831,9 @@ arg_free_all(rejected_hosts); plugins_scheduler_free(sched); - if(detached) - { - if(preferences_detached_scan_email(preferences)) - detached_send_email(globals); - } - - if(continuous){ - sleep(preferences_delay_between_scans(preferences)); - plugins = plugins_reload(preferences, plugins, 1); - arg_set_value(globals, "plugins", -1, plugins); - goto start_attack_network; - } - else if(detached)detached_end_session(globals); - gettimeofday(&now, NULL); log_write("Total time to scan all hosts : %ld seconds\n", now.tv_sec - then.tv_sec); return return_code; } - - - Modified: trunk/openvas-server/openvasd/comm.c =================================================================== --- trunk/openvas-server/openvasd/comm.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/comm.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -42,9 +42,6 @@ #include "plugs_hash.h" #include "utils.h" #include "nasl.h" -#ifdef ENABLE_SAVE_KB -#include "detached.h" -#endif #ifndef FALSE #define FALSE 0 @@ -447,7 +444,6 @@ } #ifdef ENABLE_SAVE_TESTS auth_printf(globals, "ntp_save_sessions <|> yes\n"); - auth_printf(globals, "ntp_detached_sessions <|> yes\n"); auth_printf(globals, "server_info_openvasd_version <|> %s\n", OPENVAS_VERSION); auth_printf(globals, "server_info_libnasl_version <|> %s\n", nasl_version()); auth_printf(globals, "server_info_libnessus_version <|> %s\n", nessuslib_version()); Deleted: trunk/openvas-server/openvasd/detached.c =================================================================== --- trunk/openvas-server/openvasd/detached.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/detached.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -1,520 +0,0 @@ -/* OpenVAS -* $Id$ -* Description: Deals with comminucating results of a detached scan. -* -* Authors: - Renaud Deraison <deraison at nessus.org> (Original pre-fork develoment) -* - Tim Brown <mailto:timb at openvas.org> (Initial fork) -* - Laban Mwangi <mailto:labanm at openvas.org> (Renaming work) -* - Tarik El-Yassem <mailto:tarik at openvas.org> (Headers section) -* -* Copyright: -* Portions Copyright (C) 2006 Software in the Public Interest, Inc. -* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2, -* as published by the Free Software Foundation -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -*/ - -#include <includes.h> -#ifdef ENABLE_SAVE_KB - -#include "detached.h" -#include "utils.h" -#include "log.h" -#include "users.h" -#include "processes.h" - -/*-----------------------------------------------------------------------* - * Private functions * - *-----------------------------------------------------------------------*/ -#define PORT_HDR "SERVER <|> PORT <|> " -#define PORT_HDR_LEN strlen(PORT_HDR) - -#define NOTE_HDR "SERVER <|> NOTE <|> " -#define NOTE_HDR_LEN strlen(NOTE_HDR) - -#define INFO_HDR "SERVER <|> INFO <|> " -#define INFO_HDR_LEN strlen(INFO_HDR) - -#define HOLE_HDR "SERVER <|> HOLE <|> " -#define HOLE_HDR_LEN strlen(HOLE_HDR) - -#define NOTE 1 -#define INFO 2 -#define HOLE 3 - - -/* - * Invokes sendmail -t - */ -void _detached_send_mail(globals) - struct arglist * globals; -{ - /* - * We do not check the full path to sendmail because if root - * can not trust his path, then I bet he's hosed already - */ - char * argv[]={"sendmail", "-t", "-B8BITMIME", NULL}; - char * fname = arg_get_value(globals, "detached_scan_email_filename"); - pid_t pid; - struct stat st; - off_t * orig_size = arg_get_value(globals, "detached_scan_file_len"); - struct arglist * preferences = arg_get_value(globals, "preferences"); - - stat(fname, &st); - - - /* - * Nothing new - we don't send any mail (because a blank mail - * is useless) - */ - if(st.st_size == *orig_size) - { - log_write("user %s : scan did not produce any result, so no email will be sent", - (char*)arg_get_value(globals, "user")); - - efree(&orig_size); - return; - } - - efree(&orig_size); - - if(!(pid = fork())) - { - int fd; - int i; - - /* - * Close all open files - */ - for(i=0;i<getdtablesize();i++)close(i); - - /* - * Our email file becomes stdin - */ - fd = open(fname, O_RDONLY, 0); - if(fd < 0) - { - log_init(arg_get_value(preferences, "logfile")); - log_write("user %s : could not open our email %s - %s\n", - (char*)arg_get_value(globals, "user"), - fname, - strerror(errno)); - exit(1); - } - if(execvp("sendmail", argv) < 0) - { - log_init(arg_get_value(preferences, "logfile")); - log_write("user %s : could not execute sendmail - %s\n", - (char*)arg_get_value(globals, "user"), - strerror(errno)); - } - exit(1); - } - else if(pid > 0)waitpid(pid, NULL, 0); -} - -static void -detached_copy_data_port(globals, buffer) - struct arglist * globals; - char * buffer; -{ - char * t; - FILE * fl = arg_get_value(globals, "detached_scan_email_fd"); - - - t = strchr(buffer, '<'); - if(!t)return; - t--; - t[0]='\0'; - t+=5; - - fprintf(fl, "o %s : port %s was found to be open\n\n", - buffer, - t); - -} - - -static void -detached_copy_data_content(globals, buffer, type) - struct arglist * globals; - char * buffer; - int type; -{ - char * t = strrchr(buffer, '<'); - char * host, * port; - char * asctype = NULL; - FILE * fl = arg_get_value(globals, "detached_scan_email_fd"); - char * noslashes; - - - - switch(type) - { - case INFO : - asctype = "warning"; - break; - case NOTE : - asctype = "note"; - break; - case HOLE : - asctype = "hole"; - break; - } - - - if(!t)return; - t--; - t[0]='\0'; - - t = strchr(buffer, '<'); - if(!t) - return; - - t--; - t[0]='\0'; - host = estrdup(buffer); - buffer = t + 5; - t = strchr(buffer, '<'); - if(!t) - { - efree(&host); - return; - } - - t--; - t[0]='\0'; - port = estrdup(buffer); - - buffer = t+5; - - noslashes = rmslashes(buffer); - fprintf(fl, "o %s : Security %s found on port %s :\n%s\n\n", - host, - asctype, - port, - noslashes); - efree(&noslashes); - efree(&host); - efree(&port); -} - - -/*------------------------------------------------------------------------* - * Public functions * - *------------------------------------------------------------------------*/ -void -detached_copy_data(globals, buffer, length) - struct arglist * globals; - char * buffer; - int length; -{ - char *t; - int info = 0, note = 0, hole = 0; - - if(!buffer || !globals) - return; - - if(!arg_get_value(globals, "detached_scan_email_address")) - { - efree(&buffer); - return; - } - - while((t = strchr(buffer, ';')))t[0]='\n'; - - t = strrchr(buffer, '<'); - if(t){ - t--; - t[0]='\0'; - } - - /* - * Ok, so we want to parse the message. It's in NTP/1.whatever, - * want we are only interested in open ports and information reports - */ - if(!strncmp(buffer, PORT_HDR, PORT_HDR_LEN)) - { - detached_copy_data_port(globals, buffer+PORT_HDR_LEN); - } - else if(!(info = strncmp(buffer, INFO_HDR, INFO_HDR_LEN)) || - !(note = strncmp(buffer, NOTE_HDR, NOTE_HDR_LEN)) || - !(hole = strncmp(buffer, HOLE_HDR, HOLE_HDR_LEN))) - { - detached_copy_data_content(globals, buffer+INFO_HDR_LEN, - hole==0?HOLE:(info==0?INFO:NOTE)); - } - efree(&buffer); -} - - - - - -int -detached_setup_mail_file(globals, email) - struct arglist * globals; - char * email; -{ - FILE* fl; - char * tmpname; - char * today; - time_t t; - char *hostname = emalloc(256); - struct stat st; - off_t * sz; - - t = time(NULL); - today = estrdup(ctime(&t)); - today[strlen(today)-1]='\0'; - - log_write("user %s : mailing results of a detached scan to %s\n", - (char*)arg_get_value(globals, "user"), - email); - - if((arg_get_type(globals, "detached_scan_email_address")) < 0) - arg_add_value(globals, "detached_scan_email_address", ARG_STRING, strlen(email), email); - else - arg_set_value(globals, "detached_scan_email_address", strlen(email), email); - - tmpname = temp_file_name(); - fl = fopen(tmpname, "w"); - if (fchmod(fl, S_IRUSR|S_IWUSR) != 0) - perror("fchmod() error on tmp file"); - if(!fl) - { - log_write("user %s : could not create file '%s' (%s) - aborting", - (char*)arg_get_value(globals, "user"), - tmpname, - strerror(errno)); - - auth_printf(globals, "SERVER <|> ERROR <|> Could not create the temporary \ -file needed for detached scan (%s) - aborting <|> SERVER\n", strerror(errno)); - efree(&today); - return -1; - } - bzero(hostname, 256); - gethostname(hostname, 255); - fprintf(fl, "From: OpenVAS Daemon <root@%s>\n", hostname); - fprintf(fl, "To: OpenVAS User <%s>\n", email); - fprintf(fl, "Subject: OpenVAS Scan (%s)\n\n", today); - fflush(fl); - efree(&today); - efree(&hostname); - stat(tmpname, &st); - - sz = emalloc(sizeof(st.st_size)); - memcpy(sz, &(st.st_size), sizeof(st.st_size)); - if(arg_get_type(globals, "detached_scan_file_len") < 0) - arg_add_value(globals, "detached_scan_file_len", ARG_PTR, sizeof(int),sz); - else - arg_set_value(globals, "detached_scan_file_len", sizeof(int), sz); - - - if(arg_get_type(globals, "detached_scan_email_fd") < 0) - arg_add_value(globals, "detached_scan_email_fd", ARG_PTR, sizeof(fl), fl); - else - arg_set_value(globals, "detached_scan_email_fd", sizeof(fl), fl); - - - - if(arg_get_type(globals, "detached_scan_email_filename") < 0) - arg_add_value(globals, "detached_scan_email_filename", ARG_STRING, strlen(tmpname), tmpname); - else - arg_set_value(globals, "detached_scan_email_filename", strlen(tmpname), tmpname); - - return 0; -} - -void -detached_send_email(globals) - struct arglist * globals; -{ - char * fname = arg_get_value(globals, "detached_scan_email_filename"); - FILE * fl = arg_get_value(globals, "detached_scan_email_fd"); - - if(fl){ - fclose(fl); - arg_set_value(globals, "detached_scan_email_fd", 0, NULL); - } - - - _detached_send_mail(globals); - - - - unlink(fname); - if(fname){ - efree(&fname); - arg_set_value(globals, "detached_scan_email_filename", 0, NULL); - } -} - -/*----------------------------------------------------------------------- - Management of detached scans --------------------------------------------------------------------------*/ -static char * -detached_dirname(globals) - struct arglist * globals; -{ - char * dir; - char * userhome = user_home(globals); - dir = emalloc(strlen(userhome) + strlen("detached") + 2); - sprintf(dir, "%s/detached", userhome); - efree(&userhome); - return(dir); -} - - -static int -detached_mkdir(dir) - char * dir; -{ - char *t = strchr(dir+1, '/'); - while(t) - { - t[0] = '\0'; - mkdir(dir, 0700); - t[0] = '/'; - t = strchr(t+1, '/'); - } - mkdir(dir, 0700); - return 0; -} - - - -static char * -detached_fname(globals) - struct arglist * globals; -{ - char * dir = detached_dirname(globals); - char * ret; - - detached_mkdir(dir); - ret = emalloc(strlen(dir) + 40); - sprintf(ret, "%s/%d", dir, getpid()); - efree(&dir); - return ret; -} - -int -detached_new_session(globals, target) - struct arglist * globals; - char * target; -{ - char * fname = detached_fname(globals); - int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR); - if(f >= 0) - { - write(f, target, strlen(target)); - fsync(f); - if (fchmod(f, S_IRUSR|S_IWUSR) != 0) - perror("fchmod() error on tmp file"); - close(f); - efree(&fname); - return getpid(); - } - else log_write("user %s : could not create %s - %s\n", - (char*)arg_get_value(globals, "user"), - fname, - strerror(errno)); - efree(&fname); - return -1; -} - - -int -detached_send_sessions(globals) - struct arglist * globals; -{ - char * dir = detached_dirname(globals); - DIR * d = opendir(dir); - struct dirent * dp; - - - if(!d) - { - efree(&dir); - return 0; - } - while(( dp = readdir(d) )) - { - char * name = dp->d_name; - char * full; - int pid = atoi(name); - if(pid) - { - if(!process_alive(pid)) - { - log_write("user %s : session %d is dead - removing its lock", - (char*)arg_get_value(globals, "user"), - pid); - detached_delete_session(globals, pid); - } - else - { - int f; - full = emalloc(strlen(dir) + strlen(name) + 20); - sprintf(full, "%s/%s", dir, name); - f = open(full, O_RDONLY); - if( f >= 0 ) - { - char buf[2048]; - read(f, buf, sizeof(buf) - 1); - auth_printf(globals, "%s %s\n", name, buf); - close(f); - } - efree(&full); - } - } - } - closedir(d); - efree(&dir); - return 0; -} - - - -int -detached_delete_session(globals, index) - struct arglist * globals; - int index; -{ - char * dir = detached_dirname(globals); - char * file = emalloc(strlen(dir) + 30); - int f; - sprintf(file, "%s/%d", dir, index); - efree(&dir); - if(( f = open(file, O_RDONLY) ) >= 0) - { - close(f); - if(index != getpid()) - kill(index, SIGTERM); - unlink(file); - } - efree(&file); - return 0; -} - -int -detached_end_session(globals) - struct arglist * globals; -{ - return detached_delete_session(globals, getpid()); -} - -#endif /* enable save kb */ Deleted: trunk/openvas-server/openvasd/detached.h =================================================================== --- trunk/openvas-server/openvasd/detached.h 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/detached.h 2008-08-08 12:57:38 UTC (rev 1118) @@ -1,46 +0,0 @@ -/* OpenVAS -* $Id $ -* Description: detached.c header. -* -* Authors: - Renaud Deraison <deraison at nessus.org> (Original pre-fork develoment) -* - Tim Brown <mailto:timb at openvas.org> (Initial fork) -* - Laban Mwangi <mailto:labanm at openvas.org> (Renaming work) -* - Tarik El-Yassem <mailto:tarik at openvas.org> (Headers section) -* -* Copyright: -* Portions Copyright (C) 2006 Software in the Public Interest, Inc. -* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2, -* as published by the Free Software Foundation -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -*/ - - -#ifndef NESSUSD_DETACHED_H__ -#define NESSUSD_DETACHED_H__ - -#ifdef ENABLE_SAVE_KB -int detached_setup_mail_file(struct arglist*, char*); -void detached_copy_data(struct arglist*, char*, int); -void detached_send_email(struct arglist*); - - -int detached_new_session(struct arglist *, char *); -int detached_end_session(struct arglist *); -int detached_delete_session(struct arglist *, int); - -int detached_send_sessions(struct arglist *); -#endif -#endif Modified: trunk/openvas-server/openvasd/hosts.c =================================================================== --- trunk/openvas-server/openvasd/hosts.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/hosts.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -32,7 +32,6 @@ #include "utils.h" #include "log.h" #include "preferences.h" -#include "detached.h" #include "save_kb.h" #include "save_tests.h" #include "hosts.h" @@ -97,9 +96,6 @@ if(preferences != NULL) { - if(preferences_detached_scan(preferences) != 0) - detached_copy_data(globals, estrdup(buf), len); - if(preferences_save_session(preferences) != 0) save_tests_write_data(globals, estrdup(buf)); } Modified: trunk/openvas-server/openvasd/ntp_11.c =================================================================== --- trunk/openvas-server/openvasd/ntp_11.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/ntp_11.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -41,7 +41,6 @@ #include "users.h" #include "utils.h" #include "save_tests.h" -#include "detached.h" #include "preferences.h" #include "hosts.h" @@ -67,9 +66,6 @@ static int ntp_11_list_sessions(struct arglist*); static int ntp_11_delete_session(struct arglist*, char*); static int ntp_11_restore_session(struct arglist*, char*); - -static int ntp_11_list_detached_sessions(struct arglist *, char *); -static int ntp_11_stop_detached_session(struct arglist*, char*); #endif /* * Parses the input sent by the client before @@ -120,12 +116,8 @@ efree(&orig); return n; } - - if(!strcmp(input, "STOP_DETACHED")) { - ntp_11_stop_detached_session(globals, orig); - efree(&orig); - return 1; - } +#endif + if(!strcmp(input, "OPENVAS_VERSION")) { auth_printf(globals, "SERVER <|> OPENVAS_VERSION <|> %s <|> SERVER\n", OPENVAS_VERSION); return 1; @@ -145,12 +137,7 @@ plugin_send_infos(globals, atoi(s)); return 1; } - if(!strcmp(input, "DETACHED_SESSIONS_LIST")) { - ntp_11_list_detached_sessions(globals, orig); - efree(&orig); - return 1; - } -#endif + if(!strcmp(input, "LONG_ATTACK")){ int code = ntp_11_long_attack(globals, orig); efree(&orig); @@ -623,77 +610,7 @@ } - static int -extract_detached_session_key_from_session_msg(globals, orig) - struct arglist * globals; - char * orig; -{ - char * t; - int i, len; - - t = strrchr(orig, '<'); - if(!t)return -1; - t[0] = 0; - - t = strrchr(orig, '>'); - if(!t)return -1; - - t++; - while(t[0]==' ')t++; - len = strlen(t); - while(t[len-1]==' ') - { - t[len-1]=0; - len --; - } - /* - * Sanity check. All detached sessions name are under the form - * of a pid. - */ - for(i=0;i<len;i++) - if(!isdigit(t[i])){ - log_write("user %s : supplied an incorrect detached session name (%s)", - (char*)arg_get_value(globals, "user"), - t); - return -1; - } - return atoi(t); -} - - - -static int -ntp_11_stop_detached_session(globals, orig) - struct arglist * globals; - char * orig; -{ - int session = 0; - int ret; - - session = extract_detached_session_key_from_session_msg(globals, orig); - if(session < 0)return -1; - log_write("user %s : stopping session %d", - (char*)arg_get_value(globals, "user"), - session); - - ret = detached_delete_session(globals, session); - return 0; -} - -static int -ntp_11_list_detached_sessions(globals, orig) - struct arglist * globals; - char * orig; -{ - auth_printf(globals, "SERVER <|> DETACHED_SESSIONS_LIST\n"); - detached_send_sessions(globals); - auth_printf(globals, "<|> SERVER\n"); - return 0; -} - - -static int ntp_11_delete_session(globals, orig) struct arglist * globals; char * orig; Modified: trunk/openvas-server/openvasd/preferences.c =================================================================== --- trunk/openvas-server/openvasd/preferences.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/preferences.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -658,61 +658,6 @@ } int -preferences_detached_scan(preferences) - struct arglist * preferences; -{ - static int yes = -1; - char * pref; - - if(!preferences) - { - yes = -1; - return -1; - } - - - if(yes >= 0) - return yes; - - - pref = arg_get_value(preferences, "detached_scan"); - if(pref && !strcmp(pref, "yes")) - yes = 1; - else - yes = 0; - - return yes; -} - - -int -preferences_continuous_scan(preferences) - struct arglist * preferences; -{ - static int yes = -1; - char * pref; - - if(!preferences) - { - yes = -1; - return -1; - } - - - if(yes >= 0) - return yes; - - pref = arg_get_value(preferences, "continuous_scan"); - if(pref && !strcmp(pref, "yes")) - yes = 1; - else - yes = 0; - - return yes; -} - - -int preferences_report_killed_plugins(preferences) struct arglist * preferences; { @@ -739,53 +684,6 @@ } int -preferences_delay_between_scans(preferences) - struct arglist * preferences; -{ - static int delay = -1; - char * pref; - - if(!preferences) - { - delay = -1; - return -1; - } - - - if(delay >= 0) - return delay; - - pref = arg_get_value(preferences, "delay_between_scan_loops"); - if(pref) - { - if(atoi(pref)){ - delay = atoi(pref); - return delay; - } - else - if(!strcmp(pref, "0")){ - delay = 0; - return delay; - } - } - delay = 3600; - return delay; -} - -char * -preferences_detached_scan_email(preferences) - struct arglist * preferences; -{ - char * pref = arg_get_value(preferences, "detached_scan_email_address"); - - if(pref && pref[0] != '\0' && strcmp(pref, "no")) - return pref; - else - return NULL; -} - - -int preferences_silent_dependencies(preferences) struct arglist * preferences; { @@ -844,9 +742,5 @@ preferences_use_mac_addr(NULL); preferences_save_session(NULL); preferences_save_empty_sessions(NULL); - preferences_continuous_scan(NULL); - preferences_delay_between_scans(NULL); - preferences_detached_scan(NULL); - preferences_detached_scan_email(NULL); preferences_silent_dependencies(NULL); } Modified: trunk/openvas-server/openvasd/preferences.h =================================================================== --- trunk/openvas-server/openvasd/preferences.h 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/preferences.h 2008-08-08 12:57:38 UTC (rev 1118) @@ -57,10 +57,7 @@ #endif #ifdef ENABLE_SAVE_KB -int preferences_continuous_scan(struct arglist *); int preferences_delay_between_scans(struct arglist *); -int preferences_detached_scan(struct arglist *); -char * preferences_detached_scan_email(struct arglist *); #endif void preferences_reset_cache(); Modified: trunk/openvas-server/openvasd/utils.c =================================================================== --- trunk/openvas-server/openvasd/utils.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/utils.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -35,7 +35,6 @@ #include "ntp_11.h" #include "utils.h" #include "preferences.h" -#include "detached.h" #include "save_tests.h" #include "pluginscheduler.h" From scm-commit at wald.intevation.org Fri Aug 8 14:59:49 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 14:59:49 +0200 (CEST) Subject: [Openvas-commits] r1119 - trunk/doc/website Message-ID: <20080808125949.DA3F1406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 14:59:49 +0200 (Fri, 08 Aug 2008) New Revision: 1119 Modified: trunk/doc/website/openvas-cr-15.htm4 Log: Updated status. Modified: trunk/doc/website/openvas-cr-15.htm4 =================================================================== --- trunk/doc/website/openvas-cr-15.htm4 2008-08-08 12:57:38 UTC (rev 1118) +++ trunk/doc/website/openvas-cr-15.htm4 2008-08-08 12:59:49 UTC (rev 1119) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</h2> -Status: Voted +4. +Status: Voted +4. Implemented with SVN 1118 in openvas-server 1.1 series. Needs testing. <h3>Purpose</h3> @@ -122,6 +122,8 @@ <h3>History</h3> <ul> +<li> 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> + Updated status: implemented. <li> 2008-07-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> Added voting result. <li> 2008-07-03 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> From scm-commit at wald.intevation.org Fri Aug 8 15:05:41 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 15:05:41 +0200 (CEST) Subject: [Openvas-commits] r1120 - in trunk/openvas-client: . nessus Message-ID: <20080808130541.3081A406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 15:05:40 +0200 (Fri, 08 Aug 2008) New Revision: 1120 Removed: trunk/openvas-client/nessus/nmake.bat trunk/openvas-client/nessus/nmake.w32 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/MANIFEST Log: * nessus/nmake.w32, nessus/nmake.bat: Removed. These are desperately outdated. * MANIFEST: Updated. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/ChangeLog 2008-08-08 13:05:40 UTC (rev 1120) @@ -1,5 +1,12 @@ 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + * nessus/nmake.w32, nessus/nmake.bat: Removed. These are + desperately outdated. + + * MANIFEST: Updated. + +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-client/MANIFEST =================================================================== --- trunk/openvas-client/MANIFEST 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/MANIFEST 2008-08-08 13:05:40 UTC (rev 1120) @@ -84,8 +84,6 @@ nessus/nessus_plugin.c nessus/nessus_plugin.h nessus/nessus_regex.h -nessus/nmake.bat -nessus/nmake.w32 nessus/OBJ/.createdir nessus/OpenVAS-Client.desktop nessus/parser.c Deleted: trunk/openvas-client/nessus/nmake.bat =================================================================== --- trunk/openvas-client/nessus/nmake.bat 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/nessus/nmake.bat 2008-08-08 13:05:40 UTC (rev 1120) @@ -1,2 +0,0 @@ -nmake.exe /nologo /f nmake.w32 %1 %2 %3 %4 %5 %6 %7 %8 %9 - Deleted: trunk/openvas-client/nessus/nmake.w32 =================================================================== --- trunk/openvas-client/nessus/nmake.w32 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/nessus/nmake.w32 2008-08-08 13:05:40 UTC (rev 1120) @@ -1,131 +0,0 @@ -#!nmake /f -# -# Makefile for the Microsoft compiler/linker -# creates the nessus client -# - - -# most certailny, you need to adjust the following -# parameter to the root of your gtk stuff -GTKROOT = C:\Nessus\Src - - -!include <ntwin32.mak> - -INSTALL_TARGET = C:\Nessus -PRFS = prefs_dialog -CHRT = gdchart0.94b -CHLB = $(CHRT)\gd1.3 - -LCLINC = -I. -I$(PRFS) -I$(CHRT) -I$(CHLB) -I..\include -NESINC = -I$(INSTALL_TARGET)\include \ - -I$(INSTALL_TARGET)\include\nessus -GTKINC = -I$(GTKROOT)\gtk+ \ - -I$(GTKROOT)\gtk+/gtk \ - -I$(GTKROOT)\gtk+/gdk \ - -I$(GTKROOT)\gtk+\gdk\win32 -GLBINC = -I$(GTKROOT)\glib \ - -I$(GTKROOT)\glib\win32 - -CC = cl.exe -DEFS = $(NESINC) $(GTKINC) $(GLBINC) -CFLAGS = -nologo -Ox $(LCLINC) $(DEFS) $(EXFLAGS) - - - -LIBS = nessus.lib peks.lib mpz.lib zlib.lib \ - gtk-1.3.lib gdk-1.3.lib peks.lib \ - glib-1.3.lib wsock32.lib -LIBPATH = /libpath:$(GTKROOT)\glib \ - /libpath:$(GTKROOT)\gtk+\gdk \ - /libpath:$(GTKROOT)\gtk+\gdk\win32 \ - /libpath:$(GTKROOT)\gtk+\gtk \ - /libpath:$(INSTALL_TARGET)\lib -LDFLAGS = -nologo -map -out:nessus.exe \ - -machine:I386 -subsystem:WINDOWS -LD = link.exe - - - -OBJ = attack.obj auth.obj \ - comm.obj error_dialog.obj \ - families.obj monitor_dialog.obj \ - nessus.obj parser.obj \ - password_dialog.obj plugin_infos.obj \ - preferences.obj read_target_file.obj \ - report.obj latex_output.obj \ - sighand.obj xstuff.obj \ - report_utils.obj html_output.obj \ - text_output.obj \ - splash_screen.obj html_graph_output.obj \ - cli.obj xml_output.obj \ - detached_index.obj - -XOBJ = prefs_about.obj \ - prefs_dialog.obj \ - prefs_dialog_auth.obj \ - prefs_dialog_misc.obj \ - prefs_dialog_plugins_prefs.obj \ - prefs_dialog_scan_opt.obj \ - prefs_dialog_user.obj \ - prefs_plugins.obj \ - prefs_kb.obj \ - prefs_target.obj - - -YOBJ = gdc.obj price_conv.obj gdc_pie.obj \ - gdchart.obj gd.obj gdfontt.obj \ - gdfonts.obj gdfontmb.obj gdfontl.obj \ - gdfontg.obj - -# ------------------------------------------------------ -# default rules -# ------------------------------------------------------ - -all: nessus.exe - -.c.obj: - $(CC) $(cvarsdll) $(CFLAGS) -c -Fo$*.obj $< - -{$(PRFS)\}.c.obj:: - $(CC) $(cvarsdll) $(CFLAGS) -c $< - -{$(CHRT)\}.c.obj:: - $(CC) $(cvarsdll) $(CFLAGS) -c $< - -{$(CHLB)\}.c.obj:: - $(CC) $(cvarsdll) $(CFLAGS) -c $< - -# ------------------------------------------------------ -# install peks stuff -# ------------------------------------------------------ - -install: - - -# ------------------------------------------------------ -# built the binary -# ------------------------------------------------------ - -nessus.exe: $(OBJ) $(XOBJ) $(YOBJ) - $(LD) @<< - $(LIBPATH) - $(LDFLAGS) - $(OBJ) - $(XOBJ) - $(YOBJ) - $(LIBS) -<< - -# ------------------------------------------------------ -# clean up -# ------------------------------------------------------ - -distclean clean:: - -del nessus.map - -del nessus.exp - -del *.obj - -distclean:: - -del nessus.exe - From scm-commit at wald.intevation.org Fri Aug 8 15:30:01 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 15:30:01 +0200 (CEST) Subject: [Openvas-commits] r1121 - trunk/doc/website Message-ID: <20080808133001.5368A406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 15:30:01 +0200 (Fri, 08 Aug 2008) New Revision: 1121 Modified: trunk/doc/website/openvas-cr-15.htm4 Log: Updated description: Mentioning continous scans and reducing the list of dropped protocol elements to the ones that directly relate to the detached scan feature. Modified: trunk/doc/website/openvas-cr-15.htm4 =================================================================== --- trunk/doc/website/openvas-cr-15.htm4 2008-08-08 13:05:40 UTC (rev 1120) +++ trunk/doc/website/openvas-cr-15.htm4 2008-08-08 13:30:01 UTC (rev 1121) @@ -87,6 +87,10 @@ </p> <p> +The OpenVAS server itself will not allow for continous scans anymore. +</p> + +<p> The command line version of OpenVAS-Client will not anymore offer the respective commands line option for detached scans. </p> @@ -100,10 +104,8 @@ <p> This change would be integrated into the upcoming OTP 1.0 protocol and -remove the commands SESSIONS_LIST, SESSION_DELETE, SESSION_RESTORE, -DETACHED_SESSIONS_LIST, DETACHED_STOP and the preferences -ntp_save_sessions, save_session, -save_empty_sessions, detached_scan, continuous_scan, delay_between_scan_loops, +remove the commands DETACHED_SESSIONS_LIST and DETACHED_STOP and the preferences +detached_scan, continuous_scan, delay_between_scan_loops, and detached_scan_email_address. </p> @@ -123,7 +125,10 @@ <ul> <li> 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> - Updated status: implemented. + Updated status: implemented.<br> + Updated description: Mentioning continous scans and reducing the list of + dropped protocol elements to the ones that directly relate to the + detached scan feature. <li> 2008-07-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> Added voting result. <li> 2008-07-03 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> From scm-commit at wald.intevation.org Fri Aug 8 15:54:53 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 15:54:53 +0200 (CEST) Subject: [Openvas-commits] r1122 - trunk/doc/website Message-ID: <20080808135453.669C840700@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 15:54:53 +0200 (Fri, 08 Aug 2008) New Revision: 1122 Modified: trunk/doc/website/openvas-cr-13.htm4 Log: Add item on how to handle the .oval files. Modified: trunk/doc/website/openvas-cr-13.htm4 =================================================================== --- trunk/doc/website/openvas-cr-13.htm4 2008-08-08 13:30:01 UTC (rev 1121) +++ trunk/doc/website/openvas-cr-13.htm4 2008-08-08 13:54:53 UTC (rev 1122) @@ -357,6 +357,11 @@ <li> ovaldi: src/Main.cpp: Change report driver code to serve the needs of OpenVAS. <li> ovaldi: Extend with a OpenVAS-KB probe factory +<li> Handling of .oval files: Location should be inside directory "oval" + which is located in /usr/lib/openvas/plugins/. + This would also allow for easy extension of OpenVAS NVT feed/sync. + However, the .oval files should not be handled inside the OpenVAS SVN + repository because the management takes place at the OVAL project. </ul> <h3>History</h3> From scm-commit at wald.intevation.org Sat Aug 9 00:58:25 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sat, 9 Aug 2008 00:58:25 +0200 (CEST) Subject: [Openvas-commits] r1123 - in trunk/openvas-server: . doc/ntp doc/otp openvasd Message-ID: <20080808225825.8633540708@pyrosoma.intevation.org> Author: jan Date: 2008-08-09 00:58:24 +0200 (Sat, 09 Aug 2008) New Revision: 1123 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/doc/ntp/ntp_extensions.txt trunk/openvas-server/doc/ntp/ntp_white_paper.txt trunk/openvas-server/doc/otp/otp_specification_10.txt trunk/openvas-server/openvasd/comm.c Log: Started clean documentation of OTP. * doc/otp/otp_specification_10.txt: Extended with various protocol command documentation. * doc/ntp/ntp_extensions.txt, doc/ntp/ntp_white_paper.txt: Removed those elements which are documented cleanly in otp_specification_10.txt * openvasd/comm.c (plugin_send_infos): Added comment hinting at a potential bug. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/ChangeLog 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,5 +1,19 @@ 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + Started clean documentation of OTP. + + * doc/otp/otp_specification_10.txt: Extended with various + protocol command documentation. + + * doc/ntp/ntp_extensions.txt, doc/ntp/ntp_white_paper.txt: + Removed those elements which are documented cleanly + in otp_specification_10.txt + + * openvasd/comm.c (plugin_send_infos): Added comment + hinting at a potential bug. + +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + Patch for Change Request #15: http://www.openvas.org/openvas-cr-15.html (OpenVAS Server: Remove features for detached scans) Modified: trunk/openvas-server/doc/ntp/ntp_extensions.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,4 +1,12 @@ +ATTENTION: + Currently the specification document for OTP 1.0 + is established. Any feature clearified and added to + ../otp/otp_specification_10.txt is removed here. + The new specification for OTP is finished once the ntp + documentation files are empty. + + Nessus Transfer Protocol Extensions @@ -189,40 +197,6 @@ timeout.10246 = 12 timeout.10542 = -1 - - -7. Attached files : the message ATTACHED_FILE ----------------------------------------------- - -ATTACHED_FILE is a message that comes after the -PREFERENCES message. Its purpose is to allow the -client to upload a file to the server, which will -be used by plugins. A usage of this would be to -upload a SSL certificate to the server so that -security checks can be done over SSL. - - -The message syntax is : - -CLIENT <|> ATTACHED_FILE -name: <name> -content: octet/stream -bytes: %d -(file) - -With '%d' being the number of bytes to read and 'content' should, -in the future (and if requested by users) be mime-compliant. -Today, this field is ignored and all files are treated -as octet/stream (sent without any conversion). - -<name> is the name of the file. openvasd will re-assign -a new name (to prevent clients from uploading, say, /etc/passwd). - -This message should be used with the plugin preference 'file'. -Read plugins_prefs.txt for details. - - - 8. Alternative protocol negociation ----------------------------------- @@ -235,11 +209,8 @@ The current options are : . md5_caching [NOT IMPLEMENTED] -. plugins_version -. timestamps - 9. md5 caching ------------------------------------ @@ -283,108 +254,3 @@ . . <|> SERVER - - -11. Per plugin message -------------------------------------------------------------------------------- - -The message PLUGIN_INFO returns the information about one specific plugin. -It's defined as : - - CLIENT <|> PLUGIN_INFO <|> id <|> CLIENT - -With <id> being the ID of the plugin from which we want information about. -In return, the server returns : - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family - -(as in the PLUGIN_LIST message) - -12. plugins_version ----------------------------------------------------------------------------- - -If the client gives the option "plugins_version" at connection time -(as defined in �8) then the PLUGIN_INFO message changes from : -id <|> name <|> category <|> copyright <|> description <|> summry <|> family - -to - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> plugin_version - - -With plugin_version being the revision tag of the current plugin - - -12. plugins_cve_id ----------------------------------------------------------------------------- - -If the client sends the option "plugins_cve_id" at connection time -(as defined in �8) then the PLUGIN_INFO message has the plugins CVE ID -appended to it. Note that plugins_version takes precedence on this, so -if the client sends plugins_version AND plugins_cve_id, then the PLUGIN_INFO -message becomes : - - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> plugin_version <|> cve_id - -If just the option plugins_cve_id is set, then the PLUGIN_INFO message -becomes: - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> cve_id - -13. plugins_bugtraq_id ----------------------------------------------------------------------------- - -If the client sends the option "plugins_bugtraq_id" at connection time -(as defined in �8) then the PLUGIN_INFO message has the plugins Bugtraq ID -appended to it. Note that plugins_version takes precedence on this, and -the client needs to ALSO have set plugins_cve_id. -So if the client sends plugins_version AND plugins_bugtraq_id, -it MUST send plugins_cve_id and then the PLUGIN_INFO -message becomes : - - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> plugin_version <|> cve_id <|> bugtraq_id - -If just the option plugins_cve_id is set, then the PLUGIN_INFO message -becomes: - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> cve_id <|> bugtraq_id - - - - -14. timestamps ------------------------------------------------------------------------------- - -If the option 'timestamps' is enabled by the client at connection time, -(as defined in �8) then the server will send the message : - -SERVER <|> TIME <|> SCAN_START <|> (time of day) <|> SERVER -SERVER <|> TIME <|> SCAN_END <|> (time of day) <|> SERVER - -When the whole scan starts and ends. - -and : -SERVER <|> TIME <|> HOST_START <|> host <|> (time of day) <|> SERVER -SERVER <|> TIME <|> HOST_END <|> host <|> (time of day) <|> SERVER - -To send the timestamps of the time of the scan of each host. - - - -15. Plugins dependencies -------------------------------------------------------------------------------- - -If the option 'dependencies' is enabled by the client at connection time -(as defined in �8) then the server will send the message PLUGIN_DEPENDENCIES -after the RULES message. - -The format is : - -SERVER <|> PLUGINS_DEPENDENCIES -pluginame1 <|> dependencie1 <|> dependencie2 <|> ...... <|> -pluginame2 <|> dependencie1 <|> dependencie2 <|> ...... <|> -<|> SERVER - - Modified: trunk/openvas-server/doc/ntp/ntp_white_paper.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,4 +1,10 @@ +ATTENTION: + Currently the specification document for OTP 1.0 + is established. Any feature clearified and added to + ../otp/otp_specification_10.txt is removed here. + The new specification for OTP is finished once the ntp + documentation files are empty. Nessus Transfer Protocol White Paper version 1.0 @@ -39,14 +45,9 @@ The Nessus Transfer Protocol currently recognizes the following messages types : ERROR - HOLE - INFO PORT NEW_ATTACK - PLUGIN_LIST - STAT - STOP_ATTACK - + 31. The "ERROR" type A NTP message declared as "ERROR" contains the description of an error that @@ -58,22 +59,6 @@ If the error is important, the server will send a 'BYE BYE' message (see the end of the document) - 32. The "HOLE" and "INFO" type - - A NTP message declared as "HOLE" contains the description of a security hole - that has been found on a given host. The message contains the name of the - host as well as the port on which the hole was discovered. - The syntax for this type is : - - entity <|> HOLE <|> hostname <|> port:hole description <|> entity - - Because a hole description is very likely to contain a line feed, - before being sent every '\n' character must be replaced by ';'. - The client will have, then, to do the reverse conversion (';' -> '\n') - - When the message is of type 'INFO', this is the same as the "HOLE" type - except the fact that the description is just a warning. - 33. The "PORT" type A NTP message declared as "PORT" reports that a given port is open @@ -107,39 +92,7 @@ recursive : should the hostloop system be used against _every_ host ? (0:no) portrange : range of ports to scan (default : "1-8000") - - 35. The "PLUGIN_LIST" type - - A NTP message of type "PLUGIN_LIST" tells to the client the name, the id and the - copyright of the plugins that are installed on the server. - This list *does* contain lines feed. - - The syntax is : - SERVER <|> PLUGIN_LIST <|> - id <|> name <|> category <|> copyright <|> description <|> summary <|> family - id <|> name <|> category <|> copyright <|> description <|> summary <|> family - ... - <|> SERVER - - 36. The "STAT" type - - A NTP message of type STAT tells the client the current status of the portscanning - of a given host - Syntax : - - SERVER <|> STAT <|> hostname <|> port <|> SERVER - - This message is sent every 100 ports - - 37. The "STOP_ATTACK" type - - A NTP message of type STOP_ATTACK tells the daemon to stop the test of a given - host. - Syntax : - - CLIENT <|> STOP_ATTACK <|> hostname <|> CLIENT - - + 4. A typical NTP session A typical NTP session has a real simple scheme : @@ -171,14 +124,3 @@ EOF - - - - - - - - - - - Modified: trunk/openvas-server/doc/otp/otp_specification_10.txt =================================================================== --- trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,19 +1,20 @@ OpenVAS Transport Protocol Specification 1.0 - + Authors: Michael Wiegand <michael.wiegand at intevation.de> - + Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + PURPOSE This document describes OTP, the protocol used for communication between the server and client modules of the Open Vulnerability Assessment System (OpenVAS). - + STATUS This document is currently a draft; it does not describe the complete protocol yet, but only the changes between the Nessus Transport Protocol, version 1.2 and the OpenVAS Transport Protocol, version 1.0. For more information on NTP please refer to the NTP specification for the time being. - + INTRODUCTION The OpenVAS project is a fork of the Nessus project. Because of this, the initial protocol used for client-server communication was the Nessus @@ -24,45 +25,257 @@ made to switch to a new protocol to avoid collisions with future protocol specifications by the Nessus project and to avoid confusion with other well-established protocols. - + GENERAL CONSIDERATIONS The initial specification of the OpenVAS Transport Protocol (OTP) is very close to the NTP implementation in the last versions available under the GNU General Public License (GPL). The changes between NTP 1.2 -- the last NTP version used by OpenVAS -- and OTP 1.0 are explained in the CHANGES section below. - + CHANGES This section describes the changes between NTP 1.2 and OTP 1.0. - + Plug-in upload: Section 10 of the NTP Extensions describes the ATTACHED_PLUGIN message type. Using this message type, it was possible for a client to upload a plug-in to a server. Due to security considerations described in the OpenVAS change request #4 [1], this message type has been removed from the protocol. - + Version information: The undocumented NESSUS_VERSION message type has been replaced with the OPENVAS_VERSION message type. When an OPENVAS_VERSION message is issued by the client, the server is expected to respond with a message containing the current server version. - + New message types: In addition to the existing message types HOLE, INFO and NOTE two new message types have been added to the protocol: DEBUG and LOG. Their purpose is to give clients more control about the verbosity of the messages they receive from the server. - - Session handling: - Experimental support for handling server-side sessions and detached scans as - described in sections 3 and 5 of the NTP Extensions has been removed from OTP - as the functionality concerned has been removed from OpenVAS-Server due to - design decisions. This means the following message types have been removed - from the protocol: SESSIONS_LIST, SESSION_DELETE, SESSION_RESTORE, - DETACHED_SESSIONS_LIST, DETACHED_STOP. The following preferences have been - removed from the protocol as well: ntp_save_sessions, save_session, - save_empty_sessions, detached_scan, continuous_scan, delay_between_scan_loops, - detached_scan_email_address. - + + +PROTOCOL INITIALIZER AND PROTOCOL FEATURES + + Description: + + The client start the protocol with a initializer of + the protocol version followed by parameters switching + on various features. Available protocol features are: + + dependencies (server will use command PLUGINS_DEPENDENCIES) + timestamps (server will use command TIME) + plugins_version (server will add revision to plugin information) + plugins_cve_id (server will add cve id to plugin information) + plugins_bugtraq_id (server will add bugtraq id to plugin information) + + Syntax: + + < OTP/1.0 >< protocol_feature1 protocol_feature2 ... > + +PROTOCOL COMMANDS + + ATTACHED_FILE + + Description: + + This command corresponds to the plugin preferences + type "file". It follows the command PREFERENCES + to upload the specified files from client to server. + + Syntax: + + CLIENT <|> ATTACHED_FILE + name: file_name + content: octet/stream + bytes: file_length + file_content + + where + file_name: the path and name of the file. + It is a identifier to reference the file + in the plugin preferences. + file_length: the number of bytes that will follow after the newline + file_content: the actual file as byte stream. + + HOLE + + Description: + + With this command the server reports a identified + problem of class "security hole". + + Syntax: + + SERVER <|> HOLE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + + where + host: the target system + service_name: the name of the service (like in /etc/services) + port_number: the port number the problem relates to or "general". + protocol_type: "tcp" or "udp". + description: the problem description where newlines have been + replaced by semicolons. + oid: the OID of the NVT that identified the problem. + + INFO + + Description: + + With this command the server reports a identified + problem of class "security info". + + Syntax: + + SERVER <|> INFO <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + + where + host: the target system + service_name: the name of the service (like in /etc/services) + port_number: the port number the problem relates to or "general". + protocol_type: "tcp" or "udp". + description: the problem description where newlines have been + replaced by semicolons. + oid: the OID of the NVT that identified the problem. + + NOTE + + Description: + + With this command the server reports a identified + problem of class "security note". + + Syntax: + + SERVER <|> NOTE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + + where + host: the target system + service_name: the name of the service (like in /etc/services) + port_number: the port number the problem relates to or "general". + protocol_type: "tcp" or "udp". + description: the problem description where newlines have been + replaced by semicolons. + oid: the OID of the NVT that identified the problem. + + PLUGINS_DEPENDENCIES + + Description: + + The PLUGINS_DEPENDENCIES messages are send after the RULES messages + in case the protocol feature "dependencies" was set during protocol + initialization. + + Syntax: + + SERVER <|> PLUGINS_DEPENDENCIES + plugin_1_name <|> dependency1 <|> dependency2 <|> ... <|> + plugin_2_name <|> dependency1 <|> dependency2 <|> ... <|> + ... + <|> SERVER + + PLUGIN_INFO + + Description: + + This command is issued by the client to request + information of the NVT specified by its oid. + + Syntax: + + CLIENT <|> PLUGIN_INFO <|> oid <|> CLIENT + + The server answers with this line (analogous to PLUGIN_LIST command): + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family + + The following extensions are appended in the given order: + + In case protocol feature "plugins_version" is selected, the respective + plugin_version is appended to the line: + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family <|> plugin_version + + In case protocol feature "plugins_cve_id" is selected, the respective + cve_id is appended to the line, e.g.: + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family <|> plugin_version <|> cve_id + + In case protocol feature "plugins_bugtraq_id" is selected, the respective + bugtraq_id is appended to the line, e.g.: + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family <|> plugin_version <|> cve_id <|> bugtraq_id + + In case no plugin with OID=oid is found, the server will not answer at all. + + PLUGIN_LIST + + Description: + + With this command the server sends detailed information about + the available NVTs. + + Syntax: + + SERVER <|> PLUGIN_LIST <|> + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family + ... + <|> SERVER + + Additional information might be apended according to some procotol features. + Please refer to the description of the PLUGIN_INFO command for details. + + STAT + + Description: + + With this command, the server informs the client about + the progress of the port scan for target system "host". + "port" is the currently scanned port number. + The command with an interval of 100 ports. + + Syntax: + + SERVER <|> STAT <|> host <|> port <|> SERVER + + STOP_ATTACK + + Description: + + With this command, the client tells the server to stop + scanning target "host". + + Syntax: + + CLIENT <|> STOP_ATTACK <|> host <|> CLIENT + + TIME + + Description: + + The TIME messages will be send by the server + in case the protocol feature "timestamps" was set during protocol + initialization. + + Syntax: + + After completion of scanning a target host the server sends: + + SERVER <|> TIME <|> HOST_START <|> host <|> time_string <|> SERVER + SERVER <|> TIME <|> HOST_END <|> host <|> time_string <|> SERVER + + or, in case STOP_ATTACK was issued by the client: + + SERVER <|> TIME <|> HOST_START <|> host <|> time_string <|> SERVER + SERVER <|> TIME <|> HOST_INTERRUPTED <|> host <|> time_string <|> SERVER + + After completion of the whole scan the server sends: + + SERVER <|> TIME <|> SCAN_START <|> time_string <|> SERVER + SERVER <|> TIME <|> SCAN_END <|> time_string <|> SERVER + + where time_string is of the form "Wed Jun 30 21:49:08 1993". + REFERENCES [1] http://www.openvas.org/openvas-cr-4.html Modified: trunk/openvas-server/openvasd/comm.c =================================================================== --- trunk/openvas-server/openvasd/comm.c 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/openvasd/comm.c 2008-08-08 22:58:24 UTC (rev 1123) @@ -345,7 +345,11 @@ } plugins = plugins->next; } - + + /* XXX: This code looks like it will fail for the + * last plugin in the list: info will no be send + * because next ist NULL. + */ if(plugins->next) { send_plug_info(globals, plugins); From scm-commit at wald.intevation.org Sun Aug 10 00:35:12 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sun, 10 Aug 2008 00:35:12 +0200 (CEST) Subject: [Openvas-commits] r1124 - in trunk/openvas-server: . doc/ntp doc/otp Message-ID: <20080809223512.74A77406E7@pyrosoma.intevation.org> Author: jan Date: 2008-08-10 00:35:10 +0200 (Sun, 10 Aug 2008) New Revision: 1124 Removed: trunk/openvas-server/doc/ntp/ntp_white_paper.txt Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/MANIFEST trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt trunk/openvas-server/doc/otp/otp_specification_10.txt Log: * doc/ntp/ntp_white_paper.txt: Removed. It does not contain any information not covered by otp_specification_10.txt. * doc/ntp/ntp_white_paper_11.txt: Removed those elements which are documented cleanly in otp_specification_10.txt * doc/otp/otp_specification_10.txt: Extended with various protocol command documentation. * MANIFEST: Updated. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/ChangeLog 2008-08-09 22:35:10 UTC (rev 1124) @@ -1,3 +1,16 @@ +2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + * doc/ntp/ntp_white_paper.txt: Removed. It does not contain + any information not covered by otp_specification_10.txt. + + * doc/ntp/ntp_white_paper_11.txt: Removed those elements + which are documented cleanly in otp_specification_10.txt + + * doc/otp/otp_specification_10.txt: Extended with various + protocol command documentation. + + * MANIFEST: Updated. + 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Started clean documentation of OTP. Modified: trunk/openvas-server/MANIFEST =================================================================== --- trunk/openvas-server/MANIFEST 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/MANIFEST 2008-08-09 22:35:10 UTC (rev 1124) @@ -12,7 +12,6 @@ doc/nsr_file_format.txt doc/ntp/ntp_extensions.txt doc/ntp/ntp_white_paper_11.txt -doc/ntp/ntp_white_paper.txt doc/ntp/plugin_prefs.txt doc/ntp/README doc/openvas-adduser.8 Deleted: trunk/openvas-server/doc/ntp/ntp_white_paper.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-09 22:35:10 UTC (rev 1124) @@ -1,126 +0,0 @@ - -ATTENTION: - Currently the specification document for OTP 1.0 - is established. Any feature clearified and added to - ../otp/otp_specification_10.txt is removed here. - The new specification for OTP is finished once the ntp - documentation files are empty. - - Nessus Transfer Protocol White Paper - version 1.0 - - - - - -1. What is the Nessus Transfer Protocol (NTP) ? - - The NTP is the protocol that is used for the communication between - openvasd (also known as the server) and a nessus client. - - This protocol is widely explained in order to facilitate the development - of other clients than the 'standard' Nessus client. - - The NTP protocol is TCP based but has nothing to do with the Network - Time Protocol (sorry, this is confusing) - - -2. NTP typical message - - A NTP message is a suite of ASCII printable characters, which does not - contain any line feed ('\n'). - - Every NTP message is made up of 'fields' that are delimited by the string ' <|> ' - (note the spaces). - - The first field always contain the name of the entity that sends it (SERVER or - CLIENT), and the second field always send the type of message. - The content of the other fields depends of the message type. - The last field of the message must be the same as the first field. - - eg : SERVER <|> ERROR <|> An error occurred ! <|> SERVER - -3. NTP messages types - - The Nessus Transfer Protocol currently recognizes the following messages types : - - ERROR - PORT - NEW_ATTACK - - 31. The "ERROR" type - - A NTP message declared as "ERROR" contains the description of an error that - occurred. Once more, there must be NO line feed ('\n') character in this - description. - The syntax for this type is : - entity <|> ERROR <|> error description <|> entity - - If the error is important, the server will send a 'BYE BYE' message - (see the end of the document) - - 33. The "PORT" type - - A NTP message declared as "PORT" reports that a given port is open - on a given host. - The syntax for this type is : - - entity <|> PORT <|> hostname <|> portnumber <|> entity - - - 34. The "NEW_ATTACK" type - - A NTP message of type "NEW_ATTACK" launches a new attack again a given - host. - - The syntax of this type is : - - entity <|> NEW_ATTACK <|> pluginlist <|> maxhosts <|> recursive \ - <|> portrange <|> hostname <|> entity - - where : - - pluginlist : is the list of plugins to use. Each plugin is designated by a number - (see #35 : The "PLUGIN_LIST" type), so the plugin list is a list of numbers separated - by a semi-column ';' (eg : "1;39;11;3") - If pluginlist equals to "-1", then all the plugins will be used - If pluginlist equals to "0", then no plugin will be used (a simple portscanning will - be performed) - - maxhosts : is the maximal number of hosts to test. "-1" means 'no maximum' - - recursive : should the hostloop system be used against _every_ host ? (0:no) - - portrange : range of ports to scan (default : "1-8000") - -4. A typical NTP session - - A typical NTP session has a real simple scheme : - - the server sends : the client answers : - - "< NTP/1.0 >" - "User :" - a user name - "Password :" - a valid password - The server then sends - its plugin list (see 35) - the client sends a new attack - message (see 34) - the server sends various - messages about the status - of the attack (see 31,32,33) - - At any moment, the client can send the 'attack_stop' command (see 37) - - "SERVER <|> BYE <|> BYE" - "anything\n" and - closes the connection - - - - - - -EOF Modified: trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-09 22:35:10 UTC (rev 1124) @@ -1,3 +1,9 @@ +ATTENTION: + Currently the specification document for OTP 1.0 + is established. Any feature clearified and added to + ../otp/otp_specification_10.txt is removed here. + The new specification for OTP is finished once the ntp + documentation files are empty. Nessus Transfer Protocol White Paper version 1.1 and 1.2 @@ -153,25 +159,7 @@ Last but not least, the server can send plugins preferences. Please read the 'plugin_prefs' paper which is distributed with Nessus-980903 and the newest versions. - - -22. The "NEW_ATTACK" message - Since the client can now send more informations for a test to the server, - the "NEW_ATTACK" message is now much simpler : - - It used to be : - entity <|> NEW_ATTACK <|> pluginlist <|> maxhosts <|> recursive \ - <|> portrange <|> hostname <|> entity - - It's now : - - entity <|> NEW_ATTACK <|> hostname <|> entity - - where 'hostname' can be an IP, a FQDN or a list of them - (ie: "www.a.com,www.b.com,www.c.com" or "host1,host2,192.68.2.1" - or whatever) - 23. The "RULES" message Modified: trunk/openvas-server/doc/otp/otp_specification_10.txt =================================================================== --- trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-09 22:35:10 UTC (rev 1124) @@ -4,17 +4,17 @@ Michael Wiegand <michael.wiegand at intevation.de> Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> -PURPOSE +ABOUT THIS DOCUMENT This document describes OTP, the protocol used for communication between the server and client modules of the Open Vulnerability Assessment System (OpenVAS). STATUS This document is currently a draft; it does not describe the complete protocol - yet, but only the changes between the Nessus Transport Protocol, version 1.2 - and the OpenVAS Transport Protocol, version 1.0. For more information on NTP - please refer to the NTP specification for the time being. + yet but is still close to the Nessus Transport Protocol, version 1.2. + Apart from this the documentation itself is not complete yet. + INTRODUCTION The OpenVAS project is a fork of the Nessus project. Because of this, the initial protocol used for client-server communication was the Nessus @@ -29,9 +29,7 @@ GENERAL CONSIDERATIONS The initial specification of the OpenVAS Transport Protocol (OTP) is very close to the NTP implementation in the last versions available under the GNU - General Public License (GPL). The changes between NTP 1.2 -- the last NTP - version used by OpenVAS -- and OTP 1.0 are explained in the CHANGES section - below. + General Public License (GPL). CHANGES This section describes the changes between NTP 1.2 and OTP 1.0. @@ -54,7 +52,21 @@ clients more control about the verbosity of the messages they receive from the server. + Detached scans: + This functionality has been dropped due to design decisions. + This means the following commands have been removed + from the protocol: DETACHED_SESSIONS_LIST and DETACHED_STOP. + The following preferences have been removed from the protocol as + well: detached_scan, continuous_scan, delay_between_scan_loops, + detached_scan_email_address. +GENERAL ASPECTS OF PROTOCOL + + The OTP protocol is text-based, human readable and line-oriented. + + Each line is made of fields separated by "<|>. The first fields indicates + whether it is a command send by client or by server ("CLIENT" vs. "SERVER"). + PROTOCOL INITIALIZER AND PROTOCOL FEATURES Description: @@ -72,6 +84,8 @@ Syntax: < OTP/1.0 >< protocol_feature1 protocol_feature2 ... > + User : user_name + Password : user_password PROTOCOL COMMANDS @@ -98,6 +112,18 @@ file_length: the number of bytes that will follow after the newline file_content: the actual file as byte stream. + ERROR + + Description: + + In case of problems the server sends an error message with this + command. In case of unrecoverable problems, the server will then + close connection with BYE command. + + Syntax: + + SERVER <|> ERROR <|> error description <|> SERVER + HOLE Description: @@ -138,6 +164,17 @@ replaced by semicolons. oid: the OID of the NVT that identified the problem. + NEW_ATTACK + + Description: + + With this command the client requests the server to attack target + system(s) "host". "host" is one or many (comma-separated) IP or FQDN. + + Syntax: + + CLIENT <|> NEW_ATTACK <|> host <|> CLIENT + NOTE Description: @@ -226,6 +263,17 @@ Additional information might be apended according to some procotol features. Please refer to the description of the PLUGIN_INFO command for details. + PORT + + Description: + + With this command the server reports on open port + "port_number" on target system "host". + + Syntax: + + SERVER <|> PORT <|> host <|> port_number <|> SERVER + STAT Description: From scm-commit at wald.intevation.org Sun Aug 10 22:37:33 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sun, 10 Aug 2008 22:37:33 +0200 (CEST) Subject: [Openvas-commits] r1125 - in trunk/openvas-client: . nessus Message-ID: <20080810203733.799CA406F7@pyrosoma.intevation.org> Author: jan Date: 2008-08-10 22:37:32 +0200 (Sun, 10 Aug 2008) New Revision: 1125 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/cli.c trunk/openvas-client/nessus/cli.h trunk/openvas-client/nessus/parser.c trunk/openvas-client/nessus/parser.h Log: Removing handling of "PLUGINS_ORDER" command which is not implemented in the server at all. It is not used in a senseful way anyway here in the client. * nessus/parser.h: Remove definition of MSG_PLUGINS_ORDER * nessus/parser.c (parse_message_type, parse_server_message): Removed handling of MSG_PLUGINS_ORDER. * nessus/cli.h (struct cli_args): Removed element plugins_order_table. * nessus/cli.c (build_plugins_order_table): Removed. (cli_test_monitor): Removed code element that did not do any useful things about plugins order. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/ChangeLog 2008-08-10 20:37:32 UTC (rev 1125) @@ -1,3 +1,20 @@ +2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + Removing handling of "PLUGINS_ORDER" command which + is not implemented in the server at all. + It is not used in a senseful way anyway here in the client. + + * nessus/parser.h: Remove definition of MSG_PLUGINS_ORDER + + * nessus/parser.c (parse_message_type, parse_server_message): + Removed handling of MSG_PLUGINS_ORDER. + + * nessus/cli.h (struct cli_args): Removed element plugins_order_table. + + * nessus/cli.c (build_plugins_order_table): Removed. + (cli_test_monitor): Removed code element that did not do any useful + things about plugins order. + 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> * nessus/nmake.w32, nessus/nmake.bat: Removed. These are Modified: trunk/openvas-client/nessus/cli.c =================================================================== --- trunk/openvas-client/nessus/cli.c 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/cli.c 2008-08-10 20:37:32 UTC (rev 1125) @@ -85,70 +85,6 @@ return 1; } - - -static harglst* build_plugins_order_table(order) - char * order; -{ - int num = 0; - char * t; - int i = 0; - int * plugins_order_table_int; - harglst * plugins_order_table = harg_create(4000); - - - t = order; - - - while((t = strchr(t+1, ';')))num++; - plugins_order_table_int = emalloc((num+1)*sizeof(int)); - t = order; - if(num) - while(t) - { - char * next = strchr(t, ';'); - if(next)next[0]=0; - plugins_order_table_int[i++] = atoi(t); - if(next)next[0]=';'; - t = next+1; - next = strchr(next+1, ';'); - if(!next)t = NULL; - } - - /* - * Now, create the names table - */ - plugins_order_table = harg_create(num*3 + 1); - - for(i=0;i<num;i++) - { - struct nessus_plugin * plugs = Context->plugins; - - while(plugs != NULL && - plugs->id != plugins_order_table_int[i]) - plugs = plugs->next; - - - if( plugs == NULL ) - { - plugs = Context->scanners; - while(plugs && - plugs->id != plugins_order_table_int[i] ) - plugs = plugs->next; - } - if(plugs != NULL ){ - char id[32]; - snprintf(id, sizeof(id), "%d", i+1); - harg_add_string(plugins_order_table, id, plugs->name); - efree(&id); - } - } - efree(&plugins_order_table_int); - return plugins_order_table; -} - - - void cli_sigterm(s) int s; @@ -201,11 +137,6 @@ char * plug = NULL; parse_nessusd_short_status(&(buf[2]), &hostname, &action, ¤t, &max); - if(cli->plugins_order_table) - { - plug = harg_get_string(cli->plugins_order_table, current); - } - if(!strcmp(action, "portscan"))plug=""; printf("%s|%s|%s|%d\n", action,hostname,current,max); efree(&hostname); @@ -227,9 +158,6 @@ efree(¤t); } break; - case MSG_PLUGINS_ORDER: - cli->plugins_order_table = build_plugins_order_table(msg); - break; case MSG_FINISHED: printf("finished|%s||||\n", msg); break; Modified: trunk/openvas-client/nessus/cli.h =================================================================== --- trunk/openvas-client/nessus/cli.h 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/cli.h 2008-08-10 20:37:32 UTC (rev 1125) @@ -20,7 +20,6 @@ int backend; int verbose; int backend_output_func; - harglst * plugins_order_table; }; struct cli_args * cli_args_new(); Modified: trunk/openvas-client/nessus/parser.c =================================================================== --- trunk/openvas-client/nessus/parser.c 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/parser.c 2008-08-10 20:37:32 UTC (rev 1125) @@ -148,7 +148,6 @@ if(!strcmp(MSG_PORT_STR, type))return(MSG_PORT); if(!strcmp(MSG_ERROR_STR, type))return(MSG_ERROR); if(!strcmp(MSG_PING_STR, type))return(MSG_PING); - if(!strcmp(MSG_PLUGINS_ORDER_STR, type))return(MSG_PLUGINS_ORDER); if(!strcmp(MSG_FINISHED_STR, type))return(MSG_FINISHED); if(!strcmp(MSG_BYE_STR, type))return(MSG_BYE); return(-1); @@ -375,17 +374,6 @@ network_printf(context->socket, "CLIENT <|> PONG <|> PING <|> CLIENT\n\n"); return MSG_PING; break; - case MSG_PLUGINS_ORDER : - { - char * t = strstr(buf, " <|> SERVER"); - int tl = strlen(message_type); - int l = strlen(buf + tl); - if(t)t[0]=0; - strncpy(humanmsg, buf+tl+5, l); - humanmsg[l] = '\0'; - return(MSG_PLUGINS_ORDER); - } - break; case MSG_BYE : humanmsg[0]=0; return(MSG_BYE); Modified: trunk/openvas-client/nessus/parser.h =================================================================== --- trunk/openvas-client/nessus/parser.h 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/parser.h 2008-08-10 20:37:32 UTC (rev 1125) @@ -36,7 +36,6 @@ #define MSG_INFO 5 #define MSG_STAT 6 #define MSG_PING 7 -#define MSG_PLUGINS_ORDER 8 #define MSG_FINISHED 9 #define MSG_STAT2 10 #define MSG_NOTE 11 From scm-commit at wald.intevation.org Mon Aug 11 00:40:01 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 11 Aug 2008 00:40:01 +0200 (CEST) Subject: [Openvas-commits] r1126 - in trunk/openvas-server: . doc/ntp doc/otp Message-ID: <20080810224001.63F99406F0@pyrosoma.intevation.org> Author: jan Date: 2008-08-11 00:40:00 +0200 (Mon, 11 Aug 2008) New Revision: 1126 Removed: trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/doc/otp/otp_specification_10.txt Log: Continued consolidation of protocol documentation. * doc/ntp/ntp_white_paper_11.txt: Removed. It does not contain any information not covered by otp_specification_10.txt or defined elsewhere. * doc/otp/otp_specification_10.txt: Extended with various protocol command documentation. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-10 20:37:32 UTC (rev 1125) +++ trunk/openvas-server/ChangeLog 2008-08-10 22:40:00 UTC (rev 1126) @@ -1,3 +1,14 @@ +2008-08-11 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + Continued consolidation of protocol documentation. + + * doc/ntp/ntp_white_paper_11.txt: Removed. It does not contain + any information not covered by otp_specification_10.txt + or defined elsewhere. + + * doc/otp/otp_specification_10.txt: Extended with various + protocol command documentation. + 2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> * doc/ntp/ntp_white_paper.txt: Removed. It does not contain Deleted: trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-10 20:37:32 UTC (rev 1125) +++ trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-10 22:40:00 UTC (rev 1126) @@ -1,344 +0,0 @@ -ATTENTION: - Currently the specification document for OTP 1.0 - is established. Any feature clearified and added to - ../otp/otp_specification_10.txt is removed here. - The new specification for OTP is finished once the ntp - documentation files are empty. - - Nessus Transfer Protocol White Paper - version 1.1 and 1.2 - - -# Author : Renaud Deraison <deraison at cvs.nessus.org> -# -# Revisions : -# 07/10/98 : 10am : first release -# 07/10/98 : 4pm : first revision (thanks to Noam Rathaus :) -# 07/11/98 : 11am : added preferences and changed the 'NEW_ATTACK' message -# 07/11/98 : 2pm : added 'PLUGINS_ORDER' (thanks to Alexis de Bernis :) - updated the 'STATUS' message format -# 07/11/98 : 10pm : added a new option : the scan_level -# 07/12/98 : 1pm : corrected some minor errors -# 07/29/98 : 3pm : added the 'STOP_WHOLE_TEST' message -# 08/24/98 : 1pm : corrected a mistake in the messages order - changed some stuff in the text to make - it look like a white paper instead of - a draft -# 09/03/98 : 2pm : corrected several spelling mistakes -# 09/22/98 : 5pm : added several options -# 01/29/99 : 3am : Added Scan ID to HOLE and INFO messages. - (Jochen Wiedmann) - -# 01/31/02 : 6pm : removed scan_level and high_scan_time which are deprecated -# 03/08/02 : : documented the NOTE messages - -This paper has been written as a complement to the NTP/1.0 -white paper. If you have never read the NTP/1.0 white paper, -you should, or else you may not understand everything... - -1. Purpose of the NTP/1.1 and NTP/1.2 - - The purpose of the NTP 1.1 is to help to make the Nessus daemon more -flexible than it used to be, as well as to be more specific on the -holes/reports found on a remote host. - - + More flexible : - - Nowadays, using openvasd is a pain : before you make a test, you have - to telnet to the openvasd machine, edit openvasd.rules to be sure it - matches your needs, restart the daemon, and actually start the attack... - - Also, all the preferences should be defined by the client, not - only in openvasd.conf. Because if you want to reduce the max number - of threads of openvasd, it's a real pain. - - + More specific : - - The NTP/1.0 is TCP oriented, but a flaw can be found on a UDP port, so - the NTP/1.1 needs to be more specific in the reports messages. - So the NTP/1.1 will modify the INFO and HOLE messages to make them more - specifics and more accurate. NTP/1.2 extends the INFO and HOLE messages - again by adding the scan's ID, so that one can identify the plugin that - reports the message. - - + More open : - - The NTP/1.1 allow the server to send to the client an infinite* amount - of data, and the client can send back to the server another infinite amount - of data - - - *: we all know that in the computers world, nothing is really infinite so - maybe I should have put 'unlimited as long as there is memory on the - server side', but please don't mess up with that :) - - - + More fined-grained : - - NTP/1.1 defines the 'NOTE' message (which works the same as INFO and HOLE) - -2. New messages - -21. The "PREFERENCES" message - - The NTP/1.1 provides a new message format, which is nearly the same - as the PLUGIN_LIST message : the PREFERENCES message. - - This message will be sent by the server and by the client before the - start of a new attack. - - Syntax : - - entity <|> PREFERENCES <|> - name <|> value - name <|> value - ... - <|> entity - - where 'entity' is either SERVER or CLIENT. - - The current preferences are : - max_threads : max number of threads. Can't be greater than the one - defined in openvasd.conf - test_file : the file that some plugins will attempt to obtain from the - remote server (ie : /etc/passwd) - email : the email of the user - - ping_hosts : ping hosts before starting to scan them. Must be 'yes' or 'no' - - reverse_lookup : the IP must be reversely looked up before it's attacked - - outside_firewall: if openvasd is testing a host which is behind a firewall - - host_expansion : this is how Nessus will seek for victims. Several options - are possible : - + "none" : means that only the primary host will be tested - + "dns" : means that a AXFR request will be made to the - DNS which is in charge of the domain name of the - victim. - + "nfs" : means that Nessus will do a 'showmount' on every - host tested, and will test the hosts that can - mount the filesystems exported. - + "ip" : means that Nessus will test the entire subnet of a - host. - - It's possible to combine the last three options by putting - a ';' between the options : 'dns;ip' is a valid option, - as well as 'dns;nfs;ip'. - 'none;dns;nfs;ip' is a NONSENSE. The server will send a - PREFERENCES_ERRORS message with this one, and a good client - should first test such nonsense before sending them to the - server. - - port_range : the range of ports to scan (ie : 1-1024) - max_hosts : maximal number of hosts to test - - - This one will NEVER be sent to the client, but the client will have to - send it the the server : - - plugin_set : the list of plugins to use (same format as it used to be (1;4;6;9) - - If the client doesn't send 'plugin_set', then the server will launch all the plugins. - - Note : - In fact, the server will send to the client the content of the file - openvasd.conf. If the openvasd owner decides to remove this file, the - server will send you the message : - - SERVER <|> PREFERENCES <|> - <|> PREFERENCES - - Even if there is NO default preferences, the client has to upload the list - of 'known prefs' which is defined above. - - Also, the server might send to the client bogus preferences. If this is the case, - the client can silently ignore them (even though it would be better to show - them somewhere). - - Last but not least, the server can send plugins preferences. Please read the - 'plugin_prefs' paper which is distributed with Nessus-980903 and the newest - versions. - -23. The "RULES" message - - - I call "rules" the set of commands that restrict the test to - a set of hosts. - The "RULES" message is sent by the server and the client. - Its syntax is : - - entity <|> RULES <|> - expr1; - expr2; - expr3; - <|> entity - - where 'entity' is either SERVER or CLIENT. - 'expr' is the standard rules format (ie : 'n:*') - -24. The NOTE, INFO, HOLE messages - - It used to be : - - entity <|> HOLE <|> hostname <|> port:hole description <|> entity - - It will now be : - - entity <|> HOLE <|> hostname <|> servicename (port/protocol) <|> \ - description <|> entity - (NTP 1.1) - - entity <|> HOLE <|> hostname <|> servicename (port/protocol) <|> \ - description <|> scan_id <|> entity - (NTP 1.2) - - or - - entity <|> HOLE <|> hostname <|> general <|> \ - description <|> entity - (NTP 1.1) - - entity <|> HOLE <|> hostname <|> general <|> \ - description <|> scan_id <|> entity - (NTP 1.2) - - - Where service will be a string which indicates to the user the kind of - service which is affected by the problem (ie :"ftp") and where protocol - will be "udp" or "tcp", or maybe something else. - - If no servicename could be found by the server 'servicename' will be - "unknown" - - the second format will be used to report an info which is not port specific. - - The scan_id is the same id previously sent as part of the plugin list. - This allows to identify the plugin that generated a report. - - The 'NOTE' message has been added and defines informative information - about the remote host - -25. The 'PREFERENCES_ERRORS' message - - After the client has sent to the server a 'PREFERENCES' message, the - server will reply to report which preferences have invalid values. - The syntax of this message is very similar to 'PREFERENCES': - - SERVER <|> PREFERENCES_ERRORS - name <|> value - name <|> value - ... - <|> SERVER - - where 'name' is the name of the pref. item, and value is the value which - will be used by the server if no correction is made. - - ie : - a user asks a 'max_threads' value of 99999 - the owner of the server has set in nessus.conf 'max_threads' to 15 - - Since 99999 > 15, the server will reply (after the PREFERENCES message - of the client) - - SERVER <|> PREFERENCES_ERRORS - max_threads <|> 15 - <|> SERVER - - - Nota : - The message : - - SERVER <|> PREFERENCES_ERRORS - <|> SERVER - - means that there is no error. - -26. The 'PLUGINS_ORDER' message - - This message is sent by the server to the client to tell it in which - order the plugins will be launched. - Syntax : - - SERVER <|> PLUGINS_ORDER <|> plugins <|> SERVER - - Where 'plugins' is a string showing the ids of the plugins, - ie : '4;8;1;5' - - -27. The 'STATUS' message - - This message now shows if the current is the state of the portscan - of the state of the plugins attacks. - It used to be the 'STAT' message, note that it was renamed. - - Syntax : - SERVER <|> STATUS <|> hostname <|> action <|> status <|> SERVER - - Where : - 'hostname' is the name of the host - 'action' is either 'portscan' or 'attack' - 'status' is a string under the form "min/max" (ie : 12/80) - -28. The 'STOP_WHOLE_TEST' message - - This message stops a whole test in a clean way : all the threads - are killed and the server silently dies. - - It's better to use this message rather than just closing the socket - between the client and the server (describing why is a little off topic) - - Syntax : - - CLIENT <|> STOP_WHOLE_TEST <|> CLIENT - - -29. Notes - - The behavior of the command RULES is not the same as PREFERENCES. - With the PREFERENCES message, the client can modify the prefs. of - the server. - With the rules message, it can only add new rules. - ie : - - the client receives : - SERVER <|> RULES - n:*; - y:*.nessus.org; - <|> SERVER - -then it sends to the server : - CLIENT <|> RULES - N:grincheux.nessus.org; - <|> CLIENT - - This means that during the test, the following set of rules will be applied : - n*;y:*.nessus.org;n:grincheux.nessus.org - - -3. Using the NTP/1.1 - - 31. Activating the NTP/1.1 or NTP/1.2 - - While the client attempts to establish the communication with a server, it - should send the string '< NTP/1.1 >' or '< NTP/1.2 >' instead of the - previously used '< NTP/1.0 >' and the server will answer with the name of - the protocol it will use. Beware : older servers will close the connection - if they receive NTP/1.1, but I think the servers will be updated more often - than the clients... - - -32. When do the messages take place. - - The 'PREFERENCES' and 'RULES' message are sent by the server after the - 'PLUGIN_LIST' message. The client sends the 'PREFERENCES' and 'RULES' - message before the 'NEW_ATTACK' messages. As soon as the client sends a - 'PREFERENCES' message, the server will answer with a 'PREFERENCES_ERROR' - message (even if there is no error) - - The 'PLUGIN_ORDER' message will be sent just after the client sends the - 'NEW_ATTACK' message. - - The 'STATUS', 'PORT', 'HOLE', 'INFO' messages come during an attack. - -Comments and questions go to deraison at cvs.nessus.org Modified: trunk/openvas-server/doc/otp/otp_specification_10.txt =================================================================== --- trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-10 20:37:32 UTC (rev 1125) +++ trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-10 22:40:00 UTC (rev 1126) @@ -60,6 +60,10 @@ well: detached_scan, continuous_scan, delay_between_scan_loops, detached_scan_email_address. + Plugin order information: + The server command PLUGINS_ORDER was defined for NTP 1.2 but not + implemented in the server. + GENERAL ASPECTS OF PROTOCOL The OTP protocol is text-based, human readable and line-oriented. @@ -130,15 +134,18 @@ With this command the server reports a identified problem of class "security hole". + The "general" version is applied if no port relates to the hole. Syntax: SERVER <|> HOLE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + SERVER <|> HOLE <|> host <|> general <|> description <|> oid <|> SERVER + where host: the target system service_name: the name of the service (like in /etc/services) - port_number: the port number the problem relates to or "general". + port_number: the port number the problem relates to. protocol_type: "tcp" or "udp". description: the problem description where newlines have been replaced by semicolons. @@ -150,15 +157,18 @@ With this command the server reports a identified problem of class "security info". + The "general" version is applied if no port relates to the info. Syntax: SERVER <|> INFO <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + SERVER <|> INFO <|> host <|> general <|> description <|> oid <|> SERVER + where host: the target system service_name: the name of the service (like in /etc/services) - port_number: the port number the problem relates to or "general". + port_number: the port number the problem relates to. protocol_type: "tcp" or "udp". description: the problem description where newlines have been replaced by semicolons. @@ -171,6 +181,9 @@ With this command the client requests the server to attack target system(s) "host". "host" is one or many (comma-separated) IP or FQDN. + Before the client sends NEW_ATTACK, the commands PREFERENCES and + RULES should be applied. + Syntax: CLIENT <|> NEW_ATTACK <|> host <|> CLIENT @@ -181,15 +194,18 @@ With this command the server reports a identified problem of class "security note". + The "general" version is applied if no port relates to the note. Syntax: SERVER <|> NOTE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + SERVER <|> NOTE <|> host <|> general <|> description <|> oid <|> SERVER + where host: the target system service_name: the name of the service (like in /etc/services) - port_number: the port number the problem relates to or "general". + port_number: the port number the problem relates to protocol_type: "tcp" or "udp". description: the problem description where newlines have been replaced by semicolons. @@ -252,6 +268,8 @@ With this command the server sends detailed information about the available NVTs. + The server will send PREFERENCES and RULES right after this command. + Syntax: SERVER <|> PLUGIN_LIST <|> @@ -274,18 +292,97 @@ SERVER <|> PORT <|> host <|> port_number <|> SERVER - STAT + PREFERENCES Description: + With this command the values for the preferences are + communicated. The server uses the commands to inform + about defaults, the client uses the command to send + the user selections. The server answers with PREFERENCES_ERROR. + + Available preferences: + max_threads, test_file, email, ping_hosts, reverse_lookup, + outside_firewall, host_expansion, port_range, max_hosts. + And only sent by CLIENT: plugin_set (empty means all NVTs). + + Syntax: + + SERVER <|> PREFERENCES <|> + pref_name <|> value + pref_name <|> value + pref_name <|> value + ... + <|> SERVER + + CLIENT <|> PREFERENCES <|> + pref_name <|> value + pref_name <|> value + pref_name <|> value + ... + <|> CLIENT + + PREFERENCES_ERRORS + + Description: + + With this command the server reports problems with the + parameters set by the client. It follows immediately + the PREFERENCES command of the client. + + Each "pref_name" occuring in this list was not accepted + by the server. The server will apply "default_value" instead. + + In case no "pref_name" is reported with this command, + all preferences where accepted. + + Syntax: + + SERVER <|> PREFERENCES_ERRORS + pref_name <|> default_value + pref_name <|> default_value + pref_name <|> default_value + ... + <|> SERVER + + RULES + + Description: + + Rules define restrictions for target systems. + Client-side rules self-restrict target host patterns, + server-side rules are just for information to the client. + These rule sets are independent of each other. + + Syntax: + + SERVER <|> RULES <|> + rule_1; + rule_2; + rule_3; + ... + <|> SERVER + + CLIENT <|> RULES <|> + rule_1; + rule_2; + rule_3; + ... + <|> CLIENT + + STATUS + + Description: + With this command, the server informs the client about - the progress of the port scan for target system "host". - "port" is the currently scanned port number. - The command with an interval of 100 ports. + the progress of the scan for target system "host". + "attack_state" is either "portscan" or "attack". + current is the currently processed port and max + the last port number to be tested. Syntax: - SERVER <|> STAT <|> host <|> port <|> SERVER + SERVER <|> STATUS <|> host <|> attack_state <|> current/max <|> SERVER STOP_ATTACK @@ -298,6 +395,17 @@ CLIENT <|> STOP_ATTACK <|> host <|> CLIENT + STOP_WHOLE_TEST + + Description: + + With this command the client tells to stop + the currently running test. + + Syntax: + + CLIENT <|> STOP_WHOLE_TEST <|> CLIENT + TIME Description: From scm-commit at wald.intevation.org Mon Aug 11 08:41:43 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 11 Aug 2008 08:41:43 +0200 (CEST) Subject: [Openvas-commits] r1127 - in trunk/openvas-client: . nessus Message-ID: <20080811064143.202F620C004@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-11 08:41:42 +0200 (Mon, 11 Aug 2008) New Revision: 1127 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/nessus.c Log: Do not display html_graph as possible output type in the command line options if the client was compiled without gdchart support. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-10 22:40:00 UTC (rev 1126) +++ trunk/openvas-client/ChangeLog 2008-08-11 06:41:42 UTC (rev 1127) @@ -1,3 +1,9 @@ +2008-08-12 Michael Wiegand <michael.wiegand at intevation.de> + + * nessus/nessus.c (main): Do not display html_graph as possible output + type in the command line options if the client was compiled without + gdchart support. + 2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Removing handling of "PLUGINS_ORDER" command which Modified: trunk/openvas-client/nessus/nessus.c =================================================================== --- trunk/openvas-client/nessus/nessus.c 2008-08-10 22:40:00 UTC (rev 1126) +++ trunk/openvas-client/nessus/nessus.c 2008-08-11 06:41:42 UTC (rev 1127) @@ -674,7 +674,11 @@ { "batch-mode", 'q', 0, G_OPTION_ARG_NONE, &batch_mode, N_("Batch-mode scan"), N_("<host> <port> <user> <pass> <targets-file> <result-file>") }, { "make-config-file", 'm', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &make_config_file, "", NULL }, { "config-file", 'c', 0, G_OPTION_ARG_FILENAME, &config_file, N_("Configuration file"), N_("<.rcfile>") }, +#ifndef NO_GDCHART { "output-type", 'T', 0, G_OPTION_ARG_STRING, &output_type, N_("Output format"), N_("[nbe|html|html_graph|text|xml|tex]") }, +#else + { "output-type", 'T', 0, G_OPTION_ARG_STRING, &output_type, N_("Output format"), N_("[nbe|html|text|xml|tex]") }, +#endif { "verbose", 'V', 0, G_OPTION_ARG_NONE, &verbose, N_("Display status messages in batch mode"), NULL }, { "list-plugins", 'p', 0, G_OPTION_ARG_NONE, &list_plugins, N_("Obtain list of plugins installed on the server"), NULL }, { "list-prefs", 'P', 0, G_OPTION_ARG_NONE, &list_prefs, N_("Obtain list of server and plugin preferences"), NULL }, From scm-commit at wald.intevation.org Mon Aug 11 15:18:24 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 11 Aug 2008 15:18:24 +0200 (CEST) Subject: [Openvas-commits] r1128 - in trunk/openvas-server: . openvasd Message-ID: <20080811131824.6D16A14231@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-11 15:18:22 +0200 (Mon, 11 Aug 2008) New Revision: 1128 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/aclocal.m4 trunk/openvas-server/configure trunk/openvas-server/configure.in trunk/openvas-server/openvas.tmpl.in trunk/openvas-server/openvasd/Makefile trunk/openvas-server/openvasd/openvasd.c Log: First step for change request #9 (Make OpenVAS use (and depend on) glib) (http://www.openvas.org/openvas-cr-9.html) * openvasd/openvasd.c: Replaced getopt command line parsing with glib command line parsing. * openvasd/Makefile: Include Libs and Cflags for glib. * configure: Regenerated. * configure.in: Added check for glib, removed check for getopt. * openvas.tmpl.in: Added support for glib. * aclocal.m4: Added support for pkg-config. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/ChangeLog 2008-08-11 13:18:22 UTC (rev 1128) @@ -1,3 +1,21 @@ +2008-08-11 Michael Wiegand <michael.wiegand at intevation.de> + + First step for change request #9 (Make OpenVAS use (and depend on) glib) + (http://www.openvas.org/openvas-cr-9.html) + + * openvasd/openvasd.c: Replaced getopt command line parsing with glib + command line parsing. + + * openvasd/Makefile: Include Libs and Cflags for glib. + + * configure: Regenerated. + + * configure.in: Added check for glib, removed check for getopt. + + * openvas.tmpl.in: Added support for glib. + + * aclocal.m4: Added support for pkg-config. + 2008-08-11 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Continued consolidation of protocol documentation. Modified: trunk/openvas-server/aclocal.m4 =================================================================== --- trunk/openvas-server/aclocal.m4 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/aclocal.m4 2008-08-11 13:18:22 UTC (rev 1128) @@ -509,3 +509,59 @@ esac ]) +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" +## If we have a custom action on failure, don't print errors, but +## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + Modified: trunk/openvas-server/configure =================================================================== --- trunk/openvas-server/configure 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/configure 2008-08-11 13:18:22 UTC (rev 1128) @@ -534,7 +534,7 @@ fi -# From configure.in Revision: 857 +# From configure.in Revision: 1008 NEED_OPENVASLIBS_VERSION=1.0.2 NEED_OPENVASLIBNASL_VERSION=1.0.1 @@ -1136,6 +1136,98 @@ " 1>&2; exit 1; } fi + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1147: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 2.2.0""... $ac_c" 1>&6 +echo "configure:1191: checking for glib-2.0 >= 2.2.0" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 2.2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +echo "configure:1198: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.2.0"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +echo "configure:1203: checking GLIB_LIBS" >&5 + GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.2.0"` + echo "$ac_t""$GLIB_LIBS" 1>&6 + else + GLIB_CFLAGS="" + GLIB_LIBS="" +## If we have a custom action on failure, don't print errors, but +## do set a variable so people can do so. + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.2.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_GLIB="yes" + else + { echo "configure: error: "glib not found"" 1>&2; exit 1; } + fi + + + + OVSCFLAGS="`$LIBOPENVASCONFIG --cflags`" NASLCFLAGS="`$OPENVASLIBNASLCONFIG --cflags`" @@ -1147,7 +1239,7 @@ CFLAGS="$CFLAGS $OVSCFLAGS $NASLCFLAGS" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1151: checking how to run the C preprocessor" >&5 +echo "configure:1243: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1162,13 +1254,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1166 "configure" +#line 1258 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1179,13 +1271,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1183 "configure" +#line 1275 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1196,13 +1288,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1200 "configure" +#line 1292 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1227,12 +1319,12 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1231: checking for ANSI C header files" >&5 +echo "configure:1323: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1236 "configure" +#line 1328 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1240,7 +1332,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1257,7 +1349,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1261 "configure" +#line 1353 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1275,7 +1367,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1279 "configure" +#line 1371 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1296,7 +1388,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 1300 "configure" +#line 1392 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1307,7 +1399,7 @@ exit (0); } EOF -if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1331,12 +1423,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1335: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1427: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1340 "configure" +#line 1432 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -1352,7 +1444,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1373,12 +1465,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1377: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1469: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1382 "configure" +#line 1474 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1387,7 +1479,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1412,12 +1504,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1416: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1508: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1421 "configure" +#line 1513 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1425,7 +1517,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1450,7 +1542,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1454: checking for opendir in -ldir" >&5 +echo "configure:1546: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1458,7 +1550,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1462 "configure" +#line 1554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1469,7 +1561,7 @@ opendir() ; return 0; } EOF -if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1491,7 +1583,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1495: checking for opendir in -lx" >&5 +echo "configure:1587: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1499,7 +1591,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 1503 "configure" +#line 1595 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1510,7 +1602,7 @@ opendir() ; return 0; } EOF -if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1532,21 +1624,21 @@ fi -for ac_hdr in unistd.h getopt.h string.h strings.h sys/sockio.h sys/socketio.h +for ac_hdr in unistd.h string.h strings.h sys/sockio.h sys/socketio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1540: checking for $ac_hdr" >&5 +echo "configure:1632: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1545 "configure" +#line 1637 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1576,17 +1668,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1580: checking for $ac_hdr" >&5 +echo "configure:1672: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1585 "configure" +#line 1677 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1616,17 +1708,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1620: checking for $ac_hdr" >&5 +echo "configure:1712: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1625 "configure" +#line 1717 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1656,17 +1748,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1660: checking for $ac_hdr" >&5 +echo "configure:1752: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1665 "configure" +#line 1757 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1696,17 +1788,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1700: checking for $ac_hdr" >&5 +echo "configure:1792: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1705 "configure" +#line 1797 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1736,17 +1828,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_hdr" >&5 +echo "configure:1832: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1745 "configure" +#line 1837 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1776,17 +1868,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1780: checking for $ac_hdr" >&5 +echo "configure:1872: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1785 "configure" +#line 1877 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1816,17 +1908,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1820: checking for $ac_hdr" >&5 +echo "configure:1912: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1825 "configure" +#line 1917 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1856,17 +1948,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1860: checking for $ac_hdr" >&5 +echo "configure:1952: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1865 "configure" +#line 1957 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1914,17 +2006,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1918: checking for $ac_hdr" >&5 +echo "configure:2010: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1923 "configure" +#line 2015 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1957,19 +2049,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1961: checking for working alloca.h" >&5 +echo "configure:2053: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1966 "configure" +#line 2058 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1990,12 +2082,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1994: checking for alloca" >&5 +echo "configure:2086: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1999 "configure" +#line 2091 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2023,7 +2115,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2055,12 +2147,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2059: checking whether alloca needs Cray hooks" >&5 +echo "configure:2151: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2064 "configure" +#line 2156 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2085,12 +2177,12 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2089: checking for $ac_func" >&5 +echo "configure:2181: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2094 "configure" +#line 2186 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2113,7 +2205,7 @@ ; return 0; } EOF -if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2140,7 +2232,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2144: checking stack direction for C alloca" >&5 +echo "configure:2236: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2148,7 +2240,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2152 "configure" +#line 2244 "configure" #include "confdefs.h" find_stack_direction () { @@ -2167,7 +2259,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2189,7 +2281,7 @@ fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:2193: checking for wait3 that fills in rusage" >&5 +echo "configure:2285: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2197,7 +2289,7 @@ ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext <<EOF -#line 2201 "configure" +#line 2293 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2228,7 +2320,7 @@ } } EOF -if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -2253,12 +2345,12 @@ for ac_func in waitpid wait4 mmap atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2257: checking for $ac_func" >&5 +echo "configure:2349: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2262 "configure" +#line 2354 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2281,7 +2373,7 @@ ; return 0; } EOF -if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2308,12 +2400,12 @@ for ac_func in lstat memmove gettimeofday gethrtime getrusage rand do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2312: checking for $ac_func" >&5 +echo "configure:2404: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2317 "configure" +#line 2409 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2336,7 +2428,7 @@ ; return 0; } EOF -if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2363,12 +2455,12 @@ for ac_func in strchr memcpy select poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2367: checking for $ac_func" >&5 +echo "configure:2459: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2372 "configure" +#line 2464 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2391,7 +2483,7 @@ ; return 0; } EOF -if { (eval echo configure:2395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2416,12 +2508,12 @@ done echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:2420: checking for vsnprintf" >&5 +echo "configure:2512: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2425 "configure" +#line 2517 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -2444,7 +2536,7 @@ ; return 0; } EOF -if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -2469,12 +2561,12 @@ for ac_func in bzero bcopy setsid rint mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2473: checking for $ac_func" >&5 +echo "configure:2565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2478 "configure" +#line 2570 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2497,7 +2589,7 @@ ; return 0; } EOF -if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2524,12 +2616,12 @@ for ac_func in addr2ascii inet_neta setproctitle _exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2528: checking for $ac_func" >&5 +echo "configure:2620: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2533 "configure" +#line 2625 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2552,7 +2644,7 @@ ; return 0; } EOF -if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2578,7 +2670,7 @@ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:2582: checking size of unsigned int" >&5 +echo "configure:2674: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2586,7 +2678,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2590 "configure" +#line 2682 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -2598,7 +2690,7 @@ exit(0); } EOF -if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -2618,7 +2710,7 @@ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2622: checking size of unsigned long" >&5 +echo "configure:2714: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2626,7 +2718,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2630 "configure" +#line 2722 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -2638,7 +2730,7 @@ exit(0); } EOF -if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -2658,14 +2750,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2662: checking whether byte ordering is bigendian" >&5 +echo "configure:2754: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2669 "configure" +#line 2761 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2676,11 +2768,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:2680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2684 "configure" +#line 2776 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2691,7 +2783,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2711,7 +2803,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2715 "configure" +#line 2807 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2724,7 +2816,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2748,12 +2840,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:2752: checking for time_t" >&5 +echo "configure:2844: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2757 "configure" +#line 2849 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2781,12 +2873,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2785: checking for pid_t" >&5 +echo "configure:2877: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2790 "configure" +#line 2882 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2814,12 +2906,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2818: checking for size_t" >&5 +echo "configure:2910: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2823 "configure" +#line 2915 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2847,12 +2939,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2851: checking for uid_t in sys/types.h" >&5 +echo "configure:2943: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2856 "configure" +#line 2948 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -2882,9 +2974,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:2886: checking for struct timeval" >&5 +echo "configure:2978: checking for struct timeval" >&5 cat > conftest.$ac_ext <<EOF -#line 2888 "configure" +#line 2980 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2900,7 +2992,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -2920,9 +3012,9 @@ if test "x$HAVE_TIMEVAL" = xyes; then echo $ac_n "checking whether gettimeofday can't accept two arguments""... $ac_c" 1>&6 -echo "configure:2924: checking whether gettimeofday can't accept two arguments" >&5 +echo "configure:3016: checking whether gettimeofday can't accept two arguments" >&5 cat > conftest.$ac_ext <<EOF -#line 2926 "configure" +#line 3018 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -2944,7 +3036,7 @@ ; return 0; } EOF -if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -2974,12 +3066,12 @@ test -z "$BROKEN_REGEXP" && { echo $ac_n "checking for a working regexp implementation""... $ac_c" 1>&6 -echo "configure:2978: checking for a working regexp implementation" >&5 +echo "configure:3070: checking for a working regexp implementation" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2983 "configure" +#line 3075 "configure" #include "confdefs.h" #include <stdio.h> @@ -3009,7 +3101,7 @@ } EOF -if { (eval echo configure:3013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_REGEX_SUPPORT 1 @@ -3027,9 +3119,9 @@ } echo $ac_n "checking struct ip contains ip_csum""... $ac_c" 1>&6 -echo "configure:3031: checking struct ip contains ip_csum" >&5 +echo "configure:3123: checking struct ip contains ip_csum" >&5 cat > conftest.$ac_ext <<EOF -#line 3033 "configure" +#line 3125 "configure" #include "confdefs.h" #ifdef __linux__ #define __BSD_SOURCE @@ -3047,7 +3139,7 @@ ; return 0; } EOF -if { (eval echo configure:3051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP_CSUM 1 @@ -3062,9 +3154,9 @@ rm -f conftest* echo $ac_n "checking struct ip""... $ac_c" 1>&6 -echo "configure:3066: checking struct ip" >&5 +echo "configure:3158: checking struct ip" >&5 cat > conftest.$ac_ext <<EOF -#line 3068 "configure" +#line 3160 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3074,7 +3166,7 @@ struct ip ip; ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP 1 @@ -3089,9 +3181,9 @@ rm -f conftest* echo $ac_n "checking struct icmp""... $ac_c" 1>&6 -echo "configure:3093: checking struct icmp" >&5 +echo "configure:3185: checking struct icmp" >&5 cat > conftest.$ac_ext <<EOF -#line 3095 "configure" +#line 3187 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3102,7 +3194,7 @@ struct icmp icmp; ; return 0; } EOF -if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_ICMP 1 @@ -3117,9 +3209,9 @@ rm -f conftest* echo $ac_n "checking struct udphdr""... $ac_c" 1>&6 -echo "configure:3121: checking struct udphdr" >&5 +echo "configure:3213: checking struct udphdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3123 "configure" +#line 3215 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3130,7 +3222,7 @@ struct udphdr udp; ; return 0; } EOF -if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_UDPHDR 1 @@ -3145,9 +3237,9 @@ rm -f conftest* echo $ac_n "checking BSD struct udphdr""... $ac_c" 1>&6 -echo "configure:3149: checking BSD struct udphdr" >&5 +echo "configure:3241: checking BSD struct udphdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3151 "configure" +#line 3243 "configure" #include "confdefs.h" #ifdef __linux__ #define __BSD_SOURCE @@ -3163,7 +3255,7 @@ struct udphdr udp;udp.uh_dport = 0; ; return 0; } EOF -if { (eval echo configure:3167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_BSD_STRUCT_UDPHDR 1 @@ -3179,9 +3271,9 @@ echo $ac_n "checking struct tcphdr""... $ac_c" 1>&6 -echo "configure:3183: checking struct tcphdr" >&5 +echo "configure:3275: checking struct tcphdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3185 "configure" +#line 3277 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3192,7 +3284,7 @@ struct tcphdr tcp; ; return 0; } EOF -if { (eval echo configure:3196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TCPHDR 1 @@ -3207,9 +3299,9 @@ rm -f conftest* echo $ac_n "checking struct tcphdr has th_off""... $ac_c" 1>&6 -echo "configure:3211: checking struct tcphdr has th_off" >&5 +echo "configure:3303: checking struct tcphdr has th_off" >&5 cat > conftest.$ac_ext <<EOF -#line 3213 "configure" +#line 3305 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef __linux__ @@ -3223,7 +3315,7 @@ struct tcphdr tcp;tcp.th_off = 0; ; return 0; } EOF -if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_TCPHDR_TH_OFF 1 @@ -3238,9 +3330,9 @@ rm -f conftest* echo $ac_n "checking struct tcphdr has th_x2_off""... $ac_c" 1>&6 -echo "configure:3242: checking struct tcphdr has th_x2_off" >&5 +echo "configure:3334: checking struct tcphdr has th_x2_off" >&5 cat > conftest.$ac_ext <<EOF -#line 3244 "configure" +#line 3336 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef __linux__ @@ -3254,7 +3346,7 @@ struct tcphdr tcp;tcp.th_x2_off = 0; ; return 0; } EOF -if { (eval echo configure:3258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_TCPHDR_TH_X2_OFF 1 @@ -3275,7 +3367,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3279: checking for X" >&5 +echo "configure:3371: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3337,12 +3429,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 3341 "configure" +#line 3433 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3411,14 +3503,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 3415 "configure" +#line 3507 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3524,17 +3616,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3528: checking whether -R must be followed by a space" >&5 +echo "configure:3620: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 3531 "configure" +#line 3623 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3550,14 +3642,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +#line 3646 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3589,7 +3681,7 @@ # libraries were built with DECnet support. And karl at cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3593: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3685: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3597,7 +3689,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 3601 "configure" +#line 3693 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3608,7 +3700,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:3612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3630,7 +3722,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3634: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3726: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3638,7 +3730,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 3642 "configure" +#line 3734 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3649,7 +3741,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3678,12 +3770,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey at clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3682: checking for gethostbyname" >&5 +echo "configure:3774: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3687 "configure" +#line 3779 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -3706,7 +3798,7 @@ ; return 0; } EOF -if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3727,7 +3819,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3731: checking for gethostbyname in -lnsl" >&5 +echo "configure:3823: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3735,7 +3827,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3739 "configure" +#line 3831 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3746,7 +3838,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3776,12 +3868,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3780: checking for connect" >&5 +echo "configure:3872: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3785 "configure" +#line 3877 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -3804,7 +3896,7 @@ ; return 0; } EOF -if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3825,7 +3917,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3829: checking for connect in -lsocket" >&5 +echo "configure:3921: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3833,7 +3925,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3837 "configure" +#line 3929 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3844,7 +3936,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3868,12 +3960,12 @@ # gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3872: checking for remove" >&5 +echo "configure:3964: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3877 "configure" +#line 3969 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -3896,7 +3988,7 @@ ; return 0; } EOF -if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3917,7 +4009,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3921: checking for remove in -lposix" >&5 +echo "configure:4013: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3925,7 +4017,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 3929 "configure" +#line 4021 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3936,7 +4028,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3960,12 +4052,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3964: checking for shmat" >&5 +echo "configure:4056: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3969 "configure" +#line 4061 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -3988,7 +4080,7 @@ ; return 0; } EOF -if { (eval echo configure:3992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4009,7 +4101,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4013: checking for shmat in -lipc" >&5 +echo "configure:4105: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4017,7 +4109,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4021 "configure" +#line 4113 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4028,7 +4120,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4061,7 +4153,7 @@ # libraries we check for below, so use a different variable. # --interran at uluru.Stanford.EDU, kb at cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4065: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4157: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4069,7 +4161,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4073 "configure" +#line 4165 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4080,7 +4172,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4106,7 +4198,7 @@ PWDD=`pwd` echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4110: checking for long file names" >&5 +echo "configure:4202: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4151,21 +4243,21 @@ echo $ac_n "checking for -lrpcsvc""... $ac_c" 1>&6 -echo "configure:4155: checking for -lrpcsvc" >&5 +echo "configure:4247: checking for -lrpcsvc" >&5 if eval "test \"`echo '$''{'ac_cv_lib_rpcsvc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lrpcsvc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4162 "configure" +#line 4254 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_rpcsvc=yes else @@ -4184,7 +4276,7 @@ fi echo $ac_n "checking for xdr_mon in -lrpcsvc""... $ac_c" 1>&6 -echo "configure:4188: checking for xdr_mon in -lrpcsvc" >&5 +echo "configure:4280: checking for xdr_mon in -lrpcsvc" >&5 ac_lib_var=`echo rpcsvc'_'xdr_mon | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4192,7 +4284,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrpcsvc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4196 "configure" +#line 4288 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4203,7 +4295,7 @@ xdr_mon() ; return 0; } EOF -if { (eval echo configure:4207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4229,7 +4321,7 @@ echo $ac_n "checking for lfind in -lcompat""... $ac_c" 1>&6 -echo "configure:4233: checking for lfind in -lcompat" >&5 +echo "configure:4325: checking for lfind in -lcompat" >&5 ac_lib_var=`echo compat'_'lfind | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4237,7 +4329,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 4241 "configure" +#line 4333 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4248,7 +4340,7 @@ lfind() ; return 0; } EOF -if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4272,7 +4364,7 @@ test -n "$resolv_lib" && (echo $ac_n "checking for inet_neta in -lresolv""... $ac_c" 1>&6 -echo "configure:4276: checking for inet_neta in -lresolv" >&5 +echo "configure:4368: checking for inet_neta in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_neta | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4280,7 +4372,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4284 "configure" +#line 4376 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4291,7 +4383,7 @@ inet_neta() ; return 0; } EOF -if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4318,21 +4410,21 @@ test -n "$libwrap" && { echo $ac_n "checking for -lwrap""... $ac_c" 1>&6 -echo "configure:4322: checking for -lwrap" >&5 +echo "configure:4414: checking for -lwrap" >&5 if eval "test \"`echo '$''{'ac_cv_lib_wrap'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lwrap $LIBS" cat > conftest.$ac_ext <<EOF -#line 4329 "configure" +#line 4421 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_wrap=yes else @@ -4359,17 +4451,17 @@ ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6 -echo "configure:4363: checking for tcpd.h" >&5 +echo "configure:4455: checking for tcpd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4368 "configure" +#line 4460 "configure" #include "confdefs.h" #include <tcpd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4394,7 +4486,7 @@ uselibwrap="-DUSE_LIBWRAP" } echo $ac_n "checking for inet_aton in -lc""... $ac_c" 1>&6 -echo "configure:4398: checking for inet_aton in -lc" >&5 +echo "configure:4490: checking for inet_aton in -lc" >&5 ac_lib_var=`echo c'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4402,7 +4494,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4406 "configure" +#line 4498 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4413,7 +4505,7 @@ inet_aton() ; return 0; } EOF -if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4437,7 +4529,7 @@ fi echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:4441: checking for inet_aton in -lresolv" >&5 +echo "configure:4533: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4445,7 +4537,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4449 "configure" +#line 4541 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4456,7 +4548,7 @@ inet_aton() ; return 0; } EOF -if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4481,7 +4573,7 @@ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4485: checking for dlopen in -ldl" >&5 +echo "configure:4577: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4489,7 +4581,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4493 "configure" +#line 4585 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4500,7 +4592,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4526,12 +4618,12 @@ for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4530: checking for $ac_func" >&5 +echo "configure:4622: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4535 "configure" +#line 4627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4554,7 +4646,7 @@ ; return 0; } EOF -if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4581,12 +4673,12 @@ for ac_func in NSCreateObjectFileImageFromFile do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4585: checking for $ac_func" >&5 +echo "configure:4677: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4590 "configure" +#line 4682 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4609,7 +4701,7 @@ ; return 0; } EOF -if { (eval echo configure:4613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4637,7 +4729,7 @@ LIBS=`$LIBOPENVASCONFIG --libs` echo $ac_n "checking for nessuslib_pthreads_enabled in -lnessus""... $ac_c" 1>&6 -echo "configure:4641: checking for nessuslib_pthreads_enabled in -lnessus" >&5 +echo "configure:4733: checking for nessuslib_pthreads_enabled in -lnessus" >&5 ac_lib_var=`echo nessus'_'nessuslib_pthreads_enabled | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4645,7 +4737,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnessus $LIBS" cat > conftest.$ac_ext <<EOF -#line 4649 "configure" +#line 4741 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4656,7 +4748,7 @@ nessuslib_pthreads_enabled() ; return 0; } EOF -if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4682,17 +4774,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4686: checking for $ac_hdr" >&5 +echo "configure:4778: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4691 "configure" +#line 4783 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4719,9 +4811,9 @@ done echo $ac_n "checking if we have a broken pthread_cleanup_push""... $ac_c" 1>&6 -echo "configure:4723: checking if we have a broken pthread_cleanup_push" >&5 +echo "configure:4815: checking if we have a broken pthread_cleanup_push" >&5 cat > conftest.$ac_ext <<EOF -#line 4725 "configure" +#line 4817 "configure" #include "confdefs.h" #include <pthread.h> @@ -4729,7 +4821,7 @@ void main(){pthread_cleanup_push(NULL,NULL);} ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -4745,7 +4837,7 @@ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4749: checking for pthread_create in -lpthread" >&5 +echo "configure:4841: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4753,7 +4845,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4757 "configure" +#line 4849 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4764,7 +4856,7 @@ pthread_create() ; return 0; } EOF -if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4785,7 +4877,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:4789: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:4881: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4793,7 +4885,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4797 "configure" +#line 4889 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4804,7 +4896,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4825,7 +4917,7 @@ fi echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4829: checking for pthread_create in -lc_r" >&5 +echo "configure:4921: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4833,7 +4925,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4837 "configure" +#line 4929 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4844,7 +4936,7 @@ pthread_create() ; return 0; } EOF -if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4865,7 +4957,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lc""... $ac_c" 1>&6 -echo "configure:4869: checking for gethostbyname_r in -lc" >&5 +echo "configure:4961: checking for gethostbyname_r in -lc" >&5 ac_lib_var=`echo c'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4873,7 +4965,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4877 "configure" +#line 4969 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4884,7 +4976,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4908,7 +5000,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:4912: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:5004: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4916,7 +5008,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4920 "configure" +#line 5012 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4927,7 +5019,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4951,7 +5043,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lnsl""... $ac_c" 1>&6 -echo "configure:4955: checking for gethostbyname_r in -lnsl" >&5 +echo "configure:5047: checking for gethostbyname_r in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4959,7 +5051,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4963 "configure" +#line 5055 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4970,7 +5062,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4994,7 +5086,7 @@ fi echo $ac_n "checking for pthread_cancel in -lpthread""... $ac_c" 1>&6 -echo "configure:4998: checking for pthread_cancel in -lpthread" >&5 +echo "configure:5090: checking for pthread_cancel in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5002,7 +5094,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 5006 "configure" +#line 5098 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5013,7 +5105,7 @@ pthread_cancel() ; return 0; } EOF -if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5037,7 +5129,7 @@ fi echo $ac_n "checking for pthread_cancel in -lc_r""... $ac_c" 1>&6 -echo "configure:5041: checking for pthread_cancel in -lc_r" >&5 +echo "configure:5133: checking for pthread_cancel in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5045,7 +5137,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 5049 "configure" +#line 5141 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5056,7 +5148,7 @@ pthread_cancel() ; return 0; } EOF -if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5080,9 +5172,9 @@ fi echo $ac_n "checking whether gethostbyname_r takes 5 args""... $ac_c" 1>&6 -echo "configure:5084: checking whether gethostbyname_r takes 5 args" >&5 +echo "configure:5176: checking whether gethostbyname_r takes 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 5086 "configure" +#line 5178 "configure" #include "confdefs.h" #define THREADS 1 @@ -5102,7 +5194,7 @@ ; return 0; } EOF -if { (eval echo configure:5106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* solaris_gethostbyname_r=yes else @@ -5119,9 +5211,9 @@ echo $ac_n "checking whether gethostbyaddr_r takes 5 args""... $ac_c" 1>&6 -echo "configure:5123: checking whether gethostbyaddr_r takes 5 args" >&5 +echo "configure:5215: checking whether gethostbyaddr_r takes 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 5125 "configure" +#line 5217 "configure" #include "confdefs.h" #define THREADS 1 @@ -5142,7 +5234,7 @@ ; return 0; } EOF -if { (eval echo configure:5146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* solaris_gethostbyaddr_r=yes else @@ -5171,12 +5263,12 @@ echo $ac_n "checking if sockaddr{} has sa_len member""... $ac_c" 1>&6 -echo "configure:5175: checking if sockaddr{} has sa_len member" >&5 +echo "configure:5267: checking if sockaddr{} has sa_len member" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_has_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5180 "configure" +#line 5272 "configure" #include "confdefs.h" # include <sys/types.h> @@ -5185,7 +5277,7 @@ unsigned int i = sizeof(((struct sockaddr *)0)->sa_len) ; return 0; } EOF -if { (eval echo configure:5189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_has_sa_len=yes else @@ -5359,9 +5451,9 @@ echo $ac_n "checking whether struct sigaction has sa_restorer""... $ac_c" 1>&6 -echo "configure:5363: checking whether struct sigaction has sa_restorer" >&5 +echo "configure:5455: checking whether struct sigaction has sa_restorer" >&5 cat > conftest.$ac_ext <<EOF -#line 5365 "configure" +#line 5457 "configure" #include "confdefs.h" #include <signal.h> @@ -5374,7 +5466,7 @@ ; return 0; } EOF -if { (eval echo configure:5378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* signal_sa_restorer=yes else @@ -5433,7 +5525,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5437: checking for $ac_word" >&5 +echo "configure:5529: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5663,6 +5755,9 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g s%@LIBOPENVASCONFIG@%$LIBOPENVASCONFIG%g s%@OPENVASLIBNASLCONFIG@%$OPENVASLIBNASLCONFIG%g +s%@PKG_CONFIG@%$PKG_CONFIG%g +s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g +s%@GLIB_LIBS@%$GLIB_LIBS%g s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@X_CFLAGS@%$X_CFLAGS%g Modified: trunk/openvas-server/configure.in =================================================================== --- trunk/openvas-server/configure.in 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/configure.in 2008-08-11 13:18:22 UTC (rev 1128) @@ -198,6 +198,10 @@ ) fi +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.0, HAVE_GLIB="yes", AC_MSG_ERROR("glib not found")) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + OVSCFLAGS="`$LIBOPENVASCONFIG --cflags`" NASLCFLAGS="`$OPENVASLIBNASLCONFIG --cflags`" @@ -216,7 +220,7 @@ AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_HEADER_DIRENT -AC_CHECK_HEADERS(unistd.h getopt.h string.h strings.h sys/sockio.h sys/socketio.h) +AC_CHECK_HEADERS(unistd.h string.h strings.h sys/sockio.h sys/socketio.h) AC_CHECK_HEADERS(sys/param.h netinet/tcpip.h netinet/in_systm.h) AC_CHECK_HEADERS(netinet/ip_udp.h netinet/protocols.h sys/ioctl.h netinet/ip_icmp.h) AC_CHECK_HEADERS(rpc/rpc.h netinet/udp.h dlfcn.h sys/un.h memory.h ctype.h errno.h) Modified: trunk/openvas-server/openvas.tmpl.in =================================================================== --- trunk/openvas-server/openvas.tmpl.in 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/openvas.tmpl.in 2008-08-11 13:18:22 UTC (rev 1128) @@ -109,6 +109,8 @@ LIBOPENVASCONFIG=@LIBOPENVASCONFIG@ OPENVASLIBNASLCONFIG=@OPENVASLIBNASLCONFIG@ # libraries +GLIB_CFLAGS=@GLIB_CFLAGS@ +GLIB_LIBS=@GLIB_LIBS@ DL_LIB=@dl_lib@ RESOLV_LIB=@resolv_lib@ SOCKET_LIB=@socket_lib@ Modified: trunk/openvas-server/openvasd/Makefile =================================================================== --- trunk/openvas-server/openvasd/Makefile 2008-08-11 06:41:

From scm-commit at wald.intevation.org Mon Aug 4 11:16:50 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 4 Aug 2008 11:16:50 +0200 (CEST) Subject: [Openvas-commits] r1102 - trunk/doc Message-ID: <20080804091650.27DF840730@pyrosoma.intevation.org> Author: jan Date: 2008-08-04 11:16:50 +0200 (Mon, 04 Aug 2008) New Revision: 1102 Removed: trunk/doc/openvas-compendium/ Log: Removing last elements of openvas-compendium which is now a main module of its own. From scm-commit at wald.intevation.org Wed Aug 6 11:41:14 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 11:41:14 +0200 (CEST) Subject: [Openvas-commits] r1103 - trunk/openvas-libnasl/nasl Message-ID: <20080806094114.7A0A24069B@pyrosoma.intevation.org> Author: chandra Date: 2008-08-06 11:41:14 +0200 (Wed, 06 Aug 2008) New Revision: 1103 Modified: trunk/openvas-libnasl/nasl/nasl_socket.c Log: Fixed an issue with UDP socket close in nasl_close_socket Modified: trunk/openvas-libnasl/nasl/nasl_socket.c =================================================================== --- trunk/openvas-libnasl/nasl/nasl_socket.c 2008-08-04 09:16:50 UTC (rev 1102) +++ trunk/openvas-libnasl/nasl/nasl_socket.c 2008-08-06 09:41:14 UTC (rev 1103) @@ -612,7 +612,7 @@ int e; soc = get_int_var_by_num(lexic, 0, -1); - if(soc <= 4) + if(soc < 4) { nasl_perror(lexic, "close(): invalid argument\n"); return NULL; From scm-commit at wald.intevation.org Wed Aug 6 12:13:15 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 12:13:15 +0200 (CEST) Subject: [Openvas-commits] r1104 - branches Message-ID: <20080806101315.4591D406B0@pyrosoma.intevation.org> Author: jan Date: 2008-08-06 12:13:15 +0200 (Wed, 06 Aug 2008) New Revision: 1104 Added: branches/openvas-client-1-0/ Log: Created 1-0 branch for openvas-client. Copied: branches/openvas-client-1-0 (from rev 1103, trunk/openvas-client) From scm-commit at wald.intevation.org Wed Aug 6 12:16:44 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 12:16:44 +0200 (CEST) Subject: [Openvas-commits] r1105 - branches/openvas-client-1-0 Message-ID: <20080806101644.5B905406B0@pyrosoma.intevation.org> Author: jan Date: 2008-08-06 12:16:44 +0200 (Wed, 06 Aug 2008) New Revision: 1105 Modified: branches/openvas-client-1-0/ChangeLog Log: Note on branch in ChangeLog. Modified: branches/openvas-client-1-0/ChangeLog =================================================================== --- branches/openvas-client-1-0/ChangeLog 2008-08-06 10:13:15 UTC (rev 1104) +++ branches/openvas-client-1-0/ChangeLog 2008-08-06 10:16:44 UTC (rev 1105) @@ -1,3 +1,9 @@ +2008-08-06 Jan-Oliver Wagner + + This module is branched for 1-0 stable development. + The present ChangeLog file only covers changes within this + branch. + 2008-07-31 Vlatko Kosturjak * po/hr.po: New. Initial Croatian translation of OpenVAS client. From scm-commit at wald.intevation.org Wed Aug 6 12:52:16 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 12:52:16 +0200 (CEST) Subject: [Openvas-commits] r1107 - trunk/doc/website Message-ID: <20080806105216.AE999406A7@pyrosoma.intevation.org> Author: jan Date: 2008-08-06 12:52:16 +0200 (Wed, 06 Aug 2008) New Revision: 1107 Modified: trunk/doc/website/openvas-client.htm4 trunk/doc/website/openvas-cr-14.htm4 Log: Notes on branched 1.0 development of openvas-client. Modified: trunk/doc/website/openvas-client.htm4 =================================================================== --- trunk/doc/website/openvas-client.htm4 2008-08-06 10:43:35 UTC (rev 1106) +++ trunk/doc/website/openvas-client.htm4 2008-08-06 10:52:16 UTC (rev 1107) @@ -270,19 +270,29 @@

Most current state of development (directly from the source code management system)

+After checking out the code, +change to the new directory and follow the instructions in the +README file. +

+ +

Stable 1.0 branch

+ +

You need subversion to retrieve the code:

-$ svn checkout https://svn.wald.intevation.org/svn/openvas/trunk/openvas-client +$ svn checkout https://svn.wald.intevation.org/svn/openvas/branches/openvas-client-1-0

Current state of development

-Change to the new directory and follow the instructions in the README file. ++$ svn checkout https://svn.wald.intevation.org/svn/openvas/trunk/openvas-client +

@@ -290,3 +300,4 @@ be aware that you are using a development state that may be incomplete and unstable and should not be used in production environments.

+ Modified: trunk/doc/website/openvas-cr-14.htm4 =================================================================== --- trunk/doc/website/openvas-cr-14.htm4 2008-08-06 10:43:35 UTC (rev 1106) +++ trunk/doc/website/openvas-cr-14.htm4 2008-08-06 10:52:16 UTC (rev 1107) @@ -28,7 +28,7 @@ PAGE_START

OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd

-Status: Voted +5. +Status: Voted +5. gdchart and gd removed in SVN trunk.

Purpose

From scm-commit at wald.intevation.org Wed Aug 6 12:43:38 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 12:43:38 +0200 (CEST) Subject: [Openvas-commits] r1106 - in trunk/openvas-client: . include nessus Message-ID: <20080806104338.02FFC406A7@pyrosoma.intevation.org> Author: jan Date: 2008-08-06 12:43:35 +0200 (Wed, 06 Aug 2008) New Revision: 1106 Removed: trunk/openvas-client/nessus/gdchart0.94b/ Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/MANIFEST trunk/openvas-client/configure trunk/openvas-client/configure.in trunk/openvas-client/include/config.h.in trunk/openvas-client/nessus.tmpl.in trunk/openvas-client/nessus/Makefile trunk/openvas-client/nessus/cli.c trunk/openvas-client/nessus/globals.h trunk/openvas-client/nessus/html_graph_output.c trunk/openvas-client/nessus/nessus.c trunk/openvas-client/nessus/report_save.c Log: Removing gd and gdchart according to OpenVAS Change Request #14: http://www.openvas.org/openvas-cr-14.html First part of patch. * configure.in: Added check for gdchart * nessus.tmpl.in: Add handling of GDC_LIB. * include/config.h.in: Add conditional HAVE_GDCHART. * nessus/Makefile: Removed any handling of gdchart modules. * nessus/html_graph_output.c: Added HAVE_GDCHART conditional and replaced direct includes by generic ones for gdchart. * nessus/cli.c (cli_args_output): Replaced _NO_PIES conditional by HAVE_GDCHART. * nessus/report_save.c (file_save_ok_callback, report_save_cb): Replaced _NO_PIES and _NOPIE conditionals by HAVE_GDCHART. * nessus/nessus.c (main): Added HAVE_GDCHART conditional. * nessus/globals.h: Removed already-commented-out definition of _NO_PIES. * gdchart0.94b/gdc_samp1.c, nessus/gdchart0.94b/NOTES-092b.txt, nessus/gdchart0.94b/gdc_samp2.c, nessus/gdchart0.94b/NOTES-093b.txt, nessus/gdchart0.94b/gdcpie.h, nessus/gdchart0.94b/NOTES-094b.txt, nessus/gdchart0.94b/gdc.h, nessus/gdchart0.94b/gdc_pie_samp.c, nessus/gdchart0.94b/gdchart.c, nessus/gdchart0.94b/gdchart.h, nessus/gdchart0.94b/samp.html, nessus/gdchart0.94b/price_conv.c, nessus/gdchart0.94b/W.gif, nessus/gdchart0.94b/gdc_pie.c, nessus/gdchart0.94b/README.txt, nessus/gdchart0.94b/gd1.3/demoin.gif, nessus/gdchart0.94b/gd1.3/gd.h, nessus/gdchart0.94b/gd1.3/gddemo.c, nessus/gdchart0.94b/gd1.3/gdfontmb.c, nessus/gdchart0.94b/gd1.3/gdfontl.h, nessus/gdchart0.94b/gd1.3/webgif.c, nessus/gdchart0.94b/gd1.3/gdfonts.c, nessus/gdchart0.94b/gd1.3/gdfontmb.h, nessus/gdchart0.94b/gd1.3/gdfontt.c, nessus/gdchart0.94b/gd1.3/gdfonts.h, nessus/gdchart0.94b/gd1.3/gdfontt.h, nessus/gdchart0.94b/gd1.3/giftogd.c, nessus/gdchart0.94b/gd1.3/mtables.c, nessus/gdchart0.94b/gd1.3/mathmake.c, nessus/gdchart0.94b/gd1.3/gdfontg.c, nessus/gdchart0.94b/gd1.3/index.html, nessus/gdchart0.94b/gd1.3/gd.c, nessus/gdchart0.94b/gd1.3/readme.txt, nessus/gdchart0.94b/gd1.3/Makefile, nessus/gdchart0.94b/gd1.3/gdfontl.c, nessus/gdchart0.94b/gd1.3/gdfontg.h, nessus/gdchart0.94b/makefile, nessus/gdchart0.94b/gdc.c: Removed. * nessus/gdchart0.94b/gd1.3: Removed empty directory. * nessus/gdchart0.94b: Removed empty directory. * MANIFEST: Updated. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/ChangeLog 2008-08-06 10:43:35 UTC (rev 1106) @@ -1,3 +1,56 @@ +2008-08-06 Jan-Oliver Wagner + + Removing gd and gdchart according to OpenVAS Change Request #14: + http://www.openvas.org/openvas-cr-14.html + First part of patch. + + * configure.in: Added check for gdchart + + * nessus.tmpl.in: Add handling of GDC_LIB. + + * include/config.h.in: Add conditional HAVE_GDCHART. + + * nessus/Makefile: Removed any handling of gdchart modules. + + * nessus/html_graph_output.c: Added HAVE_GDCHART conditional and + replaced direct includes by generic ones for gdchart. + + * nessus/cli.c (cli_args_output): Replaced _NO_PIES conditional by + HAVE_GDCHART. + + * nessus/report_save.c (file_save_ok_callback, report_save_cb): + Replaced _NO_PIES and _NOPIE conditionals by HAVE_GDCHART. + + * nessus/nessus.c (main): Added HAVE_GDCHART conditional. + + * nessus/globals.h: Removed already-commented-out definition of _NO_PIES. + + * gdchart0.94b/gdc_samp1.c, nessus/gdchart0.94b/NOTES-092b.txt, + nessus/gdchart0.94b/gdc_samp2.c, nessus/gdchart0.94b/NOTES-093b.txt, + nessus/gdchart0.94b/gdcpie.h, nessus/gdchart0.94b/NOTES-094b.txt, + nessus/gdchart0.94b/gdc.h, nessus/gdchart0.94b/gdc_pie_samp.c, + nessus/gdchart0.94b/gdchart.c, nessus/gdchart0.94b/gdchart.h, + nessus/gdchart0.94b/samp.html, nessus/gdchart0.94b/price_conv.c, + nessus/gdchart0.94b/W.gif, nessus/gdchart0.94b/gdc_pie.c, + nessus/gdchart0.94b/README.txt, nessus/gdchart0.94b/gd1.3/demoin.gif, + nessus/gdchart0.94b/gd1.3/gd.h, nessus/gdchart0.94b/gd1.3/gddemo.c, + nessus/gdchart0.94b/gd1.3/gdfontmb.c, nessus/gdchart0.94b/gd1.3/gdfontl.h, + nessus/gdchart0.94b/gd1.3/webgif.c, nessus/gdchart0.94b/gd1.3/gdfonts.c, + nessus/gdchart0.94b/gd1.3/gdfontmb.h, nessus/gdchart0.94b/gd1.3/gdfontt.c, + nessus/gdchart0.94b/gd1.3/gdfonts.h, nessus/gdchart0.94b/gd1.3/gdfontt.h, + nessus/gdchart0.94b/gd1.3/giftogd.c, nessus/gdchart0.94b/gd1.3/mtables.c, + nessus/gdchart0.94b/gd1.3/mathmake.c, nessus/gdchart0.94b/gd1.3/gdfontg.c, + nessus/gdchart0.94b/gd1.3/index.html, nessus/gdchart0.94b/gd1.3/gd.c, + nessus/gdchart0.94b/gd1.3/readme.txt, nessus/gdchart0.94b/gd1.3/Makefile, + nessus/gdchart0.94b/gd1.3/gdfontl.c, nessus/gdchart0.94b/gd1.3/gdfontg.h, + nessus/gdchart0.94b/makefile, nessus/gdchart0.94b/gdc.c: Removed. + + * nessus/gdchart0.94b/gd1.3: Removed empty directory. + + * nessus/gdchart0.94b: Removed empty directory. + + * MANIFEST: Updated. + 2008-07-31 Vlatko Kosturjak * po/hr.po: New. Initial Croatian translation of OpenVAS client. Modified: trunk/openvas-client/MANIFEST =================================================================== --- trunk/openvas-client/MANIFEST 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/MANIFEST 2008-08-06 10:43:35 UTC (rev 1106) @@ -64,44 +64,6 @@ nessus/families.h nessus/filter.c nessus/filter.h -nessus/gdchart0.94b/gd1.3/demoin.gif -nessus/gdchart0.94b/gd1.3/gd.c -nessus/gdchart0.94b/gd1.3/gddemo.c -nessus/gdchart0.94b/gd1.3/gdfontg.c -nessus/gdchart0.94b/gd1.3/gdfontg.h -nessus/gdchart0.94b/gd1.3/gdfontl.c -nessus/gdchart0.94b/gd1.3/gdfontl.h -nessus/gdchart0.94b/gd1.3/gdfontmb.c -nessus/gdchart0.94b/gd1.3/gdfontmb.h -nessus/gdchart0.94b/gd1.3/gdfonts.c -nessus/gdchart0.94b/gd1.3/gdfonts.h -nessus/gdchart0.94b/gd1.3/gdfontt.c -nessus/gdchart0.94b/gd1.3/gdfontt.h -nessus/gdchart0.94b/gd1.3/gd.h -nessus/gdchart0.94b/gd1.3/giftogd.c -nessus/gdchart0.94b/gd1.3/index.html -nessus/gdchart0.94b/gd1.3/Makefile -nessus/gdchart0.94b/gd1.3/mathmake.c -nessus/gdchart0.94b/gd1.3/mtables.c -nessus/gdchart0.94b/gd1.3/readme.txt -nessus/gdchart0.94b/gd1.3/webgif.c -nessus/gdchart0.94b/gdc.c -nessus/gdchart0.94b/gdc.h -nessus/gdchart0.94b/gdchart.c -nessus/gdchart0.94b/gdchart.h -nessus/gdchart0.94b/gdc_pie.c -nessus/gdchart0.94b/gdcpie.h -nessus/gdchart0.94b/gdc_pie_samp.c -nessus/gdchart0.94b/gdc_samp1.c -nessus/gdchart0.94b/gdc_samp2.c -nessus/gdchart0.94b/makefile -nessus/gdchart0.94b/NOTES-092b.txt -nessus/gdchart0.94b/NOTES-093b.txt -nessus/gdchart0.94b/NOTES-094b.txt -nessus/gdchart0.94b/price_conv.c -nessus/gdchart0.94b/README.txt -nessus/gdchart0.94b/samp.html -nessus/gdchart0.94b/W.gif nessus/globals.h nessus/globals.w32 nessus/gtk-compat.h Modified: trunk/openvas-client/configure =================================================================== --- trunk/openvas-client/configure 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/configure 2008-08-06 10:43:35 UTC (rev 1106) @@ -1,37 +1,746 @@ #! /bin/sh - +# From configure.in Revision: 1.9 . # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.13 -# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. +# Generated by GNU Autoconf 2.61. # +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## -# Defaults: -ac_help= +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ + X"$0" : 'X$//$$' \| \ + X"$0" : 'X$/$' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/$[^/][^/]*$\/*$/{ + s//\1/ + q + } + /^X\/$\/\/$$/{ + s//\1/ + q + } + /^X\/$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + case $as_dir in + /*) + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf at gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + +exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# ac_default_prefix=/usr/local -# Any additions from configure.in: +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + +ac_unique_file=".root-dir" ac_default_prefix="/usr/local" -ac_help="$ac_help - --enable-release set the compiler flags to -O6" -ac_help="$ac_help - --enable-debug set the compiler flags to -g" -ac_help="$ac_help - --enable-gtk build with GTK" -ac_help="$ac_help - --with-ssl=[DIR] enable SSL support using libraries in DIR" -ac_help="$ac_help - --with-x use the X Window System" +# Factoring default headers for most tests. +ac_includes_default="\ +#include +#ifdef HAVE_SYS_TYPES_H +# include +#endif +#ifdef HAVE_SYS_STAT_H +# include +#endif +#ifdef STDC_HEADERS +# include +# include +#else +# ifdef HAVE_STDLIB_H +# include +# endif +#endif +#ifdef HAVE_STRING_H +# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +# include +# endif +# include +#endif +#ifdef HAVE_STRINGS_H +# include +#endif +#ifdef HAVE_INTTYPES_H +# include +#endif +#ifdef HAVE_STDINT_H +# include +#endif +#ifdef HAVE_UNISTD_H +# include +#endif" +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +build +build_cpu +build_vendor +build_os +host +host_cpu +host_vendor +host_os +CC +CFLAGS +LDFLAGS +CPPFLAGS +ac_ct_CC +EXEEXT +OBJEXT +SET_MAKE +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +CPP +GREP +EGREP +PKG_CONFIG +GLIB_CFLAGS +GLIB_LIBS +ALLOCA +XMKMF +X_CFLAGS +X_PRE_LIBS +X_LIBS +X_EXTRA_LIBS +GTKCONFIG_CFLAGS +GTKCONFIG_LIBS +AR +PWD +PWDD +CWALL +GTK_VERSION +NESSUS_MAJOR +NESSUS_MINOR +NESSUS_PATCH +NESSUS_RC +NESSUS_DATE +NESS_COMPILER +NESS_OS_NAME +NESS_OS_VERSION +INSTALL_DIR +INSTALL +RUN_LIBS +resolv_lib +socket_lib +nsl_lib +ssl_lib +gtk_flags +debug_flags +nessus_lib +man_nessus_1 +dl_lib +gdc_lib +client +client_install +ac_configure_args +ssl +sslcflags +installuser +gettext_flags +LIBOBJS +LTLIBOBJS' +ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias +CC +CFLAGS +LDFLAGS +LIBS +CPPFLAGS +CPP +XMKMF' + + # Initialize some variables set by options. +ac_init_help= +ac_init_version=false # The variables have the same names as the options, with # dashes changed to underlines. -build=NONE -cache_file=./config.cache +cache_file=/dev/null exec_prefix=NONE -host=NONE no_create= -nonopt=NONE no_recursion= prefix=NONE program_prefix=NONE @@ -40,94 +749,117 @@ silent= site= srcdir= -target=NONE verbose= x_includes=NONE x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' +datarootdir='${prefix}/share' +datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' +docdir='${datarootdir}/doc/${PACKAGE}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' -# Initialize some other variables. -subdirs= -MFLAGS= MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} -# Maximum number of lines to put in a shell here document. -ac_max_here_lines=12 - ac_prev= +ac_dashdash= for ac_option do - # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" + eval $ac_prev=\$ac_option ac_prev= continue fi - case "$ac_option" in - -*=*) ac_optarg=`echo "$ac_option" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) ac_optarg= ;; + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=$.*$'` ;; + *) ac_optarg=yes ;; esac # Accept the important Cygnus configure options, so we can diagnose typos. - case "$ac_option" in + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir="$ac_optarg" ;; + bindir=$ac_optarg ;; -build | --build | --buil | --bui | --bu) - ac_prev=build ;; + ac_prev=build_alias ;; -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build="$ac_optarg" ;; + build_alias=$ac_optarg ;; -cache-file | --cache-file | --cache-fil | --cache-fi \ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) ac_prev=cache_file ;; -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file="$ac_optarg" ;; + cache_file=$ac_optarg ;; - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir="$ac_optarg" ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + -disable-* | --disable-*) - ac_feature=`echo $ac_option|sed -e 's/-*disable-//'` + ac_feature=`expr "x$ac_option" : 'x-*disable-$.*$'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - eval "enable_${ac_feature}=no" ;; + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + -enable-* | --enable-*) - ac_feature=`echo $ac_option|sed -e 's/-*enable-//' -e 's/=.*//'` + ac_feature=`expr "x$ac_option" : 'x-*enable-$[^=]*$'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_feature| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_feature: invalid feature name" 1>&2; exit 1; } - fi - ac_feature=`echo $ac_feature| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "enable_${ac_feature}='$ac_optarg'" ;; + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -136,116 +868,77 @@ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ | --exec=* | --exe=* | --ex=*) - exec_prefix="$ac_optarg" ;; + exec_prefix=$ac_optarg ;; -gas | --gas | --ga | --g) # Obsolete; use --with-gas. with_gas=yes ;; - -help | --help | --hel | --he) - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat << EOF -Usage: configure [options] [host] -Options: [defaults in brackets after descriptions] -Configuration: - --cache-file=FILE cache test results in FILE - --help print this message - --no-create do not create output files - --quiet, --silent do not print \`checking...' messages - --version print the version of autoconf that created configure -Directory and file names: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [same as prefix] - --bindir=DIR user executables in DIR [EPREFIX/bin] - --sbindir=DIR system admin executables in DIR [EPREFIX/sbin] - --libexecdir=DIR program executables in DIR [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data in DIR - [PREFIX/share] - --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data in DIR - [PREFIX/com] - --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var] - --libdir=DIR object code libraries in DIR [EPREFIX/lib] - --includedir=DIR C header files in DIR [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include] - --infodir=DIR info documentation in DIR [PREFIX/info] - --mandir=DIR man documentation in DIR [PREFIX/man] - --srcdir=DIR find the sources in DIR [configure dir or ..] - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM - run sed PROGRAM on installed program names -EOF - cat << EOF -Host type: - --build=BUILD configure for building on BUILD [BUILD=HOST] - --host=HOST configure for HOST [guessed] - --target=TARGET configure for TARGET [TARGET=HOST] -Features and packages: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR -EOF - if test -n "$ac_help"; then - echo "--enable and --with options recognized:$ac_help" - fi - exit 0 ;; + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; -host | --host | --hos | --ho) - ac_prev=host ;; + ac_prev=host_alias ;; -host=* | --host=* | --hos=* | --ho=*) - host="$ac_optarg" ;; + host_alias=$ac_optarg ;; + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir="$ac_optarg" ;; + includedir=$ac_optarg ;; -infodir | --infodir | --infodi | --infod | --info | --inf) ac_prev=infodir ;; -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir="$ac_optarg" ;; + infodir=$ac_optarg ;; -libdir | --libdir | --libdi | --libd) ac_prev=libdir ;; -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir="$ac_optarg" ;; + libdir=$ac_optarg ;; -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ | --libexe | --libex | --libe) ac_prev=libexecdir ;; -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ | --libexe=* | --libex=* | --libe=*) - libexecdir="$ac_optarg" ;; + libexecdir=$ac_optarg ;; + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) + | --localstate | --localstat | --localsta | --localst | --locals) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir="$ac_optarg" ;; + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) ac_prev=mandir ;; -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir="$ac_optarg" ;; + mandir=$ac_optarg ;; -nfp | --nfp | --nf) # Obsolete; use --without-fp. with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -259,26 +952,26 @@ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir="$ac_optarg" ;; + oldincludedir=$ac_optarg ;; -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) ac_prev=prefix ;; -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix="$ac_optarg" ;; + prefix=$ac_optarg ;; -program-prefix | --program-prefix | --program-prefi | --program-pref \ | --program-pre | --program-pr | --program-p) ac_prev=program_prefix ;; -program-prefix=* | --program-prefix=* | --program-prefi=* \ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix="$ac_optarg" ;; + program_prefix=$ac_optarg ;; -program-suffix | --program-suffix | --program-suffi | --program-suff \ | --program-suf | --program-su | --program-s) ac_prev=program_suffix ;; -program-suffix=* | --program-suffix=* | --program-suffi=* \ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix="$ac_optarg" ;; + program_suffix=$ac_optarg ;; -program-transform-name | --program-transform-name \ | --program-transform-nam | --program-transform-na \ @@ -295,8 +988,18 @@ | --program-transfo=* | --program-transf=* \ | --program-trans=* | --program-tran=* \ | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name="$ac_optarg" ;; + program_transform_name=$ac_optarg ;; + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -305,7 +1008,7 @@ ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ | --sbi=* | --sb=*) - sbindir="$ac_optarg" ;; + sbindir=$ac_optarg ;; -sharedstatedir | --sharedstatedir | --sharedstatedi \ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ @@ -316,58 +1019,53 @@ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ | --sha=* | --sh=*) - sharedstatedir="$ac_optarg" ;; + sharedstatedir=$ac_optarg ;; -site | --site | --sit) ac_prev=site ;; -site=* | --site=* | --sit=*) - site="$ac_optarg" ;; + site=$ac_optarg ;; -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir="$ac_optarg" ;; + srcdir=$ac_optarg ;; -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ | --syscon | --sysco | --sysc | --sys | --sy) ac_prev=sysconfdir ;; -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir="$ac_optarg" ;; + sysconfdir=$ac_optarg ;; -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target ;; + ac_prev=target_alias ;; -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target="$ac_optarg" ;; + target_alias=$ac_optarg ;; -v | -verbose | --verbose | --verbos | --verbo | --verb) verbose=yes ;; - -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.13" - exit 0 ;; + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; -with-* | --with-*) - ac_package=`echo $ac_option|sed -e 's/-*with-//' -e 's/=.*//'` + ac_package=`expr "x$ac_option" : 'x-*with-$[^=]*$'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-_a-zA-Z0-9]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - case "$ac_option" in - *=*) ;; - *) ac_optarg=yes ;; - esac - eval "with_${ac_package}='$ac_optarg'" ;; + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; -without-* | --without-*) - ac_package=`echo $ac_option|sed -e 's/-*without-//'` + ac_package=`expr "x$ac_option" : 'x-*without-$.*$'` # Reject names that are not valid shell variable names. - if test -n "`echo $ac_package| sed 's/[-a-zA-Z0-9_]//g'`"; then - { echo "configure: error: $ac_package: invalid package name" 1>&2; exit 1; } - fi - ac_package=`echo $ac_package| sed 's/-/_/g'` - eval "with_${ac_package}=no" ;; + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; --x) # Obsolete; use --with-x. @@ -378,436 +1076,1603 @@ ac_prev=x_includes ;; -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes="$ac_optarg" ;; + x_includes=$ac_optarg ;; -x-libraries | --x-libraries | --x-librarie | --x-librari \ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) ac_prev=x_libraries ;; -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries="$ac_optarg" ;; + x_libraries=$ac_optarg ;; - -*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; } + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + *=*) + ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + *) - if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then - echo "configure: warning: $ac_option: invalid host type" 1>&2 - fi - if test "x$nonopt" != xNONE; then - { echo "configure: error: can only configure for one host and one target at a time" 1>&2; exit 1; } - fi - nonopt="$ac_option" + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; esac done if test -n "$ac_prev"; then - { echo "configure: error: missing argument to --`echo $ac_prev | sed 's/_/-/g'`" 1>&2; exit 1; } + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } +done -# File descriptor usage: -# 0 standard input -# 1 file creation -# 2 errors and warnings -# 3 some systems may open it to /dev/tty -# 4 used on the Kubota Titan -# 6 checking for... messages and results -# 5 compiler messages saved in config.log -if test "$silent" = yes; then - exec 6>/dev/null -else - exec 6>&1 +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi fi -exec 5>./config.log -echo "\ -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. -" 1>&5 +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- -# Strip out --no-create and --no-recursion so they do not pile up. -# Also quote any args containing shell metacharacters. -ac_configure_args= -for ac_arg -do - case "$ac_arg" in - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\{\}\\\|\;\<\>\?]*) - ac_configure_args="$ac_configure_args '$ac_arg'" ;; - *) ac_configure_args="$ac_configure_args $ac_arg" ;; - esac -done +test "$silent" = yes && exec 6>/dev/null -# NLS nuisances. -# Only set these to C if already set. These must not be set unconditionally -# because not all systems understand e.g. LANG=C (notably SCO). -# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! -# Non-C LC_CTYPE values break the ctype check. -if test "${LANG+set}" = set; then LANG=C; export LANG; fi -if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi -if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi -if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo > confdefs.h +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } -# A filename unique to this package, relative to the directory that -# configure is in, which we can look for to find out if srcdir is correct. -ac_unique_file=.root-dir # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_prog=$0 - ac_confdir=`echo $ac_prog|sed 's%/[^/][^/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$0" : 'X$//$[^/]' \| \ + X"$0" : 'X$//$$' \| \ + X"$0" : 'X$/$' \| . 2>/dev/null || +echo X"$0" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then + if test ! -r "$srcdir/$ac_unique_file"; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "configure: error: can not find sources in $ac_confdir or .." 1>&2; exit 1; } - else - { echo "configure: error: can not find sources in $srcdir" 1>&2; exit 1; } - fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } fi -srcdir=`echo "${srcdir}" | sed 's%$[^/]$/*$%\1%'` +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X$.*[^/]$' \| "X$srcdir" : 'X$.*$'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures this package to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +X features: + --x-includes=DIR X include files are in DIR + --x-libraries=DIR X library files are in DIR + +System types: + --build=BUILD configure for building on BUILD [guessed] + --host=HOST cross-compile to build programs to run on HOST [BUILD] +_ACEOF +fi + +if test -n "$ac_init_help"; then + + cat <<\_ACEOF + +Optional Features: + --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) + --enable-FEATURE[=ARG] include FEATURE [ARG=yes] + --enable-release set the compiler flags to -O6 + --enable-debug set the compiler flags to -g + --enable-gtk build with GTK + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-ssl=DIR enable SSL support using libraries in DIR + --with-x use the X Window System + +Some influential environment variables: + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a + nonstandard directory + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + you have headers in a nonstandard directory + CPP C preprocessor + XMKMF Path to xmkmf, Makefile generator for X Window System + +Use these variables to override the choices made by `configure' or to help +it to find libraries and programs with nonstandard names/locations. + +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +configure +generated by GNU Autoconf 2.61 + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by $as_me, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" fi -for ac_site_file in $CONFIG_SITE; do +shift +for ac_site_file +do if test -r "$ac_site_file"; then - echo "loading site script $ac_site_file" + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - echo "loading cache $cache_file" - . $cache_file + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi else - echo "creating cache $cache_file" - > $cache_file + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file fi +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } +fi + + + + + + + + + + + + + + + + + ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_exeext= -ac_objext=o -if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then - # Stardent Vistra SVR4 grep lacks -e, says ghazi at caip.rutgers.edu. - if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then - ac_n= ac_c=' -' ac_t=' ' - else - ac_n=-n ac_c= ac_t= - fi -else - ac_n= ac_c='\c' ac_t= -fi -# From configure.in Revision: 1.9 save_IFS="${IFS}" IFS=. read NESSUS_MAJOR NESSUS_MINOR NESSUS_PATCH NESSUS_RC /dev/null || -{ echo "configure: error: *** Panic: Corrupt version file" 1>&2; exit 1; } +{ { echo "$as_me:$LINENO: error: *** Panic: Corrupt version file" >&5 +echo "$as_me: error: *** Panic: Corrupt version file" >&2;} + { (exit 1); exit 1; }; } test "x$prefix" != "xNONE" || prefix=/usr/local +ac_config_headers="$ac_config_headers include/config.h" ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" break - elif test -f $ac_dir/install.sh; then + elif test -f "$ac_dir/install.sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install.sh -c" break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } fi -ac_config_guess=$ac_aux_dir/config.guess -ac_config_sub=$ac_aux_dir/config.sub -ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + # Make sure we can run config.sub. -if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : -else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } +$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 +echo "$as_me: error: cannot run $SHELL $ac_aux_dir/config.sub" >&2;} + { (exit 1); exit 1; }; } + +{ echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6; } +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_build_alias=$build_alias +test "x$ac_build_alias" = x && + ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` +test "x$ac_build_alias" = x && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + fi +{ echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6; } +case $ac_cv_build in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 +echo "$as_me: error: invalid value of canonical build" >&2;} + { (exit 1); exit 1; }; };; +esac +build=$ac_cv_build +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_build +shift +build_cpu=$1 +build_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +build_os=$* +IFS=$ac_save_IFS +case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:576: checking host system type" >&5 -host_alias=$host -case "$host_alias" in -NONE) - case $nonopt in - NONE) - if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then : - else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; } - fi ;; - *) host_alias=$nonopt ;; - esac ;; +{ echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6; } +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test "x$host_alias" = x; then + ac_cv_host=$ac_cv_build +else + ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || + { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 +echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} + { (exit 1); exit 1; }; } +fi + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6; } +case $ac_cv_host in +*-*-*) ;; +*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 +echo "$as_me: error: invalid value of canonical host" >&2;} + { (exit 1); exit 1; }; };; esac +host=$ac_cv_host +ac_save_IFS=$IFS; IFS='-' +set x $ac_cv_host +shift +host_cpu=$1 +host_vendor=$2 +shift; shift +# Remember, the first character of IFS is used to create $*, +# except with old shells: +host_os=$* +IFS=$ac_save_IFS +case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias` -host_cpu=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\1/'` -host_vendor=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\2/'` -host_os=`echo $host | sed 's/^$[^-]*$-$[^-]*$-$.*$$/\3/'` -echo "$ac_t""$host" 1>&6 ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu -# Extract the first word of "gcc", so it can be a program name with args. +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. +set dummy ${ac_tool_prefix}gcc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +CC=$ac_cv_prog_CC +if test -n "$CC"; then + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:607: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="gcc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ 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 at gnu.org." >&5 +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 at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +else + CC="$ac_cv_prog_CC" +fi + +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. +set dummy ${ac_tool_prefix}cc; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="gcc" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="${ac_tool_prefix}cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + + fi +fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:637: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue + fi + ac_cv_prog_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. set dummy $ac_cv_prog_CC shift - if test $# -gt 0; then + if test $# != 0; then # We chose a different compiler from the bogus one. # However, it has the same basename, so the bogon will be chosen # first if we set CC to just the basename; use the full file name. shift - set dummy "$ac_dir/$ac_word" "$@" - shift - ac_cv_prog_CC="$@" + ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" fi fi fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - if test -z "$CC"; then - case "`uname -s`" in - *win32* | *WIN32*) - # Extract the first word of "cl", so it can be a program name with args. -set dummy cl; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:688: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +fi +if test -z "$CC"; then + if test -n "$ac_tool_prefix"; then + for ac_prog in cl.exe + do + # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. +set dummy $ac_tool_prefix$ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_prog_CC="cl" - break - fi - done - IFS="$ac_save_ifs" +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_CC="$ac_tool_prefix$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + fi fi -CC="$ac_cv_prog_CC" +CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$ac_t""$CC" 1>&6 + { echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi - ;; - esac + + + test -n "$CC" && break + done +fi +if test -z "$CC"; then + ac_ct_CC=$CC + for ac_prog in cl.exe +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_CC="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi - test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } +done +done +IFS=$as_save_IFS + fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:720: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross + test -n "$ac_ct_CC" && break +done -cat > conftest.$ac_ext << EOF + if test "x$ac_ct_CC" = x; then + CC="" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ 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 at gnu.org." >&5 +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 at gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + CC=$ac_ct_CC + fi +fi -#line 731 "configure" -#include "confdefs.h" +fi -main(){return(0);} -EOF -if { (eval echo configure:736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - ac_cv_prog_cc_works=yes - # If we can't run a trivial program, we are probably using a cross compiler. - if (./conftest; exit) 2>/dev/null; then - ac_cv_prog_cc_cross=no + +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +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. +echo "$as_me:$LINENO: checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (ac_try="$ac_compiler --version >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler --version >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -v >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -v >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (ac_try="$ac_compiler -V >&5" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compiler -V >&5") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files a.out a.exe b.out" +# Try to create an executable without -o first, disregard a.out. +# It will help us diagnose broken compilers, and finding out an intuition +# of exeext. +{ echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6; } +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +# +# List of possible output files, starting from the most likely. +# The algorithm is not robust to junk in `.', hence go to wildcards (a.*) +# only as a last resort. b.out is created by i960 compilers. +ac_files='a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out' +# +# The IRIX 6 linker writes into existing files which may not be +# executable, retaining their permissions. Remove them first so a +# subsequent execution test works. +ac_rmfiles= +for ac_file in $ac_files +do + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + * ) ac_rmfiles="$ac_rmfiles $ac_file";; + esac +done +rm -f $ac_rmfiles + +if { (ac_try="$ac_link_default" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link_default") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. +# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' +# in a Makefile. We should not override ac_cv_exeext if it was cached, +# so that the user can short-circuit this test for compilers unknown to +# Autoconf. +for ac_file in $ac_files '' +do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) + ;; + [ab].out ) + # We found the default executable, but exeext='' is most + # certainly right. + break;; + *.* ) + if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; + then :; else + ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` + fi + # We set ac_cv_exeext here because the later test for it is not + # safe: cross compilers may not add the suffix if given an `-o' + # argument, so we may need to know it at that point already. + # Even if this section looks crufty: it has the advantage of + # actually working. + break;; + * ) + break;; + esac +done +test "$ac_cv_exeext" = no && ac_cv_exeext= + +else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +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 + +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6; } +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no else - ac_cv_prog_cc_cross=yes + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { 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 +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 +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + +rm -f a.out a.exe conftest$ac_cv_exeext b.out +ac_clean_files=$ac_clean_files_save +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6; } +{ echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6; } + +{ echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6; } +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # If both `conftest.exe' and `conftest' are `present' (well, observable) +# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will +# work properly (i.e., refer to `conftest.exe'), while it won't with +# `rm'. +for ac_file in conftest.exe conftest conftest.*; do + test -f "$ac_file" || continue + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.o | *.obj ) ;; + *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*$\..*$'` + break;; + * ) break;; + esac +done else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - ac_cv_prog_cc_works=no + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +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 -fr conftest* -ac_ext=c -# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. -ac_cpp='$CPP $CPPFLAGS' -ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' -cross_compiling=$ac_cv_prog_cc_cross -echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 -if test $ac_cv_prog_cc_works = no; then - { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } +rm -f conftest$ac_cv_exeext +{ echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6; } + +rm -f conftest.$ac_ext +EXEEXT=$ac_cv_exeext +ac_exeext=$EXEEXT +{ echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6; } +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.o conftest.obj +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in conftest.o conftest.obj conftest.*; do + test -f "$ac_file" || continue; + case $ac_file in + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf ) ;; + *) ac_cv_objext=`expr "$ac_file" : '.*\.$.*$'` + break;; + esac +done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi -echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:762: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 -cross_compiling=$ac_cv_prog_cc_cross -echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:767: checking whether we are using GNU C" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +rm -f conftest.$ac_cv_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6; } +OBJEXT=$ac_cv_objext +ac_objext=$OBJEXT +{ echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6; } +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.c <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ +#ifndef __GNUC__ + choke me #endif -EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:776: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then - ac_cv_prog_gcc=yes + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_compiler_gnu=yes else - ac_cv_prog_gcc=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_compiler_gnu=no fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_c_compiler_gnu=$ac_compiler_gnu + fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6; } +GCC=`test $ac_compiler_gnu = yes && echo yes` +ac_test_CFLAGS=${CFLAGS+set} +ac_save_CFLAGS=$CFLAGS +{ echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_save_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + ac_cv_prog_cc_g=no + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -echo "$ac_t""$ac_cv_prog_gcc" 1>&6 +int +main () +{ -if test $ac_cv_prog_gcc = yes; then - GCC=yes + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_g=yes else - GCC= -fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -ac_test_CFLAGS="${CFLAGS+set}" -ac_save_CFLAGS="$CFLAGS" -CFLAGS= -echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:795: checking whether ${CC-cc} accepts -g" >&5 -if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + CFLAGS="" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + : else - echo 'void f(){}' > conftest.c -if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_c_werror_flag=$ac_save_c_werror_flag + CFLAGS="-g" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_prog_cc_g=yes else - ac_cv_prog_cc_g=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + ac_c_werror_flag=$ac_save_c_werror_flag +fi +{ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6; } if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" + CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then if test "$GCC" = yes; then CFLAGS="-g -O2" @@ -821,31 +2686,154 @@ CFLAGS= fi fi +{ echo "$as_me:$LINENO: checking for $CC option to accept ISO C89" >&5 +echo $ECHO_N "checking for $CC option to accept ISO C89... $ECHO_C" >&6; } +if test "${ac_cv_prog_cc_c89+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_prog_cc_c89=no +ac_save_CC=$CC +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include +/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ +struct buf { int x; }; +FILE * (*rcsopen) (struct buf *, struct stat *, int); +static char *e (p, i) + char **p; + int i; +{ + return p[i]; +} +static char *f (char * (*g) (char **, int), char **p, ...) +{ + char *s; + va_list v; + va_start (v,p); + s = g (p, va_arg (v,int)); + va_end (v); + return s; +} -echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:827: checking whether ${MAKE-make} sets \${MAKE}" >&5 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has + function prototypes and stuff, but not '\xHH' hex character constants. + These don't provoke an error unfortunately, instead are silently treated + as 'x'. The following induces an error, until -std is added to get + proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an + array size at least. It's necessary to write '\x00'==0 to get something + that's true only with -std. */ +int osf4_cc_array ['\x00' == 0 ? 1 : -1]; + +/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters + inside strings and character constants. */ +#define FOO(x) 'x' +int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; + +int test (int i, double x); +struct s1 {int (*f) (int a);}; +struct s2 {int (*f) (double a);}; +int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); +int argc; +char **argv; +int +main () +{ +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ + -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_prog_cc_c89=$ac_arg else - cat > conftestmake <<\EOF + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c89" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c89" in + x) + { echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6; } ;; + xno) + { echo "$as_me:$LINENO: result: unsupported" >&5 +echo "${ECHO_T}unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c89" + { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;; +esac + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh all: - @echo 'ac_maketemp="${MAKE}"' -EOF + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF # GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftestmake 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make fi -rm -f conftestmake -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$ac_t""yes" 1>&6 +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } SET_MAKE= else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } SET_MAKE="MAKE=${MAKE-make}" fi @@ -856,60 +2844,76 @@ # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic # ./install, which can be erroneously created by make from ./install.sh. -echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:865: checking for a BSD compatible install" >&5 +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } if test -z "$INSTALL"; then -if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" - for ac_dir in $PATH; do - # Account for people who put trailing slashes in PATH elements. - case "$ac_dir/" in - /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - if test -f $ac_dir/$ac_prog; then + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then if test $ac_prog = install && - grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : else - ac_cv_path_install="$ac_dir/$ac_prog -c" - break 2 + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 fi fi done - ;; - esac - done - IFS="$ac_save_IFS" + done + ;; +esac +done +IFS=$as_save_IFS + fi if test "${ac_cv_path_install+set}" = set; then - INSTALL="$ac_cv_path_install" + INSTALL=$ac_cv_path_install else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL="$ac_install_sh" + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh fi fi -echo "$ac_t""$INSTALL" 1>&6 +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } # Use test -z because SunOS4 sh mishandles braces in ${var-val}. # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -925,30 +2929,27 @@ nessus_lib=-lnessus XPATH="$DESTDIR$prefix/bin:$PATH" - -# Check whether --enable-release or --disable-release was given. + +# Check whether --enable-release was given. if test "${enable_release+set}" = set; then - enableval="$enable_release" - CFLAGS="-O6" + enableval=$enable_release; CFLAGS="-O6" fi -# Check whether --enable-debug or --disable-debug was given. +# Check whether --enable-debug was given. if test "${enable_debug+set}" = set; then - enableval="$enable_debug" - + enableval=$enable_debug; CFLAGS="-g"; debug_flags="-DDEBUG" fi -# Check whether --enable-gtk or --disable-gtk was given. +# Check whether --enable-gtk was given. if test "${enable_gtk+set}" = set; then - enableval="$enable_gtk" - test "$enable_gtk" = "yes" && gtk_flags="-DUSE_GTK" && cat >> confdefs.h <<\EOF + enableval=$enable_gtk; test "$enable_gtk" = "yes" && gtk_flags="-DUSE_GTK" && cat >>confdefs.h <<\_ACEOF #define USE_GTK 1 -EOF +_ACEOF fi @@ -958,54 +2959,838 @@ ### use option --with-ssl to compile in the SSL support ssl="" sslcflags="" -# Check whether --with-ssl or --without-ssl was given. + +# Check whether --with-ssl was given. if test "${with_ssl+set}" = set; then - withval="$with_ssl" - with_ssl=$withval + withval=$with_ssl; with_ssl=$withval fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6; } +# On Suns, sometimes $CPP names a directory. +if test -n "$CPP" && test -d "$CPP"; then + CPP= +fi +if test -z "$CPP"; then + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Double quotes because CPP needs to be expanded + for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" + do + ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + break +fi + + done + ac_cv_prog_CPP=$CPP + +fi + CPP=$ac_cv_prog_CPP +else + ac_cv_prog_CPP=$CPP +fi +{ echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6; } +ac_preproc_ok=false +for ac_c_preproc_warn_flag in '' yes +do + # Use a header file that comes with gcc, so configuring glibc + # with a fresh cross-compiler works. + # Prefer to if __STDC__ is defined, since + # exists even on freestanding compilers. + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. "Syntax error" is here to catch this case. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#ifdef __STDC__ +# include +#else +# include +#endif + Syntax error +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Broken: fails on valid input. +continue +fi + +rm -f conftest.err conftest.$ac_ext + + # OK, works on sane cases. Now check whether nonexistent headers + # can be detected and how. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + # Broken: success on invalid input. +continue +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # Passes both tests. +ac_preproc_ok=: +break +fi + +rm -f conftest.err conftest.$ac_ext + +done +# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. +rm -f conftest.err conftest.$ac_ext +if $ac_preproc_ok; then + : +else + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +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 +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5 +echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; } +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Extract the first word of "grep ggrep" to use in msg output +if test -z "$GREP"; then +set dummy grep ggrep; ac_prog_name=$2 +if test "${ac_cv_path_GREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_GREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in grep ggrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + # Check for GNU ac_path_GREP and select it if it is found. + # Check for GNU $ac_path_GREP +case `"$ac_path_GREP" --version 2>&1` in +*GNU*) + ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'GREP' >> "conftest.nl" + "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_GREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_GREP="$ac_path_GREP" + ac_path_GREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_GREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +GREP="$ac_cv_path_GREP" +if test -z "$GREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_GREP=$GREP +fi + + +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_GREP" >&5 +echo "${ECHO_T}$ac_cv_path_GREP" >&6; } + GREP="$ac_cv_path_GREP" + + +{ echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6; } +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 + then ac_cv_path_EGREP="$GREP -E" + else + # Extract the first word of "egrep" to use in msg output +if test -z "$EGREP"; then +set dummy egrep; ac_prog_name=$2 +if test "${ac_cv_path_EGREP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_path_EGREP_found=false +# Loop through the user's path and test for each of PROGNAME-LIST +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in egrep; do + for ac_exec_ext in '' $ac_executable_extensions; do + ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" + { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + # Check for GNU ac_path_EGREP and select it if it is found. + # Check for GNU $ac_path_EGREP +case `"$ac_path_EGREP" --version 2>&1` in +*GNU*) + ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; +*) + ac_count=0 + echo $ECHO_N "0123456789$ECHO_C" >"conftest.in" + while : + do + cat "conftest.in" "conftest.in" >"conftest.tmp" + mv "conftest.tmp" "conftest.in" + cp "conftest.in" "conftest.nl" + echo 'EGREP' >> "conftest.nl" + "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break + diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break + ac_count=`expr $ac_count + 1` + if test $ac_count -gt ${ac_path_EGREP_max-0}; then + # Best one so far, save it but keep looking for a better one + ac_cv_path_EGREP="$ac_path_EGREP" + ac_path_EGREP_max=$ac_count + fi + # 10*(2^10) chars as input seems more than enough + test $ac_count -gt 10 && break + done + rm -f conftest.in conftest.tmp conftest.nl conftest.out;; +esac + + + $ac_path_EGREP_found && break 3 + done +done + +done +IFS=$as_save_IFS + + +fi + +EGREP="$ac_cv_path_EGREP" +if test -z "$EGREP"; then + { { echo "$as_me:$LINENO: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&5 +echo "$as_me: error: no acceptable $ac_prog_name could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" >&2;} + { (exit 1); exit 1; }; } +fi + +else + ac_cv_path_EGREP=$EGREP +fi + + + fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_path_EGREP" >&5 +echo "${ECHO_T}$ac_cv_path_EGREP" >&6; } + EGREP="$ac_cv_path_EGREP" + + +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#include +#include + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_header_stdc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + +if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "memchr" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "free" >/dev/null 2>&1; then + : +else + ac_cv_header_stdc=no +fi +rm -f conftest* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi + + +fi +fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then + +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF + +fi + +# On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + +for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ + inttypes.h stdint.h unistd.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + + + +for ac_header in gdc.h gd.h png.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +else + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi + +rm -f conftest.err conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + + succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:977: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PKG_CONFIG" in - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi -PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -1016,33 +3801,36 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for glib-2.0 >= 2.2.0""... $ac_c" 1>&6 -echo "configure:1021: checking for glib-2.0 >= 2.2.0" >&5 + { echo "$as_me:$LINENO: checking for glib-2.0 >= 2.2.0" >&5 +echo $ECHO_N "checking for glib-2.0 >= 2.2.0... $ECHO_C" >&6; } if $PKG_CONFIG --exists "glib-2.0 >= 2.2.0" ; then - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:1028: checking GLIB_CFLAGS" >&5 + { echo "$as_me:$LINENO: checking GLIB_CFLAGS" >&5 +echo $ECHO_N "checking GLIB_CFLAGS... $ECHO_C" >&6; } GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.2.0"` - echo "$ac_t""$GLIB_CFLAGS" 1>&6 + { echo "$as_me:$LINENO: result: $GLIB_CFLAGS" >&5 +echo "${ECHO_T}$GLIB_CFLAGS" >&6; } - echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:1033: checking GLIB_LIBS" >&5 + { echo "$as_me:$LINENO: checking GLIB_LIBS" >&5 +echo $ECHO_N "checking GLIB_LIBS... $ECHO_C" >&6; } GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.2.0"` - echo "$ac_t""$GLIB_LIBS" 1>&6 + { echo "$as_me:$LINENO: result: $GLIB_LIBS" >&5 +echo "${ECHO_T}$GLIB_LIBS" >&6; } else GLIB_CFLAGS="" GLIB_LIBS="" - ## If we have a custom action on failure, don't print errors, but + ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.2.0"` - + fi - - + + else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" @@ -1061,126 +3849,72 @@ saveCFLAGS="$CFLAGS" -echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1066: checking how to run the C preprocessor" >&5 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then -if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6; } +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - # This must be in double quotes, not single quotes, because CPP may get - # substituted into the Makefile and "${CC-cc}" will confuse make. - CPP="${CC-cc} -E" - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -E -traditional-cpp" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1104: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP="${CC-cc} -nologo -E" - cat > conftest.$ac_ext < -Syntax Error -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1121: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - : -else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - CPP=/lib/cpp -fi -rm -f conftest* -fi -rm -f conftest* -fi -rm -f conftest* - ac_cv_prog_CPP="$CPP" -fi - CPP="$ac_cv_prog_CPP" -else - ac_cv_prog_CPP="$CPP" -fi -echo "$ac_t""$CPP" 1>&6 - -echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1146: checking for ANSI C header files" >&5 -if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include #include -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + +int +main () +{ + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_stdc=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_stdc=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_stdc=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then + $EGREP "memchr" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -1189,16 +3923,19 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then + $EGREP "free" >/dev/null 2>&1; then : else - rm -rf conftest* ac_cv_header_stdc=no fi rm -f conftest* @@ -1207,702 +3944,2050 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -if test "$cross_compiling" = yes; then + if test "$cross_compiling" = yes; then : else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#include +#if ((' ' & 0x0FF) == 0x020) +# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) +#else +# define ISLOWER(c) \ + (('a' <= (c) && (c) <= 'i') \ + || ('j' <= (c) && (c) <= 'r') \ + || ('s' <= (c) && (c) <= 'z')) +# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) +#endif + #define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int main () { int i; for (i = 0; i < 256; i++) -if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -exit (0); } - -EOF -if { (eval echo configure:1226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + return 2; + return 0; +} +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then : else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_header_stdc=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6; } +if test $ac_cv_header_stdc = yes; then -echo "$ac_t""$ac_cv_header_stdc" 1>&6 -if test $ac_cv_header_stdc = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define STDC_HEADERS 1 -EOF +_ACEOF fi -echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1250: checking for sys/wait.h that is POSIX.1 compatible" >&5 -if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6; } +if test "${ac_cv_header_sys_wait_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #ifndef WEXITSTATUS -#define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) +# define WEXITSTATUS(stat_val) ((unsigned int) (stat_val) >> 8) #endif #ifndef WIFEXITED -#define WIFEXITED(stat_val) (((stat_val) & 255) == 0) +# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif -int main() { -int s; -wait (&s); -s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; -; return 0; } -EOF -if { (eval echo configure:1271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ + int s; + wait (&s); + s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_sys_wait_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_sys_wait_h=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_sys_wait_h=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 +echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6; } +if test $ac_cv_header_sys_wait_h = yes; then -echo "$ac_t""$ac_cv_header_sys_wait_h" 1>&6 -if test $ac_cv_header_sys_wait_h = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_WAIT_H 1 -EOF +_ACEOF fi -echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1292: checking whether time.h and sys/time.h may both be included" >&5 -if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 +echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6; } +if test "${ac_cv_header_time+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include #include -int main() { -struct tm *tp; -; return 0; } -EOF -if { (eval echo configure:1306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + +int +main () +{ +if ((struct tm *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_header_time=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_time=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_header_time=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 +echo "${ECHO_T}$ac_cv_header_time" >&6; } +if test $ac_cv_header_time = yes; then -echo "$ac_t""$ac_cv_header_time" 1>&6 -if test $ac_cv_header_time = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define TIME_WITH_SYS_TIME 1 -EOF +_ACEOF fi + + + + + ac_header_dirent=no -for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h -do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1331: checking for $ac_hdr that defines DIR" >&5 -if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do + as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 +echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include <$ac_hdr> -int main() { -DIR *dirp = 0; -; return 0; } -EOF -if { (eval echo configure:1344: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=yes" + +int +main () +{ +if ((DIR *) 0) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + eval "$as_ac_Header=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_dirent_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_Header=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -if eval "test \"`echo '$ac_cv_header_dirent_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 +_ACEOF + +ac_header_dirent=$ac_hdr; break fi + done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then -echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1369: checking for opendir in -ldir" >&5 -ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" -LIBS="-ldir $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:1388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' dir; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_opendir=$ac_res else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest* -LIBS="$ac_save_LIBS" +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -ldir" +done +if test "${ac_cv_search_opendir+set}" = set; then + : else - echo "$ac_t""no" 1>&6 + ac_cv_search_opendir=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" +fi + else -echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1410: checking for opendir in -lx" >&5 -ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6; } +if test "${ac_cv_search_opendir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" -LIBS="-lx $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -opendir() -; return 0; } -EOF -if { (eval echo configure:1429: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char opendir (); +int +main () +{ +return opendir (); + ; + return 0; +} +_ACEOF +for ac_lib in '' x; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_search_opendir=$ac_res else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest* -LIBS="$ac_save_LIBS" +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext + if test "${ac_cv_search_opendir+set}" = set; then + break fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - LIBS="$LIBS -lx" +done +if test "${ac_cv_search_opendir+set}" = set; then + : else - echo "$ac_t""no" 1>&6 + ac_cv_search_opendir=no fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6; } +ac_res=$ac_cv_search_opendir +if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" fi -for ac_hdr in unistd.h string.h strings.h sys/sockio.h sys/socketio.h +fi + + + + + + +for ac_header in unistd.h string.h strings.h sys/sockio.h sys/socketio.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1455: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in sys/param.h netinet/tcpip.h netinet/in_systm.h + + + +for ac_header in sys/param.h netinet/tcpip.h netinet/in_systm.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1495: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1505: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in netinet/ip_udp.h netinet/protocols.h sys/ioctl.h netinet/ip_icmp.h + + + + +for ac_header in netinet/ip_udp.h netinet/protocols.h sys/ioctl.h netinet/ip_icmp.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1535: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1545: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in rpc/rpc.h netinet/udp.h dlfcn.h sys/un.h memory.h ctype.h errno.h + + + + + + + +for ac_header in rpc/rpc.h netinet/udp.h dlfcn.h sys/un.h memory.h ctype.h errno.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1575: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in sys/types.h stdlib.h stdio.h sys/filio.h pwd.h + + + + + +for ac_header in sys/types.h stdlib.h stdio.h sys/filio.h pwd.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1615: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in assert.h netdb.h netinet/in.h arpa/inet.h + + + + +for ac_header in assert.h netdb.h netinet/in.h arpa/inet.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1655: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in poll.h sys/poll.h netinet/ip_tcp.h fcntl.h signal.h limits.h + + + + + + +for ac_header in poll.h sys/poll.h netinet/ip_tcp.h fcntl.h signal.h limits.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1695: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in sys/stat.h stat.h net/if.h sys/mman.h sys/resource.h dl.h + + + + + + +for ac_header in sys/stat.h stat.h net/if.h sys/mman.h sys/resource.h dl.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1735: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1745: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in pty.h termio.h termios.h sgtty.h libutil.h setjmp.h values.h + + + + + + + +for ac_header in pty.h termio.h termios.h sgtty.h libutil.h setjmp.h values.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1775: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1785: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done -for ac_hdr in locale.h + +for ac_header in locale.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1815: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1825: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done case "$host" in *-irix*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_SOCKET_H 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_NETINET_IP_H 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_NETINET_TCP_H 1 -EOF +_ACEOF ;; *) - for ac_hdr in sys/socket.h netinet/ip.h netinet/tcp.h + + + +for ac_header in sys/socket.h netinet/ip.h netinet/tcp.h do -ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1873: checking for $ac_hdr" >&5 -if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + { echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } else - cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1883: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* - eval "ac_cv_header_$ac_safe=yes" + # Is the header compilable? +{ echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_header_compiler=yes else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_header_$ac_safe=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_compiler=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6; } + +# Is the header present? +{ echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no fi -if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_header_preproc" >&6; } + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + + ;; +esac +{ echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6; } +if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + eval "$as_ac_Header=\$ac_header_preproc" fi +ac_res=`eval echo '${'$as_ac_Header'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + done ;; @@ -1911,48 +5996,77 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! -echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1916: checking for working alloca.h" >&5 -if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for working alloca.h" >&5 +echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6; } +if test "${ac_cv_working_alloca_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -int main() { -char *p = alloca(2 * sizeof(int)); -; return 0; } -EOF -if { (eval echo configure:1928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_header_alloca_h=yes +int +main () +{ +char *p = (char *) alloca (2 * sizeof (int)); + if (p) return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_working_alloca_h=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_header_alloca_h=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_working_alloca_h=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 +echo "${ECHO_T}$ac_cv_working_alloca_h" >&6; } +if test $ac_cv_working_alloca_h = yes; then -echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -if test $ac_cv_header_alloca_h = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA_H 1 -EOF +_ACEOF fi -echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1949: checking for alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for alloca" >&5 +echo $ECHO_N "checking for alloca... $ECHO_C" >&6; } +if test "${ac_cv_func_alloca_works+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef __GNUC__ # define alloca __builtin_alloca #else @@ -1960,7 +6074,7 @@ # include # define alloca _alloca # else -# if HAVE_ALLOCA_H +# ifdef HAVE_ALLOCA_H # include # else # ifdef _AIX @@ -1974,137 +6088,208 @@ # endif #endif -int main() { -char *p = (char *) alloca(1); -; return 0; } -EOF -if { (eval echo configure:1982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* +int +main () +{ +char *p = (char *) alloca (1); + if (p) return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then ac_cv_func_alloca_works=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_func_alloca_works=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_alloca_works=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 +echo "${ECHO_T}$ac_cv_func_alloca_works" >&6; } -echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 if test $ac_cv_func_alloca_works = yes; then - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define HAVE_ALLOCA 1 -EOF +_ACEOF -fi +else + # The SVR3 libPW and SVR4 libucb both contain incompatible functions +# that cause trouble. Some versions do not even contain alloca or +# contain a buggy version. If you still want to use their alloca, +# use ar to extract alloca.o from them instead of compiling alloca.c. -if test $ac_cv_func_alloca_works = no; then - # The SVR3 libPW and SVR4 libucb both contain incompatible functions - # that cause trouble. Some versions do not even contain alloca or - # contain a buggy version. If you still want to use their alloca, - # use ar to extract alloca.o from them instead of compiling alloca.c. - ALLOCA=alloca.${ac_objext} - cat >> confdefs.h <<\EOF +ALLOCA=\${LIBOBJDIR}alloca.$ac_objext + +cat >>confdefs.h <<\_ACEOF #define C_ALLOCA 1 -EOF +_ACEOF -echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2014: checking whether alloca needs Cray hooks" >&5 -if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 +echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6; } +if test "${ac_cv_os_cray+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#if defined CRAY && ! defined CRAY2 webecray #else wenotbecray #endif -EOF +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "webecray" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "webecray" >/dev/null 2>&1; then ac_cv_os_cray=yes else - rm -rf conftest* ac_cv_os_cray=no fi rm -f conftest* fi - -echo "$ac_t""$ac_cv_os_cray" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 +echo "${ECHO_T}$ac_cv_os_cray" >&6; } if test $ac_cv_os_cray = yes; then -for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2044: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + for ac_func in _getb67 GETB67 getb67; do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:2072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func -EOF +_ACEOF - break -else - echo "$ac_t""no" 1>&6 + break fi -done + done fi -echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2099: checking stack direction for C alloca" >&5 -if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 +echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6; } +if test "${ac_cv_c_stack_direction+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_c_stack_direction=0 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int find_stack_direction () { static char *addr = 0; @@ -2117,49 +6302,79 @@ else return (&dummy > addr) ? 1 : -1; } + +int main () { - exit (find_stack_direction() < 0); + return find_stack_direction () < 0; } -EOF -if { (eval echo configure:2126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_stack_direction=1 else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_stack_direction=-1 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_stack_direction=-1 fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 +echo "${ECHO_T}$ac_cv_c_stack_direction" >&6; } -echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -cat >> confdefs.h <>confdefs.h <<_ACEOF #define STACK_DIRECTION $ac_cv_c_stack_direction -EOF +_ACEOF + fi -echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:2148: checking for wait3 that fills in rusage" >&5 -if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for wait3 that fills in rusage" >&5 +echo $ECHO_N "checking for wait3 that fills in rusage... $ECHO_C" >&6; } +if test "${ac_cv_func_wait3_rusage+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then ac_cv_func_wait3_rusage=no else - cat > conftest.$ac_ext < + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default #include #include -#include +#include /* HP-UX has wait3 but does not fill in rusage at all. */ -main() { +int +main () +{ struct rusage r; int i; /* Use a field that we can force nonzero -- @@ -2170,668 +6385,1915 @@ r.ru_stime.tv_sec = 0; r.ru_stime.tv_usec = 0; r.ru_majflt = r.ru_minflt = 0; - switch (fork()) { - case 0: /* Child. */ - sleep(1); /* Give up the CPU. */ - _exit(0); - case -1: _exit(0); /* What can we do? */ - default: /* Parent. */ - wait3(&i, 0, &r); - sleep(2); /* Avoid "text file busy" from rm on fast HP-UX machines. */ - exit(r.ru_nvcsw == 0 && r.ru_majflt == 0 && r.ru_minflt == 0 - && r.ru_stime.tv_sec == 0 && r.ru_stime.tv_usec == 0); - } + switch (fork ()) + { + case 0: /* Child. */ + sleep(1); /* Give up the CPU. */ + _exit(0); + break; + case -1: /* What can we do? */ + _exit(0); + break; + default: /* Parent. */ + wait3(&i, 0, &r); + /* Avoid "text file busy" from rm on fast HP-UX machines. */ + sleep(2); + return (r.ru_nvcsw == 0 && r.ru_majflt == 0 && r.ru_minflt == 0 + && r.ru_stime.tv_sec == 0 && r.ru_stime.tv_usec == 0); + } } -EOF -if { (eval echo configure:2187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_wait3_rusage=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_func_wait3_rusage=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_func_wait3_rusage=no fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_wait3_rusage" >&5 +echo "${ECHO_T}$ac_cv_func_wait3_rusage" >&6; } +if test $ac_cv_func_wait3_rusage = yes; then -echo "$ac_t""$ac_cv_func_wait3_rusage" 1>&6 -if test $ac_cv_func_wait3_rusage = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_WAIT3 1 -EOF +_ACEOF fi + + + + for ac_func in waitpid wait4 mmap atexit do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2212: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:2240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done + + + + + + for ac_func in lstat memmove gettimeofday gethrtime getrusage rand do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2267: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:2295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done + + + + for ac_func in strchr memcpy select poll do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2322: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:2350: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done -echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:2375: checking for vsnprintf" >&5 -if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for vsnprintf" >&5 +echo $ECHO_N "checking for vsnprintf... $ECHO_C" >&6; } +if test "${ac_cv_func_vsnprintf+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define vsnprintf to an innocuous variant, in case declares vsnprintf. + For example, HP-UX 11i declares gettimeofday. */ +#define vsnprintf innocuous_vsnprintf + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char vsnprintf(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char vsnprintf(); + which can conflict with char vsnprintf (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef vsnprintf + +/* 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 "C" +#endif +char vsnprintf (); /* 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_vsnprintf) || defined (__stub___vsnprintf) +#if defined __stub_vsnprintf || defined __stub___vsnprintf choke me -#else -vsnprintf(); #endif -; return 0; } -EOF -if { (eval echo configure:2403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_vsnprintf=yes" +int +main () +{ +return vsnprintf (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_vsnprintf=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_vsnprintf=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_vsnprintf=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi - -if eval "test \"`echo '$ac_cv_func_'vsnprintf`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +{ echo "$as_me:$LINENO: result: $ac_cv_func_vsnprintf" >&5 +echo "${ECHO_T}$ac_cv_func_vsnprintf" >&6; } +if test $ac_cv_func_vsnprintf = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_VSNPRINTF 1 -EOF +_ACEOF -else - echo "$ac_t""no" 1>&6 fi + + + + + for ac_func in bzero bcopy setsid rint mkstemp do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2428: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:2456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done + + + + for ac_func in addr2ascii inet_neta setproctitle _exit do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2483: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:2511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done -echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:2537: checking size of unsigned int" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for unsigned int" >&5 +echo $ECHO_N "checking for unsigned int... $ECHO_C" >&6; } +if test "${ac_cv_type_unsigned_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef unsigned int ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_unsigned_int=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_unsigned_int=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_int" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned int" >&5 +echo $ECHO_N "checking size of unsigned int... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_unsigned_int+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned int ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned int ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else - cat > conftest.$ac_ext <&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned int ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned int ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned int ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_int=$ac_lo;; +'') if test "$ac_cv_type_unsigned_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_int=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned int ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include -#include -main() +#include +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(unsigned int)); - exit(0); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; } -EOF -if { (eval echo configure:2557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_int=`cat conftestval` +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_int=`cat conftest.val` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_unsigned_int=0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_unsigned_int" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned int) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_int=0 + fi fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_int" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_int" >&6; } -fi -echo "$ac_t""$ac_cv_sizeof_unsigned_int" 1>&6 -cat >> confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_INT $ac_cv_sizeof_unsigned_int -EOF +_ACEOF -echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2577: checking size of unsigned long" >&5 -if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for unsigned long" >&5 +echo $ECHO_N "checking for unsigned long... $ECHO_C" >&6; } +if test "${ac_cv_type_unsigned_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef unsigned long ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_cv_type_unsigned_long=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_unsigned_long=no +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_type_unsigned_long" >&6; } + +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ echo "$as_me:$LINENO: checking size of unsigned long" >&5 +echo $ECHO_N "checking size of unsigned long... $ECHO_C" >&6; } +if test "${ac_cv_sizeof_unsigned_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid; break else - cat > conftest.$ac_ext <&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) < 0)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo= ac_hi= +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +int +main () +{ +static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) <= $ac_mid)]; +test_array [0] = 0 + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_lo=`expr '(' $ac_mid ')' + 1` +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_unsigned_long=$ac_lo;; +'') if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi ;; +esac +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + typedef unsigned long ac__type_sizeof_; +static long int longval () { return (long int) (sizeof (ac__type_sizeof_)); } +static unsigned long int ulongval () { return (long int) (sizeof (ac__type_sizeof_)); } #include -#include -main() +#include +int +main () { - FILE *f=fopen("conftestval", "w"); - if (!f) exit(1); - fprintf(f, "%d\n", sizeof(unsigned long)); - exit(0); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + return 1; + if (((long int) (sizeof (ac__type_sizeof_))) < 0) + { + long int i = longval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%ld\n", i); + } + else + { + unsigned long int i = ulongval (); + if (i != ((long int) (sizeof (ac__type_sizeof_)))) + return 1; + fprintf (f, "%lu\n", i); + } + return ferror (f) || fclose (f) != 0; + + ; + return 0; } -EOF -if { (eval echo configure:2597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - ac_cv_sizeof_unsigned_long=`cat conftestval` +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_unsigned_long=`cat conftest.val` else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_sizeof_unsigned_long=0 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +if test "$ac_cv_type_unsigned_long" = yes; then + { { echo "$as_me:$LINENO: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (unsigned long) +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } + else + ac_cv_sizeof_unsigned_long=0 + fi fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +rm -f conftest.val +fi +{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_unsigned_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_unsigned_long" >&6; } -fi -echo "$ac_t""$ac_cv_sizeof_unsigned_long" 1>&6 -cat >> confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_UNSIGNED_LONG $ac_cv_sizeof_unsigned_long -EOF +_ACEOF -echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2617: checking whether byte ordering is bigendian" >&5 -if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6; } +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_c_bigendian=unknown -# See if sys/param.h defines the BYTE_ORDER macro. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include -int main() { -#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN +int +main () +{ +#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) bogus endian macros #endif -; return 0; } -EOF -if { (eval echo configure:2635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then # It does; now see whether it defined to BIG_ENDIAN or not. -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include -int main() { +int +main () +{ #if BYTE_ORDER != BIG_ENDIAN not big endian #endif -; return 0; } -EOF -if { (eval echo configure:2650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_c_bigendian=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_c_bigendian=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_c_bigendian=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + # It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short int ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short int ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short int ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short int ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } +int +main () +{ + _ascii (); _ebcdic (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes fi -rm -f conftest* -if test $ac_cv_c_bigendian = unknown; then -if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi else - cat > conftest.$ac_ext <&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + +fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ + /* Are we little or big endian? From Harbison&Steele. */ union { - long l; - char c[sizeof (long)]; + long int l; + char c[sizeof (long int)]; } u; u.l = 1; - exit (u.c[sizeof (long) - 1] == 1); + return u.c[sizeof (long int) - 1] == 1; + + ; + return 0; } -EOF -if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - ac_cv_c_bigendian=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_bigendian=yes fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + fi + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6; } +case $ac_cv_c_bigendian in + yes) -echo "$ac_t""$ac_cv_c_bigendian" 1>&6 -if test $ac_cv_c_bigendian = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define WORDS_BIGENDIAN 1 -EOF +_ACEOF + ;; + no) + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; +esac -fi - -echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:2707: checking for time_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for time_t" >&5 +echo $ECHO_N "checking for time_t... $ECHO_C" >&6; } +if test "${ac_cv_type_time_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])time_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef time_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_time_t=yes else - rm -rf conftest* - ac_cv_type_time_t=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_time_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_type_time_t" 1>&6 -if test $ac_cv_type_time_t = no; then - cat >> confdefs.h <<\EOF +{ echo "$as_me:$LINENO: result: $ac_cv_type_time_t" >&5 +echo "${ECHO_T}$ac_cv_type_time_t" >&6; } +if test $ac_cv_type_time_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF #define time_t int -EOF +_ACEOF fi -echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2740: checking for pid_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for pid_t" >&5 +echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; } +if test "${ac_cv_type_pid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef pid_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_pid_t=yes else - rm -rf conftest* - ac_cv_type_pid_t=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_pid_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_type_pid_t" 1>&6 -if test $ac_cv_type_pid_t = no; then - cat >> confdefs.h <<\EOF +{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 +echo "${ECHO_T}$ac_cv_type_pid_t" >&6; } +if test $ac_cv_type_pid_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF #define pid_t int -EOF +_ACEOF fi -echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2773: checking for size_t" >&5 -if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for size_t" >&5 +echo $ECHO_N "checking for size_t... $ECHO_C" >&6; } +if test "${ac_cv_type_size_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext < -#if STDC_HEADERS -#include -#include -#endif -EOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then - rm -rf conftest* + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +typedef size_t ac__type_new_; +int +main () +{ +if ((ac__type_new_ *) 0) + return 0; +if (sizeof (ac__type_new_)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_type_size_t=yes else - rm -rf conftest* - ac_cv_type_size_t=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_type_size_t=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi -echo "$ac_t""$ac_cv_type_size_t" 1>&6 -if test $ac_cv_type_size_t = no; then - cat >> confdefs.h <<\EOF -#define size_t unsigned -EOF +{ echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 +echo "${ECHO_T}$ac_cv_type_size_t" >&6; } +if test $ac_cv_type_size_t = yes; then + : +else +cat >>confdefs.h <<_ACEOF +#define size_t unsigned int +_ACEOF + fi -echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2806: checking for uid_t in sys/types.h" >&5 -if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 +echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6; } +if test "${ac_cv_type_uid_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -EOF + +_ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "uid_t" >/dev/null 2>&1; then - rm -rf conftest* + $EGREP "uid_t" >/dev/null 2>&1; then ac_cv_type_uid_t=yes else - rm -rf conftest* ac_cv_type_uid_t=no fi rm -f conftest* fi +{ echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 +echo "${ECHO_T}$ac_cv_type_uid_t" >&6; } +if test $ac_cv_type_uid_t = no; then -echo "$ac_t""$ac_cv_type_uid_t" 1>&6 -if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define uid_t int -EOF +_ACEOF - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define gid_t int -EOF +_ACEOF fi @@ -2860,14 +8322,14 @@ break; fi done - + test -z "$with_ssl" && { for ac_dir in \ /usr \ /usr/local \ /sw \ ; \ - do + do if test -r "$ac_dir/include/openssl/ssl.h" ; then with_ssl=$ac_dir break; @@ -2878,44 +8340,69 @@ if test -n "$with_ssl" -a "$with_ssl" != "no" then - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2883: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +if test $ac_cv_lib_dl_dlopen = yes; then withdl="-ldl" -else - echo "$ac_t""no" 1>&6 fi # With the autoconfigure above, the only time this is going to be @@ -2946,7 +8433,7 @@ echo "Enabling SSLeay support in $with_ssl" sslcflags="-I$with_ssl/include" fi - + if test `uname` = "IRIX" -a "$with_ssl" = "/usr/freeware" ; then ssl="-L$with_ssl/lib32 -lssl -lcrypto $withdl" @@ -2955,25 +8442,32 @@ fi else with_ssl="" - { echo "configure: error: Could not find OpenSSL and OpenSSL headers on your system" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Could not find OpenSSL and OpenSSL headers on your system" >&5 +echo "$as_me: error: Could not find OpenSSL and OpenSSL headers on your system" >&2;} + { (exit 1); exit 1; }; } fi test -n "$with_ssl" && { test "x$use_cipher" = "xyes" -o -z "$use_cipher" } - - -test -n "$forcessl" -a -z "$with_ssl" && { echo "configure: error: "OpenSSL not found"" 1>&2; exit 1; } +test -n "$forcessl" -a -z "$with_ssl" && { { echo "$as_me:$LINENO: error: \"OpenSSL not found\"" >&5 +echo "$as_me: error: \"OpenSSL not found\"" >&2;} + { (exit 1); exit 1; }; } -echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:2974: checking for struct timeval" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef TIME_WITH_SYS_TIME #include #include @@ -2984,34 +8478,59 @@ #include #endif #endif -int main() { +int +main () +{ static struct timeval x; x.tv_sec = x.tv_usec; -; return 0; } -EOF -if { (eval echo configure:2992: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } HAVE_TIMEVAL=yes - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_TIMEVAL 1 -EOF +_ACEOF else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } HAVE_TIMEVAL=no fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + if test "x$HAVE_TIMEVAL" = xyes; then -echo $ac_n "checking whether gettimeofday can't accept two arguments""... $ac_c" 1>&6 -echo "configure:3012: checking whether gettimeofday can't accept two arguments" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether gettimeofday can't accept two arguments... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #ifdef TIME_WITH_SYS_TIME #include @@ -3023,29 +8542,53 @@ #include #endif #endif - -int main() { +int +main () +{ + struct timeval time; struct timezone dummy; gettimeofday (&time, &dummy); -; return 0; } -EOF -if { (eval echo configure:3036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - echo "$ac_t""no" 1>&6 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + cat >>confdefs.h <<\_ACEOF #define GETTIMEOFDAY_ONE_ARGUMENT 1 -EOF +_ACEOF fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi @@ -3053,22 +8596,29 @@ # # RedHat 8.0 ships with a broken regexp library (Nessus bug#90) # -test -f /etc/redhat-release && +test -f /etc/redhat-release && { cat /etc/redhat-release | egrep "(8\.0|9)" >/dev/null && BROKEN_REGEXP=y } - + test -z "$BROKEN_REGEXP" && { -echo $ac_n "checking for a working regexp implementation""... $ac_c" 1>&6 -echo "configure:3066: checking for a working regexp implementation" >&5 +{ echo "$as_me:$LINENO: checking for a working regexp implementation" >&5 +echo $ECHO_N "checking for a working regexp implementation... $ECHO_C" >&6; } if test "$cross_compiling" = yes; then - { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include #include @@ -3080,7 +8630,7 @@ char fastmap[1 << 8]; struct re_pattern_buffer pb; struct re_registers regs; - + pb.allocated = 8; pb.buffer = malloc(8); pb.fastmap = fastmap; @@ -3088,40 +8638,68 @@ re_set_syntax(RE_SYNTAX_POSIX_EGREP); re_compile_pattern(".*nessus.*", strlen(".*nessus.*"), &pb); re_compile_fastmap(&pb); - return re_search(&pb, + return re_search(&pb, "i use nessus everyday", strlen("i use nessus everyday"), - 0, + 0, strlen("i use nessus everyday"), ®s); } -EOF -if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -then - echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF +_ACEOF +rm -f conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; };cat >>confdefs.h <<\_ACEOF #define HAVE_REGEX_SUPPORT 1 -EOF +_ACEOF else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -fr conftest* +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi + } -echo $ac_n "checking GNU gettext available""... $ac_c" 1>&6 -echo "configure:3120: checking GNU gettext available" >&5 -cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking GNU gettext available... $ECHO_C" >&6; } +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -int main() { +int +main () +{ extern int _nl_msg_cat_cntr; extern int *_nl_domain_bindings; int @@ -3130,35 +8708,51 @@ bindtextdomain ("", ""); return (int) gettext ("") + (int) ngettext ("", "", 0) + _nl_msg_cat_cntr + *_nl_domain_bindings; } -; return 0; } -EOF -if { (eval echo configure:3136: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; }; cat >>confdefs.h <<\_ACEOF #define HAVE_GNU_GETTEXT 1 -EOF +_ACEOF gettext_flags="-DHAVE_GNU_GETTEXT" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - echo "$ac_t""no" 1>&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi -rm -f conftest* +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# If we find X, set shell vars x_includes and x_libraries to the -# paths, otherwise set no_x=yes. -# Uses ac_ vars as temps to allow command line to override cache and checks. -# --without-x overrides everything else, but does not touch the cache. -echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3157: checking for X" >&5 -# Check whether --with-x or --without-x was given. +{ echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6; } + + +# Check whether --with-x was given. if test "${with_x+set}" = set; then - withval="$with_x" - : + withval=$with_x; fi # $have_x is `yes', `no', `disabled', or empty when we do not yet know. @@ -3166,227 +8760,237 @@ # The user explicitly disabled X. have_x=disabled else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else -if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + case $x_includes,$x_libraries in #( + *\'*) { { echo "$as_me:$LINENO: error: Cannot use X directory names containing '" >&5 +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 + echo $ECHO_N "(cached) $ECHO_C" >&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 -fr conftestdir -if mkdir conftestdir; then - cd conftestdir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat > Imakefile <<'EOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -EOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then +ac_x_includes=no ac_x_libraries=no +rm -f -r conftest.dir +if mkdir conftest.dir; then + cd conftest.dir + cat >Imakefile <<'_ACEOF' +incroot: + @echo incroot='${INCROOT}' +usrlibdir: + @echo usrlibdir='${USRLIBDIR}' +libdir: + @echo libdir='${LIBDIR}' +_ACEOF + if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` + for ac_var in incroot usrlibdir libdir; do + eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" + done # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break + if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && + test -f "$ac_im_libdir/libX11.$ac_extension"; 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) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;; + case $ac_im_incroot in + /usr/include) ac_x_includes= ;; + *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac - case "$ac_im_usrlibdir" in + case $ac_im_usrlibdir in /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;; + *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi cd .. - rm -fr conftestdir + rm -f -r conftest.dir fi -if test "$ac_x_includes" = NO; then - # Guess where to find include files, by looking for this one X11 .h file. - test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h +# 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 "$ac_x_includes" = no; then + # Guess where to find include files, by looking for Xlib.h. # First, try using that file with no special directory specified. -cat > conftest.$ac_ext < -EOF -ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` -if test -z "$ac_err"; then - rm -rf conftest* + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (ac_try="$ac_cpp conftest.$ac_ext" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null && { + test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || + test ! -s conftest.err + }; then # We can compile using X headers with no special include directory. ac_x_includes= else - echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - # Look for the header file in a standard set of common directories. -# Check X11 before X11Rn because it is often a symlink to the current release. - for ac_dir in \ - /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 \ - ; \ - do - if test -r "$ac_dir/$x_direct_test_include"; then - ac_x_includes=$ac_dir - break - fi - done + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + for ac_dir in $ac_x_header_dirs; do + if test -r "$ac_dir/X11/Xlib.h"; then + ac_x_includes=$ac_dir + break + fi +done fi -rm -f conftest* -fi # $ac_x_includes = NO -if test "$ac_x_libraries" = NO; then +rm -f conftest.err conftest.$ac_ext +fi # $ac_x_includes = no + +if test "$ac_x_libraries" = no; then # Check for the libraries. - - test -z "$x_direct_test_library" && x_direct_test_library=Xt - test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc - # See if we find them without any special options. # Don't add to $LIBS permanently. - ac_save_LIBS="$LIBS" - LIBS="-l$x_direct_test_library $LIBS" -cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - LIBS="$ac_save_LIBS" + ac_save_LIBS=$LIBS + LIBS="-lX11 $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +XrmInitialize () + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - LIBS="$ac_save_LIBS" -# First see if replacing the include by lib works. -# Check X11 before X11Rn because it is often a symlink to the current release. -for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \ - /usr/X11/lib \ - /usr/X11R6/lib \ - /usr/X11R5/lib \ - /usr/X11R4/lib \ - \ - /usr/lib/X11 \ - /usr/lib/X11R6 \ - /usr/lib/X11R5 \ - /usr/lib/X11R4 \ - \ - /usr/local/X11/lib \ - /usr/local/X11R6/lib \ - /usr/local/X11R5/lib \ - /usr/local/X11R4/lib \ - \ - /usr/local/lib/X11 \ - /usr/local/lib/X11R6 \ - /usr/local/lib/X11R5 \ - /usr/local/lib/X11R4 \ - \ - /usr/X386/lib \ - /usr/x386/lib \ - /usr/XFree86/lib/X11 \ - \ - /usr/lib \ - /usr/local/lib \ - /usr/unsupported/lib \ - /usr/athena/lib \ - /usr/local/x11r5/lib \ - /usr/lpp/Xamples/lib \ - /lib/usr/lib/X11 \ - \ - /usr/openwin/lib \ - /usr/openwin/share/lib \ - ; \ + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | 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; do - if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then + if test -r "$ac_dir/libX11.$ac_extension"; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f conftest* -fi # $ac_x_libraries = NO -if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" +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 "'" in its name. + ac_cv_have_x="have_x=no";; #( + *) + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes\ + ac_x_includes='$ac_x_includes'\ + ac_x_libraries='$ac_x_libraries'" +esac fi -fi - fi +;; #( + *) have_x=yes;; + esac eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - echo "$ac_t""$have_x" 1>&6 + { echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6; } no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6 + ac_cv_have_x="have_x=yes\ + ac_x_includes='$x_includes'\ + ac_x_libraries='$x_libraries'" + { echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6; } fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. - cat >> confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define X_DISPLAY_MISSING 1 -EOF +_ACEOF X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -3399,61 +9003,104 @@ X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - case "`(uname -sr) 2>/dev/null`" in - "SunOS 5"*) - echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3406: checking whether -R must be followed by a space" >&5 - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6; } + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + ac_xsave_c_werror_flag=$ac_c_werror_flag + ac_c_werror_flag=yes + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:3416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_nospace=yes + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + X_LIBS="$X_LIBS -R$x_libraries" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_nospace=no -fi -rm -f conftest* - if test $ac_R_nospace = yes; then - echo "$ac_t""no" 1>&6 - X_LIBS="$X_LIBS -R$x_libraries" - else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + LIBS="$ac_xsave_LIBS -R $x_libraries" - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { +int +main () +{ -; return 0; } -EOF -if { (eval echo configure:3439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_R_space=yes + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + X_LIBS="$X_LIBS -R $x_libraries" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_R_space=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6; } fi -rm -f conftest* - if test $ac_R_space = yes; then - echo "$ac_t""yes" 1>&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$ac_t""neither works" 1>&6 - fi - fi - LIBS="$ac_xsave_LIBS" - esac + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext +fi + +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. @@ -3463,567 +9110,996 @@ if test "$ISC" = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" else - # Martyn.Johnson at cl.cam.ac.uk says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And karl at cs.umb.edu says + # 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). - echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3471: checking for dnet_ntoa in -ldnet" >&5 -ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_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 "C" +#endif +char XOpenDisplay (); +int +main () +{ +return XOpenDisplay (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + : else - ac_save_LIBS="$LIBS" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6; } +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:3490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char dnet_ntoa (); +int +main () +{ +return dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_dnet_ntoa=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6; } +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -else - echo "$ac_t""no" 1>&6 fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3512: checking for dnet_ntoa in -ldnet_stub" >&5 -ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6; } +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -dnet_ntoa() -; return 0; } -EOF -if { (eval echo configure:3531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char dnet_ntoa (); +int +main () +{ +return dnet_ntoa (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dnet_stub_dnet_ntoa=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$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" -else - echo "$ac_t""no" 1>&6 fi fi +fi +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS="$ac_xsave_LIBS" + # msh at cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, # to get the SysV transport functions. - # chad at anasazi.com says the Pyramis MIS-ES running DC/OSx (SVR4) + # 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 dickey at clark.net. - echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3560: checking for gethostbyname" >&5 -if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # 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. + { echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6; } +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char gethostbyname(); + which can conflict with char gethostbyname (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#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 "C" +#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) +#if defined __stub_gethostbyname || defined __stub___gethostbyname choke me -#else -gethostbyname(); #endif -; return 0; } -EOF -if { (eval echo configure:3588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_gethostbyname=yes" +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_gethostbyname=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_gethostbyname=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_gethostbyname=no fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6; } if test $ac_cv_func_gethostbyname = no; then - echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3609: checking for gethostbyname in -lnsl" >&5 -ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6; } +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -gethostbyname() -; return 0; } -EOF -if { (eval echo configure:3628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_gethostbyname=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_gethostbyname=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6; } +if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" +fi + + if test $ac_cv_lib_nsl_gethostbyname = no; then + { echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6; } +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - echo "$ac_t""no" 1>&6 + ac_check_lib_save_LIBS=$LIBS +LIBS="-lbsd $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_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 "C" +#endif +char gethostbyname (); +int +main () +{ +return gethostbyname (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_bsd_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_bsd_gethostbyname=no fi +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 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6; } +if test $ac_cv_lib_bsd_gethostbyname = yes; then + X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" +fi + + fi fi # lieder at 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 at lia.di.epfl.ch: it contains - # gethostby* variants that don't use the nameserver (or something). - # -lsocket must be given before -lnsl if both are needed. - # We assume that if connect needs -lnsl, so does gethostbyname. - echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3658: checking for connect" >&5 -if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # 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. + { echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6; } +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define connect to an innocuous variant, in case declares connect. + For example, HP-UX 11i declares gettimeofday. */ +#define connect innocuous_connect + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char connect(); + which can conflict with char connect (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#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 "C" +#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) +#if defined __stub_connect || defined __stub___connect choke me -#else -connect(); #endif -; return 0; } -EOF -if { (eval echo configure:3686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_connect=yes" +int +main () +{ +return connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_connect=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_connect=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_connect=no fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'connect`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6; } if test $ac_cv_func_connect = no; then - echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3707: checking for connect in -lsocket" >&5 -ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6; } +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -connect() -; return 0; } -EOF -if { (eval echo configure:3726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char connect (); +int +main () +{ +return connect (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_connect=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_socket_connect=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6; } +if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -else - echo "$ac_t""no" 1>&6 fi fi - # gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX. - echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3750: checking for remove" >&5 -if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # Guillermo Gomez says -lposix is necessary on A/UX. + { echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6; } +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define remove to an innocuous variant, in case declares remove. + For example, HP-UX 11i declares gettimeofday. */ +#define remove innocuous_remove + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char remove(); + which can conflict with char remove (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#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 "C" +#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) +#if defined __stub_remove || defined __stub___remove choke me -#else -remove(); #endif -; return 0; } -EOF -if { (eval echo configure:3778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_remove=yes" +int +main () +{ +return remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_remove=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_remove=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_remove=no fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'remove`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6; } if test $ac_cv_func_remove = no; then - echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3799: checking for remove in -lposix" >&5 -ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6; } +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -remove() -; return 0; } -EOF -if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char remove (); +int +main () +{ +return remove (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_posix_remove=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_posix_remove=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6; } +if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -else - echo "$ac_t""no" 1>&6 fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3842: checking for shmat" >&5 -if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6; } +if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shmat to an innocuous variant, in case declares shmat. + For example, HP-UX 11i declares gettimeofday. */ +#define shmat innocuous_shmat + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char shmat(); + which can conflict with char shmat (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#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 "C" +#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) +#if defined __stub_shmat || defined __stub___shmat choke me -#else -shmat(); #endif -; return 0; } -EOF -if { (eval echo configure:3870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_shmat=yes" +int +main () +{ +return shmat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_func_shmat=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_shmat=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_func_shmat=no fi -rm -f conftest* -fi -if eval "test \"`echo '$ac_cv_func_'shmat`\" = yes"; then - echo "$ac_t""yes" 1>&6 - : -else - echo "$ac_t""no" 1>&6 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +{ echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6; } if test $ac_cv_func_shmat = no; then - echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:3891: checking for shmat in -lipc" >&5 -ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6; } +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -shmat() -; return 0; } -EOF -if { (eval echo configure:3910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char shmat (); +int +main () +{ +return shmat (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ipc_shmat=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ipc_shmat=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6; } +if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -else - echo "$ac_t""no" 1>&6 fi fi fi # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS="$LDFLAGS" + ac_save_LDFLAGS=$LDFLAGS test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" # 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. - # --interran at uluru.Stanford.EDU, kb at cs.umb.edu. - echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:3943: checking for IceConnectionNumber in -lICE" >&5 -ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + # John Interrante, Karl Berry + { echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6; } +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -IceConnectionNumber() -; return 0; } -EOF -if { (eval echo configure:3962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char IceConnectionNumber (); +int +main () +{ +return IceConnectionNumber (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_ICE_IceConnectionNumber=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6; } +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -else - echo "$ac_t""no" 1>&6 fi - LDFLAGS="$ac_save_LDFLAGS" + LDFLAGS=$ac_save_LDFLAGS fi -PWDD=`pwd` -echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3988: checking for long file names" >&5 -if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +PWDD=`pwd` +{ echo "$as_me:$LINENO: checking for long file names" >&5 +echo $ECHO_N "checking for long file names... $ECHO_C" >&6; } +if test "${ac_cv_sys_long_file_names+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_sys_long_file_names=yes # Test for long file names in all the places we know might matter: # . the current directory, where building will happen # $prefix/lib where we will be installing things # $exec_prefix/lib likewise -# eval it to expand exec_prefix. # $TMPDIR if set, where it might want to write temporary files -# if $TMPDIR is not set: # /tmp where it might want to write temporary files # /var/tmp likewise # /usr/tmp likewise -if test -n "$TMPDIR" && test -d "$TMPDIR" && test -w "$TMPDIR"; then - ac_tmpdirs="$TMPDIR" -else - ac_tmpdirs='/tmp /var/tmp /usr/tmp' -fi -for ac_dir in . $ac_tmpdirs `eval echo $prefix/lib $exec_prefix/lib` ; do - test -d $ac_dir || continue - test -w $ac_dir || continue # It is less confusing to not echo anything here. - (echo 1 > $ac_dir/conftest9012345) 2>/dev/null - (echo 2 > $ac_dir/conftest9012346) 2>/dev/null - val=`cat $ac_dir/conftest9012345 2>/dev/null` - if test ! -f $ac_dir/conftest9012345 || test "$val" != 1; then +for ac_dir in . "$TMPDIR" /tmp /var/tmp /usr/tmp "$prefix/lib" "$exec_prefix/lib"; do + # Skip $TMPDIR if it is empty or bogus, and skip $exec_prefix/lib + # in the usual case where exec_prefix is '${prefix}'. + case $ac_dir in #( + . | /* | ?:[\\/]*) ;; #( + *) continue;; + esac + test -w "$ac_dir/." || continue # It is less confusing to not echo anything here. + ac_xdir=$ac_dir/cf$$ + (umask 077 && mkdir "$ac_xdir" 2>/dev/null) || continue + ac_tf1=$ac_xdir/conftest9012345 + ac_tf2=$ac_xdir/conftest9012346 + touch "$ac_tf1" 2>/dev/null && test -f "$ac_tf1" && test ! -f "$ac_tf2" || ac_cv_sys_long_file_names=no - rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null - break - fi - rm -f $ac_dir/conftest9012345 $ac_dir/conftest9012346 2>/dev/null + rm -f -r "$ac_xdir" 2>/dev/null + test $ac_cv_sys_long_file_names = no && break done fi +{ echo "$as_me:$LINENO: result: $ac_cv_sys_long_file_names" >&5 +echo "${ECHO_T}$ac_cv_sys_long_file_names" >&6; } +if test $ac_cv_sys_long_file_names = yes; then -echo "$ac_t""$ac_cv_sys_long_file_names" 1>&6 -if test $ac_cv_sys_long_file_names = yes; then - cat >> confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LONG_FILE_NAMES 1 -EOF +_ACEOF fi @@ -4031,338 +10107,560 @@ if test "`uname`" != "IRIX" ; then - echo $ac_n "checking for -lsocket""... $ac_c" 1>&6 -echo "configure:4036: checking for -lsocket" >&5 -if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for main in -lsocket" >&5 +echo $ECHO_N "checking for main in -lsocket... $ECHO_C" >&6; } +if test "${ac_cv_lib_socket_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:4050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_lib_socket=yes + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_socket_main=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_lib_socket=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_socket_main=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -echo "$ac_t""$ac_cv_lib_socket" 1>&6 -if test "$ac_cv_lib_socket" = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_socket_main" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_main" >&6; } +if test $ac_cv_lib_socket_main = yes; then socket_lib="-lsocket";LIBS="-lsocket $LIBS"; fi +ac_cv_lib_socket=ac_cv_lib_socket_main - echo $ac_n "checking for -lnsl""... $ac_c" 1>&6 -echo "configure:4069: checking for -lnsl" >&5 -if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for main in -lnsl" >&5 +echo $ECHO_N "checking for main in -lnsl... $ECHO_C" >&6; } +if test "${ac_cv_lib_nsl_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:4083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_lib_nsl=yes + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_nsl_main=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_lib_nsl=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_nsl_main=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -echo "$ac_t""$ac_cv_lib_nsl" 1>&6 -if test "$ac_cv_lib_nsl" = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_main" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_main" >&6; } +if test $ac_cv_lib_nsl_main = yes; then nsl_lib="-lnsl";LIBS="-lnsl $LIBS"; fi +ac_cv_lib_nsl=ac_cv_lib_nsl_main - echo $ac_n "checking for -lresolv""... $ac_c" 1>&6 -echo "configure:4102: checking for -lresolv" >&5 -if eval "test \"`echo '$''{'ac_cv_lib_resolv'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + { echo "$as_me:$LINENO: checking for main in -lresolv" >&5 +echo $ECHO_N "checking for main in -lresolv... $ECHO_C" >&6; } +if test "${ac_cv_lib_resolv_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -main() -; return 0; } -EOF -if { (eval echo configure:4116: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_lib_resolv=yes + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_resolv_main=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_lib_resolv=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_resolv_main=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -echo "$ac_t""$ac_cv_lib_resolv" 1>&6 -if test "$ac_cv_lib_resolv" = yes; then +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_main" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_main" >&6; } +if test $ac_cv_lib_resolv_main = yes; then resolv_lib="-lresolv";LIBS="-lresolv $LIBS"; fi +ac_cv_lib_resolv=ac_cv_lib_resolv_main fi -echo $ac_n "checking for inet_aton in -lc""... $ac_c" 1>&6 -echo "configure:4138: checking for inet_aton in -lc" >&5 -ac_lib_var=`echo c'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for inet_aton in -lc" >&5 +echo $ECHO_N "checking for inet_aton in -lc... $ECHO_C" >&6; } +if test "${ac_cv_lib_c_inet_aton+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -inet_aton() -; return 0; } -EOF -if { (eval echo configure:4157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char inet_aton (); +int +main () +{ +return inet_aton (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_c_inet_aton=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_c_inet_aton=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +{ echo "$as_me:$LINENO: result: $ac_cv_lib_c_inet_aton" >&5 +echo "${ECHO_T}$ac_cv_lib_c_inet_aton" >&6; } +if test $ac_cv_lib_c_inet_aton = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_INET_ATON 1 -EOF +_ACEOF -else - echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:4181: checking for inet_aton in -lresolv" >&5 -ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for inet_aton in -lresolv" >&5 +echo $ECHO_N "checking for inet_aton in -lresolv... $ECHO_C" >&6; } +if test "${ac_cv_lib_resolv_inet_aton+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -inet_aton() -; return 0; } -EOF -if { (eval echo configure:4200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char inet_aton (); +int +main () +{ +return inet_aton (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_resolv_inet_aton=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_resolv_inet_aton=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF +{ echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_aton" >&5 +echo "${ECHO_T}$ac_cv_lib_resolv_inet_aton" >&6; } +if test $ac_cv_lib_resolv_inet_aton = yes; then + cat >>confdefs.h <<\_ACEOF #define HAVE_INET_ATON 1 -EOF +_ACEOF -else - echo "$ac_t""no" 1>&6 fi -echo $ac_n "checking for compress in -lz""... $ac_c" 1>&6 -echo "configure:4224: checking for compress in -lz" >&5 -ac_lib_var=`echo z'_'compress | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + +{ echo "$as_me:$LINENO: checking for compress in -lz" >&5 +echo $ECHO_N "checking for compress in -lz... $ECHO_C" >&6; } +if test "${ac_cv_lib_z_compress+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -compress() -; return 0; } -EOF -if { (eval echo configure:4243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char compress (); +int +main () +{ +return compress (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_z_compress=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_z_compress=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo z | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <&5 +echo "${ECHO_T}$ac_cv_lib_z_compress" >&6; } +if test $ac_cv_lib_z_compress = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBZ 1 +_ACEOF LIBS="-lz $LIBS" else - echo "$ac_t""no" 1>&6 -{ echo "configure: error: "libz is needed"" 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: \"libz is needed\"" >&5 +echo "$as_me: error: \"libz is needed\"" >&2;} + { (exit 1); exit 1; }; } fi -echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4273: checking for dlopen in -ldl" >&5 -ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6; } +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_save_LIBS="$LIBS" + ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ -int main() { -dlopen() -; return 0; } -EOF -if { (eval echo configure:4292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" +/* 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 "C" +#endif +char dlopen (); +int +main () +{ +return dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + ac_cv_lib_dl_dlopen=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_lib_dl_dlopen=no fi -rm -f conftest* -LIBS="$ac_save_LIBS" +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 -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - dl_lib="-ldl" ; cat >> confdefs.h <<\EOF +{ echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; } +if test $ac_cv_lib_dl_dlopen = yes; then + dl_lib="-ldl" ; cat >>confdefs.h <<\_ACEOF #define HAVE_DL_LIB 1 -EOF +_ACEOF -else - echo "$ac_t""no" 1>&6 fi + for ac_func in snprintf do -echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4318: checking for $ac_func" >&5 -if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +{ echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; } +if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + /* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func(); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func(); + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ -int main() { +#ifdef __STDC__ +# include +#else +# include +#endif +#undef $ac_func + +/* 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 "C" +#endif +char $ac_func (); /* 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_$ac_func) || defined (__stub___$ac_func) +#if defined __stub_$ac_func || defined __stub___$ac_func choke me -#else -$ac_func(); #endif -; return 0; } -EOF -if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_$ac_func=yes" +int +main () +{ +return $ac_func (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_link") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then + eval "$as_ac_var=yes" else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_func_$ac_func=no" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + eval "$as_ac_var=no" fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext fi +ac_res=`eval echo '${'$as_ac_var'}'` + { echo "$as_me:$LINENO: result: $ac_res" >&5 +echo "${ECHO_T}$ac_res" >&6; } +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF -if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` - cat >> confdefs.h <&6 fi done @@ -4375,38 +10673,61 @@ -echo $ac_n "checking if sockaddr{} has sa_len member""... $ac_c" 1>&6 -echo "configure:4380: checking if sockaddr{} has sa_len member" >&5 -if eval "test \"`echo '$''{'ac_cv_sockaddr_has_sa_len'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking if sockaddr{} has sa_len member" >&5 +echo $ECHO_N "checking if sockaddr{} has sa_len member... $ECHO_C" >&6; } +if test "${ac_cv_sockaddr_has_sa_len+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat > conftest.$ac_ext <conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ # include # include -int main() { +int +main () +{ unsigned int i = sizeof(((struct sockaddr *)0)->sa_len) -; return 0; } -EOF -if { (eval echo configure:4394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then ac_cv_sockaddr_has_sa_len=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - ac_cv_sockaddr_has_sa_len=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_cv_sockaddr_has_sa_len=no fi -rm -f conftest* + +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi - -echo "$ac_t""$ac_cv_sockaddr_has_sa_len" 1>&6 +{ echo "$as_me:$LINENO: result: $ac_cv_sockaddr_has_sa_len" >&5 +echo "${ECHO_T}$ac_cv_sockaddr_has_sa_len" >&6; } if test $ac_cv_sockaddr_has_sa_len = yes ; then - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKADDR_SA_LEN 1 -EOF +_ACEOF fi @@ -4414,9 +10735,9 @@ case "$host" in *-freebsd*|*-bsdi*|*-netbsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define BSD_BYTE_ORDERING 1 -EOF +_ACEOF esac @@ -4424,21 +10745,21 @@ case "$host" in *-netbsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define NETBSD 1 -EOF +_ACEOF ;; *-openbsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define OPENBSD 1 -EOF +_ACEOF ;; *-sgi-irix5*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define IRIX 1 -EOF +_ACEOF no_libsocket=yes no_libnsl=yes @@ -4447,9 +10768,9 @@ fi ;; *-sgi-irix6*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define IRIX 1 -EOF +_ACEOF no_libsocket=yes no_libnsl=yes @@ -4457,152 +10778,179 @@ sgi_cc=yes fi ;; - *-solaris2.0*) - cat >> confdefs.h <<\EOF + *-solaris2.0*) + cat >>confdefs.h <<\_ACEOF #define STUPID_SOLARIS_CHECKSUM_BUG 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-solaris2.1*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define STUPID_SOLARIS_CHECKSUM_BUG 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-solaris2.2*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define STUPID_SOLARIS_CHECKSUM_BUG 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-solaris2.3*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define STUPID_SOLARIS_CHECKSUM_BUG 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-solaris2.4*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define STUPID_SOLARIS_CHECKSUM_BUG 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-solaris2.5.1) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define STUPID_SOLARIS_CHECKSUM_BUG 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-solaris*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SOLARIS 1 -EOF +_ACEOF ;; *-sunos4*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SUNOS 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define SPRINTF_RETURNS_STRING 1 -EOF +_ACEOF no_libnsl=yes no_libsocket=yes ;; *-linux*) linux=yes - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define LINUX 1 -EOF +_ACEOF - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define PCAP_TIMEOUT_IGNORED 1 -EOF +_ACEOF # libpcap doesn't even LOOK at # the timeout you give it under Linux ;; *-freebsd*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define FREEBSD 1 -EOF +_ACEOF ;; *-bsdi*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define BSDI 1 -EOF +_ACEOF ;; *-cygwin*) - cat >> confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define CYGWIN 1 -EOF +_ACEOF ;; esac -echo $ac_n "checking whether struct sigaction has sa_restorer""... $ac_c" 1>&6 -echo "configure:4574: checking whether struct sigaction has sa_restorer" >&5 - cat > conftest.$ac_ext <&5 +echo $ECHO_N "checking whether struct sigaction has sa_restorer... $ECHO_C" >&6; } + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ #include -int main() { +int +main () +{ struct sigaction sa; - + sa.sa_restorer = 0; -; return 0; } -EOF -if { (eval echo configure:4589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (ac_try="$ac_compile" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 + (eval "$ac_compile") 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest.$ac_objext; then signal_sa_restorer=yes else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + fi -rm -f conftest* - test "x$signal_sa_restorer" = "x" && echo "$ac_t""no" 1>&6 - test "x$signal_sa_restorer" = "x" || echo "$ac_t""yes" 1>&6 - test "x$signal_sa_restorer" = "xyes" && cat >> confdefs.h <<\EOF +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + + test "x$signal_sa_restorer" = "x" && { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + test "x$signal_sa_restorer" = "x" || { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + test "x$signal_sa_restorer" = "xyes" && cat >>confdefs.h <<\_ACEOF #define HAVE_SIGNAL_SA_RESTORER 1 -EOF +_ACEOF - + if test "x$enable_client" = "xyes"; then client=client client_install=client-install @@ -4622,40 +10970,45 @@ if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4627: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$PKG_CONFIG" in - /*) + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi -PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +PKG_CONFIG=$ac_cv_path_PKG_CONFIG if test -n "$PKG_CONFIG"; then - echo "$ac_t""$PKG_CONFIG" 1>&6 + { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi + fi if test "$PKG_CONFIG" = "no" ; then @@ -4666,33 +11019,36 @@ else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - echo $ac_n "checking for $pkg_modules""... $ac_c" 1>&6 -echo "configure:4671: checking for $pkg_modules" >&5 + { echo "$as_me:$LINENO: checking for $pkg_modules" >&5 +echo $ECHO_N "checking for $pkg_modules... $ECHO_C" >&6; } if $PKG_CONFIG --exists "$pkg_modules" ; then - echo "$ac_t""yes" 1>&6 + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } succeeded=yes - echo $ac_n "checking GTKCONFIG_CFLAGS""... $ac_c" 1>&6 -echo "configure:4678: checking GTKCONFIG_CFLAGS" >&5 + { echo "$as_me:$LINENO: checking GTKCONFIG_CFLAGS" >&5 +echo $ECHO_N "checking GTKCONFIG_CFLAGS... $ECHO_C" >&6; } GTKCONFIG_CFLAGS=`$PKG_CONFIG --cflags "$pkg_modules"` - echo "$ac_t""$GTKCONFIG_CFLAGS" 1>&6 + { echo "$as_me:$LINENO: result: $GTKCONFIG_CFLAGS" >&5 +echo "${ECHO_T}$GTKCONFIG_CFLAGS" >&6; } - echo $ac_n "checking GTKCONFIG_LIBS""... $ac_c" 1>&6 -echo "configure:4683: checking GTKCONFIG_LIBS" >&5 + { echo "$as_me:$LINENO: checking GTKCONFIG_LIBS" >&5 +echo $ECHO_N "checking GTKCONFIG_LIBS... $ECHO_C" >&6; } GTKCONFIG_LIBS=`$PKG_CONFIG --libs "$pkg_modules"` - echo "$ac_t""$GTKCONFIG_LIBS" 1>&6 + { echo "$as_me:$LINENO: result: $GTKCONFIG_LIBS" >&5 +echo "${ECHO_T}$GTKCONFIG_LIBS" >&6; } else GTKCONFIG_CFLAGS="" GTKCONFIG_LIBS="" - ## If we have a custom action on failure, don't print errors, but + ## If we have a custom action on failure, don't print errors, but ## do set a variable so people can do so. GTKCONFIG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$pkg_modules"` echo $GTKCONFIG_PKG_ERRORS fi - - + + else echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." echo "*** See http://www.freedesktop.org/software/pkgconfig" @@ -4702,7 +11058,9 @@ if test $succeeded = yes; then : else - { echo "configure: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." 1>&2; exit 1; } + { { echo "$as_me:$LINENO: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements ($pkg_modules) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi @@ -4714,43 +11072,47 @@ test -n "$ssl" -a -d /usr/kerberos && { sslcflags="-I/usr/kerberos/include $sslcflags" ssl="-L/usr/kerberos/lib $ssl" - } + } man_nessus_1=doc/OpenVAS-Client.1 # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:4725: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_path_AR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - case "$AR" in - /*) + case $AR in + [\\/]* | ?:[\\/]*) ac_cv_path_AR="$AR" # Let the user override the test with a path. ;; - ?:/*) - ac_cv_path_AR="$AR" # Let the user override the test with a dos path. - ;; *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" - ac_dummy="$PATH" - for ac_dir in $ac_dummy; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - ac_cv_path_AR="$ac_dir/$ac_word" - break - fi - done - IFS="$ac_save_ifs" + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_AR="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + ;; esac fi -AR="$ac_cv_path_AR" +AR=$ac_cv_path_AR if test -n "$AR"; then - echo "$ac_t""$AR" 1>&6 + { echo "$as_me:$LINENO: result: $AR" >&5 +echo "${ECHO_T}$AR" >&6; } else - echo "$ac_t""no" 1>&6 + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } fi @@ -4793,413 +11155,1207 @@ -trap '' 1 2 15 -cat > confcache <<\EOF + + +ac_config_files="$ac_config_files nessus.tmpl include/corevers.h openvasclient-mkcert" + +cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure -# scripts and configure runs. It is not useful on other systems. -# If it contains results you don't want to keep, you may remove or edit it. +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. # -# By default, configure uses ./config.cache as the cache file, -# creating it if it does not exist already. You can give configure -# the --cache-file=FILE option to use a different cache file; that is -# what configure does when it calls configure scripts in -# subdirectories, so they share the cache. -# Giving --cache-file=/dev/null disables caching, for debugging configure. -# config.status only pays attention to the cache file if you give it the -# --recheck option to rerun configure. +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. # -EOF +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. +# So, we kill variables containing newlines. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -(set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote substitution - # turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - -e "s/'/'\\\\''/g" \ - -e "s/^\$[a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\$=\$.*\$/\\1=\${\\1='\\2'}/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n -e 's/^$[a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*$=$.*$/\1=${\1=\2}/p' - ;; - esac >> confcache -if cmp -s $cache_file confcache; then - : -else - if test -w $cache_file; then - echo "updating cache $cache_file" - cat confcache > $cache_file +( + for ac_var in `(set) 2>&1 | sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]*$=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\$[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\$=\$.*\$/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^$[^=]*$=$.*[{}].*$$/test "${\1+set}" = set || &/ + t end + s/^$[^=]*$=$.*$$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file else - echo "not updating unwritable cache $cache_file" + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} fi fi rm -f confcache -trap 'rm -fr conftest* confdefs* core core.* *.core $ac_clean_files; exit 1' 1 2 15 - test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -# Any assignment to VPATH causes Sun make to only execute -# the first set of double-colon rules, so remove it if not needed. -# If there is a colon in the path, we need to keep it. -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=[^:]*$/d' -fi +DEFS=-DHAVE_CONFIG_H -trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs -DEFS=-DHAVE_CONFIG_H +LTLIBOBJS=$ac_ltlibobjs -# Without the "./", some shells look in PATH for config.status. + + : ${CONFIG_STATUS=./config.status} - -echo creating $CONFIG_STATUS -rm -f $CONFIG_STATUS -cat > $CONFIG_STATUS <&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL +# Generated by $as_me. # Run this file to recreate the current configuration. -# This directory was configured as follows, -# on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -# -# $0 $ac_configure_args -# # Compiler output produced by configure, useful for debugging -# configure, is in ./config.log if it exists. +# configure, is in config.log if it exists. -ac_cs_usage="Usage: $CONFIG_STATUS [--recheck] [--version] [--help]" -for ac_option -do - case "\$ac_option" in - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" - exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; - -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.13" - exit 0 ;; - -help | --help | --hel | --he | --h) - echo "\$ac_cs_usage"; exit 0 ;; - *) echo "\$ac_cs_usage"; exit 1 ;; - esac -done +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF -ac_given_srcdir=$srcdir -ac_given_INSTALL="$INSTALL" +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## -trap 'rm -fr `echo "nessus.tmpl include/corevers.h openvasclient-mkcert include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 -EOF -cat >> $CONFIG_STATUS </dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac -# Protect against being on the right side of a sed subst in config.status. -sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; - s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF -$ac_vpsub -$extrasub -s%@SHELL@%$SHELL%g -s%@CFLAGS@%$CFLAGS%g -s%@CPPFLAGS@%$CPPFLAGS%g -s%@CXXFLAGS@%$CXXFLAGS%g -s%@FFLAGS@%$FFLAGS%g -s%@DEFS@%$DEFS%g -s%@LDFLAGS@%$LDFLAGS%g -s%@LIBS@%$LIBS%g -s%@exec_prefix@%$exec_prefix%g -s%@prefix@%$prefix%g -s%@program_transform_name@%$program_transform_name%g -s%@bindir@%$bindir%g -s%@sbindir@%$sbindir%g -s%@libexecdir@%$libexecdir%g -s%@datadir@%$datadir%g -s%@sysconfdir@%$sysconfdir%g -s%@sharedstatedir@%$sharedstatedir%g -s%@localstatedir@%$localstatedir%g -s%@libdir@%$libdir%g -s%@includedir@%$includedir%g -s%@oldincludedir@%$oldincludedir%g -s%@infodir@%$infodir%g -s%@mandir@%$mandir%g -s%@host@%$host%g -s%@host_alias@%$host_alias%g -s%@host_cpu@%$host_cpu%g -s%@host_vendor@%$host_vendor%g -s%@host_os@%$host_os%g -s%@CC@%$CC%g -s%@SET_MAKE@%$SET_MAKE%g -s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g -s%@INSTALL_DATA@%$INSTALL_DATA%g -s%@PKG_CONFIG@%$PKG_CONFIG%g -s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g -s%@GLIB_LIBS@%$GLIB_LIBS%g -s%@CPP@%$CPP%g -s%@ALLOCA@%$ALLOCA%g -s%@X_CFLAGS@%$X_CFLAGS%g -s%@X_PRE_LIBS@%$X_PRE_LIBS%g -s%@X_LIBS@%$X_LIBS%g -s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g -s%@GTKCONFIG_CFLAGS@%$GTKCONFIG_CFLAGS%g -s%@GTKCONFIG_LIBS@%$GTKCONFIG_LIBS%g -s%@AR@%$AR%g -s%@PWD@%$PWD%g -s%@PWDD@%$PWDD%g -s%@CWALL@%$CWALL%g -s%@GTK_VERSION@%$GTK_VERSION%g -s%@NESSUS_MAJOR@%$NESSUS_MAJOR%g -s%@NESSUS_MINOR@%$NESSUS_MINOR%g -s%@NESSUS_PATCH@%$NESSUS_PATCH%g -s%@NESSUS_RC@%$NESSUS_RC%g -s%@NESSUS_DATE@%$NESSUS_DATE%g -s%@NESS_COMPILER@%$NESS_COMPILER%g -s%@NESS_OS_NAME@%$NESS_OS_NAME%g -s%@NESS_OS_VERSION@%$NESS_OS_VERSION%g -s%@INSTALL_DIR@%$INSTALL_DIR%g -s%@INSTALL@%$INSTALL%g -s%@RUN_LIBS@%$RUN_LIBS%g -s%@resolv_lib@%$resolv_lib%g -s%@socket_lib@%$socket_lib%g -s%@nsl_lib@%$nsl_lib%g -s%@ssl_lib@%$ssl_lib%g -s%@gtk_flags@%$gtk_flags%g -s%@debug_flags@%$debug_flags%g -s%@nessus_lib@%$nessus_lib%g -s%@man_nessus_1@%$man_nessus_1%g -s%@dl_lib@%$dl_lib%g -s%@client@%$client%g -s%@client_install@%$client_install%g -s%@ac_configure_args@%$ac_configure_args%g -s%@ssl@%$ssl%g -s%@sslcflags@%$sslcflags%g -s%@installuser@%$installuser%g -s%@gettext_flags@%$gettext_flags%g +fi -CEOF -EOF -cat >> $CONFIG_STATUS <<\EOF -# Split the substitutions into bite-sized pieces for seds with -# small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. -ac_file=1 # Number of current file. -ac_beg=1 # First line for current file. -ac_end=$ac_max_sed_cmds # Line after last line for current file. -ac_more_lines=: -ac_sed_cmds="" -while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' else - sed "${ac_end}q" conftest.subs > conftest.s$ac_file + PATH_SEPARATOR=: fi - if test ! -s conftest.s$ac_file; then - ac_more_lines=false - rm -f conftest.s$ac_file + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var else - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f conftest.s$ac_file" - else - ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" - fi - ac_file=`expr $ac_file + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_cmds` + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var fi done -if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat + +# Required to use basename. +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr +else + as_expr=false fi -EOF -cat >> $CONFIG_STATUS </dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi -CONFIG_FILES=\${CONFIG_FILES-"nessus.tmpl include/corevers.h openvasclient-mkcert"} -EOF -cat >> $CONFIG_STATUS <<\EOF -for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; - esac - # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/$[^/][^/]*$/*$' \| \ + X"$0" : 'X$//$$' \| \ + X"$0" : 'X$/$' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/$[^/][^/]*$\/*$/{ + s//\1/ + q + } + /^X\/$\/\/$$/{ + s//\1/ + q + } + /^X\/$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - ac_dir_suffix="/`echo $ac_dir|sed 's%^\./%%'`" - # A "../" for each directory in $ac_dir_suffix. - ac_dots=`echo $ac_dir_suffix|sed 's%/[^/]*%../%g'` +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO$[^'$as_cr_alnum'_].*\n$$.*$/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '$a$' >/dev/null 2>&1 && + test "X`expr 00001 : '.*$...$'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L else - ac_dir_suffix= ac_dots= + as_ls_L_option= fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x - case "$ac_given_srcdir" in - .) srcdir=. - if test -z "$ac_dots"; then top_srcdir=. - else top_srcdir=`echo $ac_dots|sed 's%/$%%'`; fi ;; - /*) srcdir="$ac_given_srcdir$ac_dir_suffix"; top_srcdir="$ac_given_srcdir" ;; - *) # Relative path. - srcdir="$ac_dots$ac_given_srcdir$ac_dir_suffix" - top_srcdir="$ac_dots$ac_given_srcdir" ;; +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 + +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by $as_me, which was +generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF +# Files that config.status was made for. +config_files="$ac_config_files" +config_headers="$ac_config_headers" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + --header=FILE[:TEMPLATE] + instantiate the configuration header FILE + +Configuration files: +$config_files + +Configuration headers: +$config_headers + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +ac_cs_version="\\ +config.status +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +Copyright (C) 2006 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "X$1" : 'X$[^=]*$='` + ac_optarg=`expr "X$1" : 'X[^=]*=$.*$'` + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; esac - case "$ac_given_INSTALL" in - [/$]*) INSTALL="$ac_given_INSTALL" ;; - *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" + ac_need_defaults=false;; + --he | --h) + # Conflict between --help and --header + { echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; + esac + shift +done - echo creating "$ac_file" - rm -f "$ac_file" - configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." - case "$ac_file" in - *Makefile*) ac_comsub="1i\\ -# $configure_input" ;; - *) ac_comsub= ;; +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "include/config.h") CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; + "nessus.tmpl") CONFIG_FILES="$CONFIG_FILES nessus.tmpl" ;; + "include/corevers.h") CONFIG_FILES="$CONFIG_FILES include/corevers.h" ;; + "openvasclient-mkcert") CONFIG_FILES="$CONFIG_FILES openvasclient-mkcert" ;; + + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; esac +done - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - sed -e "$ac_comsub -s%@configure_input@%$configure_input%g -s%@srcdir@%$srcdir%g -s%@top_srcdir@%$top_srcdir%g -s%@INSTALL@%$INSTALL%g -" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file -fi; done -rm -f conftest.s* -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files + test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || +{ + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} + # -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s%^$[ ]*$#$[ ]*define[ ][ ]*$' -ac_dB='$[ ][ ]*$[^ ]*%\1#\2' -ac_dC='\3' -ac_dD='%g' -# ac_u turns "#undef NAME" with trailing blanks into "#define NAME VALUE". -ac_uA='s%^$[ ]*$#$[ ]*$undef$[ ][ ]*$' -ac_uB='$[ ]$%\1#\2define\3' -ac_uC=' ' -ac_uD='\4%g' -# ac_e turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_eA='s%^$[ ]*$#$[ ]*$undef$[ ][ ]*$' -ac_eB='$%\1#\2define\3' -ac_eC=' ' -ac_eD='%g' +# Set up the sed scripts for CONFIG_FILES section. +# -if test "${CONFIG_HEADERS+set}" != set; then -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +build!$build$ac_delim +build_cpu!$build_cpu$ac_delim +build_vendor!$build_vendor$ac_delim +build_os!$build_os$ac_delim +host!$host$ac_delim +host_cpu!$host_cpu$ac_delim +host_vendor!$host_vendor$ac_delim +host_os!$host_os$ac_delim +CC!$CC$ac_delim +CFLAGS!$CFLAGS$ac_delim +LDFLAGS!$LDFLAGS$ac_delim +CPPFLAGS!$CPPFLAGS$ac_delim +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +CPP!$CPP$ac_delim +GREP!$GREP$ac_delim +EGREP!$EGREP$ac_delim +PKG_CONFIG!$PKG_CONFIG$ac_delim +GLIB_CFLAGS!$GLIB_CFLAGS$ac_delim +GLIB_LIBS!$GLIB_LIBS$ac_delim +ALLOCA!$ALLOCA$ac_delim +XMKMF!$XMKMF$ac_delim +X_CFLAGS!$X_CFLAGS$ac_delim +X_PRE_LIBS!$X_PRE_LIBS$ac_delim +X_LIBS!$X_LIBS$ac_delim +X_EXTRA_LIBS!$X_EXTRA_LIBS$ac_delim +GTKCONFIG_CFLAGS!$GTKCONFIG_CFLAGS$ac_delim +GTKCONFIG_LIBS!$GTKCONFIG_LIBS$ac_delim +AR!$AR$ac_delim +PWD!$PWD$ac_delim +PWDD!$PWDD$ac_delim +CWALL!$CWALL$ac_delim +GTK_VERSION!$GTK_VERSION$ac_delim +NESSUS_MAJOR!$NESSUS_MAJOR$ac_delim +NESSUS_MINOR!$NESSUS_MINOR$ac_delim +NESSUS_PATCH!$NESSUS_PATCH$ac_delim +NESSUS_RC!$NESSUS_RC$ac_delim +NESSUS_DATE!$NESSUS_DATE$ac_delim +NESS_COMPILER!$NESS_COMPILER$ac_delim +NESS_OS_NAME!$NESS_OS_NAME$ac_delim +NESS_OS_VERSION!$NESS_OS_VERSION$ac_delim +INSTALL_DIR!$INSTALL_DIR$ac_delim +INSTALL!$INSTALL$ac_delim +RUN_LIBS!$RUN_LIBS$ac_delim +resolv_lib!$resolv_lib$ac_delim +socket_lib!$socket_lib$ac_delim +nsl_lib!$nsl_lib$ac_delim +ssl_lib!$ssl_lib$ac_delim +gtk_flags!$gtk_flags$ac_delim +debug_flags!$debug_flags$ac_delim +nessus_lib!$nessus_lib$ac_delim +man_nessus_1!$man_nessus_1$ac_delim +dl_lib!$dl_lib$ac_delim +gdc_lib!$gdc_lib$ac_delim +client!$client$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` fi -for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case "$ac_file" in - *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` - ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - *) ac_file_in="${ac_file}.in" ;; + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +client_install!$client_install$ac_delim +ac_configure_args!$ac_configure_args$ac_delim +ssl!$ssl$ac_delim +sslcflags!$sslcflags$ac_delim +installuser!$installuser$ac_delim +gettext_flags!$gettext_flags$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^$[^=]*=[ ]*$:*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES :H $CONFIG_HEADERS +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift - echo creating $ac_file + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done - rm -f conftest.frag conftest.in conftest.out - ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` - cat $ac_file_inputs > conftest.in + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi -EOF + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac -# Transform confdefs.h into a sed script conftest.vals that substitutes -# the proper values into config.h.in to produce config.h. And first: -# Protect against being on the right side of a sed subst in config.status. -# Protect against being in an unquoted here document in config.status. -rm -f conftest.vals -cat > conftest.hdr <<\EOF -s/[\\&%]/\\&/g -s%[\\$`]%\\&%g -s%#define $[A-Za-z_][A-Za-z0-9_]*$ *$.*$%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp -s%ac_d%ac_u%gp -s%ac_u%ac_e%gp -EOF -sed -n -f conftest.hdr confdefs.h > conftest.vals -rm -f conftest.hdr + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X$//$[^/]' \| \ + X"$ac_file" : 'X$//$$' \| \ + X"$ac_file" : 'X$/$' \| . 2>/dev/null || +echo X"$ac_file" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X$.*[^/]$//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X$//$[^/]' \| \ + X"$as_dir" : 'X$//$$' \| \ + X"$as_dir" : 'X$/$' \| . 2>/dev/null || +echo X"$as_dir" | + sed '/^X$.*[^/]$\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X$\/\/$[^/].*/{ + s//\1/ + q + } + /^X$\/\/$$/{ + s//\1/ + q + } + /^X$\/$.*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. -# This sed command replaces #undef with comments. This is necessary, for +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; + :H) + # + # CONFIG_HEADER + # +_ACEOF + +# Transform confdefs.h into a sed script `conftest.defines', that +# substitutes the proper values into config.h.in to produce config.h. +rm -f conftest.defines conftest.tail +# First, append a space to every undef/define line, to ease matching. +echo 's/$/ /' >conftest.defines +# Then, protect against being on the right side of a sed subst, or in +# an unquoted here document, in config.status. If some macros were +# called several times there might be several #defines for the same +# symbol, which is useless. But do not sort them, since the last +# AC_DEFINE must be honored. +ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* +# These sed commands are passed to sed as "A NAME B PARAMS C VALUE D", where +# NAME is the cpp macro being defined, VALUE is the value it is being given. +# PARAMS is the parameter list in the macro definition--in most cases, it's +# just an empty string. +ac_dA='s,^\$[ #]*\$[^ ]*\$[ ]*' +ac_dB='\$[ (].*,\\1define\\2' +ac_dC=' ' +ac_dD=' ,' + +uniq confdefs.h | + sed -n ' + t rset + :rset + s/^[ ]*#[ ]*define[ ][ ]*// + t ok + d + :ok + s/[\\&,]/\\&/g + s/^$'"$ac_word_re"'$$([^()]*)$[ ]*$.*$/ '"$ac_dA"'\1'"$ac_dB"'\2'"${ac_dC}"'\3'"$ac_dD"'/p + s/^$'"$ac_word_re"'$[ ]*$.*$/'"$ac_dA"'\1'"$ac_dB$ac_dC"'\2'"$ac_dD"'/p + ' >>conftest.defines + +# Remove the space that was appended to ease matching. +# Then replace #undef with comments. This is necessary, for # example, in the case of _POSIX_SOURCE, which is predefined and required # on some systems where configure will not decide to define it. -cat >> conftest.vals <<\EOF -s%^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*%/* & */% -EOF +# (The regexp can be short, since the line contains either #define or #undef.) +echo 's/ $// +s,^[ #]*u.*,/* & */,' >>conftest.defines -# Break up conftest.vals because some shells have a limit on -# the size of here documents, and old seds have small limits too. +# Break up conftest.defines: +ac_max_sed_lines=50 -rm -f conftest.tail +# First sed command is: sed -f defines.sed $ac_file_inputs >"$tmp/out1" +# Second one is: sed -f defines.sed "$tmp/out1" >"$tmp/out2" +# Third one will be: sed -f defines.sed "$tmp/out2" >"$tmp/out1" +# et cetera. +ac_in='$ac_file_inputs' +ac_out='"$tmp/out1"' +ac_nxt='"$tmp/out2"' + while : do - ac_lines=`grep -c . conftest.vals` - # grep -c gives empty output for an empty file on some AIX systems. - if test -z "$ac_lines" || test "$ac_lines" -eq 0; then break; fi - # Write a limited-size here document to conftest.frag. - echo ' cat > conftest.frag <> $CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.vals >> $CONFIG_STATUS + # Write a here document: + cat >>$CONFIG_STATUS <<_ACEOF + # First, check the format of the line: + cat >"\$tmp/defines.sed" <<\\CEOF +/^[ ]*#[ ]*undef[ ][ ]*$ac_word_re[ ]*\$/b def +/^[ ]*#[ ]*define[ ][ ]*$ac_word_re[( ]/b def +b +:def +_ACEOF + sed ${ac_max_sed_lines}q conftest.defines >>$CONFIG_STATUS echo 'CEOF - sed -f conftest.frag conftest.in > conftest.out - rm -f conftest.in - mv conftest.out conftest.in -' >> $CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.vals > conftest.tail - rm -f conftest.vals - mv conftest.tail conftest.vals + sed -f "$tmp/defines.sed"' "$ac_in >$ac_out" >>$CONFIG_STATUS + ac_in=$ac_out; ac_out=$ac_nxt; ac_nxt=$ac_in + sed 1,${ac_max_sed_lines}d conftest.defines >conftest.tail + grep . conftest.tail >/dev/null || break + rm -f conftest.defines + mv conftest.tail conftest.defines done -rm -f conftest.vals +rm -f conftest.defines conftest.tail -cat >> $CONFIG_STATUS <<\EOF - rm -f conftest.frag conftest.h - echo "/* $ac_file. Generated automatically by configure. */" > conftest.h - cat conftest.in >> conftest.h - rm -f conftest.in - if cmp -s $ac_file conftest.h 2>/dev/null; then - echo "$ac_file is unchanged" - rm -f conftest.h +echo "ac_result=$ac_in" >>$CONFIG_STATUS +cat >>$CONFIG_STATUS <<\_ACEOF + if test x"$ac_file" != x-; then + echo "/* $configure_input */" >"$tmp/config.h" + cat "$ac_result" >>"$tmp/config.h" + if diff $ac_file "$tmp/config.h" >/dev/null 2>&1; then + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 +echo "$as_me: $ac_file is unchanged" >&6;} + else + rm -f $ac_file + mv "$tmp/config.h" $ac_file + fi else - # Remove last slash and all that follows it. Not all systems have dirname. - ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - # The file is in a subdirectory. - test ! -d "$ac_dir" && mkdir "$ac_dir" - fi - rm -f $ac_file - mv conftest.h $ac_file + echo "/* $configure_input */" + cat "$ac_result" fi -fi; done + rm -f "$tmp/out12" + ;; -EOF -cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + esac -exit 0 -EOF +done # for ac_tag + + +{ (exit 0); exit 0; } +_ACEOF chmod +x $CONFIG_STATUS -rm -fr confdefs* $ac_clean_files -test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 +ac_clean_files=$ac_clean_files_save +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi + + chmod +x openvasclient-mkcert exit 0 Modified: trunk/openvas-client/configure.in =================================================================== --- trunk/openvas-client/configure.in 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/configure.in 2008-08-06 10:43:35 UTC (rev 1106) @@ -73,6 +73,8 @@ [ --with-ssl=[DIR] enable SSL support using libraries in DIR], [with_ssl=$withval]) +dnl GDChart +AC_CHECK_HEADERS([gdc.h gd.h png.h]) PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.0, HAVE_GLIB="yes", sweep_config_ok="no") AC_SUBST(GLIB_CFLAGS) @@ -538,6 +540,7 @@ AC_SUBST(nessus_lib) AC_SUBST(man_nessus_1) AC_SUBST(dl_lib) +AC_SUBST(gdc_lib) AC_SUBST(client) AC_SUBST(client_install) AC_SUBST(datadir) Modified: trunk/openvas-client/include/config.h.in =================================================================== --- trunk/openvas-client/include/config.h.in 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/include/config.h.in 2008-08-06 10:43:35 UTC (rev 1106) @@ -224,6 +224,8 @@ #undef HAVE_SETPROCTITLE #undef HAVE__EXIT +#undef HAVE_GDCHART + #undef HAVE_PTY_H #undef HAVE_SYS_MMAN_H #undef HAVE_SIGNAL_H Modified: trunk/openvas-client/nessus/Makefile =================================================================== --- trunk/openvas-client/nessus/Makefile 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus/Makefile 2008-08-06 10:43:35 UTC (rev 1106) @@ -1,9 +1,9 @@ include ../nessus.tmpl GTKLIBS= $(GTKCONFIG_LIBS) -INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIB_CFLAGS) -I../src/gui -Igdchart0.94b -Igdchart0.94b/gd1.3 -LIBS = $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) $(GLIB_LIBS) \ - $(RUN_LIBS) $(C_R_LIB) gdchart0.94b/gd1.3/libgd.a -lm -L../libnessus -lnessus-client -lssl -lcrypto $(DL_LIB) -lz $(SOCKET_LIB) +INCLUDE = ${include} $(GTKCONFIG_CFLAGS) $(GLIB_CFLAGS) -I../src/gui +LIBS = $(X_LIBS) $(X_CFLAGS) $(GTKLIBS) $(GLIB_LIBS) $(GDC_LIB) \ + $(RUN_LIBS) $(C_R_LIB) -lm -L../libnessus -lnessus-client -lssl -lcrypto $(DL_LIB) -lz $(SOCKET_LIB) NESSUS_INCLUDE=`sh ./cflags` CFLAGS+=-Wall @@ -57,10 +57,6 @@ prefs_kb.o \ listnotebook.o \ read_target_file.o \ - gdchart0.94b/gdc.o \ - gdchart0.94b/price_conv.o \ - gdchart0.94b/gdc_pie.o \ - gdchart0.94b/gdchart.o \ regex.o \ filter.o \ dirutils.o \ @@ -289,17 +285,5 @@ sslui.o : cflags sslui.c globals.h xpm/lock.xpm $(CC) $(CFLAGS) $(NESSUS_INCLUDE) -c sslui.c -gdchart0.94b/gdc.o : cflags - cd gdchart0.94b && $(MAKE) - -gdchart0.94b/gdchart.o : cflags - cd gdchart0.94b && $(MAKE) - -gdchart0.94b/price_conv.o : cflags - cd gdchart0.94b && $(MAKE) - -gdchart0.94b/gdc_pie.o : cflags - cd gdchart0.94b && $(MAKE) clean : rm -f *.o $(NESSUSCLIENT) *~ cflags prefs_dialog/*.o - cd gdchart0.94b && $(MAKE) clean Modified: trunk/openvas-client/nessus/cli.c =================================================================== --- trunk/openvas-client/nessus/cli.c 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus/cli.c 2008-08-06 10:43:35 UTC (rev 1106) @@ -373,13 +373,13 @@ return; } -#ifndef _NO_PIES +#ifdef HAVE_GDCHART if(!strncmp(ftype, "html_pie", 8)|| !strncmp(ftype, "html_graph", 10)) { args->output = arglist_to_html_graph; } else -#endif /* _NO_PIES */ +#endif /* HAVE_GDCHART */ if (!strncmp(ftype, "html", 4)) { args->output = arglist_to_html; } else if (!strcmp(ftype, "latex") || Modified: trunk/openvas-client/nessus/globals.h =================================================================== --- trunk/openvas-client/nessus/globals.h 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus/globals.h 2008-08-06 10:43:35 UTC (rev 1106) @@ -11,7 +11,6 @@ #ifdef _WIN32 # include "globals.w32" -/* #define _NO_PIES */ #endif /* _WIN32 */ # define HANDLE int Modified: trunk/openvas-client/nessus/html_graph_output.c =================================================================== --- trunk/openvas-client/nessus/html_graph_output.c 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus/html_graph_output.c 2008-08-06 10:43:35 UTC (rev 1106) @@ -64,11 +64,14 @@ - HTML report -------------------------------------------------------------------*/ + +#ifdef HAVE_GDCHART + #include #include "nessus_i18n.h" -#include "gdchart0.94b/gdc.h" -#include "gdchart0.94b/gdchart.h" -#include "gdchart0.94b/gdcpie.h" +#include "gdc.h" +#include "gdchart.h" +#include "gdcpie.h" #include "report.h" #include "report_utils.h" #include "error_dlg.h" @@ -1366,5 +1369,4 @@ return 0; } - - +#endif /* HAVE_GDCHART */ Modified: trunk/openvas-client/nessus/nessus.c =================================================================== --- trunk/openvas-client/nessus/nessus.c 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus/nessus.c 2008-08-06 10:43:35 UTC (rev 1106) @@ -788,8 +788,10 @@ arglist_to_text(backend_convert(be), out_report); else if(!strcmp(type, "html")) arglist_to_html(backend_convert(be), out_report); +#ifdef HAVE_GDCHART else if(!strcmp(type, "html_pie") || !strcmp(type, "html_graph")) arglist_to_html_graph(backend_convert(be), out_report); +#endif else if(!strcmp(type, "nbe")) backend_to_nbe(be, out_report); else if(!strcmp(type, "xml")) @@ -804,7 +806,7 @@ } else { - fprintf(stderr, _("Could not import '%s' - is it a .nbe file?\n"), + fprintf(stderr, _("Could not import '%s' - is it a .nbe file?\n"), in_report); } exit(0); Modified: trunk/openvas-client/nessus/report_save.c =================================================================== --- trunk/openvas-client/nessus/report_save.c 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus/report_save.c 2008-08-06 10:43:35 UTC (rev 1106) @@ -126,7 +126,7 @@ hosts = backend_convert(be); arglist_to_text(hosts, fname); break; -#ifndef _NOPIE +#ifdef HAVE_GDCHART case SAVE_HTML_GRAPH: hosts = backend_convert(be); arglist_to_html_graph(hosts, fname); @@ -231,7 +231,7 @@ gtk_menu_append(GTK_MENU(menu), type); gtk_widget_show(type); -#ifndef _NO_PIES +#ifdef HAVE_GDCHART type = gtk_menu_item_new_with_label(_("HTML with Pies and Graphs")); gtk_object_set_data(GTK_OBJECT(type), "type", (void *)SAVE_HTML_GRAPH); gtk_menu_append(GTK_MENU(menu), type); Modified: trunk/openvas-client/nessus.tmpl.in =================================================================== --- trunk/openvas-client/nessus.tmpl.in 2008-08-06 10:16:44 UTC (rev 1105) +++ trunk/openvas-client/nessus.tmpl.in 2008-08-06 10:43:35 UTC (rev 1106) @@ -106,6 +106,7 @@ GLIB_CFLAGS=@GLIB_CFLAGS@ GLIB_LIBS=@GLIB_LIBS@ DL_LIB=@dl_lib@ +GDC_LIB=@gdc_lib@ RESOLV_LIB=@resolv_lib@ SOCKET_LIB=@socket_lib@ LIBS=@LIBS@ @ssl@ From scm-commit at wald.intevation.org Wed Aug 6 14:25:57 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 14:25:57 +0200 (CEST) Subject: [Openvas-commits] r1108 - trunk/doc/website Message-ID: <20080806122557.87332406C7@pyrosoma.intevation.org> Author: jan Date: 2008-08-06 14:25:57 +0200 (Wed, 06 Aug 2008) New Revision: 1108 Modified: trunk/doc/website/openvas-crs.htm4 Log: Setting #14 to "in progress". Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2008-08-06 10:52:16 UTC (rev 1107) +++ trunk/doc/website/openvas-crs.htm4 2008-08-06 12:25:57 UTC (rev 1108) @@ -57,7 +57,7 @@

OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib (done)

OpenVAS Change Request #12: Replace NTP with OTP (in progress)

OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server (accepted) -

OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd (accepted) +

OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd (in progress)

OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans (accepted) From scm-commit at wald.intevation.org Wed Aug 6 23:49:40 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Wed, 6 Aug 2008 23:49:40 +0200 (CEST) Subject: [Openvas-commits] r1109 - branches Message-ID: <20080806214940.02A2640710@pyrosoma.intevation.org> Author: jan Date: 2008-08-06 23:49:39 +0200 (Wed, 06 Aug 2008) New Revision: 1109 Added: branches/openvas-server-1-0/ Log: Creating branch for 1.0 series of openvas-server to unblock trunk/openvas-server for deeper changes. Copied: branches/openvas-server-1-0 (from rev 1108, trunk/openvas-server) From scm-commit at wald.intevation.org Thu Aug 7 00:16:21 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 7 Aug 2008 00:16:21 +0200 (CEST) Subject: [Openvas-commits] r1110 - in trunk/openvas-server: . doc doc/ntp openvasd Message-ID: <20080806221621.823ED40710@pyrosoma.intevation.org> Author: jan Date: 2008-08-07 00:16:17 +0200 (Thu, 07 Aug 2008) New Revision: 1110 Removed: trunk/openvas-server/openvasd/pluginupload.c trunk/openvas-server/openvasd/pluginupload.h Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/MANIFEST trunk/openvas-server/doc/ntp/ntp_extensions.txt trunk/openvas-server/doc/openvasd.8.in trunk/openvas-server/openvasd/Makefile trunk/openvas-server/openvasd/ntp_11.c Log: Final step of Change Request #4, http://www.openvas.org/openvas-cr-4.html : Remove plugin upload feature * openvasd/pluginupload.c, openvasd/pluginupload.h: Removed. * openvasd/Makefile: Removed handling of module pluginupload. * openvasd/ntp_11.c: (ntp_11_parse_input): Removed command ATTACHED_PLUGIN from protocol. * doc/openvasd.8.in: Removed documentation of "plugin_upload". * doc/ntp/ntp_extensions.txt: Removed description of ATTACHED_PLUGIN. * MANIFEST: Updated. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/ChangeLog 2008-08-06 22:16:17 UTC (rev 1110) @@ -1,3 +1,28 @@ +2008-08-07 Jan-Oliver Wagner + + Final step of Change Request #4, + http://www.openvas.org/openvas-cr-4.html : + Remove plugin upload feature + + * openvasd/pluginupload.c, openvasd/pluginupload.h: Removed. + + * openvasd/Makefile: Removed handling of module pluginupload. + + * openvasd/ntp_11.c: (ntp_11_parse_input): Removed command + ATTACHED_PLUGIN from protocol. + + * doc/openvasd.8.in: Removed documentation of "plugin_upload". + + * doc/ntp/ntp_extensions.txt: Removed description of + ATTACHED_PLUGIN. + + * MANIFEST: Updated. + +2008-08-06 Jan-Oliver Wagner + + Branching of 1.0 series happened. The present file + described trunk developments. + 2008-07-31 Tim Brown * openvas-adduser.in: Now sets prefix, execprefix during build. Modified: trunk/openvas-server/MANIFEST =================================================================== --- trunk/openvas-server/MANIFEST 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/MANIFEST 2008-08-06 22:16:17 UTC (rev 1110) @@ -77,8 +77,6 @@ openvasd/pluginload.h openvasd/pluginscheduler.c openvasd/pluginscheduler.h -openvasd/pluginupload.c -openvasd/pluginupload.h openvasd/plugs_hash.c openvasd/plugs_hash.h openvasd/plugs_req.c Modified: trunk/openvas-server/doc/ntp/ntp_extensions.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-06 22:16:17 UTC (rev 1110) @@ -355,27 +355,6 @@ <|> SERVER -10. Plugin upload ----------------------------------------------------------------------------- - -If the server allows it, the user may upload his own plugins to the server, -which will then be stored under his home -($prefix/var/openvas/users//plugins/) - -The client has to send the message ATTACHED_PLUGIN to the server -for this to work. The syntax of the message is : - -CLIENT <|> ATTACHED_PLUGIN -name: -content: octet/stream -bytes: %d -(file) - - -Note that may not contain any slash, and must have a server-approved -suffix (.nes, .nasl) - - 11. Per plugin message ------------------------------------------------------------------------------- Modified: trunk/openvas-server/doc/openvasd.8.in =================================================================== --- trunk/openvas-server/doc/openvasd.8.in 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/doc/openvasd.8.in 2008-08-06 22:16:17 UTC (rev 1110) @@ -166,9 +166,6 @@ .IP use_mac_addr Set this option to 'yes' if you are testing your local network and each local host has a dynamic IP address (affected by DHCP or BOOTP), and all the tested hosts will be referred to by their MAC address. -.IP plugin_upload -Set this option to 'yes' if you want to let openvasd users upload their own plugins. Note that the plugins they will upload will end up in their openvasd home directory, so they won't be shared among users (except if the user who uploads the plugins is the one declared in the option 'admin_user' - .IP admin_user The user listed in this option will upload his plugins into the global openvas plugins directory, and they will be shared by every other users Modified: trunk/openvas-server/openvasd/Makefile =================================================================== --- trunk/openvas-server/openvasd/Makefile 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/openvasd/Makefile 2008-08-06 22:16:17 UTC (rev 1110) @@ -33,7 +33,6 @@ locks.o \ dirutils.o \ plugs_hash.o \ - pluginupload.o \ pluginscheduler.o \ shared_socket.o @@ -128,9 +127,6 @@ plugs_hash.o : plugs_hash.c $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c plugs_hash.c -pluginupload.o : pluginupload.c - $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginupload.c - pluginscheduler.o : pluginscheduler.c $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginscheduler.c Modified: trunk/openvas-server/openvasd/ntp_11.c =================================================================== --- trunk/openvas-server/openvasd/ntp_11.c 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/openvasd/ntp_11.c 2008-08-06 22:16:17 UTC (rev 1110) @@ -40,7 +40,6 @@ #include "log.h" #include "users.h" #include "utils.h" -#include "pluginupload.h" #include "save_tests.h" #include "detached.h" #include "preferences.h" @@ -136,12 +135,6 @@ efree(&orig); return 1; } - /* XXX: This command should be entirely removed for protocol - * newer than NTP 11 */ - if(!strcmp(input, "ATTACHED_PLUGIN")) { - plugin_recv(globals); - return 1; - } if(!strcmp(input, "PLUGIN_INFO")) { char * t, *s; t = strstr(&(str[1]), " <|> "); Deleted: trunk/openvas-server/openvasd/pluginupload.c =================================================================== --- trunk/openvas-server/openvasd/pluginupload.c 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/openvasd/pluginupload.c 2008-08-06 22:16:17 UTC (rev 1110) @@ -1,102 +0,0 @@ -/* OpenVAS -* $Id$ -* Description: Provides somekind of remote plugin upload service -* ATTENTION: this feature is deprecated. -* This module just remains to give clients -* that try to upload plugins a denial answer. -* -* Authors: - Renaud Deraison (Original pre-fork develoment) -* - Tim Brown (Initial fork) -* - Laban Mwangi (Renaming work) -* - Tarik El-Yassem (Headers section) -* -* Copyright: -* Portions Copyright (C) 2006 Software in the Public Interest, Inc. -* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2, -* as published by the Free Software Foundation -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -*/ - -/* XXX: This module can be deleted once a new protocol version - * drops the upload feature. */ - -#include -#include "preferences.h" -#include "users.h" -#include "log.h" -#include "pluginload.h" - - -int -plugin_recv(struct arglist * globals) -{ - int soc = (int)arg_get_value(globals, "global_socket"); - int n; - long bytes = 0; - char input[4096]; - - /* Read and ignore the "name:" line */ - n = recv_line(soc, input, sizeof(input) - 1); - if (n <= 0) - return -1; - if (strncmp(input, "name: ", strlen("name: ")) != 0) - return -1; - - /* Read and ignore the "content:" line */ - n = recv_line(soc, input, sizeof(input) - 1); - if (n <= 0) - return -1; - - /* Read and parse the "bytes:" line */ - n = recv_line(soc, input, sizeof(input) - 1); - if (n <= 0) - return -1; - - if (!strncmp(input, "bytes: ", strlen("bytes: "))) - { - char * t = input + strlen("bytes: "); - bytes = atol(t); - } - else - return -1; - - /* Don't accept plugins bigger than 5Mb */ - if (bytes > 5*1024*1024) - return -1; - - /* - * Read and discard the bytes with the actual plugin. - */ - while (bytes > 0) - { - int e; - int chunk_size = bytes < sizeof(input) ? bytes : sizeof(input); - e = read_stream_connection_min(soc, input, chunk_size, chunk_size); - if (e <= 0) - { - if (errno == EINTR) - continue; - else - break; - } - bytes -= e; - } - - /* Always deny the upload since openvasd does not support it */ - auth_printf(globals, "SERVER <|> PLUGIN_DENIED <|> SERVER\n"); - - return 0; -} Deleted: trunk/openvas-server/openvasd/pluginupload.h =================================================================== --- trunk/openvas-server/openvasd/pluginupload.h 2008-08-06 21:49:39 UTC (rev 1109) +++ trunk/openvas-server/openvasd/pluginupload.h 2008-08-06 22:16:17 UTC (rev 1110) @@ -1,38 +0,0 @@ -/* OpenVAS -* $Id$ -* Description: pluginupload.c header. -* -* Authors: - Renaud Deraison (Original pre-fork develoment) -* - Tim Brown (Initial fork) -* - Laban Mwangi (Renaming work) -* - Tarik El-Yassem (Headers section) -* -* Copyright: -* Portions Copyright (C) 2006 Software in the Public Interest, Inc. -* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2, -* as published by the Free Software Foundation -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -*/ - - -#ifndef __NESSUS_PLUGINUPLOAD_H__ -#define __NESSUS_PLUGINUPLOAD_H__ - -/* XXX: This module can be deleted once a new protocol version - * drops the upload feature (ATTACHED_PLUGINS). */ - -int plugin_recv(struct arglist*); -#endif From scm-commit at wald.intevation.org Thu Aug 7 17:25:17 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 7 Aug 2008 17:25:17 +0200 (CEST) Subject: [Openvas-commits] r1111 - trunk/openvas-plugins/scripts Message-ID: <20080807152517.25F19404DF@pyrosoma.intevation.org> Author: chandra Date: 2008-08-07 17:25:16 +0200 (Thu, 07 Aug 2008) New Revision: 1111 Added: trunk/openvas-plugins/scripts/secpod_apache_tomcat_xss_n_bypass_vuln_900021.nasl Log: Script for Apache tomcat XSS vulnerability Added: trunk/openvas-plugins/scripts/secpod_apache_tomcat_xss_n_bypass_vuln_900021.nasl =================================================================== --- trunk/openvas-plugins/scripts/secpod_apache_tomcat_xss_n_bypass_vuln_900021.nasl 2008-08-06 22:16:17 UTC (rev 1110) +++ trunk/openvas-plugins/scripts/secpod_apache_tomcat_xss_n_bypass_vuln_900021.nasl 2008-08-07 15:25:16 UTC (rev 1111) @@ -0,0 +1,102 @@ +############################################################################## +# +# Apache Tomcat Cross-Site Scripting and Security Bypass Vulnerabilities +# +# Copyright: SecPod +# +# Date Written: 2008/08/05 +# +# Revision: 1.1 +# +# Log: schandan +# Issue #0085 +# ------------------------------------------------------------------------ +# This program was written by SecPod and is licensed under the GNU GPL +# license. Please refer to the below link for details, +# http://www.gnu.org/licenses/gpl.html +# This header contains information regarding licensing terms under the GPL, +# and information regarding obtaining source code from the Author. +# Consequently, pursuant to section 3(c) of the GPL, you must accompany the +# information found in this header with any distribution you make of this +# Program. +# ------------------------------------------------------------------------ +############################################################################## + +if(description) +{ + script_id(900021); + script_bugtraq_id(30494, 30496); + script_cve_id("CVE-2008-1232", "CVE-2008-2370"); + script_copyright(english:"Copyright (C) 2008 SecPod"); + script_version("$Revision: 1.1 $"); + script_category(ACT_GATHER_INFO); + script_family(english:"CGI abuses"); + script_name(english:"Apache Tomcat Cross-Site Scripting and Security Bypass Vulnerabilities"); + script_summary(english:"Check for vulnerable version of Apache Tomcat"); + desc["english"] = " + Overview : This host is running Apache Tomcat web server, which is prone to + cross site scripting and security bypass vulnerabilities. + + Vulnerability Insight : + + The flaws are due to, + - input validation error in the method HttpServletResponse.sendError() which + fails to properly sanitise before being returned to the user in the + HTTP Reason-Phrase. + - the application fails to normalize the target path before removing + the query string when using a RequestDispatcher. + + Impact : Successful exploitation could cause execution of arbitrary + HTML code, script code, and information disclosure. + + Impact Level : Application. + + Affected Software/OS : + Apache Tomcat 4.1.0 - 4.1.37, 5.5.0 - 5.5.26, and 6.0.0 - 6.0.16 + on All Platforms. + + Fix : Upgrade to higher version of 4.x, 5.x, or 6.x series. + http://tomcat.apache.org/ + + References : + http://secunia.com/advisories/31379/ + http://secunia.com/advisories/31381/ + + CVSS Score : + CVSS Base Score : 5.8 (AV:N/AC:M/Au:NR/C:P/I:P/A:N) + CVSS Temporal Score : 4.5 + Risk factor : Medium"; + script_description(english:desc["english"]); + script_dependencies("http_version.nasl"); + exit(0); +} + + + soc = open_sock_tcp(139); + display(soc); + + exit(0); + + include("http_func.inc"); + include("http_keepalive.inc"); + + port = 8080; + if(!port){ + exit(0); + } + + sndReq = http_get(item:string("/index.jsp"), port:port); + rcvRes = http_keepalive_send_recv(port:port, data:sndReq, bodyonly:1); + if(rcvRes == NULL){ + exit(0); + } + + if(egrep(pattern:"Apache Tomcat", string:rcvRes)) + { + # Grep for Apache Tomcat 4.1.0 - 4.1.37, 5.5.0 - 5.5.26, 6.0.0 - 6.0.16 + if(egrep(pattern:"Apache Tomcat/(4\.1(\.[0-2]?[0-9]|\.3[0-7])?|5\.5" + + "(\.[01]?[0-9]|\.2[0-6])?|6\.0(\.[0-9]|\.1[0-6])?)" + + "[^.0-9]", string:rcvRes)){ + security_warning(port); + } + } Property changes on: trunk/openvas-plugins/scripts/secpod_apache_tomcat_xss_n_bypass_vuln_900021.nasl ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Thu Aug 7 17:25:49 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Thu, 7 Aug 2008 17:25:49 +0200 (CEST) Subject: [Openvas-commits] r1112 - trunk/openvas-plugins/scripts Message-ID: <20080807152549.B5431404DF@pyrosoma.intevation.org> Author: chandra Date: 2008-08-07 17:25:49 +0200 (Thu, 07 Aug 2008) New Revision: 1112 Added: trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl Log: Script for Xampp Multiple XSS vulnerability Added: trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl =================================================================== --- trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl 2008-08-07 15:25:16 UTC (rev 1111) +++ trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl 2008-08-07 15:25:49 UTC (rev 1112) @@ -0,0 +1,111 @@ +############################################################################## +# +# XAMPP for Linux text Parameter Multiple XSS Vulnerabilities +# +# Copyright: SecPod +# +# Date Written: 2008/08/07 +# +# Revision: 1.2 +# +# Log: schandan +# Issue #0093 +# ------------------------------------------------------------------------ +# This program was written by SecPod and is licensed under the GNU GPL +# license. Please refer to the below link for details, +# http://www.gnu.org/licenses/gpl.html +# This header contains information regarding licensing terms under the GPL, +# and information regarding obtaining source code from the Author. +# Consequently, pursuant to section 3(c) of the GPL, you must accompany the +# information found in this header with any distribution you make of this +# Program. +# ------------------------------------------------------------------------ +############################################################################## + +if(description) +{ + script_id(900023); + script_bugtraq_id(30535); + script_copyright(english:"Copyright (C) 2008 SecPod"); + script_version("$Revision: 1.1 $"); + script_category(ACT_GATHER_INFO); + script_family(english:"CGI abuses : XSS"); + script_name(english:"XAMPP for Linux text Parameter Multiple XSS Vulnerabilities"); + script_summary(english:"Check for the vulnerable version of XAMPP"); + desc["english"] = " + Overview : The host is running Xampp, which is prone to multiple cross site + scripting vulnerabilities. + + Vulnerability Insight : + + The flaw is due the input passed to the parameter text in iart.php and + ming.php files are not santised before being returned to the user. + + Impact : Successful exploitation could allow remote attackers to execute + arbitrary HTML and script code. + + Impact Level : Application + + Affected Software/OS: + Xampp Linux 1.6.7 and prior on Linux (All). + + Solution : No solution/patch is available as on 07th August, 2008. Information + regarding this issue will be updated once the solution details are available. + For updates check, http://www.apachefriends.org/en/xampp-linux.html + + References : http://www.securityfocus.com/archive/1/495096 + + CVSS Score : + CVSS Base Score : 5.8 (AV:N/AC:M/Au:NR/C:P/I:P/A:N) + CVSS Temporal Score : 5.2 + Risk factor : Medium"; + script_description(english:desc["english"]); + script_dependencies("http_version.nasl"); + script_require_ports("Services/www", 80); + exit(0); +} + + + include("http_func.inc"); + include("http_keepalive.inc"); + + port = get_http_port(default:80); + if(!port){ + exit(0); + } + + foreach path (make_list("/xampp", cgi_dirs())) + { + sndReq = http_get(item:string(path, "/start.php"), port:port); + rcvRes = http_keepalive_send_recv(port:port, data:sndReq); + if(rcvRes == NULL){ + exit(0); + } + + if(egrep(pattern:"XAMPP for Linux", string:rcvRes) && + egrep(pattern:"^HTTP/.* 200 OK", string:rcvRes)) + { + if(safe_checks()) + { + if(egrep(pattern:"XAMPP for Linux 1\.([0-5]\..*|6\.[0-7])" + + "($|[^.0-9])", string:rcvRes)){ + security_warning(port); + } + exit(0); + } + + # XSS request sent to parameter text in iart.php + sndReq = http_get(item:string(path, "/iart.php?text=%22%3E%" + + "3E%3C%3C%3E%3E%22%22%3Cscript%3Ealert(document.alert)" + + "%3C/script%3E"), port:port); + rcvRes = http_keepalive_send_recv(port:port, data:sndReq, bodyonly:1); + if(rcvRes == NULL){ + exit(0); + } + + if('<script>alert(document.alert)</script>' >< rcvRes){ + security_warning(port); + } + exit(0); + } + } Property changes on: trunk/openvas-plugins/scripts/secpod_xampp_mult_xss_vuln_900023.nasl ___________________________________________________________________ Name: svn:executable + * From scm-commit at wald.intevation.org Fri Aug 8 09:36:26 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 09:36:26 +0200 (CEST) Subject: [Openvas-commits] r1113 - in trunk/openvas-client: . include nessus Message-ID: <20080808073626.0DC36406F7@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-08 09:36:23 +0200 (Fri, 08 Aug 2008) New Revision: 1113 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/configure trunk/openvas-client/configure.in trunk/openvas-client/include/config.h.in trunk/openvas-client/nessus/cli.c trunk/openvas-client/nessus/html_graph_output.c trunk/openvas-client/nessus/nessus.c trunk/openvas-client/nessus/report_save.c Log: Removing gd and gdchart according to OpenVAS Change Request #14: http://www.openvas.org/openvas-cr-14.html Second part of patch. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/ChangeLog 2008-08-08 07:36:23 UTC (rev 1113) @@ -1,3 +1,22 @@ +2008-08-08 Michael Wiegand <michael.wiegand at intevation.de> + + Removing gd and gdchart according to OpenVAS Change Request #14: + http://www.openvas.org/openvas-cr-14.html + Second part of patch. + + * nessus/html_graph_output.c, nessus/cli.c, nessus/report_save.c, + nessus/nessus.c: Changed conditional to NO_GDCHART to better adapt + to gdchart oddities. + + * configure.in: Improved header check for headers needed by gdchart; + only set GDC_LIBS when _all_ headers are present. + + * include/config.h.in: Changed conditional to NO_GDCHART; defining + HAVE_LIBFREETYPE as gdchart breaks compilation if it is not set + (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=242936). + + * configure: Updated. + 2008-08-06 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Removing gd and gdchart according to OpenVAS Change Request #14: Modified: trunk/openvas-client/configure =================================================================== --- trunk/openvas-client/configure 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/configure 2008-08-08 07:36:23 UTC (rev 1113) @@ -3745,8 +3745,20 @@ done +if test "$ac_cv_header_gdc_h" = "yes" && test "$ac_cv_header_gd_h" = "yes" && test "$ac_cv_header_png_h" = "yes"; then + gdc_lib="-lgd -lpng -lgdc" + cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBFREETYPE 1 +_ACEOF +else + cat >>confdefs.h <<\_ACEOF +#define NO_GDCHART 1 +_ACEOF +fi + + succeeded=no if test -z "$PKG_CONFIG"; then Modified: trunk/openvas-client/configure.in =================================================================== --- trunk/openvas-client/configure.in 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/configure.in 2008-08-08 07:36:23 UTC (rev 1113) @@ -75,6 +75,12 @@ dnl GDChart AC_CHECK_HEADERS([gdc.h gd.h png.h]) +if test "$ac_cv_header_gdc_h" = "yes" && test "$ac_cv_header_gd_h" = "yes" && test "$ac_cv_header_png_h" = "yes"; then + gdc_lib="-lgd -lpng -lgdc" + AC_DEFINE(HAVE_LIBFREETYPE) +else + AC_DEFINE(NO_GDCHART) +fi PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.0, HAVE_GLIB="yes", sweep_config_ok="no") AC_SUBST(GLIB_CFLAGS) Modified: trunk/openvas-client/include/config.h.in =================================================================== --- trunk/openvas-client/include/config.h.in 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/include/config.h.in 2008-08-08 07:36:23 UTC (rev 1113) @@ -224,7 +224,8 @@ #undef HAVE_SETPROCTITLE #undef HAVE__EXIT -#undef HAVE_GDCHART +#undef NO_GDCHART +#undef HAVE_LIBFREETYPE #undef HAVE_PTY_H #undef HAVE_SYS_MMAN_H Modified: trunk/openvas-client/nessus/cli.c =================================================================== --- trunk/openvas-client/nessus/cli.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/cli.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -373,13 +373,13 @@ return; } -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART if(!strncmp(ftype, "html_pie", 8)|| !strncmp(ftype, "html_graph", 10)) { args->output = arglist_to_html_graph; } else -#endif /* HAVE_GDCHART */ +#endif /* NO_GDCHART */ if (!strncmp(ftype, "html", 4)) { args->output = arglist_to_html; } else if (!strcmp(ftype, "latex") || Modified: trunk/openvas-client/nessus/html_graph_output.c =================================================================== --- trunk/openvas-client/nessus/html_graph_output.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/html_graph_output.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -65,13 +65,13 @@ -------------------------------------------------------------------*/ -#ifdef HAVE_GDCHART #include <includes.h> #include "nessus_i18n.h" -#include "gdc.h" -#include "gdchart.h" -#include "gdcpie.h" +#ifndef NO_GDCHART +#include <gdc.h> +#include <gdchart.h> +#include <gdcpie.h> #include "report.h" #include "report_utils.h" #include "error_dlg.h" @@ -1369,4 +1369,4 @@ return 0; } -#endif /* HAVE_GDCHART */ +#endif /* NO_GDCHART */ Modified: trunk/openvas-client/nessus/nessus.c =================================================================== --- trunk/openvas-client/nessus/nessus.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/nessus.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -788,7 +788,7 @@ arglist_to_text(backend_convert(be), out_report); else if(!strcmp(type, "html")) arglist_to_html(backend_convert(be), out_report); -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART else if(!strcmp(type, "html_pie") || !strcmp(type, "html_graph")) arglist_to_html_graph(backend_convert(be), out_report); #endif Modified: trunk/openvas-client/nessus/report_save.c =================================================================== --- trunk/openvas-client/nessus/report_save.c 2008-08-07 15:25:49 UTC (rev 1112) +++ trunk/openvas-client/nessus/report_save.c 2008-08-08 07:36:23 UTC (rev 1113) @@ -126,7 +126,7 @@ hosts = backend_convert(be); arglist_to_text(hosts, fname); break; -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART case SAVE_HTML_GRAPH: hosts = backend_convert(be); arglist_to_html_graph(hosts, fname); @@ -231,7 +231,7 @@ gtk_menu_append(GTK_MENU(menu), type); gtk_widget_show(type); -#ifdef HAVE_GDCHART +#ifndef NO_GDCHART type = gtk_menu_item_new_with_label(_("HTML with Pies and Graphs")); gtk_object_set_data(GTK_OBJECT(type), "type", (void *)SAVE_HTML_GRAPH); gtk_menu_append(GTK_MENU(menu), type); From scm-commit at wald.intevation.org Fri Aug 8 10:58:51 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 10:58:51 +0200 (CEST) Subject: [Openvas-commits] r1114 - trunk/doc/website Message-ID: <20080808085851.9AF49406F7@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-08 10:58:50 +0200 (Fri, 08 Aug 2008) New Revision: 1114 Modified: trunk/doc/website/openvas-cr-10.htm4 trunk/doc/website/openvas-cr-11.htm4 trunk/doc/website/openvas-cr-14.htm4 trunk/doc/website/openvas-cr-2.htm4 trunk/doc/website/openvas-cr-3.htm4 trunk/doc/website/openvas-cr-4.htm4 trunk/doc/website/openvas-cr-6.htm4 trunk/doc/website/openvas-cr-7.htm4 trunk/doc/website/openvas-cr-8.htm4 trunk/doc/website/openvas-crs.htm4 Log: Updated status for change requests to reflect the latest round of releases and other work done in the meantime. Modified: trunk/doc/website/openvas-cr-10.htm4 =================================================================== --- trunk/doc/website/openvas-cr-10.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-10.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #10: Remove support for non-SSL connections in OpenVAS-Client</h2> -Status: Voted +2. Implemented with revision 937. +Status: Voted +2. Implemented with revision 937. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-11.htm4 =================================================================== --- trunk/doc/website/openvas-cr-11.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-11.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib</h2> -Status: Voted +2. Implemented with revision 949. +Status: Voted +2. Implemented with revision 949. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-14.htm4 =================================================================== --- trunk/doc/website/openvas-cr-14.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-14.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</h2> -Status: Voted +5. gdchart and gd removed in SVN trunk. +Status: Voted +5. Implemented in SVN trunk, revision 1113. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-2.htm4 =================================================================== --- trunk/doc/website/openvas-cr-2.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-2.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #2: Remove any support for NSR export format of OpenVAS-Client</h2> -Status: Voted +4. Implemented with SVN 673. Release with OpenVAS-Client 1.0.3. +Status: Voted +4. Implemented with SVN 673. Released with OpenVAS-Client 1.0.3. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-3.htm4 =================================================================== --- trunk/doc/website/openvas-cr-3.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-3.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #3: Remove plugin factory from openvas-plugins</h2> -Status: Voted +5. Implemented with SVN 699. Scheduled for openvas-plugins 1.0.1. +Status: Voted +5. Implemented with SVN 699. Released with openvas-plugins 1.0.1. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-4.htm4 =================================================================== --- trunk/doc/website/openvas-cr-4.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-4.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #4: Remove plugin upload feature</h2> -Status: Voted +4. First step (denial of upload) implemented (will be in openvas-server 1.0.1). +Status: Voted +4. First step (denial of upload) implemented and released with OpenVAS-Server 1.0.1. Completion will happen with next protocol version. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-6.htm4 =================================================================== --- trunk/doc/website/openvas-cr-6.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-6.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #6: Remove support of old XML report format</h2> -Status: Voted +2. Implemented with SVN-884. Will be in release 1.0.4. +Status: Voted +2. Implemented with SVN-884. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-7.htm4 =================================================================== --- trunk/doc/website/openvas-cr-7.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-7.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #7: Extend report widget with optional info on NVT name/oid in OpenVAS-Client</h2> -Status: Voted +2. Implemented. Will be in release OpenVAS-Client 1.0.4. +Status: Voted +2. Implemented. Released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-cr-8.htm4 =================================================================== --- trunk/doc/website/openvas-cr-8.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-cr-8.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #8: Introduce NVT family "Credentials"</h2> -Status: Voted +2. Implemented. Server-side changes released with openvas-plugins 1.0.2, client-side Will be in release OpenVAS-Client 1.0.4. +Status: Voted +2. Implemented. Server-side changes released with openvas-plugins 1.0.2, client-side released with OpenVAS-Client 1.0.4. <h3>Purpose</h3> Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2008-08-08 07:36:23 UTC (rev 1113) +++ trunk/doc/website/openvas-crs.htm4 2008-08-08 08:58:50 UTC (rev 1114) @@ -40,7 +40,7 @@ <h3>Overview on change requests so far</h3> <p> -(statis can be: in discussion, accepted, in progress, done) +(Status can be: in discussion, accepted, in progress, done) </p> <ul> @@ -57,7 +57,7 @@ <li> <a href="openvas-cr-11.html">OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib</a> (done) <li> <a href="openvas-cr-12.html">OpenVAS Change Request #12: Replace NTP with OTP</a> (in progress) <li> <a href="openvas-cr-13.html">OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server</a> (accepted) -<li> <a href="openvas-cr-14.html">OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</a> (in progress) +<li> <a href="openvas-cr-14.html">OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</a> (done) <li> <a href="openvas-cr-15.html">OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</a> (accepted) </ul> From scm-commit at wald.intevation.org Fri Aug 8 12:34:37 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 12:34:37 +0200 (CEST) Subject: [Openvas-commits] r1115 - trunk/openvas-client Message-ID: <20080808103437.E782640708@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 12:34:37 +0200 (Fri, 08 Aug 2008) New Revision: 1115 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/VERSION Log: * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-08 08:58:50 UTC (rev 1114) +++ trunk/openvas-client/ChangeLog 2008-08-08 10:34:37 UTC (rev 1115) @@ -1,3 +1,9 @@ +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development + has been branched and the development here lead to a next + major release. + 2008-08-08 Michael Wiegand <michael.wiegand at intevation.de> Removing gd and gdchart according to OpenVAS Change Request #14: Modified: trunk/openvas-client/VERSION =================================================================== --- trunk/openvas-client/VERSION 2008-08-08 08:58:50 UTC (rev 1114) +++ trunk/openvas-client/VERSION 2008-08-08 10:34:37 UTC (rev 1115) @@ -1 +1 @@ -1.0.5.SVN +1.1.0.SVN From scm-commit at wald.intevation.org Fri Aug 8 12:35:47 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 12:35:47 +0200 (CEST) Subject: [Openvas-commits] r1116 - trunk/openvas-server Message-ID: <20080808103547.43E3540708@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 12:35:47 +0200 (Fri, 08 Aug 2008) New Revision: 1116 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/VERSION Log: * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 10:34:37 UTC (rev 1115) +++ trunk/openvas-server/ChangeLog 2008-08-08 10:35:47 UTC (rev 1116) @@ -1,3 +1,9 @@ +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development + has been branched and the development here lead to a next + major release. + 2008-08-07 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Final step of Change Request #4, Modified: trunk/openvas-server/VERSION =================================================================== --- trunk/openvas-server/VERSION 2008-08-08 10:34:37 UTC (rev 1115) +++ trunk/openvas-server/VERSION 2008-08-08 10:35:47 UTC (rev 1116) @@ -1 +1 @@ -1.0.2.SVN +1.1.0.SVN From scm-commit at wald.intevation.org Fri Aug 8 12:37:14 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 12:37:14 +0200 (CEST) Subject: [Openvas-commits] r1117 - trunk/doc/website Message-ID: <20080808103714.8002C4070A@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 12:37:14 +0200 (Fri, 08 Aug 2008) New Revision: 1117 Modified: trunk/doc/website/openvas-crs.htm4 Log: Setting status of #13 and #15 to "in progress". Modified: trunk/doc/website/openvas-crs.htm4 =================================================================== --- trunk/doc/website/openvas-crs.htm4 2008-08-08 10:35:47 UTC (rev 1116) +++ trunk/doc/website/openvas-crs.htm4 2008-08-08 10:37:14 UTC (rev 1117) @@ -56,9 +56,9 @@ <li> <a href="openvas-cr-10.html">OpenVAS Change Request #10: Remove support for non-SSL connections in OpenVAS-Client</a> (done) <li> <a href="openvas-cr-11.html">OpenVAS Change Request #11: Make OpenVAS-Client use (and depend on) glib</a> (done) <li> <a href="openvas-cr-12.html">OpenVAS Change Request #12: Replace NTP with OTP</a> (in progress) -<li> <a href="openvas-cr-13.html">OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server</a> (accepted) +<li> <a href="openvas-cr-13.html">OpenVAS Change Request #13: Integrating the OVAL interpreter ovaldi into OpenVAS Server</a> (in progress) <li> <a href="openvas-cr-14.html">OpenVAS Change Request #14: OpenVAS-Client: Remove source code copy of gdchart and gd</a> (done) -<li> <a href="openvas-cr-15.html">OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</a> (accepted) +<li> <a href="openvas-cr-15.html">OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</a> (in progress) </ul> <h3>How to write a change request</h3> From scm-commit at wald.intevation.org Fri Aug 8 14:57:39 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 14:57:39 +0200 (CEST) Subject: [Openvas-commits] r1118 - in trunk/openvas-server: . doc/ntp openvasd Message-ID: <20080808125739.F3CBF406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 14:57:38 +0200 (Fri, 08 Aug 2008) New Revision: 1118 Removed: trunk/openvas-server/openvasd/detached.c trunk/openvas-server/openvasd/detached.h Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/MANIFEST trunk/openvas-server/doc/ntp/ntp_extensions.txt trunk/openvas-server/openvasd/Makefile trunk/openvas-server/openvasd/attack.c trunk/openvas-server/openvasd/comm.c trunk/openvas-server/openvasd/hosts.c trunk/openvas-server/openvasd/ntp_11.c trunk/openvas-server/openvasd/preferences.c trunk/openvas-server/openvasd/preferences.h trunk/openvas-server/openvasd/utils.c Log: Patch for Change Request #15: http://www.openvas.org/openvas-cr-15.html (OpenVAS Server: Remove features for detached scans) * openvasd/ntp_11.c: Don't include detached.h anymore. (ntp_11_stop_detached_session, ntp_11_list_detached_sessions, extract_detached_session_key_from_session_msg): Removed. (ntp_11_parse_input): Removed handling of STOP_DETACHED and DETACHED_SESSIONS_LIST. (ntp_11_parse_input): Fixed anyway-misplaced ENABLE_SAVE_TESTS conditional. * openvasd/preferences.c (preferences_detached_scan, preferences_detached_scan_email, preferences_continuous_scan, preferences_delay_between_scans): Removed. (preferences_reset_cache): Removed initializing of detached params. * openvasd/preferences.h: Removed protos for preferences_detached_scan, preferences_detached_scan_email, preferences_delay_between_scans and preferences_continuous_scan. * openvasd/attack.c: Removed include for detached.h. (attack_network): Removed handling of "detached" and "continous". (attack_sigterm, arg_addset_value): Removed. * openvasd/hosts.c: Removed include for detached.h. (forward): Removed handling for detached scans. * Makefile: Don't handle detached module. * doc/ntp/ntp_extensions.txt: Removed documentation about the detached functionality. * openvasd/utils.c: Removed include for detached.h. It wasn't required anyway. * openvasd/comm.c: Removed include for detached.h. It wasn't required anyway. (comm_send_preferences): Don't send settings for ntp_detached_sessions anymore. * openvasd/detached.c, openvasd/detached.h: Removed. * MANIFEST: Updated. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/ChangeLog 2008-08-08 12:57:38 UTC (rev 1118) @@ -1,5 +1,49 @@ 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + Patch for Change Request #15: + http://www.openvas.org/openvas-cr-15.html + (OpenVAS Server: Remove features for detached scans) + + * openvasd/ntp_11.c: Don't include detached.h anymore. + (ntp_11_stop_detached_session, ntp_11_list_detached_sessions, + extract_detached_session_key_from_session_msg): Removed. + (ntp_11_parse_input): Removed handling of STOP_DETACHED and DETACHED_SESSIONS_LIST. + (ntp_11_parse_input): Fixed anyway-misplaced ENABLE_SAVE_TESTS conditional. + + * openvasd/preferences.c (preferences_detached_scan, preferences_detached_scan_email, + preferences_continuous_scan, preferences_delay_between_scans): Removed. + (preferences_reset_cache): Removed initializing of detached params. + + * openvasd/preferences.h: Removed protos for preferences_detached_scan, + preferences_detached_scan_email, preferences_delay_between_scans and + preferences_continuous_scan. + + * openvasd/attack.c: Removed include for detached.h. + (attack_network): Removed handling of "detached" and "continous". + (attack_sigterm, arg_addset_value): Removed. + + * openvasd/hosts.c: Removed include for detached.h. + (forward): Removed handling for detached scans. + + * Makefile: Don't handle detached module. + + * doc/ntp/ntp_extensions.txt: Removed documentation about the + detached functionality. + + * openvasd/utils.c: Removed include for detached.h. It wasn't + required anyway. + + * openvasd/comm.c: Removed include for detached.h. It wasn't + required anyway. + (comm_send_preferences): Don't send settings for ntp_detached_sessions + anymore. + + * openvasd/detached.c, openvasd/detached.h: Removed. + + * MANIFEST: Updated. + +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-server/MANIFEST =================================================================== --- trunk/openvas-server/MANIFEST 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/MANIFEST 2008-08-08 12:57:38 UTC (rev 1118) @@ -48,8 +48,6 @@ openvasd/comm.c openvasd/comm.h openvasd-config.in -openvasd/detached.c -openvasd/detached.h openvasd/dirutils.c openvasd/hosts.c openvasd/hosts.h Modified: trunk/openvas-server/doc/ntp/ntp_extensions.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 12:57:38 UTC (rev 1118) @@ -129,50 +129,7 @@ the data it saved. The user sees the attack as if it was happening extremely quickly. -3.4 List of detached sessions ------------------------------ -Detached sessions are sessions that are run detached from the client. -Please read http://www.nessus.org/doc/detached_scan.html for details. - -The message : - -CLIENT <|> DETACHED_SESSIONS_LIST <|> CLIENT - -will make openvasd send the list of detached scans to the client. The format -of the message is identical to the LIST_SESSIONS message, that is : - -SERVER <|> DETACHED_SESSIONS_LIST -name targets -name targets -. -. -. -<|> SERVER - -ie: - -SERVER <|> DETACHED_SESSIONS_LIST -2421 prof.fr.nessus.org -41001 www.nessus.org -. -. -. -<|> SERVER - - - - -3.5 Stopping a detached session -------------------------------- - -A user may want to stop a detached scan. The message which has this -effect is the message : - -CLIENT <|> DETACHED_STOP <|> name <|> CLIENT - -Where <name> is the name sent in a DETACHED_SESSIONS_LIST message. - 3.6 Options ------------ @@ -219,33 +176,6 @@ maximum age of a KB (in seconds) -5. Detached scans ------------------ - -detached_scan - - If set to "yes", openvasd will close the communication and - forward the result of the scan to /dev/null (but will fill the - KBs and will save its sessions) - - -continuous_scan - - If set to "yes", openvasd will restart the scan from scratch - when completed (openvasd runs forever) - -delay_between_scan_loops - - If "continuous_scan" is set to "yes", this value contain the - number of seconds to sleep between two loops - - -detached_scan_email_address - - Contains the email address to send results to. If empty, no - mail will be sent to anyone. - - 6. Per-plugin timeout --------------------- Modified: trunk/openvas-server/openvasd/Makefile =================================================================== --- trunk/openvas-server/openvasd/Makefile 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/Makefile 2008-08-08 12:57:38 UTC (rev 1118) @@ -28,7 +28,6 @@ openvasd.o \ save_tests.o \ save_kb.o \ - detached.o \ pluginlaunch.o \ locks.o \ dirutils.o \ @@ -110,9 +109,6 @@ save_kb.o : save_kb.c save_kb.h $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c save_kb.c -detached.o : detached.c detached.h - $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c detached.c - pluginlaunch.o : pluginlaunch.c $(CC) $(OPENVAS_CFLAGS) $(OPENVAS_INCLUDE) -c pluginlaunch.c Modified: trunk/openvas-server/openvasd/attack.c =================================================================== --- trunk/openvas-server/openvasd/attack.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/attack.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -46,7 +46,6 @@ #include "pluginload.h" #include "save_tests.h" #include "save_kb.h" -#include "detached.h" #include "pluginscheduler.h" #include "pluginlaunch.h" @@ -92,29 +91,6 @@ } -static void -attack_sigterm() -{ - hosts_stop_all(); - wait_for_children1(); -} - - -static void -arg_addset_value(arg, name, type, len, value) - struct arglist *arg; - char * name; - int type, len; - void * value; -{ - if(arg_get_type(arg, name) < 0) - arg_add_value(arg, name, type, len, value); - else - arg_set_value(arg, name, len, value); -} - - - /*------------------------------------------------------- Init. an arglist which can be used by @@ -548,8 +524,6 @@ int restoring = 0; harglst * tested = NULL; int save_session= 0; - int continuous = 0; - int detached = 0; int return_code = 0; char * port_range; plugins_scheduler_t sched; @@ -563,48 +537,9 @@ host_ip.s_addr = 0; preferences = arg_get_value(globals, "preferences"); - detached = preferences_detached_scan(preferences); - if(detached) - { - char *email; - - detached_new_session(globals, arg_get_value(preferences, "TARGET")); - arg_addset_value(preferences, "ntp_keep_communication_alive", ARG_STRING, 0, NULL); - - /* - * Tell the client that the scan is finished (actually, we will - * work hard to test the network, but this lazy client has the right - * to get some rest... - */ - log_write("user %s : running a detached scan\n", (char*)arg_get_value(globals, "user")); - global_socket = (int)arg_get_value(globals, "global_socket"); - comm_terminate(globals); - close_stream_connection(global_socket); - global_socket = -1; - arg_set_value(globals, "global_socket", sizeof(int), (void*)global_socket); - - nessus_signal(SIGTERM, attack_sigterm); - -start_attack_network: - if((email = preferences_detached_scan_email(preferences))) - { - /* - * The user wants to receive the results by e-mail. - */ - if(detached_setup_mail_file(globals, email)) - { - /* - * Could not create the file to store our data - */ - close_stream_connection(global_socket); - return -1; - } - } - else arg_addset_value(globals, "detached_scan_email_address", ARG_STRING, 0, NULL); - } + num_tested = 0; - global_socket = (int)arg_get_value(globals, "global_socket"); plugins = arg_get_value(globals, "plugins"); @@ -612,14 +547,8 @@ rules = arg_get_value(globals, "rules"); rejected_hosts = emalloc(sizeof(struct arglist)); - if(detached) - continuous = preferences_continuous_scan(preferences); - save_session = preferences_save_session(preferences); - if(continuous) - restoring = 0; - else - restoring = ((int)arg_get_value(globals, "RESTORE-SESSION") == 1); + restoring = ((int)arg_get_value(globals, "RESTORE-SESSION") == 1); if(restoring)tested = arg_get_value(globals, "TESTED_HOSTS"); if(save_session)save_tests_init(globals); @@ -902,26 +831,9 @@ arg_free_all(rejected_hosts); plugins_scheduler_free(sched); - if(detached) - { - if(preferences_detached_scan_email(preferences)) - detached_send_email(globals); - } - - if(continuous){ - sleep(preferences_delay_between_scans(preferences)); - plugins = plugins_reload(preferences, plugins, 1); - arg_set_value(globals, "plugins", -1, plugins); - goto start_attack_network; - } - else if(detached)detached_end_session(globals); - gettimeofday(&now, NULL); log_write("Total time to scan all hosts : %ld seconds\n", now.tv_sec - then.tv_sec); return return_code; } - - - Modified: trunk/openvas-server/openvasd/comm.c =================================================================== --- trunk/openvas-server/openvasd/comm.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/comm.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -42,9 +42,6 @@ #include "plugs_hash.h" #include "utils.h" #include "nasl.h" -#ifdef ENABLE_SAVE_KB -#include "detached.h" -#endif #ifndef FALSE #define FALSE 0 @@ -447,7 +444,6 @@ } #ifdef ENABLE_SAVE_TESTS auth_printf(globals, "ntp_save_sessions <|> yes\n"); - auth_printf(globals, "ntp_detached_sessions <|> yes\n"); auth_printf(globals, "server_info_openvasd_version <|> %s\n", OPENVAS_VERSION); auth_printf(globals, "server_info_libnasl_version <|> %s\n", nasl_version()); auth_printf(globals, "server_info_libnessus_version <|> %s\n", nessuslib_version()); Deleted: trunk/openvas-server/openvasd/detached.c =================================================================== --- trunk/openvas-server/openvasd/detached.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/detached.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -1,520 +0,0 @@ -/* OpenVAS -* $Id$ -* Description: Deals with comminucating results of a detached scan. -* -* Authors: - Renaud Deraison <deraison at nessus.org> (Original pre-fork develoment) -* - Tim Brown <mailto:timb at openvas.org> (Initial fork) -* - Laban Mwangi <mailto:labanm at openvas.org> (Renaming work) -* - Tarik El-Yassem <mailto:tarik at openvas.org> (Headers section) -* -* Copyright: -* Portions Copyright (C) 2006 Software in the Public Interest, Inc. -* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2, -* as published by the Free Software Foundation -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -*/ - -#include <includes.h> -#ifdef ENABLE_SAVE_KB - -#include "detached.h" -#include "utils.h" -#include "log.h" -#include "users.h" -#include "processes.h" - -/*-----------------------------------------------------------------------* - * Private functions * - *-----------------------------------------------------------------------*/ -#define PORT_HDR "SERVER <|> PORT <|> " -#define PORT_HDR_LEN strlen(PORT_HDR) - -#define NOTE_HDR "SERVER <|> NOTE <|> " -#define NOTE_HDR_LEN strlen(NOTE_HDR) - -#define INFO_HDR "SERVER <|> INFO <|> " -#define INFO_HDR_LEN strlen(INFO_HDR) - -#define HOLE_HDR "SERVER <|> HOLE <|> " -#define HOLE_HDR_LEN strlen(HOLE_HDR) - -#define NOTE 1 -#define INFO 2 -#define HOLE 3 - - -/* - * Invokes sendmail -t - */ -void _detached_send_mail(globals) - struct arglist * globals; -{ - /* - * We do not check the full path to sendmail because if root - * can not trust his path, then I bet he's hosed already - */ - char * argv[]={"sendmail", "-t", "-B8BITMIME", NULL}; - char * fname = arg_get_value(globals, "detached_scan_email_filename"); - pid_t pid; - struct stat st; - off_t * orig_size = arg_get_value(globals, "detached_scan_file_len"); - struct arglist * preferences = arg_get_value(globals, "preferences"); - - stat(fname, &st); - - - /* - * Nothing new - we don't send any mail (because a blank mail - * is useless) - */ - if(st.st_size == *orig_size) - { - log_write("user %s : scan did not produce any result, so no email will be sent", - (char*)arg_get_value(globals, "user")); - - efree(&orig_size); - return; - } - - efree(&orig_size); - - if(!(pid = fork())) - { - int fd; - int i; - - /* - * Close all open files - */ - for(i=0;i<getdtablesize();i++)close(i); - - /* - * Our email file becomes stdin - */ - fd = open(fname, O_RDONLY, 0); - if(fd < 0) - { - log_init(arg_get_value(preferences, "logfile")); - log_write("user %s : could not open our email %s - %s\n", - (char*)arg_get_value(globals, "user"), - fname, - strerror(errno)); - exit(1); - } - if(execvp("sendmail", argv) < 0) - { - log_init(arg_get_value(preferences, "logfile")); - log_write("user %s : could not execute sendmail - %s\n", - (char*)arg_get_value(globals, "user"), - strerror(errno)); - } - exit(1); - } - else if(pid > 0)waitpid(pid, NULL, 0); -} - -static void -detached_copy_data_port(globals, buffer) - struct arglist * globals; - char * buffer; -{ - char * t; - FILE * fl = arg_get_value(globals, "detached_scan_email_fd"); - - - t = strchr(buffer, '<'); - if(!t)return; - t--; - t[0]='\0'; - t+=5; - - fprintf(fl, "o %s : port %s was found to be open\n\n", - buffer, - t); - -} - - -static void -detached_copy_data_content(globals, buffer, type) - struct arglist * globals; - char * buffer; - int type; -{ - char * t = strrchr(buffer, '<'); - char * host, * port; - char * asctype = NULL; - FILE * fl = arg_get_value(globals, "detached_scan_email_fd"); - char * noslashes; - - - - switch(type) - { - case INFO : - asctype = "warning"; - break; - case NOTE : - asctype = "note"; - break; - case HOLE : - asctype = "hole"; - break; - } - - - if(!t)return; - t--; - t[0]='\0'; - - t = strchr(buffer, '<'); - if(!t) - return; - - t--; - t[0]='\0'; - host = estrdup(buffer); - buffer = t + 5; - t = strchr(buffer, '<'); - if(!t) - { - efree(&host); - return; - } - - t--; - t[0]='\0'; - port = estrdup(buffer); - - buffer = t+5; - - noslashes = rmslashes(buffer); - fprintf(fl, "o %s : Security %s found on port %s :\n%s\n\n", - host, - asctype, - port, - noslashes); - efree(&noslashes); - efree(&host); - efree(&port); -} - - -/*------------------------------------------------------------------------* - * Public functions * - *------------------------------------------------------------------------*/ -void -detached_copy_data(globals, buffer, length) - struct arglist * globals; - char * buffer; - int length; -{ - char *t; - int info = 0, note = 0, hole = 0; - - if(!buffer || !globals) - return; - - if(!arg_get_value(globals, "detached_scan_email_address")) - { - efree(&buffer); - return; - } - - while((t = strchr(buffer, ';')))t[0]='\n'; - - t = strrchr(buffer, '<'); - if(t){ - t--; - t[0]='\0'; - } - - /* - * Ok, so we want to parse the message. It's in NTP/1.whatever, - * want we are only interested in open ports and information reports - */ - if(!strncmp(buffer, PORT_HDR, PORT_HDR_LEN)) - { - detached_copy_data_port(globals, buffer+PORT_HDR_LEN); - } - else if(!(info = strncmp(buffer, INFO_HDR, INFO_HDR_LEN)) || - !(note = strncmp(buffer, NOTE_HDR, NOTE_HDR_LEN)) || - !(hole = strncmp(buffer, HOLE_HDR, HOLE_HDR_LEN))) - { - detached_copy_data_content(globals, buffer+INFO_HDR_LEN, - hole==0?HOLE:(info==0?INFO:NOTE)); - } - efree(&buffer); -} - - - - - -int -detached_setup_mail_file(globals, email) - struct arglist * globals; - char * email; -{ - FILE* fl; - char * tmpname; - char * today; - time_t t; - char *hostname = emalloc(256); - struct stat st; - off_t * sz; - - t = time(NULL); - today = estrdup(ctime(&t)); - today[strlen(today)-1]='\0'; - - log_write("user %s : mailing results of a detached scan to %s\n", - (char*)arg_get_value(globals, "user"), - email); - - if((arg_get_type(globals, "detached_scan_email_address")) < 0) - arg_add_value(globals, "detached_scan_email_address", ARG_STRING, strlen(email), email); - else - arg_set_value(globals, "detached_scan_email_address", strlen(email), email); - - tmpname = temp_file_name(); - fl = fopen(tmpname, "w"); - if (fchmod(fl, S_IRUSR|S_IWUSR) != 0) - perror("fchmod() error on tmp file"); - if(!fl) - { - log_write("user %s : could not create file '%s' (%s) - aborting", - (char*)arg_get_value(globals, "user"), - tmpname, - strerror(errno)); - - auth_printf(globals, "SERVER <|> ERROR <|> Could not create the temporary \ -file needed for detached scan (%s) - aborting <|> SERVER\n", strerror(errno)); - efree(&today); - return -1; - } - bzero(hostname, 256); - gethostname(hostname, 255); - fprintf(fl, "From: OpenVAS Daemon <root@%s>\n", hostname); - fprintf(fl, "To: OpenVAS User <%s>\n", email); - fprintf(fl, "Subject: OpenVAS Scan (%s)\n\n", today); - fflush(fl); - efree(&today); - efree(&hostname); - stat(tmpname, &st); - - sz = emalloc(sizeof(st.st_size)); - memcpy(sz, &(st.st_size), sizeof(st.st_size)); - if(arg_get_type(globals, "detached_scan_file_len") < 0) - arg_add_value(globals, "detached_scan_file_len", ARG_PTR, sizeof(int),sz); - else - arg_set_value(globals, "detached_scan_file_len", sizeof(int), sz); - - - if(arg_get_type(globals, "detached_scan_email_fd") < 0) - arg_add_value(globals, "detached_scan_email_fd", ARG_PTR, sizeof(fl), fl); - else - arg_set_value(globals, "detached_scan_email_fd", sizeof(fl), fl); - - - - if(arg_get_type(globals, "detached_scan_email_filename") < 0) - arg_add_value(globals, "detached_scan_email_filename", ARG_STRING, strlen(tmpname), tmpname); - else - arg_set_value(globals, "detached_scan_email_filename", strlen(tmpname), tmpname); - - return 0; -} - -void -detached_send_email(globals) - struct arglist * globals; -{ - char * fname = arg_get_value(globals, "detached_scan_email_filename"); - FILE * fl = arg_get_value(globals, "detached_scan_email_fd"); - - if(fl){ - fclose(fl); - arg_set_value(globals, "detached_scan_email_fd", 0, NULL); - } - - - _detached_send_mail(globals); - - - - unlink(fname); - if(fname){ - efree(&fname); - arg_set_value(globals, "detached_scan_email_filename", 0, NULL); - } -} - -/*----------------------------------------------------------------------- - Management of detached scans --------------------------------------------------------------------------*/ -static char * -detached_dirname(globals) - struct arglist * globals; -{ - char * dir; - char * userhome = user_home(globals); - dir = emalloc(strlen(userhome) + strlen("detached") + 2); - sprintf(dir, "%s/detached", userhome); - efree(&userhome); - return(dir); -} - - -static int -detached_mkdir(dir) - char * dir; -{ - char *t = strchr(dir+1, '/'); - while(t) - { - t[0] = '\0'; - mkdir(dir, 0700); - t[0] = '/'; - t = strchr(t+1, '/'); - } - mkdir(dir, 0700); - return 0; -} - - - -static char * -detached_fname(globals) - struct arglist * globals; -{ - char * dir = detached_dirname(globals); - char * ret; - - detached_mkdir(dir); - ret = emalloc(strlen(dir) + 40); - sprintf(ret, "%s/%d", dir, getpid()); - efree(&dir); - return ret; -} - -int -detached_new_session(globals, target) - struct arglist * globals; - char * target; -{ - char * fname = detached_fname(globals); - int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, S_IRUSR|S_IWUSR); - if(f >= 0) - { - write(f, target, strlen(target)); - fsync(f); - if (fchmod(f, S_IRUSR|S_IWUSR) != 0) - perror("fchmod() error on tmp file"); - close(f); - efree(&fname); - return getpid(); - } - else log_write("user %s : could not create %s - %s\n", - (char*)arg_get_value(globals, "user"), - fname, - strerror(errno)); - efree(&fname); - return -1; -} - - -int -detached_send_sessions(globals) - struct arglist * globals; -{ - char * dir = detached_dirname(globals); - DIR * d = opendir(dir); - struct dirent * dp; - - - if(!d) - { - efree(&dir); - return 0; - } - while(( dp = readdir(d) )) - { - char * name = dp->d_name; - char * full; - int pid = atoi(name); - if(pid) - { - if(!process_alive(pid)) - { - log_write("user %s : session %d is dead - removing its lock", - (char*)arg_get_value(globals, "user"), - pid); - detached_delete_session(globals, pid); - } - else - { - int f; - full = emalloc(strlen(dir) + strlen(name) + 20); - sprintf(full, "%s/%s", dir, name); - f = open(full, O_RDONLY); - if( f >= 0 ) - { - char buf[2048]; - read(f, buf, sizeof(buf) - 1); - auth_printf(globals, "%s %s\n", name, buf); - close(f); - } - efree(&full); - } - } - } - closedir(d); - efree(&dir); - return 0; -} - - - -int -detached_delete_session(globals, index) - struct arglist * globals; - int index; -{ - char * dir = detached_dirname(globals); - char * file = emalloc(strlen(dir) + 30); - int f; - sprintf(file, "%s/%d", dir, index); - efree(&dir); - if(( f = open(file, O_RDONLY) ) >= 0) - { - close(f); - if(index != getpid()) - kill(index, SIGTERM); - unlink(file); - } - efree(&file); - return 0; -} - -int -detached_end_session(globals) - struct arglist * globals; -{ - return detached_delete_session(globals, getpid()); -} - -#endif /* enable save kb */ Deleted: trunk/openvas-server/openvasd/detached.h =================================================================== --- trunk/openvas-server/openvasd/detached.h 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/detached.h 2008-08-08 12:57:38 UTC (rev 1118) @@ -1,46 +0,0 @@ -/* OpenVAS -* $Id $ -* Description: detached.c header. -* -* Authors: - Renaud Deraison <deraison at nessus.org> (Original pre-fork develoment) -* - Tim Brown <mailto:timb at openvas.org> (Initial fork) -* - Laban Mwangi <mailto:labanm at openvas.org> (Renaming work) -* - Tarik El-Yassem <mailto:tarik at openvas.org> (Headers section) -* -* Copyright: -* Portions Copyright (C) 2006 Software in the Public Interest, Inc. -* Based on work Copyright (C) 1998 - 2006 Tenable Network Security, Inc. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License version 2, -* as published by the Free Software Foundation -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. -* -* -*/ - - -#ifndef NESSUSD_DETACHED_H__ -#define NESSUSD_DETACHED_H__ - -#ifdef ENABLE_SAVE_KB -int detached_setup_mail_file(struct arglist*, char*); -void detached_copy_data(struct arglist*, char*, int); -void detached_send_email(struct arglist*); - - -int detached_new_session(struct arglist *, char *); -int detached_end_session(struct arglist *); -int detached_delete_session(struct arglist *, int); - -int detached_send_sessions(struct arglist *); -#endif -#endif Modified: trunk/openvas-server/openvasd/hosts.c =================================================================== --- trunk/openvas-server/openvasd/hosts.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/hosts.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -32,7 +32,6 @@ #include "utils.h" #include "log.h" #include "preferences.h" -#include "detached.h" #include "save_kb.h" #include "save_tests.h" #include "hosts.h" @@ -97,9 +96,6 @@ if(preferences != NULL) { - if(preferences_detached_scan(preferences) != 0) - detached_copy_data(globals, estrdup(buf), len); - if(preferences_save_session(preferences) != 0) save_tests_write_data(globals, estrdup(buf)); } Modified: trunk/openvas-server/openvasd/ntp_11.c =================================================================== --- trunk/openvas-server/openvasd/ntp_11.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/ntp_11.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -41,7 +41,6 @@ #include "users.h" #include "utils.h" #include "save_tests.h" -#include "detached.h" #include "preferences.h" #include "hosts.h" @@ -67,9 +66,6 @@ static int ntp_11_list_sessions(struct arglist*); static int ntp_11_delete_session(struct arglist*, char*); static int ntp_11_restore_session(struct arglist*, char*); - -static int ntp_11_list_detached_sessions(struct arglist *, char *); -static int ntp_11_stop_detached_session(struct arglist*, char*); #endif /* * Parses the input sent by the client before @@ -120,12 +116,8 @@ efree(&orig); return n; } - - if(!strcmp(input, "STOP_DETACHED")) { - ntp_11_stop_detached_session(globals, orig); - efree(&orig); - return 1; - } +#endif + if(!strcmp(input, "OPENVAS_VERSION")) { auth_printf(globals, "SERVER <|> OPENVAS_VERSION <|> %s <|> SERVER\n", OPENVAS_VERSION); return 1; @@ -145,12 +137,7 @@ plugin_send_infos(globals, atoi(s)); return 1; } - if(!strcmp(input, "DETACHED_SESSIONS_LIST")) { - ntp_11_list_detached_sessions(globals, orig); - efree(&orig); - return 1; - } -#endif + if(!strcmp(input, "LONG_ATTACK")){ int code = ntp_11_long_attack(globals, orig); efree(&orig); @@ -623,77 +610,7 @@ } - static int -extract_detached_session_key_from_session_msg(globals, orig) - struct arglist * globals; - char * orig; -{ - char * t; - int i, len; - - t = strrchr(orig, '<'); - if(!t)return -1; - t[0] = 0; - - t = strrchr(orig, '>'); - if(!t)return -1; - - t++; - while(t[0]==' ')t++; - len = strlen(t); - while(t[len-1]==' ') - { - t[len-1]=0; - len --; - } - /* - * Sanity check. All detached sessions name are under the form - * of a pid. - */ - for(i=0;i<len;i++) - if(!isdigit(t[i])){ - log_write("user %s : supplied an incorrect detached session name (%s)", - (char*)arg_get_value(globals, "user"), - t); - return -1; - } - return atoi(t); -} - - - -static int -ntp_11_stop_detached_session(globals, orig) - struct arglist * globals; - char * orig; -{ - int session = 0; - int ret; - - session = extract_detached_session_key_from_session_msg(globals, orig); - if(session < 0)return -1; - log_write("user %s : stopping session %d", - (char*)arg_get_value(globals, "user"), - session); - - ret = detached_delete_session(globals, session); - return 0; -} - -static int -ntp_11_list_detached_sessions(globals, orig) - struct arglist * globals; - char * orig; -{ - auth_printf(globals, "SERVER <|> DETACHED_SESSIONS_LIST\n"); - detached_send_sessions(globals); - auth_printf(globals, "<|> SERVER\n"); - return 0; -} - - -static int ntp_11_delete_session(globals, orig) struct arglist * globals; char * orig; Modified: trunk/openvas-server/openvasd/preferences.c =================================================================== --- trunk/openvas-server/openvasd/preferences.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/preferences.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -658,61 +658,6 @@ } int -preferences_detached_scan(preferences) - struct arglist * preferences; -{ - static int yes = -1; - char * pref; - - if(!preferences) - { - yes = -1; - return -1; - } - - - if(yes >= 0) - return yes; - - - pref = arg_get_value(preferences, "detached_scan"); - if(pref && !strcmp(pref, "yes")) - yes = 1; - else - yes = 0; - - return yes; -} - - -int -preferences_continuous_scan(preferences) - struct arglist * preferences; -{ - static int yes = -1; - char * pref; - - if(!preferences) - { - yes = -1; - return -1; - } - - - if(yes >= 0) - return yes; - - pref = arg_get_value(preferences, "continuous_scan"); - if(pref && !strcmp(pref, "yes")) - yes = 1; - else - yes = 0; - - return yes; -} - - -int preferences_report_killed_plugins(preferences) struct arglist * preferences; { @@ -739,53 +684,6 @@ } int -preferences_delay_between_scans(preferences) - struct arglist * preferences; -{ - static int delay = -1; - char * pref; - - if(!preferences) - { - delay = -1; - return -1; - } - - - if(delay >= 0) - return delay; - - pref = arg_get_value(preferences, "delay_between_scan_loops"); - if(pref) - { - if(atoi(pref)){ - delay = atoi(pref); - return delay; - } - else - if(!strcmp(pref, "0")){ - delay = 0; - return delay; - } - } - delay = 3600; - return delay; -} - -char * -preferences_detached_scan_email(preferences) - struct arglist * preferences; -{ - char * pref = arg_get_value(preferences, "detached_scan_email_address"); - - if(pref && pref[0] != '\0' && strcmp(pref, "no")) - return pref; - else - return NULL; -} - - -int preferences_silent_dependencies(preferences) struct arglist * preferences; { @@ -844,9 +742,5 @@ preferences_use_mac_addr(NULL); preferences_save_session(NULL); preferences_save_empty_sessions(NULL); - preferences_continuous_scan(NULL); - preferences_delay_between_scans(NULL); - preferences_detached_scan(NULL); - preferences_detached_scan_email(NULL); preferences_silent_dependencies(NULL); } Modified: trunk/openvas-server/openvasd/preferences.h =================================================================== --- trunk/openvas-server/openvasd/preferences.h 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/preferences.h 2008-08-08 12:57:38 UTC (rev 1118) @@ -57,10 +57,7 @@ #endif #ifdef ENABLE_SAVE_KB -int preferences_continuous_scan(struct arglist *); int preferences_delay_between_scans(struct arglist *); -int preferences_detached_scan(struct arglist *); -char * preferences_detached_scan_email(struct arglist *); #endif void preferences_reset_cache(); Modified: trunk/openvas-server/openvasd/utils.c =================================================================== --- trunk/openvas-server/openvasd/utils.c 2008-08-08 10:37:14 UTC (rev 1117) +++ trunk/openvas-server/openvasd/utils.c 2008-08-08 12:57:38 UTC (rev 1118) @@ -35,7 +35,6 @@ #include "ntp_11.h" #include "utils.h" #include "preferences.h" -#include "detached.h" #include "save_tests.h" #include "pluginscheduler.h" From scm-commit at wald.intevation.org Fri Aug 8 14:59:49 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 14:59:49 +0200 (CEST) Subject: [Openvas-commits] r1119 - trunk/doc/website Message-ID: <20080808125949.DA3F1406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 14:59:49 +0200 (Fri, 08 Aug 2008) New Revision: 1119 Modified: trunk/doc/website/openvas-cr-15.htm4 Log: Updated status. Modified: trunk/doc/website/openvas-cr-15.htm4 =================================================================== --- trunk/doc/website/openvas-cr-15.htm4 2008-08-08 12:57:38 UTC (rev 1118) +++ trunk/doc/website/openvas-cr-15.htm4 2008-08-08 12:59:49 UTC (rev 1119) @@ -28,7 +28,7 @@ PAGE_START <h2>OpenVAS Change Request #15: OpenVAS Server: Remove features for detached scans</h2> -Status: Voted +4. +Status: Voted +4. Implemented with SVN 1118 in openvas-server 1.1 series. Needs testing. <h3>Purpose</h3> @@ -122,6 +122,8 @@ <h3>History</h3> <ul> +<li> 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> + Updated status: implemented. <li> 2008-07-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> Added voting result. <li> 2008-07-03 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> From scm-commit at wald.intevation.org Fri Aug 8 15:05:41 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 15:05:41 +0200 (CEST) Subject: [Openvas-commits] r1120 - in trunk/openvas-client: . nessus Message-ID: <20080808130541.3081A406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 15:05:40 +0200 (Fri, 08 Aug 2008) New Revision: 1120 Removed: trunk/openvas-client/nessus/nmake.bat trunk/openvas-client/nessus/nmake.w32 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/MANIFEST Log: * nessus/nmake.w32, nessus/nmake.bat: Removed. These are desperately outdated. * MANIFEST: Updated. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/ChangeLog 2008-08-08 13:05:40 UTC (rev 1120) @@ -1,5 +1,12 @@ 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + * nessus/nmake.w32, nessus/nmake.bat: Removed. These are + desperately outdated. + + * MANIFEST: Updated. + +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + * VERSION: Set to 1.1.0.SVN to reflect that the 1.0 development has been branched and the development here lead to a next major release. Modified: trunk/openvas-client/MANIFEST =================================================================== --- trunk/openvas-client/MANIFEST 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/MANIFEST 2008-08-08 13:05:40 UTC (rev 1120) @@ -84,8 +84,6 @@ nessus/nessus_plugin.c nessus/nessus_plugin.h nessus/nessus_regex.h -nessus/nmake.bat -nessus/nmake.w32 nessus/OBJ/.createdir nessus/OpenVAS-Client.desktop nessus/parser.c Deleted: trunk/openvas-client/nessus/nmake.bat =================================================================== --- trunk/openvas-client/nessus/nmake.bat 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/nessus/nmake.bat 2008-08-08 13:05:40 UTC (rev 1120) @@ -1,2 +0,0 @@ -nmake.exe /nologo /f nmake.w32 %1 %2 %3 %4 %5 %6 %7 %8 %9 - Deleted: trunk/openvas-client/nessus/nmake.w32 =================================================================== --- trunk/openvas-client/nessus/nmake.w32 2008-08-08 12:59:49 UTC (rev 1119) +++ trunk/openvas-client/nessus/nmake.w32 2008-08-08 13:05:40 UTC (rev 1120) @@ -1,131 +0,0 @@ -#!nmake /f -# -# Makefile for the Microsoft compiler/linker -# creates the nessus client -# - - -# most certailny, you need to adjust the following -# parameter to the root of your gtk stuff -GTKROOT = C:\Nessus\Src - - -!include <ntwin32.mak> - -INSTALL_TARGET = C:\Nessus -PRFS = prefs_dialog -CHRT = gdchart0.94b -CHLB = $(CHRT)\gd1.3 - -LCLINC = -I. -I$(PRFS) -I$(CHRT) -I$(CHLB) -I..\include -NESINC = -I$(INSTALL_TARGET)\include \ - -I$(INSTALL_TARGET)\include\nessus -GTKINC = -I$(GTKROOT)\gtk+ \ - -I$(GTKROOT)\gtk+/gtk \ - -I$(GTKROOT)\gtk+/gdk \ - -I$(GTKROOT)\gtk+\gdk\win32 -GLBINC = -I$(GTKROOT)\glib \ - -I$(GTKROOT)\glib\win32 - -CC = cl.exe -DEFS = $(NESINC) $(GTKINC) $(GLBINC) -CFLAGS = -nologo -Ox $(LCLINC) $(DEFS) $(EXFLAGS) - - - -LIBS = nessus.lib peks.lib mpz.lib zlib.lib \ - gtk-1.3.lib gdk-1.3.lib peks.lib \ - glib-1.3.lib wsock32.lib -LIBPATH = /libpath:$(GTKROOT)\glib \ - /libpath:$(GTKROOT)\gtk+\gdk \ - /libpath:$(GTKROOT)\gtk+\gdk\win32 \ - /libpath:$(GTKROOT)\gtk+\gtk \ - /libpath:$(INSTALL_TARGET)\lib -LDFLAGS = -nologo -map -out:nessus.exe \ - -machine:I386 -subsystem:WINDOWS -LD = link.exe - - - -OBJ = attack.obj auth.obj \ - comm.obj error_dialog.obj \ - families.obj monitor_dialog.obj \ - nessus.obj parser.obj \ - password_dialog.obj plugin_infos.obj \ - preferences.obj read_target_file.obj \ - report.obj latex_output.obj \ - sighand.obj xstuff.obj \ - report_utils.obj html_output.obj \ - text_output.obj \ - splash_screen.obj html_graph_output.obj \ - cli.obj xml_output.obj \ - detached_index.obj - -XOBJ = prefs_about.obj \ - prefs_dialog.obj \ - prefs_dialog_auth.obj \ - prefs_dialog_misc.obj \ - prefs_dialog_plugins_prefs.obj \ - prefs_dialog_scan_opt.obj \ - prefs_dialog_user.obj \ - prefs_plugins.obj \ - prefs_kb.obj \ - prefs_target.obj - - -YOBJ = gdc.obj price_conv.obj gdc_pie.obj \ - gdchart.obj gd.obj gdfontt.obj \ - gdfonts.obj gdfontmb.obj gdfontl.obj \ - gdfontg.obj - -# ------------------------------------------------------ -# default rules -# ------------------------------------------------------ - -all: nessus.exe - -.c.obj: - $(CC) $(cvarsdll) $(CFLAGS) -c -Fo$*.obj $< - -{$(PRFS)\}.c.obj:: - $(CC) $(cvarsdll) $(CFLAGS) -c $< - -{$(CHRT)\}.c.obj:: - $(CC) $(cvarsdll) $(CFLAGS) -c $< - -{$(CHLB)\}.c.obj:: - $(CC) $(cvarsdll) $(CFLAGS) -c $< - -# ------------------------------------------------------ -# install peks stuff -# ------------------------------------------------------ - -install: - - -# ------------------------------------------------------ -# built the binary -# ------------------------------------------------------ - -nessus.exe: $(OBJ) $(XOBJ) $(YOBJ) - $(LD) @<< - $(LIBPATH) - $(LDFLAGS) - $(OBJ) - $(XOBJ) - $(YOBJ) - $(LIBS) -<< - -# ------------------------------------------------------ -# clean up -# ------------------------------------------------------ - -distclean clean:: - -del nessus.map - -del nessus.exp - -del *.obj - -distclean:: - -del nessus.exe - From scm-commit at wald.intevation.org Fri Aug 8 15:30:01 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 15:30:01 +0200 (CEST) Subject: [Openvas-commits] r1121 - trunk/doc/website Message-ID: <20080808133001.5368A406FB@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 15:30:01 +0200 (Fri, 08 Aug 2008) New Revision: 1121 Modified: trunk/doc/website/openvas-cr-15.htm4 Log: Updated description: Mentioning continous scans and reducing the list of dropped protocol elements to the ones that directly relate to the detached scan feature. Modified: trunk/doc/website/openvas-cr-15.htm4 =================================================================== --- trunk/doc/website/openvas-cr-15.htm4 2008-08-08 13:05:40 UTC (rev 1120) +++ trunk/doc/website/openvas-cr-15.htm4 2008-08-08 13:30:01 UTC (rev 1121) @@ -87,6 +87,10 @@ </p> <p> +The OpenVAS server itself will not allow for continous scans anymore. +</p> + +<p> The command line version of OpenVAS-Client will not anymore offer the respective commands line option for detached scans. </p> @@ -100,10 +104,8 @@ <p> This change would be integrated into the upcoming OTP 1.0 protocol and -remove the commands SESSIONS_LIST, SESSION_DELETE, SESSION_RESTORE, -DETACHED_SESSIONS_LIST, DETACHED_STOP and the preferences -ntp_save_sessions, save_session, -save_empty_sessions, detached_scan, continuous_scan, delay_between_scan_loops, +remove the commands DETACHED_SESSIONS_LIST and DETACHED_STOP and the preferences +detached_scan, continuous_scan, delay_between_scan_loops, and detached_scan_email_address. </p> @@ -123,7 +125,10 @@ <ul> <li> 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> - Updated status: implemented. + Updated status: implemented.<br> + Updated description: Mentioning continous scans and reducing the list of + dropped protocol elements to the ones that directly relate to the + detached scan feature. <li> 2008-07-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> Added voting result. <li> 2008-07-03 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de>:<br> From scm-commit at wald.intevation.org Fri Aug 8 15:54:53 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Fri, 8 Aug 2008 15:54:53 +0200 (CEST) Subject: [Openvas-commits] r1122 - trunk/doc/website Message-ID: <20080808135453.669C840700@pyrosoma.intevation.org> Author: jan Date: 2008-08-08 15:54:53 +0200 (Fri, 08 Aug 2008) New Revision: 1122 Modified: trunk/doc/website/openvas-cr-13.htm4 Log: Add item on how to handle the .oval files. Modified: trunk/doc/website/openvas-cr-13.htm4 =================================================================== --- trunk/doc/website/openvas-cr-13.htm4 2008-08-08 13:30:01 UTC (rev 1121) +++ trunk/doc/website/openvas-cr-13.htm4 2008-08-08 13:54:53 UTC (rev 1122) @@ -357,6 +357,11 @@ <li> ovaldi: src/Main.cpp: Change report driver code to serve the needs of OpenVAS. <li> ovaldi: Extend with a OpenVAS-KB probe factory +<li> Handling of .oval files: Location should be inside directory "oval" + which is located in /usr/lib/openvas/plugins/. + This would also allow for easy extension of OpenVAS NVT feed/sync. + However, the .oval files should not be handled inside the OpenVAS SVN + repository because the management takes place at the OVAL project. </ul> <h3>History</h3> From scm-commit at wald.intevation.org Sat Aug 9 00:58:25 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sat, 9 Aug 2008 00:58:25 +0200 (CEST) Subject: [Openvas-commits] r1123 - in trunk/openvas-server: . doc/ntp doc/otp openvasd Message-ID: <20080808225825.8633540708@pyrosoma.intevation.org> Author: jan Date: 2008-08-09 00:58:24 +0200 (Sat, 09 Aug 2008) New Revision: 1123 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/doc/ntp/ntp_extensions.txt trunk/openvas-server/doc/ntp/ntp_white_paper.txt trunk/openvas-server/doc/otp/otp_specification_10.txt trunk/openvas-server/openvasd/comm.c Log: Started clean documentation of OTP. * doc/otp/otp_specification_10.txt: Extended with various protocol command documentation. * doc/ntp/ntp_extensions.txt, doc/ntp/ntp_white_paper.txt: Removed those elements which are documented cleanly in otp_specification_10.txt * openvasd/comm.c (plugin_send_infos): Added comment hinting at a potential bug. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/ChangeLog 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,5 +1,19 @@ 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + Started clean documentation of OTP. + + * doc/otp/otp_specification_10.txt: Extended with various + protocol command documentation. + + * doc/ntp/ntp_extensions.txt, doc/ntp/ntp_white_paper.txt: + Removed those elements which are documented cleanly + in otp_specification_10.txt + + * openvasd/comm.c (plugin_send_infos): Added comment + hinting at a potential bug. + +2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + Patch for Change Request #15: http://www.openvas.org/openvas-cr-15.html (OpenVAS Server: Remove features for detached scans) Modified: trunk/openvas-server/doc/ntp/ntp_extensions.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/doc/ntp/ntp_extensions.txt 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,4 +1,12 @@ +ATTENTION: + Currently the specification document for OTP 1.0 + is established. Any feature clearified and added to + ../otp/otp_specification_10.txt is removed here. + The new specification for OTP is finished once the ntp + documentation files are empty. + + Nessus Transfer Protocol Extensions @@ -189,40 +197,6 @@ timeout.10246 = 12 timeout.10542 = -1 - - -7. Attached files : the message ATTACHED_FILE ----------------------------------------------- - -ATTACHED_FILE is a message that comes after the -PREFERENCES message. Its purpose is to allow the -client to upload a file to the server, which will -be used by plugins. A usage of this would be to -upload a SSL certificate to the server so that -security checks can be done over SSL. - - -The message syntax is : - -CLIENT <|> ATTACHED_FILE -name: <name> -content: octet/stream -bytes: %d -(file) - -With '%d' being the number of bytes to read and 'content' should, -in the future (and if requested by users) be mime-compliant. -Today, this field is ignored and all files are treated -as octet/stream (sent without any conversion). - -<name> is the name of the file. openvasd will re-assign -a new name (to prevent clients from uploading, say, /etc/passwd). - -This message should be used with the plugin preference 'file'. -Read plugins_prefs.txt for details. - - - 8. Alternative protocol negociation ----------------------------------- @@ -235,11 +209,8 @@ The current options are : . md5_caching [NOT IMPLEMENTED] -. plugins_version -. timestamps - 9. md5 caching ------------------------------------ @@ -283,108 +254,3 @@ . . <|> SERVER - - -11. Per plugin message -------------------------------------------------------------------------------- - -The message PLUGIN_INFO returns the information about one specific plugin. -It's defined as : - - CLIENT <|> PLUGIN_INFO <|> id <|> CLIENT - -With <id> being the ID of the plugin from which we want information about. -In return, the server returns : - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family - -(as in the PLUGIN_LIST message) - -12. plugins_version ----------------------------------------------------------------------------- - -If the client gives the option "plugins_version" at connection time -(as defined in �8) then the PLUGIN_INFO message changes from : -id <|> name <|> category <|> copyright <|> description <|> summry <|> family - -to - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> plugin_version - - -With plugin_version being the revision tag of the current plugin - - -12. plugins_cve_id ----------------------------------------------------------------------------- - -If the client sends the option "plugins_cve_id" at connection time -(as defined in �8) then the PLUGIN_INFO message has the plugins CVE ID -appended to it. Note that plugins_version takes precedence on this, so -if the client sends plugins_version AND plugins_cve_id, then the PLUGIN_INFO -message becomes : - - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> plugin_version <|> cve_id - -If just the option plugins_cve_id is set, then the PLUGIN_INFO message -becomes: - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> cve_id - -13. plugins_bugtraq_id ----------------------------------------------------------------------------- - -If the client sends the option "plugins_bugtraq_id" at connection time -(as defined in �8) then the PLUGIN_INFO message has the plugins Bugtraq ID -appended to it. Note that plugins_version takes precedence on this, and -the client needs to ALSO have set plugins_cve_id. -So if the client sends plugins_version AND plugins_bugtraq_id, -it MUST send plugins_cve_id and then the PLUGIN_INFO -message becomes : - - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> plugin_version <|> cve_id <|> bugtraq_id - -If just the option plugins_cve_id is set, then the PLUGIN_INFO message -becomes: - -id <|> name <|> category <|> copyright <|> description <|> summry <|> family <|> cve_id <|> bugtraq_id - - - - -14. timestamps ------------------------------------------------------------------------------- - -If the option 'timestamps' is enabled by the client at connection time, -(as defined in �8) then the server will send the message : - -SERVER <|> TIME <|> SCAN_START <|> (time of day) <|> SERVER -SERVER <|> TIME <|> SCAN_END <|> (time of day) <|> SERVER - -When the whole scan starts and ends. - -and : -SERVER <|> TIME <|> HOST_START <|> host <|> (time of day) <|> SERVER -SERVER <|> TIME <|> HOST_END <|> host <|> (time of day) <|> SERVER - -To send the timestamps of the time of the scan of each host. - - - -15. Plugins dependencies -------------------------------------------------------------------------------- - -If the option 'dependencies' is enabled by the client at connection time -(as defined in �8) then the server will send the message PLUGIN_DEPENDENCIES -after the RULES message. - -The format is : - -SERVER <|> PLUGINS_DEPENDENCIES -pluginame1 <|> dependencie1 <|> dependencie2 <|> ...... <|> -pluginame2 <|> dependencie1 <|> dependencie2 <|> ...... <|> -<|> SERVER - - Modified: trunk/openvas-server/doc/ntp/ntp_white_paper.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,4 +1,10 @@ +ATTENTION: + Currently the specification document for OTP 1.0 + is established. Any feature clearified and added to + ../otp/otp_specification_10.txt is removed here. + The new specification for OTP is finished once the ntp + documentation files are empty. Nessus Transfer Protocol White Paper version 1.0 @@ -39,14 +45,9 @@ The Nessus Transfer Protocol currently recognizes the following messages types : ERROR - HOLE - INFO PORT NEW_ATTACK - PLUGIN_LIST - STAT - STOP_ATTACK - + 31. The "ERROR" type A NTP message declared as "ERROR" contains the description of an error that @@ -58,22 +59,6 @@ If the error is important, the server will send a 'BYE BYE' message (see the end of the document) - 32. The "HOLE" and "INFO" type - - A NTP message declared as "HOLE" contains the description of a security hole - that has been found on a given host. The message contains the name of the - host as well as the port on which the hole was discovered. - The syntax for this type is : - - entity <|> HOLE <|> hostname <|> port:hole description <|> entity - - Because a hole description is very likely to contain a line feed, - before being sent every '\n' character must be replaced by ';'. - The client will have, then, to do the reverse conversion (';' -> '\n') - - When the message is of type 'INFO', this is the same as the "HOLE" type - except the fact that the description is just a warning. - 33. The "PORT" type A NTP message declared as "PORT" reports that a given port is open @@ -107,39 +92,7 @@ recursive : should the hostloop system be used against _every_ host ? (0:no) portrange : range of ports to scan (default : "1-8000") - - 35. The "PLUGIN_LIST" type - - A NTP message of type "PLUGIN_LIST" tells to the client the name, the id and the - copyright of the plugins that are installed on the server. - This list *does* contain lines feed. - - The syntax is : - SERVER <|> PLUGIN_LIST <|> - id <|> name <|> category <|> copyright <|> description <|> summary <|> family - id <|> name <|> category <|> copyright <|> description <|> summary <|> family - ... - <|> SERVER - - 36. The "STAT" type - - A NTP message of type STAT tells the client the current status of the portscanning - of a given host - Syntax : - - SERVER <|> STAT <|> hostname <|> port <|> SERVER - - This message is sent every 100 ports - - 37. The "STOP_ATTACK" type - - A NTP message of type STOP_ATTACK tells the daemon to stop the test of a given - host. - Syntax : - - CLIENT <|> STOP_ATTACK <|> hostname <|> CLIENT - - + 4. A typical NTP session A typical NTP session has a real simple scheme : @@ -171,14 +124,3 @@ EOF - - - - - - - - - - - Modified: trunk/openvas-server/doc/otp/otp_specification_10.txt =================================================================== --- trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-08 22:58:24 UTC (rev 1123) @@ -1,19 +1,20 @@ OpenVAS Transport Protocol Specification 1.0 - + Authors: Michael Wiegand <michael.wiegand at intevation.de> - + Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + PURPOSE This document describes OTP, the protocol used for communication between the server and client modules of the Open Vulnerability Assessment System (OpenVAS). - + STATUS This document is currently a draft; it does not describe the complete protocol yet, but only the changes between the Nessus Transport Protocol, version 1.2 and the OpenVAS Transport Protocol, version 1.0. For more information on NTP please refer to the NTP specification for the time being. - + INTRODUCTION The OpenVAS project is a fork of the Nessus project. Because of this, the initial protocol used for client-server communication was the Nessus @@ -24,45 +25,257 @@ made to switch to a new protocol to avoid collisions with future protocol specifications by the Nessus project and to avoid confusion with other well-established protocols. - + GENERAL CONSIDERATIONS The initial specification of the OpenVAS Transport Protocol (OTP) is very close to the NTP implementation in the last versions available under the GNU General Public License (GPL). The changes between NTP 1.2 -- the last NTP version used by OpenVAS -- and OTP 1.0 are explained in the CHANGES section below. - + CHANGES This section describes the changes between NTP 1.2 and OTP 1.0. - + Plug-in upload: Section 10 of the NTP Extensions describes the ATTACHED_PLUGIN message type. Using this message type, it was possible for a client to upload a plug-in to a server. Due to security considerations described in the OpenVAS change request #4 [1], this message type has been removed from the protocol. - + Version information: The undocumented NESSUS_VERSION message type has been replaced with the OPENVAS_VERSION message type. When an OPENVAS_VERSION message is issued by the client, the server is expected to respond with a message containing the current server version. - + New message types: In addition to the existing message types HOLE, INFO and NOTE two new message types have been added to the protocol: DEBUG and LOG. Their purpose is to give clients more control about the verbosity of the messages they receive from the server. - - Session handling: - Experimental support for handling server-side sessions and detached scans as - described in sections 3 and 5 of the NTP Extensions has been removed from OTP - as the functionality concerned has been removed from OpenVAS-Server due to - design decisions. This means the following message types have been removed - from the protocol: SESSIONS_LIST, SESSION_DELETE, SESSION_RESTORE, - DETACHED_SESSIONS_LIST, DETACHED_STOP. The following preferences have been - removed from the protocol as well: ntp_save_sessions, save_session, - save_empty_sessions, detached_scan, continuous_scan, delay_between_scan_loops, - detached_scan_email_address. - + + +PROTOCOL INITIALIZER AND PROTOCOL FEATURES + + Description: + + The client start the protocol with a initializer of + the protocol version followed by parameters switching + on various features. Available protocol features are: + + dependencies (server will use command PLUGINS_DEPENDENCIES) + timestamps (server will use command TIME) + plugins_version (server will add revision to plugin information) + plugins_cve_id (server will add cve id to plugin information) + plugins_bugtraq_id (server will add bugtraq id to plugin information) + + Syntax: + + < OTP/1.0 >< protocol_feature1 protocol_feature2 ... > + +PROTOCOL COMMANDS + + ATTACHED_FILE + + Description: + + This command corresponds to the plugin preferences + type "file". It follows the command PREFERENCES + to upload the specified files from client to server. + + Syntax: + + CLIENT <|> ATTACHED_FILE + name: file_name + content: octet/stream + bytes: file_length + file_content + + where + file_name: the path and name of the file. + It is a identifier to reference the file + in the plugin preferences. + file_length: the number of bytes that will follow after the newline + file_content: the actual file as byte stream. + + HOLE + + Description: + + With this command the server reports a identified + problem of class "security hole". + + Syntax: + + SERVER <|> HOLE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + + where + host: the target system + service_name: the name of the service (like in /etc/services) + port_number: the port number the problem relates to or "general". + protocol_type: "tcp" or "udp". + description: the problem description where newlines have been + replaced by semicolons. + oid: the OID of the NVT that identified the problem. + + INFO + + Description: + + With this command the server reports a identified + problem of class "security info". + + Syntax: + + SERVER <|> INFO <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + + where + host: the target system + service_name: the name of the service (like in /etc/services) + port_number: the port number the problem relates to or "general". + protocol_type: "tcp" or "udp". + description: the problem description where newlines have been + replaced by semicolons. + oid: the OID of the NVT that identified the problem. + + NOTE + + Description: + + With this command the server reports a identified + problem of class "security note". + + Syntax: + + SERVER <|> NOTE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + + where + host: the target system + service_name: the name of the service (like in /etc/services) + port_number: the port number the problem relates to or "general". + protocol_type: "tcp" or "udp". + description: the problem description where newlines have been + replaced by semicolons. + oid: the OID of the NVT that identified the problem. + + PLUGINS_DEPENDENCIES + + Description: + + The PLUGINS_DEPENDENCIES messages are send after the RULES messages + in case the protocol feature "dependencies" was set during protocol + initialization. + + Syntax: + + SERVER <|> PLUGINS_DEPENDENCIES + plugin_1_name <|> dependency1 <|> dependency2 <|> ... <|> + plugin_2_name <|> dependency1 <|> dependency2 <|> ... <|> + ... + <|> SERVER + + PLUGIN_INFO + + Description: + + This command is issued by the client to request + information of the NVT specified by its oid. + + Syntax: + + CLIENT <|> PLUGIN_INFO <|> oid <|> CLIENT + + The server answers with this line (analogous to PLUGIN_LIST command): + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family + + The following extensions are appended in the given order: + + In case protocol feature "plugins_version" is selected, the respective + plugin_version is appended to the line: + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family <|> plugin_version + + In case protocol feature "plugins_cve_id" is selected, the respective + cve_id is appended to the line, e.g.: + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family <|> plugin_version <|> cve_id + + In case protocol feature "plugins_bugtraq_id" is selected, the respective + bugtraq_id is appended to the line, e.g.: + + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family <|> plugin_version <|> cve_id <|> bugtraq_id + + In case no plugin with OID=oid is found, the server will not answer at all. + + PLUGIN_LIST + + Description: + + With this command the server sends detailed information about + the available NVTs. + + Syntax: + + SERVER <|> PLUGIN_LIST <|> + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family + oid <|> name <|> category <|> copyright <|> description <|> summary <|> family + ... + <|> SERVER + + Additional information might be apended according to some procotol features. + Please refer to the description of the PLUGIN_INFO command for details. + + STAT + + Description: + + With this command, the server informs the client about + the progress of the port scan for target system "host". + "port" is the currently scanned port number. + The command with an interval of 100 ports. + + Syntax: + + SERVER <|> STAT <|> host <|> port <|> SERVER + + STOP_ATTACK + + Description: + + With this command, the client tells the server to stop + scanning target "host". + + Syntax: + + CLIENT <|> STOP_ATTACK <|> host <|> CLIENT + + TIME + + Description: + + The TIME messages will be send by the server + in case the protocol feature "timestamps" was set during protocol + initialization. + + Syntax: + + After completion of scanning a target host the server sends: + + SERVER <|> TIME <|> HOST_START <|> host <|> time_string <|> SERVER + SERVER <|> TIME <|> HOST_END <|> host <|> time_string <|> SERVER + + or, in case STOP_ATTACK was issued by the client: + + SERVER <|> TIME <|> HOST_START <|> host <|> time_string <|> SERVER + SERVER <|> TIME <|> HOST_INTERRUPTED <|> host <|> time_string <|> SERVER + + After completion of the whole scan the server sends: + + SERVER <|> TIME <|> SCAN_START <|> time_string <|> SERVER + SERVER <|> TIME <|> SCAN_END <|> time_string <|> SERVER + + where time_string is of the form "Wed Jun 30 21:49:08 1993". + REFERENCES [1] http://www.openvas.org/openvas-cr-4.html Modified: trunk/openvas-server/openvasd/comm.c =================================================================== --- trunk/openvas-server/openvasd/comm.c 2008-08-08 13:54:53 UTC (rev 1122) +++ trunk/openvas-server/openvasd/comm.c 2008-08-08 22:58:24 UTC (rev 1123) @@ -345,7 +345,11 @@ } plugins = plugins->next; } - + + /* XXX: This code looks like it will fail for the + * last plugin in the list: info will no be send + * because next ist NULL. + */ if(plugins->next) { send_plug_info(globals, plugins); From scm-commit at wald.intevation.org Sun Aug 10 00:35:12 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sun, 10 Aug 2008 00:35:12 +0200 (CEST) Subject: [Openvas-commits] r1124 - in trunk/openvas-server: . doc/ntp doc/otp Message-ID: <20080809223512.74A77406E7@pyrosoma.intevation.org> Author: jan Date: 2008-08-10 00:35:10 +0200 (Sun, 10 Aug 2008) New Revision: 1124 Removed: trunk/openvas-server/doc/ntp/ntp_white_paper.txt Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/MANIFEST trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt trunk/openvas-server/doc/otp/otp_specification_10.txt Log: * doc/ntp/ntp_white_paper.txt: Removed. It does not contain any information not covered by otp_specification_10.txt. * doc/ntp/ntp_white_paper_11.txt: Removed those elements which are documented cleanly in otp_specification_10.txt * doc/otp/otp_specification_10.txt: Extended with various protocol command documentation. * MANIFEST: Updated. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/ChangeLog 2008-08-09 22:35:10 UTC (rev 1124) @@ -1,3 +1,16 @@ +2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + * doc/ntp/ntp_white_paper.txt: Removed. It does not contain + any information not covered by otp_specification_10.txt. + + * doc/ntp/ntp_white_paper_11.txt: Removed those elements + which are documented cleanly in otp_specification_10.txt + + * doc/otp/otp_specification_10.txt: Extended with various + protocol command documentation. + + * MANIFEST: Updated. + 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Started clean documentation of OTP. Modified: trunk/openvas-server/MANIFEST =================================================================== --- trunk/openvas-server/MANIFEST 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/MANIFEST 2008-08-09 22:35:10 UTC (rev 1124) @@ -12,7 +12,6 @@ doc/nsr_file_format.txt doc/ntp/ntp_extensions.txt doc/ntp/ntp_white_paper_11.txt -doc/ntp/ntp_white_paper.txt doc/ntp/plugin_prefs.txt doc/ntp/README doc/openvas-adduser.8 Deleted: trunk/openvas-server/doc/ntp/ntp_white_paper.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/doc/ntp/ntp_white_paper.txt 2008-08-09 22:35:10 UTC (rev 1124) @@ -1,126 +0,0 @@ - -ATTENTION: - Currently the specification document for OTP 1.0 - is established. Any feature clearified and added to - ../otp/otp_specification_10.txt is removed here. - The new specification for OTP is finished once the ntp - documentation files are empty. - - Nessus Transfer Protocol White Paper - version 1.0 - - - - - -1. What is the Nessus Transfer Protocol (NTP) ? - - The NTP is the protocol that is used for the communication between - openvasd (also known as the server) and a nessus client. - - This protocol is widely explained in order to facilitate the development - of other clients than the 'standard' Nessus client. - - The NTP protocol is TCP based but has nothing to do with the Network - Time Protocol (sorry, this is confusing) - - -2. NTP typical message - - A NTP message is a suite of ASCII printable characters, which does not - contain any line feed ('\n'). - - Every NTP message is made up of 'fields' that are delimited by the string ' <|> ' - (note the spaces). - - The first field always contain the name of the entity that sends it (SERVER or - CLIENT), and the second field always send the type of message. - The content of the other fields depends of the message type. - The last field of the message must be the same as the first field. - - eg : SERVER <|> ERROR <|> An error occurred ! <|> SERVER - -3. NTP messages types - - The Nessus Transfer Protocol currently recognizes the following messages types : - - ERROR - PORT - NEW_ATTACK - - 31. The "ERROR" type - - A NTP message declared as "ERROR" contains the description of an error that - occurred. Once more, there must be NO line feed ('\n') character in this - description. - The syntax for this type is : - entity <|> ERROR <|> error description <|> entity - - If the error is important, the server will send a 'BYE BYE' message - (see the end of the document) - - 33. The "PORT" type - - A NTP message declared as "PORT" reports that a given port is open - on a given host. - The syntax for this type is : - - entity <|> PORT <|> hostname <|> portnumber <|> entity - - - 34. The "NEW_ATTACK" type - - A NTP message of type "NEW_ATTACK" launches a new attack again a given - host. - - The syntax of this type is : - - entity <|> NEW_ATTACK <|> pluginlist <|> maxhosts <|> recursive \ - <|> portrange <|> hostname <|> entity - - where : - - pluginlist : is the list of plugins to use. Each plugin is designated by a number - (see #35 : The "PLUGIN_LIST" type), so the plugin list is a list of numbers separated - by a semi-column ';' (eg : "1;39;11;3") - If pluginlist equals to "-1", then all the plugins will be used - If pluginlist equals to "0", then no plugin will be used (a simple portscanning will - be performed) - - maxhosts : is the maximal number of hosts to test. "-1" means 'no maximum' - - recursive : should the hostloop system be used against _every_ host ? (0:no) - - portrange : range of ports to scan (default : "1-8000") - -4. A typical NTP session - - A typical NTP session has a real simple scheme : - - the server sends : the client answers : - - "< NTP/1.0 >" - "User :" - a user name - "Password :" - a valid password - The server then sends - its plugin list (see 35) - the client sends a new attack - message (see 34) - the server sends various - messages about the status - of the attack (see 31,32,33) - - At any moment, the client can send the 'attack_stop' command (see 37) - - "SERVER <|> BYE <|> BYE" - "anything\n" and - closes the connection - - - - - - -EOF Modified: trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-09 22:35:10 UTC (rev 1124) @@ -1,3 +1,9 @@ +ATTENTION: + Currently the specification document for OTP 1.0 + is established. Any feature clearified and added to + ../otp/otp_specification_10.txt is removed here. + The new specification for OTP is finished once the ntp + documentation files are empty. Nessus Transfer Protocol White Paper version 1.1 and 1.2 @@ -153,25 +159,7 @@ Last but not least, the server can send plugins preferences. Please read the 'plugin_prefs' paper which is distributed with Nessus-980903 and the newest versions. - - -22. The "NEW_ATTACK" message - Since the client can now send more informations for a test to the server, - the "NEW_ATTACK" message is now much simpler : - - It used to be : - entity <|> NEW_ATTACK <|> pluginlist <|> maxhosts <|> recursive \ - <|> portrange <|> hostname <|> entity - - It's now : - - entity <|> NEW_ATTACK <|> hostname <|> entity - - where 'hostname' can be an IP, a FQDN or a list of them - (ie: "www.a.com,www.b.com,www.c.com" or "host1,host2,192.68.2.1" - or whatever) - 23. The "RULES" message Modified: trunk/openvas-server/doc/otp/otp_specification_10.txt =================================================================== --- trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-08 22:58:24 UTC (rev 1123) +++ trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-09 22:35:10 UTC (rev 1124) @@ -4,17 +4,17 @@ Michael Wiegand <michael.wiegand at intevation.de> Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> -PURPOSE +ABOUT THIS DOCUMENT This document describes OTP, the protocol used for communication between the server and client modules of the Open Vulnerability Assessment System (OpenVAS). STATUS This document is currently a draft; it does not describe the complete protocol - yet, but only the changes between the Nessus Transport Protocol, version 1.2 - and the OpenVAS Transport Protocol, version 1.0. For more information on NTP - please refer to the NTP specification for the time being. + yet but is still close to the Nessus Transport Protocol, version 1.2. + Apart from this the documentation itself is not complete yet. + INTRODUCTION The OpenVAS project is a fork of the Nessus project. Because of this, the initial protocol used for client-server communication was the Nessus @@ -29,9 +29,7 @@ GENERAL CONSIDERATIONS The initial specification of the OpenVAS Transport Protocol (OTP) is very close to the NTP implementation in the last versions available under the GNU - General Public License (GPL). The changes between NTP 1.2 -- the last NTP - version used by OpenVAS -- and OTP 1.0 are explained in the CHANGES section - below. + General Public License (GPL). CHANGES This section describes the changes between NTP 1.2 and OTP 1.0. @@ -54,7 +52,21 @@ clients more control about the verbosity of the messages they receive from the server. + Detached scans: + This functionality has been dropped due to design decisions. + This means the following commands have been removed + from the protocol: DETACHED_SESSIONS_LIST and DETACHED_STOP. + The following preferences have been removed from the protocol as + well: detached_scan, continuous_scan, delay_between_scan_loops, + detached_scan_email_address. +GENERAL ASPECTS OF PROTOCOL + + The OTP protocol is text-based, human readable and line-oriented. + + Each line is made of fields separated by "<|>. The first fields indicates + whether it is a command send by client or by server ("CLIENT" vs. "SERVER"). + PROTOCOL INITIALIZER AND PROTOCOL FEATURES Description: @@ -72,6 +84,8 @@ Syntax: < OTP/1.0 >< protocol_feature1 protocol_feature2 ... > + User : user_name + Password : user_password PROTOCOL COMMANDS @@ -98,6 +112,18 @@ file_length: the number of bytes that will follow after the newline file_content: the actual file as byte stream. + ERROR + + Description: + + In case of problems the server sends an error message with this + command. In case of unrecoverable problems, the server will then + close connection with BYE command. + + Syntax: + + SERVER <|> ERROR <|> error description <|> SERVER + HOLE Description: @@ -138,6 +164,17 @@ replaced by semicolons. oid: the OID of the NVT that identified the problem. + NEW_ATTACK + + Description: + + With this command the client requests the server to attack target + system(s) "host". "host" is one or many (comma-separated) IP or FQDN. + + Syntax: + + CLIENT <|> NEW_ATTACK <|> host <|> CLIENT + NOTE Description: @@ -226,6 +263,17 @@ Additional information might be apended according to some procotol features. Please refer to the description of the PLUGIN_INFO command for details. + PORT + + Description: + + With this command the server reports on open port + "port_number" on target system "host". + + Syntax: + + SERVER <|> PORT <|> host <|> port_number <|> SERVER + STAT Description: From scm-commit at wald.intevation.org Sun Aug 10 22:37:33 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Sun, 10 Aug 2008 22:37:33 +0200 (CEST) Subject: [Openvas-commits] r1125 - in trunk/openvas-client: . nessus Message-ID: <20080810203733.799CA406F7@pyrosoma.intevation.org> Author: jan Date: 2008-08-10 22:37:32 +0200 (Sun, 10 Aug 2008) New Revision: 1125 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/cli.c trunk/openvas-client/nessus/cli.h trunk/openvas-client/nessus/parser.c trunk/openvas-client/nessus/parser.h Log: Removing handling of "PLUGINS_ORDER" command which is not implemented in the server at all. It is not used in a senseful way anyway here in the client. * nessus/parser.h: Remove definition of MSG_PLUGINS_ORDER * nessus/parser.c (parse_message_type, parse_server_message): Removed handling of MSG_PLUGINS_ORDER. * nessus/cli.h (struct cli_args): Removed element plugins_order_table. * nessus/cli.c (build_plugins_order_table): Removed. (cli_test_monitor): Removed code element that did not do any useful things about plugins order. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/ChangeLog 2008-08-10 20:37:32 UTC (rev 1125) @@ -1,3 +1,20 @@ +2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + Removing handling of "PLUGINS_ORDER" command which + is not implemented in the server at all. + It is not used in a senseful way anyway here in the client. + + * nessus/parser.h: Remove definition of MSG_PLUGINS_ORDER + + * nessus/parser.c (parse_message_type, parse_server_message): + Removed handling of MSG_PLUGINS_ORDER. + + * nessus/cli.h (struct cli_args): Removed element plugins_order_table. + + * nessus/cli.c (build_plugins_order_table): Removed. + (cli_test_monitor): Removed code element that did not do any useful + things about plugins order. + 2008-08-08 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> * nessus/nmake.w32, nessus/nmake.bat: Removed. These are Modified: trunk/openvas-client/nessus/cli.c =================================================================== --- trunk/openvas-client/nessus/cli.c 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/cli.c 2008-08-10 20:37:32 UTC (rev 1125) @@ -85,70 +85,6 @@ return 1; } - - -static harglst* build_plugins_order_table(order) - char * order; -{ - int num = 0; - char * t; - int i = 0; - int * plugins_order_table_int; - harglst * plugins_order_table = harg_create(4000); - - - t = order; - - - while((t = strchr(t+1, ';')))num++; - plugins_order_table_int = emalloc((num+1)*sizeof(int)); - t = order; - if(num) - while(t) - { - char * next = strchr(t, ';'); - if(next)next[0]=0; - plugins_order_table_int[i++] = atoi(t); - if(next)next[0]=';'; - t = next+1; - next = strchr(next+1, ';'); - if(!next)t = NULL; - } - - /* - * Now, create the names table - */ - plugins_order_table = harg_create(num*3 + 1); - - for(i=0;i<num;i++) - { - struct nessus_plugin * plugs = Context->plugins; - - while(plugs != NULL && - plugs->id != plugins_order_table_int[i]) - plugs = plugs->next; - - - if( plugs == NULL ) - { - plugs = Context->scanners; - while(plugs && - plugs->id != plugins_order_table_int[i] ) - plugs = plugs->next; - } - if(plugs != NULL ){ - char id[32]; - snprintf(id, sizeof(id), "%d", i+1); - harg_add_string(plugins_order_table, id, plugs->name); - efree(&id); - } - } - efree(&plugins_order_table_int); - return plugins_order_table; -} - - - void cli_sigterm(s) int s; @@ -201,11 +137,6 @@ char * plug = NULL; parse_nessusd_short_status(&(buf[2]), &hostname, &action, ¤t, &max); - if(cli->plugins_order_table) - { - plug = harg_get_string(cli->plugins_order_table, current); - } - if(!strcmp(action, "portscan"))plug=""; printf("%s|%s|%s|%d\n", action,hostname,current,max); efree(&hostname); @@ -227,9 +158,6 @@ efree(¤t); } break; - case MSG_PLUGINS_ORDER: - cli->plugins_order_table = build_plugins_order_table(msg); - break; case MSG_FINISHED: printf("finished|%s||||\n", msg); break; Modified: trunk/openvas-client/nessus/cli.h =================================================================== --- trunk/openvas-client/nessus/cli.h 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/cli.h 2008-08-10 20:37:32 UTC (rev 1125) @@ -20,7 +20,6 @@ int backend; int verbose; int backend_output_func; - harglst * plugins_order_table; }; struct cli_args * cli_args_new(); Modified: trunk/openvas-client/nessus/parser.c =================================================================== --- trunk/openvas-client/nessus/parser.c 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/parser.c 2008-08-10 20:37:32 UTC (rev 1125) @@ -148,7 +148,6 @@ if(!strcmp(MSG_PORT_STR, type))return(MSG_PORT); if(!strcmp(MSG_ERROR_STR, type))return(MSG_ERROR); if(!strcmp(MSG_PING_STR, type))return(MSG_PING); - if(!strcmp(MSG_PLUGINS_ORDER_STR, type))return(MSG_PLUGINS_ORDER); if(!strcmp(MSG_FINISHED_STR, type))return(MSG_FINISHED); if(!strcmp(MSG_BYE_STR, type))return(MSG_BYE); return(-1); @@ -375,17 +374,6 @@ network_printf(context->socket, "CLIENT <|> PONG <|> PING <|> CLIENT\n\n"); return MSG_PING; break; - case MSG_PLUGINS_ORDER : - { - char * t = strstr(buf, " <|> SERVER"); - int tl = strlen(message_type); - int l = strlen(buf + tl); - if(t)t[0]=0; - strncpy(humanmsg, buf+tl+5, l); - humanmsg[l] = '\0'; - return(MSG_PLUGINS_ORDER); - } - break; case MSG_BYE : humanmsg[0]=0; return(MSG_BYE); Modified: trunk/openvas-client/nessus/parser.h =================================================================== --- trunk/openvas-client/nessus/parser.h 2008-08-09 22:35:10 UTC (rev 1124) +++ trunk/openvas-client/nessus/parser.h 2008-08-10 20:37:32 UTC (rev 1125) @@ -36,7 +36,6 @@ #define MSG_INFO 5 #define MSG_STAT 6 #define MSG_PING 7 -#define MSG_PLUGINS_ORDER 8 #define MSG_FINISHED 9 #define MSG_STAT2 10 #define MSG_NOTE 11 From scm-commit at wald.intevation.org Mon Aug 11 00:40:01 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 11 Aug 2008 00:40:01 +0200 (CEST) Subject: [Openvas-commits] r1126 - in trunk/openvas-server: . doc/ntp doc/otp Message-ID: <20080810224001.63F99406F0@pyrosoma.intevation.org> Author: jan Date: 2008-08-11 00:40:00 +0200 (Mon, 11 Aug 2008) New Revision: 1126 Removed: trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/doc/otp/otp_specification_10.txt Log: Continued consolidation of protocol documentation. * doc/ntp/ntp_white_paper_11.txt: Removed. It does not contain any information not covered by otp_specification_10.txt or defined elsewhere. * doc/otp/otp_specification_10.txt: Extended with various protocol command documentation. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-10 20:37:32 UTC (rev 1125) +++ trunk/openvas-server/ChangeLog 2008-08-10 22:40:00 UTC (rev 1126) @@ -1,3 +1,14 @@ +2008-08-11 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> + + Continued consolidation of protocol documentation. + + * doc/ntp/ntp_white_paper_11.txt: Removed. It does not contain + any information not covered by otp_specification_10.txt + or defined elsewhere. + + * doc/otp/otp_specification_10.txt: Extended with various + protocol command documentation. + 2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> * doc/ntp/ntp_white_paper.txt: Removed. It does not contain Deleted: trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt =================================================================== --- trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-10 20:37:32 UTC (rev 1125) +++ trunk/openvas-server/doc/ntp/ntp_white_paper_11.txt 2008-08-10 22:40:00 UTC (rev 1126) @@ -1,344 +0,0 @@ -ATTENTION: - Currently the specification document for OTP 1.0 - is established. Any feature clearified and added to - ../otp/otp_specification_10.txt is removed here. - The new specification for OTP is finished once the ntp - documentation files are empty. - - Nessus Transfer Protocol White Paper - version 1.1 and 1.2 - - -# Author : Renaud Deraison <deraison at cvs.nessus.org> -# -# Revisions : -# 07/10/98 : 10am : first release -# 07/10/98 : 4pm : first revision (thanks to Noam Rathaus :) -# 07/11/98 : 11am : added preferences and changed the 'NEW_ATTACK' message -# 07/11/98 : 2pm : added 'PLUGINS_ORDER' (thanks to Alexis de Bernis :) - updated the 'STATUS' message format -# 07/11/98 : 10pm : added a new option : the scan_level -# 07/12/98 : 1pm : corrected some minor errors -# 07/29/98 : 3pm : added the 'STOP_WHOLE_TEST' message -# 08/24/98 : 1pm : corrected a mistake in the messages order - changed some stuff in the text to make - it look like a white paper instead of - a draft -# 09/03/98 : 2pm : corrected several spelling mistakes -# 09/22/98 : 5pm : added several options -# 01/29/99 : 3am : Added Scan ID to HOLE and INFO messages. - (Jochen Wiedmann) - -# 01/31/02 : 6pm : removed scan_level and high_scan_time which are deprecated -# 03/08/02 : : documented the NOTE messages - -This paper has been written as a complement to the NTP/1.0 -white paper. If you have never read the NTP/1.0 white paper, -you should, or else you may not understand everything... - -1. Purpose of the NTP/1.1 and NTP/1.2 - - The purpose of the NTP 1.1 is to help to make the Nessus daemon more -flexible than it used to be, as well as to be more specific on the -holes/reports found on a remote host. - - + More flexible : - - Nowadays, using openvasd is a pain : before you make a test, you have - to telnet to the openvasd machine, edit openvasd.rules to be sure it - matches your needs, restart the daemon, and actually start the attack... - - Also, all the preferences should be defined by the client, not - only in openvasd.conf. Because if you want to reduce the max number - of threads of openvasd, it's a real pain. - - + More specific : - - The NTP/1.0 is TCP oriented, but a flaw can be found on a UDP port, so - the NTP/1.1 needs to be more specific in the reports messages. - So the NTP/1.1 will modify the INFO and HOLE messages to make them more - specifics and more accurate. NTP/1.2 extends the INFO and HOLE messages - again by adding the scan's ID, so that one can identify the plugin that - reports the message. - - + More open : - - The NTP/1.1 allow the server to send to the client an infinite* amount - of data, and the client can send back to the server another infinite amount - of data - - - *: we all know that in the computers world, nothing is really infinite so - maybe I should have put 'unlimited as long as there is memory on the - server side', but please don't mess up with that :) - - - + More fined-grained : - - NTP/1.1 defines the 'NOTE' message (which works the same as INFO and HOLE) - -2. New messages - -21. The "PREFERENCES" message - - The NTP/1.1 provides a new message format, which is nearly the same - as the PLUGIN_LIST message : the PREFERENCES message. - - This message will be sent by the server and by the client before the - start of a new attack. - - Syntax : - - entity <|> PREFERENCES <|> - name <|> value - name <|> value - ... - <|> entity - - where 'entity' is either SERVER or CLIENT. - - The current preferences are : - max_threads : max number of threads. Can't be greater than the one - defined in openvasd.conf - test_file : the file that some plugins will attempt to obtain from the - remote server (ie : /etc/passwd) - email : the email of the user - - ping_hosts : ping hosts before starting to scan them. Must be 'yes' or 'no' - - reverse_lookup : the IP must be reversely looked up before it's attacked - - outside_firewall: if openvasd is testing a host which is behind a firewall - - host_expansion : this is how Nessus will seek for victims. Several options - are possible : - + "none" : means that only the primary host will be tested - + "dns" : means that a AXFR request will be made to the - DNS which is in charge of the domain name of the - victim. - + "nfs" : means that Nessus will do a 'showmount' on every - host tested, and will test the hosts that can - mount the filesystems exported. - + "ip" : means that Nessus will test the entire subnet of a - host. - - It's possible to combine the last three options by putting - a ';' between the options : 'dns;ip' is a valid option, - as well as 'dns;nfs;ip'. - 'none;dns;nfs;ip' is a NONSENSE. The server will send a - PREFERENCES_ERRORS message with this one, and a good client - should first test such nonsense before sending them to the - server. - - port_range : the range of ports to scan (ie : 1-1024) - max_hosts : maximal number of hosts to test - - - This one will NEVER be sent to the client, but the client will have to - send it the the server : - - plugin_set : the list of plugins to use (same format as it used to be (1;4;6;9) - - If the client doesn't send 'plugin_set', then the server will launch all the plugins. - - Note : - In fact, the server will send to the client the content of the file - openvasd.conf. If the openvasd owner decides to remove this file, the - server will send you the message : - - SERVER <|> PREFERENCES <|> - <|> PREFERENCES - - Even if there is NO default preferences, the client has to upload the list - of 'known prefs' which is defined above. - - Also, the server might send to the client bogus preferences. If this is the case, - the client can silently ignore them (even though it would be better to show - them somewhere). - - Last but not least, the server can send plugins preferences. Please read the - 'plugin_prefs' paper which is distributed with Nessus-980903 and the newest - versions. - -23. The "RULES" message - - - I call "rules" the set of commands that restrict the test to - a set of hosts. - The "RULES" message is sent by the server and the client. - Its syntax is : - - entity <|> RULES <|> - expr1; - expr2; - expr3; - <|> entity - - where 'entity' is either SERVER or CLIENT. - 'expr' is the standard rules format (ie : 'n:*') - -24. The NOTE, INFO, HOLE messages - - It used to be : - - entity <|> HOLE <|> hostname <|> port:hole description <|> entity - - It will now be : - - entity <|> HOLE <|> hostname <|> servicename (port/protocol) <|> \ - description <|> entity - (NTP 1.1) - - entity <|> HOLE <|> hostname <|> servicename (port/protocol) <|> \ - description <|> scan_id <|> entity - (NTP 1.2) - - or - - entity <|> HOLE <|> hostname <|> general <|> \ - description <|> entity - (NTP 1.1) - - entity <|> HOLE <|> hostname <|> general <|> \ - description <|> scan_id <|> entity - (NTP 1.2) - - - Where service will be a string which indicates to the user the kind of - service which is affected by the problem (ie :"ftp") and where protocol - will be "udp" or "tcp", or maybe something else. - - If no servicename could be found by the server 'servicename' will be - "unknown" - - the second format will be used to report an info which is not port specific. - - The scan_id is the same id previously sent as part of the plugin list. - This allows to identify the plugin that generated a report. - - The 'NOTE' message has been added and defines informative information - about the remote host - -25. The 'PREFERENCES_ERRORS' message - - After the client has sent to the server a 'PREFERENCES' message, the - server will reply to report which preferences have invalid values. - The syntax of this message is very similar to 'PREFERENCES': - - SERVER <|> PREFERENCES_ERRORS - name <|> value - name <|> value - ... - <|> SERVER - - where 'name' is the name of the pref. item, and value is the value which - will be used by the server if no correction is made. - - ie : - a user asks a 'max_threads' value of 99999 - the owner of the server has set in nessus.conf 'max_threads' to 15 - - Since 99999 > 15, the server will reply (after the PREFERENCES message - of the client) - - SERVER <|> PREFERENCES_ERRORS - max_threads <|> 15 - <|> SERVER - - - Nota : - The message : - - SERVER <|> PREFERENCES_ERRORS - <|> SERVER - - means that there is no error. - -26. The 'PLUGINS_ORDER' message - - This message is sent by the server to the client to tell it in which - order the plugins will be launched. - Syntax : - - SERVER <|> PLUGINS_ORDER <|> plugins <|> SERVER - - Where 'plugins' is a string showing the ids of the plugins, - ie : '4;8;1;5' - - -27. The 'STATUS' message - - This message now shows if the current is the state of the portscan - of the state of the plugins attacks. - It used to be the 'STAT' message, note that it was renamed. - - Syntax : - SERVER <|> STATUS <|> hostname <|> action <|> status <|> SERVER - - Where : - 'hostname' is the name of the host - 'action' is either 'portscan' or 'attack' - 'status' is a string under the form "min/max" (ie : 12/80) - -28. The 'STOP_WHOLE_TEST' message - - This message stops a whole test in a clean way : all the threads - are killed and the server silently dies. - - It's better to use this message rather than just closing the socket - between the client and the server (describing why is a little off topic) - - Syntax : - - CLIENT <|> STOP_WHOLE_TEST <|> CLIENT - - -29. Notes - - The behavior of the command RULES is not the same as PREFERENCES. - With the PREFERENCES message, the client can modify the prefs. of - the server. - With the rules message, it can only add new rules. - ie : - - the client receives : - SERVER <|> RULES - n:*; - y:*.nessus.org; - <|> SERVER - -then it sends to the server : - CLIENT <|> RULES - N:grincheux.nessus.org; - <|> CLIENT - - This means that during the test, the following set of rules will be applied : - n*;y:*.nessus.org;n:grincheux.nessus.org - - -3. Using the NTP/1.1 - - 31. Activating the NTP/1.1 or NTP/1.2 - - While the client attempts to establish the communication with a server, it - should send the string '< NTP/1.1 >' or '< NTP/1.2 >' instead of the - previously used '< NTP/1.0 >' and the server will answer with the name of - the protocol it will use. Beware : older servers will close the connection - if they receive NTP/1.1, but I think the servers will be updated more often - than the clients... - - -32. When do the messages take place. - - The 'PREFERENCES' and 'RULES' message are sent by the server after the - 'PLUGIN_LIST' message. The client sends the 'PREFERENCES' and 'RULES' - message before the 'NEW_ATTACK' messages. As soon as the client sends a - 'PREFERENCES' message, the server will answer with a 'PREFERENCES_ERROR' - message (even if there is no error) - - The 'PLUGIN_ORDER' message will be sent just after the client sends the - 'NEW_ATTACK' message. - - The 'STATUS', 'PORT', 'HOLE', 'INFO' messages come during an attack. - -Comments and questions go to deraison at cvs.nessus.org Modified: trunk/openvas-server/doc/otp/otp_specification_10.txt =================================================================== --- trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-10 20:37:32 UTC (rev 1125) +++ trunk/openvas-server/doc/otp/otp_specification_10.txt 2008-08-10 22:40:00 UTC (rev 1126) @@ -60,6 +60,10 @@ well: detached_scan, continuous_scan, delay_between_scan_loops, detached_scan_email_address. + Plugin order information: + The server command PLUGINS_ORDER was defined for NTP 1.2 but not + implemented in the server. + GENERAL ASPECTS OF PROTOCOL The OTP protocol is text-based, human readable and line-oriented. @@ -130,15 +134,18 @@ With this command the server reports a identified problem of class "security hole". + The "general" version is applied if no port relates to the hole. Syntax: SERVER <|> HOLE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + SERVER <|> HOLE <|> host <|> general <|> description <|> oid <|> SERVER + where host: the target system service_name: the name of the service (like in /etc/services) - port_number: the port number the problem relates to or "general". + port_number: the port number the problem relates to. protocol_type: "tcp" or "udp". description: the problem description where newlines have been replaced by semicolons. @@ -150,15 +157,18 @@ With this command the server reports a identified problem of class "security info". + The "general" version is applied if no port relates to the info. Syntax: SERVER <|> INFO <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + SERVER <|> INFO <|> host <|> general <|> description <|> oid <|> SERVER + where host: the target system service_name: the name of the service (like in /etc/services) - port_number: the port number the problem relates to or "general". + port_number: the port number the problem relates to. protocol_type: "tcp" or "udp". description: the problem description where newlines have been replaced by semicolons. @@ -171,6 +181,9 @@ With this command the client requests the server to attack target system(s) "host". "host" is one or many (comma-separated) IP or FQDN. + Before the client sends NEW_ATTACK, the commands PREFERENCES and + RULES should be applied. + Syntax: CLIENT <|> NEW_ATTACK <|> host <|> CLIENT @@ -181,15 +194,18 @@ With this command the server reports a identified problem of class "security note". + The "general" version is applied if no port relates to the note. Syntax: SERVER <|> NOTE <|> host <|> service_name (port_number/protocol_type) <|> description <|> oid <|> SERVER + SERVER <|> NOTE <|> host <|> general <|> description <|> oid <|> SERVER + where host: the target system service_name: the name of the service (like in /etc/services) - port_number: the port number the problem relates to or "general". + port_number: the port number the problem relates to protocol_type: "tcp" or "udp". description: the problem description where newlines have been replaced by semicolons. @@ -252,6 +268,8 @@ With this command the server sends detailed information about the available NVTs. + The server will send PREFERENCES and RULES right after this command. + Syntax: SERVER <|> PLUGIN_LIST <|> @@ -274,18 +292,97 @@ SERVER <|> PORT <|> host <|> port_number <|> SERVER - STAT + PREFERENCES Description: + With this command the values for the preferences are + communicated. The server uses the commands to inform + about defaults, the client uses the command to send + the user selections. The server answers with PREFERENCES_ERROR. + + Available preferences: + max_threads, test_file, email, ping_hosts, reverse_lookup, + outside_firewall, host_expansion, port_range, max_hosts. + And only sent by CLIENT: plugin_set (empty means all NVTs). + + Syntax: + + SERVER <|> PREFERENCES <|> + pref_name <|> value + pref_name <|> value + pref_name <|> value + ... + <|> SERVER + + CLIENT <|> PREFERENCES <|> + pref_name <|> value + pref_name <|> value + pref_name <|> value + ... + <|> CLIENT + + PREFERENCES_ERRORS + + Description: + + With this command the server reports problems with the + parameters set by the client. It follows immediately + the PREFERENCES command of the client. + + Each "pref_name" occuring in this list was not accepted + by the server. The server will apply "default_value" instead. + + In case no "pref_name" is reported with this command, + all preferences where accepted. + + Syntax: + + SERVER <|> PREFERENCES_ERRORS + pref_name <|> default_value + pref_name <|> default_value + pref_name <|> default_value + ... + <|> SERVER + + RULES + + Description: + + Rules define restrictions for target systems. + Client-side rules self-restrict target host patterns, + server-side rules are just for information to the client. + These rule sets are independent of each other. + + Syntax: + + SERVER <|> RULES <|> + rule_1; + rule_2; + rule_3; + ... + <|> SERVER + + CLIENT <|> RULES <|> + rule_1; + rule_2; + rule_3; + ... + <|> CLIENT + + STATUS + + Description: + With this command, the server informs the client about - the progress of the port scan for target system "host". - "port" is the currently scanned port number. - The command with an interval of 100 ports. + the progress of the scan for target system "host". + "attack_state" is either "portscan" or "attack". + current is the currently processed port and max + the last port number to be tested. Syntax: - SERVER <|> STAT <|> host <|> port <|> SERVER + SERVER <|> STATUS <|> host <|> attack_state <|> current/max <|> SERVER STOP_ATTACK @@ -298,6 +395,17 @@ CLIENT <|> STOP_ATTACK <|> host <|> CLIENT + STOP_WHOLE_TEST + + Description: + + With this command the client tells to stop + the currently running test. + + Syntax: + + CLIENT <|> STOP_WHOLE_TEST <|> CLIENT + TIME Description: From scm-commit at wald.intevation.org Mon Aug 11 08:41:43 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 11 Aug 2008 08:41:43 +0200 (CEST) Subject: [Openvas-commits] r1127 - in trunk/openvas-client: . nessus Message-ID: <20080811064143.202F620C004@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-11 08:41:42 +0200 (Mon, 11 Aug 2008) New Revision: 1127 Modified: trunk/openvas-client/ChangeLog trunk/openvas-client/nessus/nessus.c Log: Do not display html_graph as possible output type in the command line options if the client was compiled without gdchart support. Modified: trunk/openvas-client/ChangeLog =================================================================== --- trunk/openvas-client/ChangeLog 2008-08-10 22:40:00 UTC (rev 1126) +++ trunk/openvas-client/ChangeLog 2008-08-11 06:41:42 UTC (rev 1127) @@ -1,3 +1,9 @@ +2008-08-12 Michael Wiegand <michael.wiegand at intevation.de> + + * nessus/nessus.c (main): Do not display html_graph as possible output + type in the command line options if the client was compiled without + gdchart support. + 2008-08-10 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Removing handling of "PLUGINS_ORDER" command which Modified: trunk/openvas-client/nessus/nessus.c =================================================================== --- trunk/openvas-client/nessus/nessus.c 2008-08-10 22:40:00 UTC (rev 1126) +++ trunk/openvas-client/nessus/nessus.c 2008-08-11 06:41:42 UTC (rev 1127) @@ -674,7 +674,11 @@ { "batch-mode", 'q', 0, G_OPTION_ARG_NONE, &batch_mode, N_("Batch-mode scan"), N_("<host> <port> <user> <pass> <targets-file> <result-file>") }, { "make-config-file", 'm', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_NONE, &make_config_file, "", NULL }, { "config-file", 'c', 0, G_OPTION_ARG_FILENAME, &config_file, N_("Configuration file"), N_("<.rcfile>") }, +#ifndef NO_GDCHART { "output-type", 'T', 0, G_OPTION_ARG_STRING, &output_type, N_("Output format"), N_("[nbe|html|html_graph|text|xml|tex]") }, +#else + { "output-type", 'T', 0, G_OPTION_ARG_STRING, &output_type, N_("Output format"), N_("[nbe|html|text|xml|tex]") }, +#endif { "verbose", 'V', 0, G_OPTION_ARG_NONE, &verbose, N_("Display status messages in batch mode"), NULL }, { "list-plugins", 'p', 0, G_OPTION_ARG_NONE, &list_plugins, N_("Obtain list of plugins installed on the server"), NULL }, { "list-prefs", 'P', 0, G_OPTION_ARG_NONE, &list_prefs, N_("Obtain list of server and plugin preferences"), NULL }, From scm-commit at wald.intevation.org Mon Aug 11 15:18:24 2008 From: scm-commit at wald.intevation.org (scm-commit@wald.intevation.org) Date: Mon, 11 Aug 2008 15:18:24 +0200 (CEST) Subject: [Openvas-commits] r1128 - in trunk/openvas-server: . openvasd Message-ID: <20080811131824.6D16A14231@pyrosoma.intevation.org> Author: mwiegand Date: 2008-08-11 15:18:22 +0200 (Mon, 11 Aug 2008) New Revision: 1128 Modified: trunk/openvas-server/ChangeLog trunk/openvas-server/aclocal.m4 trunk/openvas-server/configure trunk/openvas-server/configure.in trunk/openvas-server/openvas.tmpl.in trunk/openvas-server/openvasd/Makefile trunk/openvas-server/openvasd/openvasd.c Log: First step for change request #9 (Make OpenVAS use (and depend on) glib) (http://www.openvas.org/openvas-cr-9.html) * openvasd/openvasd.c: Replaced getopt command line parsing with glib command line parsing. * openvasd/Makefile: Include Libs and Cflags for glib. * configure: Regenerated. * configure.in: Added check for glib, removed check for getopt. * openvas.tmpl.in: Added support for glib. * aclocal.m4: Added support for pkg-config. Modified: trunk/openvas-server/ChangeLog =================================================================== --- trunk/openvas-server/ChangeLog 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/ChangeLog 2008-08-11 13:18:22 UTC (rev 1128) @@ -1,3 +1,21 @@ +2008-08-11 Michael Wiegand <michael.wiegand at intevation.de> + + First step for change request #9 (Make OpenVAS use (and depend on) glib) + (http://www.openvas.org/openvas-cr-9.html) + + * openvasd/openvasd.c: Replaced getopt command line parsing with glib + command line parsing. + + * openvasd/Makefile: Include Libs and Cflags for glib. + + * configure: Regenerated. + + * configure.in: Added check for glib, removed check for getopt. + + * openvas.tmpl.in: Added support for glib. + + * aclocal.m4: Added support for pkg-config. + 2008-08-11 Jan-Oliver Wagner <jan-oliver.wagner at intevation.de> Continued consolidation of protocol documentation. Modified: trunk/openvas-server/aclocal.m4 =================================================================== --- trunk/openvas-server/aclocal.m4 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/aclocal.m4 2008-08-11 13:18:22 UTC (rev 1128) @@ -509,3 +509,59 @@ esac ]) +dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) +dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page +dnl also defines GSTUFF_PKG_ERRORS on error +AC_DEFUN(PKG_CHECK_MODULES, [ + succeeded=no + + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + AC_MSG_CHECKING(for $2) + + if $PKG_CONFIG --exists "$2" ; then + AC_MSG_RESULT(yes) + succeeded=yes + + AC_MSG_CHECKING($1_CFLAGS) + $1_CFLAGS=`$PKG_CONFIG --cflags "$2"` + AC_MSG_RESULT($$1_CFLAGS) + + AC_MSG_CHECKING($1_LIBS) + $1_LIBS=`$PKG_CONFIG --libs "$2"` + AC_MSG_RESULT($$1_LIBS) + else + $1_CFLAGS="" + $1_LIBS="" +## If we have a custom action on failure, don't print errors, but +## do set a variable so people can do so. + $1_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + ifelse([$4], ,echo $$1_PKG_ERRORS,) + fi + + AC_SUBST($1_CFLAGS) + AC_SUBST($1_LIBS) + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + ifelse([$3], , :, [$3]) + else + ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4]) + fi +]) + + Modified: trunk/openvas-server/configure =================================================================== --- trunk/openvas-server/configure 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/configure 2008-08-11 13:18:22 UTC (rev 1128) @@ -534,7 +534,7 @@ fi -# From configure.in Revision: 857 +# From configure.in Revision: 1008 NEED_OPENVASLIBS_VERSION=1.0.2 NEED_OPENVASLIBNASL_VERSION=1.0.1 @@ -1136,6 +1136,98 @@ " 1>&2; exit 1; } fi + + succeeded=no + + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:1147: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$PKG_CONFIG" in + /*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + ?:/*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" + break + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac +fi +PKG_CONFIG="$ac_cv_path_PKG_CONFIG" +if test -n "$PKG_CONFIG"; then + echo "$ac_t""$PKG_CONFIG" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + + fi + + if test "$PKG_CONFIG" = "no" ; then + echo "*** The pkg-config script could not be found. Make sure it is" + echo "*** in your path, or set the PKG_CONFIG environment variable" + echo "*** to the full path to pkg-config." + echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + echo $ac_n "checking for glib-2.0 >= 2.2.0""... $ac_c" 1>&6 +echo "configure:1191: checking for glib-2.0 >= 2.2.0" >&5 + + if $PKG_CONFIG --exists "glib-2.0 >= 2.2.0" ; then + echo "$ac_t""yes" 1>&6 + succeeded=yes + + echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 +echo "configure:1198: checking GLIB_CFLAGS" >&5 + GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.2.0"` + echo "$ac_t""$GLIB_CFLAGS" 1>&6 + + echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 +echo "configure:1203: checking GLIB_LIBS" >&5 + GLIB_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.2.0"` + echo "$ac_t""$GLIB_LIBS" 1>&6 + else + GLIB_CFLAGS="" + GLIB_LIBS="" +## If we have a custom action on failure, don't print errors, but +## do set a variable so people can do so. + GLIB_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "glib-2.0 >= 2.2.0"` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_GLIB="yes" + else + { echo "configure: error: "glib not found"" 1>&2; exit 1; } + fi + + + + OVSCFLAGS="`$LIBOPENVASCONFIG --cflags`" NASLCFLAGS="`$OPENVASLIBNASLCONFIG --cflags`" @@ -1147,7 +1239,7 @@ CFLAGS="$CFLAGS $OVSCFLAGS $NASLCFLAGS" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1151: checking how to run the C preprocessor" >&5 +echo "configure:1243: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1162,13 +1254,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1166 "configure" +#line 1258 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1264: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1179,13 +1271,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1183 "configure" +#line 1275 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1189: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1196,13 +1288,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1200 "configure" +#line 1292 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1206: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1227,12 +1319,12 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1231: checking for ANSI C header files" >&5 +echo "configure:1323: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1236 "configure" +#line 1328 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1240,7 +1332,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1244: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1336: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1257,7 +1349,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1261 "configure" +#line 1353 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1275,7 +1367,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1279 "configure" +#line 1371 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1296,7 +1388,7 @@ : else cat > conftest.$ac_ext <<EOF -#line 1300 "configure" +#line 1392 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1307,7 +1399,7 @@ exit (0); } EOF -if { (eval echo configure:1311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1331,12 +1423,12 @@ fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:1335: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:1427: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1340 "configure" +#line 1432 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -1352,7 +1444,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:1356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -1373,12 +1465,12 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:1377: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:1469: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1382 "configure" +#line 1474 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -1387,7 +1479,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:1391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -1412,12 +1504,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:1416: checking for $ac_hdr that defines DIR" >&5 +echo "configure:1508: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1421 "configure" +#line 1513 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_hdr> @@ -1425,7 +1517,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:1429: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -1450,7 +1542,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:1454: checking for opendir in -ldir" >&5 +echo "configure:1546: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1458,7 +1550,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <<EOF -#line 1462 "configure" +#line 1554 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1469,7 +1561,7 @@ opendir() ; return 0; } EOF -if { (eval echo configure:1473: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1491,7 +1583,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:1495: checking for opendir in -lx" >&5 +echo "configure:1587: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1499,7 +1591,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <<EOF -#line 1503 "configure" +#line 1595 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -1510,7 +1602,7 @@ opendir() ; return 0; } EOF -if { (eval echo configure:1514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -1532,21 +1624,21 @@ fi -for ac_hdr in unistd.h getopt.h string.h strings.h sys/sockio.h sys/socketio.h +for ac_hdr in unistd.h string.h strings.h sys/sockio.h sys/socketio.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1540: checking for $ac_hdr" >&5 +echo "configure:1632: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1545 "configure" +#line 1637 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1550: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1642: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1576,17 +1668,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1580: checking for $ac_hdr" >&5 +echo "configure:1672: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1585 "configure" +#line 1677 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1616,17 +1708,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1620: checking for $ac_hdr" >&5 +echo "configure:1712: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1625 "configure" +#line 1717 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1722: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1656,17 +1748,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1660: checking for $ac_hdr" >&5 +echo "configure:1752: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1665 "configure" +#line 1757 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1696,17 +1788,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1700: checking for $ac_hdr" >&5 +echo "configure:1792: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1705 "configure" +#line 1797 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1710: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1802: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1736,17 +1828,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_hdr" >&5 +echo "configure:1832: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1745 "configure" +#line 1837 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1776,17 +1868,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1780: checking for $ac_hdr" >&5 +echo "configure:1872: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1785 "configure" +#line 1877 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1882: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1816,17 +1908,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1820: checking for $ac_hdr" >&5 +echo "configure:1912: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1825 "configure" +#line 1917 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1856,17 +1948,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1860: checking for $ac_hdr" >&5 +echo "configure:1952: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1865 "configure" +#line 1957 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1962: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1914,17 +2006,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:1918: checking for $ac_hdr" >&5 +echo "configure:2010: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1923 "configure" +#line 2015 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1957,19 +2049,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:1961: checking for working alloca.h" >&5 +echo "configure:2053: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1966 "configure" +#line 2058 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:1973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -1990,12 +2082,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:1994: checking for alloca" >&5 +echo "configure:2086: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1999 "configure" +#line 2091 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2023,7 +2115,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2055,12 +2147,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2059: checking whether alloca needs Cray hooks" >&5 +echo "configure:2151: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2064 "configure" +#line 2156 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2085,12 +2177,12 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2089: checking for $ac_func" >&5 +echo "configure:2181: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2094 "configure" +#line 2186 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2113,7 +2205,7 @@ ; return 0; } EOF -if { (eval echo configure:2117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2140,7 +2232,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:2144: checking stack direction for C alloca" >&5 +echo "configure:2236: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2148,7 +2240,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 2152 "configure" +#line 2244 "configure" #include "confdefs.h" find_stack_direction () { @@ -2167,7 +2259,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:2171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -2189,7 +2281,7 @@ fi echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6 -echo "configure:2193: checking for wait3 that fills in rusage" >&5 +echo "configure:2285: checking for wait3 that fills in rusage" >&5 if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2197,7 +2289,7 @@ ac_cv_func_wait3_rusage=no else cat > conftest.$ac_ext <<EOF -#line 2201 "configure" +#line 2293 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2228,7 +2320,7 @@ } } EOF -if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_wait3_rusage=yes else @@ -2253,12 +2345,12 @@ for ac_func in waitpid wait4 mmap atexit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2257: checking for $ac_func" >&5 +echo "configure:2349: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2262 "configure" +#line 2354 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2281,7 +2373,7 @@ ; return 0; } EOF -if { (eval echo configure:2285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2308,12 +2400,12 @@ for ac_func in lstat memmove gettimeofday gethrtime getrusage rand do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2312: checking for $ac_func" >&5 +echo "configure:2404: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2317 "configure" +#line 2409 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2336,7 +2428,7 @@ ; return 0; } EOF -if { (eval echo configure:2340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2363,12 +2455,12 @@ for ac_func in strchr memcpy select poll do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2367: checking for $ac_func" >&5 +echo "configure:2459: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2372 "configure" +#line 2464 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2391,7 +2483,7 @@ ; return 0; } EOF -if { (eval echo configure:2395: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2416,12 +2508,12 @@ done echo $ac_n "checking for vsnprintf""... $ac_c" 1>&6 -echo "configure:2420: checking for vsnprintf" >&5 +echo "configure:2512: checking for vsnprintf" >&5 if eval "test \"`echo '$''{'ac_cv_func_vsnprintf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2425 "configure" +#line 2517 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vsnprintf(); below. */ @@ -2444,7 +2536,7 @@ ; return 0; } EOF -if { (eval echo configure:2448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vsnprintf=yes" else @@ -2469,12 +2561,12 @@ for ac_func in bzero bcopy setsid rint mkstemp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2473: checking for $ac_func" >&5 +echo "configure:2565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2478 "configure" +#line 2570 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2497,7 +2589,7 @@ ; return 0; } EOF -if { (eval echo configure:2501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2524,12 +2616,12 @@ for ac_func in addr2ascii inet_neta setproctitle _exit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2528: checking for $ac_func" >&5 +echo "configure:2620: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2533 "configure" +#line 2625 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2552,7 +2644,7 @@ ; return 0; } EOF -if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2578,7 +2670,7 @@ echo $ac_n "checking size of unsigned int""... $ac_c" 1>&6 -echo "configure:2582: checking size of unsigned int" >&5 +echo "configure:2674: checking size of unsigned int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2586,7 +2678,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2590 "configure" +#line 2682 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -2598,7 +2690,7 @@ exit(0); } EOF -if { (eval echo configure:2602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_int=`cat conftestval` else @@ -2618,7 +2710,7 @@ echo $ac_n "checking size of unsigned long""... $ac_c" 1>&6 -echo "configure:2622: checking size of unsigned long" >&5 +echo "configure:2714: checking size of unsigned long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_unsigned_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2626,7 +2718,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2630 "configure" +#line 2722 "configure" #include "confdefs.h" #include <stdio.h> #include <sys/types.h> @@ -2638,7 +2730,7 @@ exit(0); } EOF -if { (eval echo configure:2642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_unsigned_long=`cat conftestval` else @@ -2658,14 +2750,14 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:2662: checking whether byte ordering is bigendian" >&5 +echo "configure:2754: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 2669 "configure" +#line 2761 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2676,11 +2768,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:2680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 2684 "configure" +#line 2776 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -2691,7 +2783,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:2695: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2787: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -2711,7 +2803,7 @@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2715 "configure" +#line 2807 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -2724,7 +2816,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:2728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -2748,12 +2840,12 @@ fi echo $ac_n "checking for time_t""... $ac_c" 1>&6 -echo "configure:2752: checking for time_t" >&5 +echo "configure:2844: checking for time_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_time_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2757 "configure" +#line 2849 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2781,12 +2873,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2785: checking for pid_t" >&5 +echo "configure:2877: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2790 "configure" +#line 2882 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2814,12 +2906,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2818: checking for size_t" >&5 +echo "configure:2910: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2823 "configure" +#line 2915 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2847,12 +2939,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2851: checking for uid_t in sys/types.h" >&5 +echo "configure:2943: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2856 "configure" +#line 2948 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -2882,9 +2974,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:2886: checking for struct timeval" >&5 +echo "configure:2978: checking for struct timeval" >&5 cat > conftest.$ac_ext <<EOF -#line 2888 "configure" +#line 2980 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2900,7 +2992,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:2904: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -2920,9 +3012,9 @@ if test "x$HAVE_TIMEVAL" = xyes; then echo $ac_n "checking whether gettimeofday can't accept two arguments""... $ac_c" 1>&6 -echo "configure:2924: checking whether gettimeofday can't accept two arguments" >&5 +echo "configure:3016: checking whether gettimeofday can't accept two arguments" >&5 cat > conftest.$ac_ext <<EOF -#line 2926 "configure" +#line 3018 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -2944,7 +3036,7 @@ ; return 0; } EOF -if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -2974,12 +3066,12 @@ test -z "$BROKEN_REGEXP" && { echo $ac_n "checking for a working regexp implementation""... $ac_c" 1>&6 -echo "configure:2978: checking for a working regexp implementation" >&5 +echo "configure:3070: checking for a working regexp implementation" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext <<EOF -#line 2983 "configure" +#line 3075 "configure" #include "confdefs.h" #include <stdio.h> @@ -3009,7 +3101,7 @@ } EOF -if { (eval echo configure:3013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6;cat >> confdefs.h <<\EOF #define HAVE_REGEX_SUPPORT 1 @@ -3027,9 +3119,9 @@ } echo $ac_n "checking struct ip contains ip_csum""... $ac_c" 1>&6 -echo "configure:3031: checking struct ip contains ip_csum" >&5 +echo "configure:3123: checking struct ip contains ip_csum" >&5 cat > conftest.$ac_ext <<EOF -#line 3033 "configure" +#line 3125 "configure" #include "confdefs.h" #ifdef __linux__ #define __BSD_SOURCE @@ -3047,7 +3139,7 @@ ; return 0; } EOF -if { (eval echo configure:3051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3143: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP_CSUM 1 @@ -3062,9 +3154,9 @@ rm -f conftest* echo $ac_n "checking struct ip""... $ac_c" 1>&6 -echo "configure:3066: checking struct ip" >&5 +echo "configure:3158: checking struct ip" >&5 cat > conftest.$ac_ext <<EOF -#line 3068 "configure" +#line 3160 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3074,7 +3166,7 @@ struct ip ip; ; return 0; } EOF -if { (eval echo configure:3078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP 1 @@ -3089,9 +3181,9 @@ rm -f conftest* echo $ac_n "checking struct icmp""... $ac_c" 1>&6 -echo "configure:3093: checking struct icmp" >&5 +echo "configure:3185: checking struct icmp" >&5 cat > conftest.$ac_ext <<EOF -#line 3095 "configure" +#line 3187 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3102,7 +3194,7 @@ struct icmp icmp; ; return 0; } EOF -if { (eval echo configure:3106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_ICMP 1 @@ -3117,9 +3209,9 @@ rm -f conftest* echo $ac_n "checking struct udphdr""... $ac_c" 1>&6 -echo "configure:3121: checking struct udphdr" >&5 +echo "configure:3213: checking struct udphdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3123 "configure" +#line 3215 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3130,7 +3222,7 @@ struct udphdr udp; ; return 0; } EOF -if { (eval echo configure:3134: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_UDPHDR 1 @@ -3145,9 +3237,9 @@ rm -f conftest* echo $ac_n "checking BSD struct udphdr""... $ac_c" 1>&6 -echo "configure:3149: checking BSD struct udphdr" >&5 +echo "configure:3241: checking BSD struct udphdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3151 "configure" +#line 3243 "configure" #include "confdefs.h" #ifdef __linux__ #define __BSD_SOURCE @@ -3163,7 +3255,7 @@ struct udphdr udp;udp.uh_dport = 0; ; return 0; } EOF -if { (eval echo configure:3167: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_BSD_STRUCT_UDPHDR 1 @@ -3179,9 +3271,9 @@ echo $ac_n "checking struct tcphdr""... $ac_c" 1>&6 -echo "configure:3183: checking struct tcphdr" >&5 +echo "configure:3275: checking struct tcphdr" >&5 cat > conftest.$ac_ext <<EOF -#line 3185 "configure" +#line 3277 "configure" #include "confdefs.h" #include <sys/types.h> #include <netinet/in.h> @@ -3192,7 +3284,7 @@ struct tcphdr tcp; ; return 0; } EOF -if { (eval echo configure:3196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3288: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_STRUCT_TCPHDR 1 @@ -3207,9 +3299,9 @@ rm -f conftest* echo $ac_n "checking struct tcphdr has th_off""... $ac_c" 1>&6 -echo "configure:3211: checking struct tcphdr has th_off" >&5 +echo "configure:3303: checking struct tcphdr has th_off" >&5 cat > conftest.$ac_ext <<EOF -#line 3213 "configure" +#line 3305 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef __linux__ @@ -3223,7 +3315,7 @@ struct tcphdr tcp;tcp.th_off = 0; ; return 0; } EOF -if { (eval echo configure:3227: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_TCPHDR_TH_OFF 1 @@ -3238,9 +3330,9 @@ rm -f conftest* echo $ac_n "checking struct tcphdr has th_x2_off""... $ac_c" 1>&6 -echo "configure:3242: checking struct tcphdr has th_x2_off" >&5 +echo "configure:3334: checking struct tcphdr has th_x2_off" >&5 cat > conftest.$ac_ext <<EOF -#line 3244 "configure" +#line 3336 "configure" #include "confdefs.h" #include <sys/types.h> #ifdef __linux__ @@ -3254,7 +3346,7 @@ struct tcphdr tcp;tcp.th_x2_off = 0; ; return 0; } EOF -if { (eval echo configure:3258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6; cat >> confdefs.h <<\EOF #define HAVE_TCPHDR_TH_X2_OFF 1 @@ -3275,7 +3367,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:3279: checking for X" >&5 +echo "configure:3371: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3337,12 +3429,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 3341 "configure" +#line 3433 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3438: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3411,14 +3503,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 3415 "configure" +#line 3507 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:3422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -3524,17 +3616,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:3528: checking whether -R must be followed by a space" >&5 +echo "configure:3620: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 3531 "configure" +#line 3623 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -3550,14 +3642,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +#line 3646 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:3561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -3589,7 +3681,7 @@ # libraries were built with DECnet support. And karl at cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:3593: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:3685: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3597,7 +3689,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 3601 "configure" +#line 3693 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3608,7 +3700,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:3612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3630,7 +3722,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:3634: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:3726: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3638,7 +3730,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 3642 "configure" +#line 3734 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3649,7 +3741,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:3653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3678,12 +3770,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey at clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:3682: checking for gethostbyname" >&5 +echo "configure:3774: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3687 "configure" +#line 3779 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -3706,7 +3798,7 @@ ; return 0; } EOF -if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -3727,7 +3819,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:3731: checking for gethostbyname in -lnsl" >&5 +echo "configure:3823: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3735,7 +3827,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3739 "configure" +#line 3831 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3746,7 +3838,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:3750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3776,12 +3868,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:3780: checking for connect" >&5 +echo "configure:3872: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3785 "configure" +#line 3877 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -3804,7 +3896,7 @@ ; return 0; } EOF -if { (eval echo configure:3808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -3825,7 +3917,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:3829: checking for connect in -lsocket" >&5 +echo "configure:3921: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3833,7 +3925,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 3837 "configure" +#line 3929 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3844,7 +3936,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:3848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3868,12 +3960,12 @@ # gomez at mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:3872: checking for remove" >&5 +echo "configure:3964: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3877 "configure" +#line 3969 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -3896,7 +3988,7 @@ ; return 0; } EOF -if { (eval echo configure:3900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -3917,7 +4009,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:3921: checking for remove in -lposix" >&5 +echo "configure:4013: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3925,7 +4017,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 3929 "configure" +#line 4021 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3936,7 +4028,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:3940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3960,12 +4052,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:3964: checking for shmat" >&5 +echo "configure:4056: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3969 "configure" +#line 4061 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -3988,7 +4080,7 @@ ; return 0; } EOF -if { (eval echo configure:3992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4009,7 +4101,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4013: checking for shmat in -lipc" >&5 +echo "configure:4105: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4017,7 +4109,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4021 "configure" +#line 4113 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4028,7 +4120,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:4032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4061,7 +4153,7 @@ # libraries we check for below, so use a different variable. # --interran at uluru.Stanford.EDU, kb at cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4065: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4157: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4069,7 +4161,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 4073 "configure" +#line 4165 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4080,7 +4172,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4106,7 +4198,7 @@ PWDD=`pwd` echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:4110: checking for long file names" >&5 +echo "configure:4202: checking for long file names" >&5 if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4151,21 +4243,21 @@ echo $ac_n "checking for -lrpcsvc""... $ac_c" 1>&6 -echo "configure:4155: checking for -lrpcsvc" >&5 +echo "configure:4247: checking for -lrpcsvc" >&5 if eval "test \"`echo '$''{'ac_cv_lib_rpcsvc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lrpcsvc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4162 "configure" +#line 4254 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_rpcsvc=yes else @@ -4184,7 +4276,7 @@ fi echo $ac_n "checking for xdr_mon in -lrpcsvc""... $ac_c" 1>&6 -echo "configure:4188: checking for xdr_mon in -lrpcsvc" >&5 +echo "configure:4280: checking for xdr_mon in -lrpcsvc" >&5 ac_lib_var=`echo rpcsvc'_'xdr_mon | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4192,7 +4284,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrpcsvc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4196 "configure" +#line 4288 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4203,7 +4295,7 @@ xdr_mon() ; return 0; } EOF -if { (eval echo configure:4207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4229,7 +4321,7 @@ echo $ac_n "checking for lfind in -lcompat""... $ac_c" 1>&6 -echo "configure:4233: checking for lfind in -lcompat" >&5 +echo "configure:4325: checking for lfind in -lcompat" >&5 ac_lib_var=`echo compat'_'lfind | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4237,7 +4329,7 @@ ac_save_LIBS="$LIBS" LIBS="-lcompat $LIBS" cat > conftest.$ac_ext <<EOF -#line 4241 "configure" +#line 4333 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4248,7 +4340,7 @@ lfind() ; return 0; } EOF -if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4272,7 +4364,7 @@ test -n "$resolv_lib" && (echo $ac_n "checking for inet_neta in -lresolv""... $ac_c" 1>&6 -echo "configure:4276: checking for inet_neta in -lresolv" >&5 +echo "configure:4368: checking for inet_neta in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_neta | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4280,7 +4372,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4284 "configure" +#line 4376 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4291,7 +4383,7 @@ inet_neta() ; return 0; } EOF -if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4318,21 +4410,21 @@ test -n "$libwrap" && { echo $ac_n "checking for -lwrap""... $ac_c" 1>&6 -echo "configure:4322: checking for -lwrap" >&5 +echo "configure:4414: checking for -lwrap" >&5 if eval "test \"`echo '$''{'ac_cv_lib_wrap'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" LIBS="-lwrap $LIBS" cat > conftest.$ac_ext <<EOF -#line 4329 "configure" +#line 4421 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_lib_wrap=yes else @@ -4359,17 +4451,17 @@ ac_safe=`echo "tcpd.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for tcpd.h""... $ac_c" 1>&6 -echo "configure:4363: checking for tcpd.h" >&5 +echo "configure:4455: checking for tcpd.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4368 "configure" +#line 4460 "configure" #include "confdefs.h" #include <tcpd.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4394,7 +4486,7 @@ uselibwrap="-DUSE_LIBWRAP" } echo $ac_n "checking for inet_aton in -lc""... $ac_c" 1>&6 -echo "configure:4398: checking for inet_aton in -lc" >&5 +echo "configure:4490: checking for inet_aton in -lc" >&5 ac_lib_var=`echo c'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4402,7 +4494,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4406 "configure" +#line 4498 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4413,7 +4505,7 @@ inet_aton() ; return 0; } EOF -if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4437,7 +4529,7 @@ fi echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 -echo "configure:4441: checking for inet_aton in -lresolv" >&5 +echo "configure:4533: checking for inet_aton in -lresolv" >&5 ac_lib_var=`echo resolv'_'inet_aton | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4445,7 +4537,7 @@ ac_save_LIBS="$LIBS" LIBS="-lresolv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4449 "configure" +#line 4541 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4456,7 +4548,7 @@ inet_aton() ; return 0; } EOF -if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4481,7 +4573,7 @@ echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:4485: checking for dlopen in -ldl" >&5 +echo "configure:4577: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4489,7 +4581,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4493 "configure" +#line 4585 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4500,7 +4592,7 @@ dlopen() ; return 0; } EOF -if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4526,12 +4618,12 @@ for ac_func in shl_load do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4530: checking for $ac_func" >&5 +echo "configure:4622: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4535 "configure" +#line 4627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4554,7 +4646,7 @@ ; return 0; } EOF -if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4581,12 +4673,12 @@ for ac_func in NSCreateObjectFileImageFromFile do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4585: checking for $ac_func" >&5 +echo "configure:4677: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4590 "configure" +#line 4682 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4609,7 +4701,7 @@ ; return 0; } EOF -if { (eval echo configure:4613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4637,7 +4729,7 @@ LIBS=`$LIBOPENVASCONFIG --libs` echo $ac_n "checking for nessuslib_pthreads_enabled in -lnessus""... $ac_c" 1>&6 -echo "configure:4641: checking for nessuslib_pthreads_enabled in -lnessus" >&5 +echo "configure:4733: checking for nessuslib_pthreads_enabled in -lnessus" >&5 ac_lib_var=`echo nessus'_'nessuslib_pthreads_enabled | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4645,7 +4737,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnessus $LIBS" cat > conftest.$ac_ext <<EOF -#line 4649 "configure" +#line 4741 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4656,7 +4748,7 @@ nessuslib_pthreads_enabled() ; return 0; } EOF -if { (eval echo configure:4660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4682,17 +4774,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4686: checking for $ac_hdr" >&5 +echo "configure:4778: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4691 "configure" +#line 4783 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4719,9 +4811,9 @@ done echo $ac_n "checking if we have a broken pthread_cleanup_push""... $ac_c" 1>&6 -echo "configure:4723: checking if we have a broken pthread_cleanup_push" >&5 +echo "configure:4815: checking if we have a broken pthread_cleanup_push" >&5 cat > conftest.$ac_ext <<EOF -#line 4725 "configure" +#line 4817 "configure" #include "confdefs.h" #include <pthread.h> @@ -4729,7 +4821,7 @@ void main(){pthread_cleanup_push(NULL,NULL);} ; return 0; } EOF -if { (eval echo configure:4733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -4745,7 +4837,7 @@ echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:4749: checking for pthread_create in -lpthread" >&5 +echo "configure:4841: checking for pthread_create in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4753,7 +4845,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 4757 "configure" +#line 4849 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4764,7 +4856,7 @@ pthread_create() ; return 0; } EOF -if { (eval echo configure:4768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4785,7 +4877,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:4789: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:4881: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4793,7 +4885,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4797 "configure" +#line 4889 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4804,7 +4896,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4900: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4825,7 +4917,7 @@ fi echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:4829: checking for pthread_create in -lc_r" >&5 +echo "configure:4921: checking for pthread_create in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_create | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4833,7 +4925,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4837 "configure" +#line 4929 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4844,7 +4936,7 @@ pthread_create() ; return 0; } EOF -if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4865,7 +4957,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lc""... $ac_c" 1>&6 -echo "configure:4869: checking for gethostbyname_r in -lc" >&5 +echo "configure:4961: checking for gethostbyname_r in -lc" >&5 ac_lib_var=`echo c'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4873,7 +4965,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <<EOF -#line 4877 "configure" +#line 4969 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4884,7 +4976,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4908,7 +5000,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:4912: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:5004: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4916,7 +5008,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 4920 "configure" +#line 5012 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4927,7 +5019,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4951,7 +5043,7 @@ fi echo $ac_n "checking for gethostbyname_r in -lnsl""... $ac_c" 1>&6 -echo "configure:4955: checking for gethostbyname_r in -lnsl" >&5 +echo "configure:5047: checking for gethostbyname_r in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4959,7 +5051,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 4963 "configure" +#line 5055 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4970,7 +5062,7 @@ gethostbyname_r() ; return 0; } EOF -if { (eval echo configure:4974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4994,7 +5086,7 @@ fi echo $ac_n "checking for pthread_cancel in -lpthread""... $ac_c" 1>&6 -echo "configure:4998: checking for pthread_cancel in -lpthread" >&5 +echo "configure:5090: checking for pthread_cancel in -lpthread" >&5 ac_lib_var=`echo pthread'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5002,7 +5094,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <<EOF -#line 5006 "configure" +#line 5098 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5013,7 +5105,7 @@ pthread_cancel() ; return 0; } EOF -if { (eval echo configure:5017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5037,7 +5129,7 @@ fi echo $ac_n "checking for pthread_cancel in -lc_r""... $ac_c" 1>&6 -echo "configure:5041: checking for pthread_cancel in -lc_r" >&5 +echo "configure:5133: checking for pthread_cancel in -lc_r" >&5 ac_lib_var=`echo c_r'_'pthread_cancel | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5045,7 +5137,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <<EOF -#line 5049 "configure" +#line 5141 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5056,7 +5148,7 @@ pthread_cancel() ; return 0; } EOF -if { (eval echo configure:5060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5080,9 +5172,9 @@ fi echo $ac_n "checking whether gethostbyname_r takes 5 args""... $ac_c" 1>&6 -echo "configure:5084: checking whether gethostbyname_r takes 5 args" >&5 +echo "configure:5176: checking whether gethostbyname_r takes 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 5086 "configure" +#line 5178 "configure" #include "confdefs.h" #define THREADS 1 @@ -5102,7 +5194,7 @@ ; return 0; } EOF -if { (eval echo configure:5106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* solaris_gethostbyname_r=yes else @@ -5119,9 +5211,9 @@ echo $ac_n "checking whether gethostbyaddr_r takes 5 args""... $ac_c" 1>&6 -echo "configure:5123: checking whether gethostbyaddr_r takes 5 args" >&5 +echo "configure:5215: checking whether gethostbyaddr_r takes 5 args" >&5 cat > conftest.$ac_ext <<EOF -#line 5125 "configure" +#line 5217 "configure" #include "confdefs.h" #define THREADS 1 @@ -5142,7 +5234,7 @@ ; return 0; } EOF -if { (eval echo configure:5146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5238: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* solaris_gethostbyaddr_r=yes else @@ -5171,12 +5263,12 @@ echo $ac_n "checking if sockaddr{} has sa_len member""... $ac_c" 1>&6 -echo "configure:5175: checking if sockaddr{} has sa_len member" >&5 +echo "configure:5267: checking if sockaddr{} has sa_len member" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_has_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5180 "configure" +#line 5272 "configure" #include "confdefs.h" # include <sys/types.h> @@ -5185,7 +5277,7 @@ unsigned int i = sizeof(((struct sockaddr *)0)->sa_len) ; return 0; } EOF -if { (eval echo configure:5189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_has_sa_len=yes else @@ -5359,9 +5451,9 @@ echo $ac_n "checking whether struct sigaction has sa_restorer""... $ac_c" 1>&6 -echo "configure:5363: checking whether struct sigaction has sa_restorer" >&5 +echo "configure:5455: checking whether struct sigaction has sa_restorer" >&5 cat > conftest.$ac_ext <<EOF -#line 5365 "configure" +#line 5457 "configure" #include "confdefs.h" #include <signal.h> @@ -5374,7 +5466,7 @@ ; return 0; } EOF -if { (eval echo configure:5378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5470: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* signal_sa_restorer=yes else @@ -5433,7 +5525,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5437: checking for $ac_word" >&5 +echo "configure:5529: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5663,6 +5755,9 @@ s%@INSTALL_DATA@%$INSTALL_DATA%g s%@LIBOPENVASCONFIG@%$LIBOPENVASCONFIG%g s%@OPENVASLIBNASLCONFIG@%$OPENVASLIBNASLCONFIG%g +s%@PKG_CONFIG@%$PKG_CONFIG%g +s%@GLIB_CFLAGS@%$GLIB_CFLAGS%g +s%@GLIB_LIBS@%$GLIB_LIBS%g s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@X_CFLAGS@%$X_CFLAGS%g Modified: trunk/openvas-server/configure.in =================================================================== --- trunk/openvas-server/configure.in 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/configure.in 2008-08-11 13:18:22 UTC (rev 1128) @@ -198,6 +198,10 @@ ) fi +PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.2.0, HAVE_GLIB="yes", AC_MSG_ERROR("glib not found")) +AC_SUBST(GLIB_CFLAGS) +AC_SUBST(GLIB_LIBS) + OVSCFLAGS="`$LIBOPENVASCONFIG --cflags`" NASLCFLAGS="`$OPENVASLIBNASLCONFIG --cflags`" @@ -216,7 +220,7 @@ AC_HEADER_SYS_WAIT AC_HEADER_TIME AC_HEADER_DIRENT -AC_CHECK_HEADERS(unistd.h getopt.h string.h strings.h sys/sockio.h sys/socketio.h) +AC_CHECK_HEADERS(unistd.h string.h strings.h sys/sockio.h sys/socketio.h) AC_CHECK_HEADERS(sys/param.h netinet/tcpip.h netinet/in_systm.h) AC_CHECK_HEADERS(netinet/ip_udp.h netinet/protocols.h sys/ioctl.h netinet/ip_icmp.h) AC_CHECK_HEADERS(rpc/rpc.h netinet/udp.h dlfcn.h sys/un.h memory.h ctype.h errno.h) Modified: trunk/openvas-server/openvas.tmpl.in =================================================================== --- trunk/openvas-server/openvas.tmpl.in 2008-08-11 06:41:42 UTC (rev 1127) +++ trunk/openvas-server/openvas.tmpl.in 2008-08-11 13:18:22 UTC (rev 1128) @@ -109,6 +109,8 @@ LIBOPENVASCONFIG=@LIBOPENVASCONFIG@ OPENVASLIBNASLCONFIG=@OPENVASLIBNASLCONFIG@ # libraries +GLIB_CFLAGS=@GLIB_CFLAGS@ +GLIB_LIBS=@GLIB_LIBS@ DL_LIB=@dl_lib@ RESOLV_LIB=@resolv_lib@ SOCKET_LIB=@socket_lib@ Modified: trunk/openvas-server/openvasd/Makefile =================================================================== --- trunk/openvas-server/openvasd/Makefile 2008-08-11 06:41: