diff -Naur openssh-3.4p1/Makefile.in openssh-3.4p1-gsi/Makefile.in --- openssh-3.4p1/Makefile.in Tue Jun 25 18:45:42 2002 +++ openssh-3.4p1-gsi/Makefile.in Tue Jul 2 08:29:53 2002 @@ -60,11 +60,11 @@ TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-keysign${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) ssh-rand-helper${EXEEXT} $(SFTP_PROGS) -LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o fatal.o mac.o msg.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o scard-opensc.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o monitor_wrap.o monitor_fdpass.o +LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dh.o dispatch.o fatal.o mac.o msg.o hostfile.o key.o kex.o kexdh.o kexgex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o scard.o scard-opensc.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o monitor_wrap.o monitor_fdpass.o kexgss.o gss-genr.o SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o sshtty.o readconf.o clientloop.o -SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth2-hostbased.o auth2-kbdint.o auth2-none.o auth2-passwd.o auth2-pubkey.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-krb5.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o auth-skey.o auth-bsdauth.o monitor_mm.o monitor.o +SSHDOBJS= sshd.o auth.o auth1.o auth2.o auth2-hostbased.o auth2-kbdint.o auth2-none.o auth2-passwd.o auth2-pubkey.o auth-chall.o auth2-chall.o auth-rhosts.o auth-options.o auth-krb4.o auth-krb5.o auth-pam.o auth2-pam.o auth-passwd.o auth-rsa.o auth-rh-rsa.o auth-sia.o sshpty.o sshlogin.o loginrec.o servconf.o serverloop.o md5crypt.o session.o groupaccess.o auth-skey.o auth-bsdauth.o monitor_mm.o monitor.o auth2-gss.o gss-serv.o MANPAGES = scp.1.out ssh-add.1.out ssh-agent.1.out ssh-keygen.1.out ssh-keyscan.1.out ssh.1.out sshd.8.out sftp-server.8.out sftp.1.out ssh-rand-helper.8.out ssh-keysign.8.out sshd_config.5.out ssh_config.5.out MANPAGES_IN = scp.1 ssh-add.1 ssh-agent.1 ssh-keygen.1 ssh-keyscan.1 ssh.1 sshd.8 sftp-server.8 sftp.1 ssh-rand-helper.8 ssh-keysign.8 sshd_config.5 ssh_config.5 @@ -251,6 +251,14 @@ ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/slogin -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/slogin.1 + -rm -f $(DESTDIR)$(bindir)/gsissh + ln -s ssh$(EXEEXT) $(DESTDIR)$(bindir)/gsissh + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1 + ln -s ssh.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1 + -rm -f $(DESTDIR)$(bindir)/gsiscp + ln -s scp$(EXEEXT) $(DESTDIR)$(bindir)/gsiscp + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1 + ln -s scp.1 $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1 if [ ! -d $(DESTDIR)$(sysconfdir) ]; then \ $(srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir); \ fi @@ -321,6 +329,8 @@ uninstall: -rm -f $(DESTDIR)$(bindir)/slogin + -rm -f $(DESTDIR)$(bindir)/gsiscp + -rm -f $(DESTDIR)$(bindir)/gsissh -rm -f $(DESTDIR)$(bindir)/ssh$(EXEEXT) -rm -f $(DESTDIR)$(bindir)/scp$(EXEEXT) -rm -f $(DESTDIR)$(bindir)/ssh-add$(EXEEXT) @@ -334,6 +344,8 @@ -rm -f $(DESTDIR)$(RAND_HELPER)$(EXEEXT) -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh.1 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/scp.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsissh.1 + -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/gsiscp.1 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-add.1 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-agent.1 -rm -f $(DESTDIR)$(mandir)/$(mansubdir)1/ssh-keygen.1 diff -Naur openssh-3.4p1/acconfig.h openssh-3.4p1-gsi/acconfig.h --- openssh-3.4p1/acconfig.h Tue Jun 25 17:35:16 2002 +++ openssh-3.4p1-gsi/acconfig.h Tue Jul 2 08:29:53 2002 @@ -198,6 +198,9 @@ /* Define if compiler implements __func__ */ #undef HAVE___func__ +/* Define this is you want GSSAPI support in the version 2 protocol */ +#undef GSSAPI + /* Define if you want Kerberos 5 support */ #undef KRB5 @@ -209,6 +212,9 @@ /* Define if you want AFS support */ #undef AFS + +/* Define if you want GSI/Globus authentication support */ +#undef GSI /* Define if you want S/Key support */ #undef SKEY diff -Naur openssh-3.4p1/auth-pam.c openssh-3.4p1-gsi/auth-pam.c --- openssh-3.4p1/auth-pam.c Tue May 7 21:27:56 2002 +++ openssh-3.4p1-gsi/auth-pam.c Tue Jul 2 08:29:53 2002 @@ -402,6 +402,26 @@ #endif /* HAVE_PAM_GETENVLIST */ } +/* Set a PAM environment string. We need to do this so that the session + * modules can handle things like Kerberos/GSI credentials that appear + * during the ssh authentication process. + */ + +int do_pam_putenv(char *name, char *value) { + char *compound; + int ret=1; + +#ifdef HAVE_PAM_PUTENV + compound=xmalloc(strlen(name)+strlen(value)+2); + if (compound) { + sprintf(compound,"%s=%s",name,value); + ret=pam_putenv(__pamh,compound); + xfree(compound); + } +#endif + return(ret); +} + /* Print any messages that have been generated during authentication */ /* or account checking to stderr */ void print_pam_messages(void) diff -Naur openssh-3.4p1/auth-pam.h openssh-3.4p1-gsi/auth-pam.h --- openssh-3.4p1/auth-pam.h Thu Apr 4 13:02:28 2002 +++ openssh-3.4p1-gsi/auth-pam.h Tue Jul 2 08:29:53 2002 @@ -17,6 +17,7 @@ int is_pam_password_change_required(void); void do_pam_chauthtok(void); void do_pam_set_conv(struct pam_conv *); +int do_pam_putenv(char *, char *); void message_cat(char **p, const char *a); #endif /* USE_PAM */ diff -Naur openssh-3.4p1/auth.h openssh-3.4p1-gsi/auth.h --- openssh-3.4p1/auth.h Thu Jun 6 15:52:37 2002 +++ openssh-3.4p1-gsi/auth.h Tue Jul 2 08:29:53 2002 @@ -70,6 +70,7 @@ krb5_principal krb5_user; char *krb5_ticket_file; #endif + void *methoddata; }; struct Authmethod { diff -Naur openssh-3.4p1/auth1.c openssh-3.4p1-gsi/auth1.c --- openssh-3.4p1/auth1.c Fri Jun 21 01:21:11 2002 +++ openssh-3.4p1-gsi/auth1.c Tue Jul 2 08:29:53 2002 @@ -15,6 +15,7 @@ #include "xmalloc.h" #include "rsa.h" #include "ssh1.h" +#include "dispatch.h" #include "packet.h" #include "buffer.h" #include "mpaux.h" @@ -29,6 +30,126 @@ /* import */ extern ServerOptions options; +extern Authmethod method_gssapi; + + + +#ifdef GSSAPI +#ifdef GSI +#include "globus_gss_assist.h" +#endif + +int userauth_gssapi(Authctxt *authctxt); + +void +auth1_gss_protocol_error(int type, u_int32_t plen, void *ctxt) +{ + Authctxt *authctxt = ctxt; + /* Other side told us to abort, dont need to tell him */ + /* maybe we can us some other method. */ + if (type == SSH_MSG_AUTH_GSSAPI_ABORT) { + log("auth1: GSSAPI aborting"); + dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, NULL); + authctxt->success = 1; /* get out of loop*/ + return; + } + + log("auth1: protocol error: type %d plen %d", type, plen); + packet_disconnect("Protocol error during GSSAPI authentication: " + "Unknown packet type %d", type); +} + +int +gsi_gridmap(char *subject_name, char **mapped_name) +{ + return(globus_gss_assist_gridmap(subject_name, mapped_name) == 0); +} + +/* + * SSH1 GSSAPI clients may send us a user name of the form: + * + * (1) username:x:SSL Subject Name + * or + * (2) username:i:SSL Subject Name + * or + * (3) username + * + * if case 1, then uname is an explicit name (ssh -l uname). Keep this + * name always, rewrite the user parameter to be just uname. We'll pull + * the GSSAPI idenity out and deal with (or skip it) later. + * + * if case 2, then uname is implicit (user didn't use the -l option), so + * use the default gridmap mapping and replace uname with whatever + * the gridmap maps to. If the gridmap mapping fails, drop down + * to just uname + * + * if case 3, then leave it be. + * + * This function may return the original pointer to the orginal string, + * the original pointer to a modified string, or a completely new pointer. + */ +static char * +ssh1_gssapi_parse_userstring(char *userstring) +{ + char name_type = '\0'; /* explicit 'x' or implicit 'i' */ + char *ssl_subject_name = NULL; + char *delim = NULL; + + debug("Looking at username '%s' for gssapi-ssleay type name", userstring); + if((delim = strchr(userstring, ':')) != NULL) { + /* Parse and split into components */ + ssl_subject_name = strchr(delim + 1, ':'); + + if (ssl_subject_name) { + /* Successful parse, split into components */ + *delim = '\0'; + name_type = *(delim + 1); + *ssl_subject_name = '\0'; + ssl_subject_name++; + + debug("Name parsed. type = '%c'. ssl subject name is \"%s\"", + name_type, ssl_subject_name); + + } else { + + debug("Don't understand name format. Letting it pass."); + } + } + +#ifdef GSI + if(ssl_subject_name) { + char *gridmapped_name = NULL; + switch (name_type) { + case 'x': + debug("explicit name given, using %s as username", userstring); + break; + + case 'i': + /* gridmap check */ + debug("implicit name given. gridmapping '%s'", ssl_subject_name); + + PRIVSEP(gsi_gridmap(ssl_subject_name, &gridmapped_name)); + if (gridmapped_name && gridmapped_name[0] != '\0') { + userstring = gridmapped_name; + debug("I gridmapped and got %s", userstring); + + } else { + debug("I gridmapped and got null, reverting to %s", userstring); + } + break; + + default: + debug("Unknown name type '%c'. Ignoring.", name_type); + break; + } + } else { + debug("didn't find any :'s so I assume it's just a user name"); + } +#endif /* GSI */ + + return userstring; +} +#endif /* * convert ssh auth msg type into description @@ -53,6 +174,10 @@ case SSH_CMSG_AUTH_KERBEROS: return "kerberos"; #endif +#if defined(GSSAPI) + case SSH_CMSG_AUTH_GSSAPI: + return "gssapi"; +#endif } snprintf(buf, sizeof buf, "bad-auth-msg-%d", type); return buf; @@ -150,6 +275,39 @@ break; #endif /* KRB4 || KRB5 */ +#ifdef GSSAPI + case SSH_CMSG_AUTH_GSSAPI: + if (!options.gss_authentication) { + verbose("GSSAPI authentication disabled."); + break; + } + /* + * GSSAPI was first added to ssh1 in ssh-1.2.27, and + * was added to the SecurtCRT product. In order + * to continue operating with these, we will add + * the equivelent GSSAPI support to SSH1. + * Will use the gssapi routines from the ssh2 as + * they are almost identical. But they use dispatch + * so we need to setup the dispatch tables here + * auth1.c for use only by the gssapi code. + * Since we already have the packet, we will call + * userauth_gssapi then start the dispatch loop. + */ + if (!authctxt->valid) { + packet_disconnect("Authentication rejected for invalid user"); + } + dispatch_init(&auth1_gss_protocol_error); + method_gssapi.userauth(authctxt); + dispatch_run(DISPATCH_BLOCK, &authctxt->success, authctxt); + if (authctxt->postponed) { /* failed, try other methods */ + authctxt->success = 0; + authctxt->postponed = 0; + break; + } + authenticated = 1; + break; +#endif /* GSSAPI */ + #if defined(AFS) || defined(KRB5) /* XXX - punt on backward compatibility here. */ case SSH_CMSG_HAVE_KERBEROS_TGT: @@ -355,6 +513,11 @@ /* Get the user name. */ user = packet_get_string(&ulen); packet_check_eom(); + +#ifdef GSSAPI + /* Parse GSSAPI identity from userstring */ + user = ssh1_gssapi_parse_userstring(user); +#endif /* GSSAPI */ if ((style = strchr(user, ':')) != NULL) *style++ = '\0'; diff -Naur openssh-3.4p1/auth2-gss.c openssh-3.4p1-gsi/auth2-gss.c --- openssh-3.4p1/auth2-gss.c Wed Dec 31 18:00:00 1969 +++ openssh-3.4p1-gsi/auth2-gss.c Tue Jul 2 08:29:53 2002 @@ -0,0 +1,240 @@ +/* + * Copyright (c) 2001,2002 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#ifdef GSSAPI +#include "auth.h" +#include "ssh2.h" +#include "ssh1.h" +#include "xmalloc.h" +#include "log.h" +#include "dispatch.h" +#include "servconf.h" +#include "compat.h" +#include "packet.h" +#include "monitor_wrap.h" + +#include "ssh-gss.h" + +extern ServerOptions options; +extern unsigned char ssh1_key_digest[16]; + +static int +userauth_external(Authctxt *authctxt) +{ + packet_check_eom(); + + return(PRIVSEP(ssh_gssapi_userok(authctxt->user))); +} + +static void input_gssapi_token(int type, u_int32_t plen, void *ctxt); +static void input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt); + +/* We only support those mechanisms that we know about (ie ones that we know + * how to check local user kuserok and the like + */ +static int +userauth_gssapi(Authctxt *authctxt) +{ + gss_OID_desc oid= {0,NULL}; + Gssctxt *ctxt = NULL; + int mechs; + gss_OID_set supported; + int present; + OM_uint32 ms; + u_int len; + + if (!authctxt->valid || authctxt->user == NULL) + return 0; + + if (datafellows & SSH_OLD_GSSAPI) { + debug("Early drafts of GSSAPI userauth not supported"); + return 0; + } + + mechs=packet_get_int(); + if (mechs==0) { + debug("Mechanism negotiation is not supported"); + return 0; + } + + ssh_gssapi_supported_oids(&supported); + do { + if (oid.elements) + xfree(oid.elements); + oid.elements = packet_get_string(&len); + oid.length = len; + gss_test_oid_set_member(&ms, &oid, supported, &present); + mechs--; + } while (mechs>0 && !present); + + if (!present) { + xfree(oid.elements); + return(0); + } + + if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt,&oid)))) + return(0); + + authctxt->methoddata=(void *)ctxt; + + /* Send SSH_MSG_USERAUTH_GSSAPI_RESPONSE */ + + if (!compat20) + packet_start(SSH_SMSG_AUTH_GSSAPI_RESPONSE); + else + packet_start(SSH2_MSG_USERAUTH_GSSAPI_RESPONSE); + packet_put_string(oid.elements,oid.length); + packet_send(); + packet_write_wait(); + xfree(oid.elements); + + if (!compat20) + dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, + &input_gssapi_token); + else + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, + &input_gssapi_token); + authctxt->postponed = 1; + + return 0; +} + +static void +input_gssapi_token(int type, u_int32_t plen, void *ctxt) +{ + Authctxt *authctxt = ctxt; + Gssctxt *gssctxt; + gss_buffer_desc send_tok,recv_tok; + OM_uint32 maj_status, min_status; + + if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) + fatal("No authentication or GSSAPI context"); + + gssctxt=authctxt->methoddata; + recv_tok.value=packet_get_string(&recv_tok.length); + + maj_status=PRIVSEP(ssh_gssapi_accept_ctx(gssctxt, &recv_tok, + &send_tok, NULL)); + packet_check_eom(); + + if (GSS_ERROR(maj_status)) { + /* Failure */ + ssh_gssapi_send_error(maj_status,min_status); + authctxt->postponed = 0; + dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, NULL); + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); + userauth_finish(authctxt, 0, "gssapi"); + } + + if (send_tok.length != 0) { + /* Send a packet back to the client */ + if (!compat20) + packet_start(SSH_MSG_AUTH_GSSAPI_TOKEN); + else + packet_start(SSH2_MSG_USERAUTH_GSSAPI_TOKEN); + packet_put_string(send_tok.value,send_tok.length); + packet_send(); + packet_write_wait(); + gss_release_buffer(&min_status, &send_tok); + } + + if (maj_status == GSS_S_COMPLETE) { + dispatch_set(SSH_MSG_AUTH_GSSAPI_TOKEN, NULL); + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN,NULL); + /* ssh1 does not have an extra message here */ + if (!compat20) + input_gssapi_exchange_complete(0, 0, ctxt); + else + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, + &input_gssapi_exchange_complete); + } +} + +/* This is called when the client thinks we've completed authentication. + * It should only be enabled in the dispatch handler by the function above, + * which only enables it once the GSSAPI exchange is complete. + */ + +static void +input_gssapi_exchange_complete(int type, u_int32_t plen, void *ctxt) +{ + Authctxt *authctxt = ctxt; + Gssctxt *gssctxt; + int authenticated; + + if (authctxt == NULL || (authctxt->methoddata == NULL && !use_privsep)) + fatal("No authentication or GSSAPI context"); + + gssctxt=authctxt->methoddata; + + /* ssh1 needs to exchange the hash of the keys */ + if (!compat20) { + + OM_uint32 min_status; + gss_buffer_desc dummy, msg_tok; + + /* ssh1 wraps the keys, in the monitor */ + + dummy.value=malloc(sizeof(ssh1_key_digest)); + memcpy(dummy.value,ssh1_key_digest,sizeof(ssh1_key_digest)); + dummy.length=sizeof(ssh1_key_digest); + if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(gssctxt,&dummy,&msg_tok)))) + fatal("Couldn't wrap keys"); + + packet_start(SSH_SMSG_AUTH_GSSAPI_HASH); + packet_put_string((char *)msg_tok.value,msg_tok.length); + packet_send(); + packet_write_wait(); + gss_release_buffer(&min_status,&msg_tok); + } + + + /* We don't need to check the status, because the stored credentials + * which userok uses are only populated once the context init step + * has returned complete. + */ + + authenticated = PRIVSEP(ssh_gssapi_userok(authctxt->user)); + + authctxt->postponed = 0; + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); + userauth_finish(authctxt, authenticated, "gssapi"); +} + +Authmethod method_external = { + "external-keyx", + userauth_external, + &options.gss_authentication +}; + +Authmethod method_gssapi = { + "gssapi", + userauth_gssapi, + &options.gss_authentication +}; + +#endif /* GSSAPI */ diff -Naur openssh-3.4p1/auth2.c openssh-3.4p1-gsi/auth2.c --- openssh-3.4p1/auth2.c Fri Jun 21 01:21:11 2002 +++ openssh-3.4p1-gsi/auth2.c Tue Jul 2 08:29:53 2002 @@ -26,6 +26,7 @@ RCSID("$OpenBSD: auth2.c,v 1.93 2002/05/31 11:35:15 markus Exp $"); #include "ssh2.h" +#include "ssh1.h" #include "xmalloc.h" #include "packet.h" #include "log.h" @@ -35,6 +36,11 @@ #include "dispatch.h" #include "pathnames.h" #include "monitor_wrap.h" +#include "misc.h" + +#ifdef GSSAPI +#include "ssh-gss.h" +#endif /* import */ extern ServerOptions options; @@ -46,6 +52,10 @@ /* methods */ extern Authmethod method_none; +#ifdef GSSAPI +extern Authmethod method_external; +extern Authmethod method_gssapi; +#endif extern Authmethod method_pubkey; extern Authmethod method_passwd; extern Authmethod method_kbdint; @@ -53,6 +63,10 @@ Authmethod *authmethods[] = { &method_none, +#ifdef GSSAPI + &method_external, + &method_gssapi, +#endif &method_pubkey, &method_passwd, &method_kbdint, @@ -144,14 +158,44 @@ user = packet_get_string(NULL); service = packet_get_string(NULL); method = packet_get_string(NULL); + +#ifdef GSSAPI + if (strcmp(user, "") == 0) { + char *lname = NULL; + debug("gssapi received empty username"); + PRIVSEP(ssh_gssapi_localname(&lname)); + if (lname && lname[0] != '\0') { + xfree(user); + user = lname; + debug("gssapi successfully set username to %s", user); + } else if (authctxt->valid) { + debug("failed to set username from gssapi context"); + goto finish; + } + } +#endif + debug("userauth-request for user %s service %s method %s", user, service, method); debug("attempt %d failures %d", authctxt->attempt, authctxt->failures); if ((style = strchr(user, ':')) != NULL) *style++ = 0; - if (authctxt->attempt++ == 0) { + if (!authctxt->user || + strcmp(user, authctxt->user) != 0) { /* setup auth context */ + if (authctxt->user) { + xfree(authctxt->user); + authctxt->user = NULL; + } + if (authctxt->service) { + xfree(authctxt->service); + authctxt->service = NULL; + } + if (authctxt->style) { + xfree(authctxt->style); + authctxt->style = NULL; + } authctxt->pw = PRIVSEP(getpwnamallow(user)); if (authctxt->pw && strcmp(service, "ssh-connection")==0) { authctxt->valid = 1; @@ -160,6 +204,7 @@ PRIVSEP(start_pam(authctxt->pw->pw_name)); #endif } else { + authctxt->valid = 0; log("input_userauth_request: illegal user %s", user); #ifdef USE_PAM PRIVSEP(start_pam("NOUSER")); @@ -172,14 +217,15 @@ authctxt->style = style ? xstrdup(style) : NULL; if (use_privsep) mm_inform_authserv(service, style); - } else if (strcmp(user, authctxt->user) != 0 || - strcmp(service, authctxt->service) != 0) { - packet_disconnect("Change of username or service not allowed: " - "(%s,%s) -> (%s,%s)", - authctxt->user, authctxt->service, user, service); } /* reset state */ auth2_challenge_stop(authctxt); + +#ifdef GSSAPI + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_TOKEN, NULL); + dispatch_set(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE, NULL); +#endif + authctxt->postponed = 0; /* try to authenticate user */ @@ -188,6 +234,7 @@ debug2("input_userauth_request: try method %s", method); authenticated = m->userauth(authctxt); } +finish: userauth_finish(authctxt, authenticated, method); xfree(service); @@ -216,6 +263,9 @@ #endif /* USE_PAM */ /* Log before sending the reply */ + if (!compat20) + auth_log(authctxt, authenticated, method, " ssh1"); + else auth_log(authctxt, authenticated, method, " ssh2"); if (authctxt->postponed) @@ -225,9 +275,11 @@ if (authenticated == 1) { /* turn off userauth */ dispatch_set(SSH2_MSG_USERAUTH_REQUEST, &dispatch_protocol_ignore); + if (compat20) { packet_start(SSH2_MSG_USERAUTH_SUCCESS); packet_send(); packet_write_wait(); + } /* now we can break out */ authctxt->success = 1; } else { @@ -240,6 +292,16 @@ #endif /* WITH_AIXAUTHENTICATE */ packet_disconnect(AUTH_FAIL_MSG, authctxt->user); } + if (!compat20) { + /* + * Break out of the dispatch loop now and go back to + * SSH1 code. We need to set the 'success' flag to + * break out of the loop. Set the 'postponed' flag to + * tell the SSH1 code that authentication failed. The + * SSH1 code will handle sending SSH_SMSG_FAILURE. + */ + authctxt->success = authctxt->postponed = 1; + } else { methods = authmethods_get(); packet_start(SSH2_MSG_USERAUTH_FAILURE); packet_put_cstring(methods); @@ -247,6 +309,7 @@ packet_send(); packet_write_wait(); xfree(methods); + } } } diff -Naur openssh-3.4p1/compat.c openssh-3.4p1-gsi/compat.c --- openssh-3.4p1/compat.c Wed Apr 10 11:22:10 2002 +++ openssh-3.4p1-gsi/compat.c Tue Jul 2 08:29:53 2002 @@ -71,15 +71,17 @@ { "OpenSSH_2.5.0p1*," "OpenSSH_2.5.1p1*", SSH_BUG_BIGENDIANAES|SSH_OLD_DHGEX| - SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, + SSH_BUG_NOREKEY|SSH_BUG_EXTEOF| + SSH_OLD_GSSAPI}, { "OpenSSH_2.5.0*," "OpenSSH_2.5.1*," "OpenSSH_2.5.2*", SSH_OLD_DHGEX|SSH_BUG_NOREKEY| SSH_BUG_EXTEOF}, { "OpenSSH_2.5.3*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, + { "OpenSSH_2.9p*", SSH_OLD_GSSAPI }, { "OpenSSH_2.*," "OpenSSH_3.0*," - "OpenSSH_3.1*", SSH_BUG_EXTEOF}, + "OpenSSH_3.1*", SSH_BUG_EXTEOF|SSH_BUG_GSS_EMPTYUSER}, { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF}, { "OpenSSH*", 0 }, { "*MindTerm*", 0 }, diff -Naur openssh-3.4p1/compat.h openssh-3.4p1-gsi/compat.h --- openssh-3.4p1/compat.h Wed Apr 10 11:22:10 2002 +++ openssh-3.4p1-gsi/compat.h Tue Jul 2 08:29:53 2002 @@ -54,6 +54,8 @@ #define SSH_BUG_DUMMYCHAN 0x00100000 #define SSH_BUG_EXTEOF 0x00200000 #define SSH_BUG_K5USER 0x00400000 +#define SSH_OLD_GSSAPI 0x00800000 +#define SSH_BUG_GSS_EMPTYUSER 0x01000000 void enable_compat13(void); void enable_compat20(void); diff -Naur openssh-3.4p1/config.h.in openssh-3.4p1-gsi/config.h.in --- openssh-3.4p1/config.h.in Wed Jun 26 09:08:19 2002 +++ openssh-3.4p1-gsi/config.h.in Tue Jul 2 08:30:04 2002 @@ -1,4 +1,4 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ +/* config.h.in. Generated automatically from configure.ac by autoheader. */ /* $Id: acconfig.h,v 1.141 2002/06/25 22:35:16 tim Exp $ */ #ifndef _CONFIG_H @@ -8,6 +8,7 @@ /* Please make your changes there */ + /* Define to a Set Process Title type if your system is */ /* supported by bsd-setproctitle.c */ #undef SPT_TYPE @@ -198,6 +199,9 @@ /* Define if compiler implements __func__ */ #undef HAVE___func__ +/* Define this is you want GSSAPI support in the version 2 protocol */ +#undef GSSAPI + /* Define if you want Kerberos 5 support */ #undef KRB5 @@ -210,6 +214,9 @@ /* Define if you want AFS support */ #undef AFS +/* Define if you want GSI/Globus authentication support */ +#undef GSI + /* Define if you want S/Key support */ #undef SKEY @@ -362,489 +369,480 @@ #undef BROKEN_FD_PASSING -/* Define to 1 if the `getpgrp' function requires zero arguments. */ +/* Define if the `getpgrp' function takes no argument. */ #undef GETPGRP_VOID -/* Define to 1 if you have the `arc4random' function. */ +/* Define if you have the `arc4random' function. */ #undef HAVE_ARC4RANDOM -/* Define to 1 if you have the `b64_ntop' function. */ +/* Define if you have the `b64_ntop' function. */ #undef HAVE_B64_NTOP -/* Define to 1 if you have the `bcopy' function. */ +/* Define if you have the `bcopy' function. */ #undef HAVE_BCOPY -/* Define to 1 if you have the `bindresvport_sa' function. */ +/* Define if you have the `bindresvport_sa' function. */ #undef HAVE_BINDRESVPORT_SA -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_BSTRING_H -/* Define to 1 if you have the `clock' function. */ +/* Define if you have the `clock' function. */ #undef HAVE_CLOCK -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_CRYPT_H -/* Define to 1 if you have the `dirname' function. */ +/* Define if you have the `dirname' function. */ #undef HAVE_DIRNAME -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_ENDIAN_H -/* Define to 1 if you have the `endutent' function. */ +/* Define if you have the `endutent' function. */ #undef HAVE_ENDUTENT -/* Define to 1 if you have the `endutxent' function. */ +/* Define if you have the `endutxent' function. */ #undef HAVE_ENDUTXENT -/* Define to 1 if you have the `fchmod' function. */ +/* Define if you have the `fchmod' function. */ #undef HAVE_FCHMOD -/* Define to 1 if you have the `fchown' function. */ +/* Define if you have the `fchown' function. */ #undef HAVE_FCHOWN -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_FLOATINGPOINT_H -/* Define to 1 if you have the `freeaddrinfo' function. */ +/* Define if you have the `freeaddrinfo' function. */ #undef HAVE_FREEADDRINFO -/* Define to 1 if you have the `futimes' function. */ +/* Define if you have the `futimes' function. */ #undef HAVE_FUTIMES -/* Define to 1 if you have the `gai_strerror' function. */ +/* Define if you have the `gai_strerror' function. */ #undef HAVE_GAI_STRERROR -/* Define to 1 if you have the `getaddrinfo' function. */ +/* Define if you have the `getaddrinfo' function. */ #undef HAVE_GETADDRINFO -/* Define to 1 if you have the `getcwd' function. */ +/* Define if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `getgrouplist' function. */ +/* Define if you have the `getgrouplist' function. */ #undef HAVE_GETGROUPLIST -/* Define to 1 if you have the `getluid' function. */ +/* Define if you have the `getluid' function. */ #undef HAVE_GETLUID -/* Define to 1 if you have the `getnameinfo' function. */ +/* Define if you have the `getnameinfo' function. */ #undef HAVE_GETNAMEINFO -/* Define to 1 if you have the `getopt' function. */ +/* Define if you have the `getopt' function. */ #undef HAVE_GETOPT -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_GETOPT_H -/* Define to 1 if you have the `getpwanam' function. */ +/* Define if you have the `getpwanam' function. */ #undef HAVE_GETPWANAM -/* Define to 1 if you have the `getrlimit' function. */ +/* Define if you have the `getrlimit' function. */ #undef HAVE_GETRLIMIT -/* Define to 1 if you have the `getrusage' function. */ +/* Define if you have the `getrusage' function. */ #undef HAVE_GETRUSAGE -/* Define to 1 if you have the `gettimeofday' function. */ +/* Define if you have the `gettimeofday' function. */ #undef HAVE_GETTIMEOFDAY -/* Define to 1 if you have the `getttyent' function. */ +/* Define if you have the `getttyent' function. */ #undef HAVE_GETTTYENT -/* Define to 1 if you have the `getutent' function. */ +/* Define if you have the `getutent' function. */ #undef HAVE_GETUTENT -/* Define to 1 if you have the `getutid' function. */ +/* Define if you have the `getutid' function. */ #undef HAVE_GETUTID -/* Define to 1 if you have the `getutline' function. */ +/* Define if you have the `getutline' function. */ #undef HAVE_GETUTLINE -/* Define to 1 if you have the `getutxent' function. */ +/* Define if you have the `getutxent' function. */ #undef HAVE_GETUTXENT -/* Define to 1 if you have the `getutxid' function. */ +/* Define if you have the `getutxid' function. */ #undef HAVE_GETUTXID -/* Define to 1 if you have the `getutxline' function. */ +/* Define if you have the `getutxline' function. */ #undef HAVE_GETUTXLINE -/* Define to 1 if you have the `glob' function. */ +/* Define if you have the `glob' function. */ #undef HAVE_GLOB -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_GLOB_H -/* Define to 1 if you have the `inet_aton' function. */ +/* Define if you have the header file. */ +#undef HAVE_GSSAPI_H + +/* Define if you have the `inet_aton' function. */ #undef HAVE_INET_ATON -/* Define to 1 if you have the `inet_ntoa' function. */ +/* Define if you have the `inet_ntoa' function. */ #undef HAVE_INET_NTOA -/* Define to 1 if you have the `inet_ntop' function. */ +/* Define if you have the `inet_ntop' function. */ #undef HAVE_INET_NTOP -/* Define to 1 if you have the `innetgr' function. */ +/* Define if you have the `innetgr' function. */ #undef HAVE_INNETGR -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_KRB_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_LASTLOG_H -/* Define to 1 if you have the `des' library (-ldes). */ +/* Define if you have the `des' library (-ldes). */ #undef HAVE_LIBDES -/* Define to 1 if you have the `des425' library (-ldes425). */ +/* Define if you have the `des425' library (-ldes425). */ #undef HAVE_LIBDES425 -/* Define to 1 if you have the `dl' library (-ldl). */ +/* Define if you have the `dl' library (-ldl). */ #undef HAVE_LIBDL -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_LIBGEN_H -/* Define to 1 if you have the `krb' library (-lkrb). */ +/* Define if you have the `krb' library (-lkrb). */ #undef HAVE_LIBKRB -/* Define to 1 if you have the `krb4' library (-lkrb4). */ +/* Define if you have the `krb4' library (-lkrb4). */ #undef HAVE_LIBKRB4 -/* Define to 1 if you have the `nsl' library (-lnsl). */ +/* Define if you have the `nsl' library (-lnsl). */ #undef HAVE_LIBNSL -/* Define to 1 if you have the `pam' library (-lpam). */ +/* Define if you have the `pam' library (-lpam). */ #undef HAVE_LIBPAM -/* Define to 1 if you have the `resolv' library (-lresolv). */ +/* Define if you have the `resolv' library (-lresolv). */ #undef HAVE_LIBRESOLV -/* Define to 1 if you have the `sectok' library (-lsectok). */ +/* Define if you have the `sectok' library (-lsectok). */ #undef HAVE_LIBSECTOK -/* Define to 1 if you have the `socket' library (-lsocket). */ +/* Define if you have the `socket' library (-lsocket). */ #undef HAVE_LIBSOCKET -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_LIBUTIL_H -/* Define to 1 if you have the `z' library (-lz). */ +/* Define if you have the `z' library (-lz). */ #undef HAVE_LIBZ -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_LIMITS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_LOGIN_CAP_H -/* Define to 1 if you have the `login_getcapbool' function. */ +/* Define if you have the `login_getcapbool' function. */ #undef HAVE_LOGIN_GETCAPBOOL -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_LOGIN_H -/* Define to 1 if you have the `logout' function. */ +/* Define if you have the `logout' function. */ #undef HAVE_LOGOUT -/* Define to 1 if you have the `logwtmp' function. */ +/* Define if you have the `logwtmp' function. */ #undef HAVE_LOGWTMP -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_MAILLOCK_H -/* Define to 1 if you have the `md5_crypt' function. */ +/* Define if you have the `md5_crypt' function. */ #undef HAVE_MD5_CRYPT -/* Define to 1 if you have the `memmove' function. */ +/* Define if you have the `memmove' function. */ #undef HAVE_MEMMOVE -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_MEMORY_H -/* Define to 1 if you have the `mkdtemp' function. */ +/* Define if you have the `mkdtemp' function. */ #undef HAVE_MKDTEMP -/* Define to 1 if you have the `mmap' function. */ +/* Define if you have the `mmap' function. */ #undef HAVE_MMAP -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_NETDB_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_NETGROUP_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_NETINET_IN_SYSTM_H -/* Define to 1 if you have the `ngetaddrinfo' function. */ +/* Define if you have the `ngetaddrinfo' function. */ #undef HAVE_NGETADDRINFO -/* Define to 1 if you have the `ogetaddrinfo' function. */ +/* Define if you have the `ogetaddrinfo' function. */ #undef HAVE_OGETADDRINFO -/* Define to 1 if you have the `openpty' function. */ +/* Define if you have the `openpty' function. */ #undef HAVE_OPENPTY -/* Define to 1 if you have the `pam_getenvlist' function. */ +/* Define if you have the `pam_getenvlist' function. */ #undef HAVE_PAM_GETENVLIST -/* Define to 1 if you have the header file. */ +/* Define if you have the `pam_putenv' function. */ +#undef HAVE_PAM_PUTENV + +/* Define if you have the header file. */ #undef HAVE_PATHS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_PTY_H -/* Define to 1 if you have the `pututline' function. */ +/* Define if you have the `pututline' function. */ #undef HAVE_PUTUTLINE -/* Define to 1 if you have the `pututxline' function. */ +/* Define if you have the `pututxline' function. */ #undef HAVE_PUTUTXLINE -/* Define to 1 if you have the `readpassphrase' function. */ +/* Define if you have the `readpassphrase' function. */ #undef HAVE_READPASSPHRASE -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_READPASSPHRASE_H -/* Define to 1 if you have the `realpath' function. */ +/* Define if you have the `realpath' function. */ #undef HAVE_REALPATH -/* Define to 1 if you have the `recvmsg' function. */ +/* Define if you have the `recvmsg' function. */ #undef HAVE_RECVMSG -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_RPC_TYPES_H -/* Define to 1 if you have the `rresvport_af' function. */ +/* Define if you have the `rresvport_af' function. */ #undef HAVE_RRESVPORT_AF -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SECTOK_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SECURITY_PAM_APPL_H -/* Define to 1 if you have the `sendmsg' function. */ +/* Define if you have the `sendmsg' function. */ #undef HAVE_SENDMSG -/* Define to 1 if you have the `setdtablesize' function. */ +/* Define if you have the `setdtablesize' function. */ #undef HAVE_SETDTABLESIZE -/* Define to 1 if you have the `setegid' function. */ +/* Define if you have the `setegid' function. */ #undef HAVE_SETEGID -/* Define to 1 if you have the `setenv' function. */ +/* Define if you have the `setenv' function. */ #undef HAVE_SETENV -/* Define to 1 if you have the `seteuid' function. */ +/* Define if you have the `seteuid' function. */ #undef HAVE_SETEUID -/* Define to 1 if you have the `setgroups' function. */ +/* Define if you have the `setgroups' function. */ #undef HAVE_SETGROUPS -/* Define to 1 if you have the `setlogin' function. */ +/* Define if you have the `setlogin' function. */ #undef HAVE_SETLOGIN -/* Define to 1 if you have the `setluid' function. */ +/* Define if you have the `setluid' function. */ #undef HAVE_SETLUID -/* Define to 1 if you have the `setpcred' function. */ +/* Define if you have the `setpcred' function. */ #undef HAVE_SETPCRED -/* Define to 1 if you have the `setproctitle' function. */ +/* Define if you have the `setproctitle' function. */ #undef HAVE_SETPROCTITLE -/* Define to 1 if you have the `setresgid' function. */ +/* Define if you have the `setresgid' function. */ #undef HAVE_SETRESGID -/* Define to 1 if you have the `setreuid' function. */ +/* Define if you have the `setreuid' function. */ #undef HAVE_SETREUID -/* Define to 1 if you have the `setrlimit' function. */ +/* Define if you have the `setrlimit' function. */ #undef HAVE_SETRLIMIT -/* Define to 1 if you have the `setsid' function. */ +/* Define if you have the `setsid' function. */ #undef HAVE_SETSID -/* Define to 1 if you have the `setutent' function. */ +/* Define if you have the `setutent' function. */ #undef HAVE_SETUTENT -/* Define to 1 if you have the `setutxent' function. */ +/* Define if you have the `setutxent' function. */ #undef HAVE_SETUTXENT -/* Define to 1 if you have the `setvbuf' function. */ +/* Define if you have the `setvbuf' function. */ #undef HAVE_SETVBUF -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SHADOW_H -/* Define to 1 if you have the `sigaction' function. */ +/* Define if you have the `sigaction' function. */ #undef HAVE_SIGACTION -/* Define to 1 if you have the `sigvec' function. */ +/* Define if you have the `sigvec' function. */ #undef HAVE_SIGVEC -/* Define to 1 if the system has the type `sig_atomic_t'. */ +/* Define if the system has the type `sig_atomic_t'. */ #undef HAVE_SIG_ATOMIC_T -/* Define to 1 if you have the `snprintf' function. */ +/* Define if you have the `snprintf' function. */ #undef HAVE_SNPRINTF -/* Define to 1 if you have the `socketpair' function. */ +/* Define if you have the `socketpair' function. */ #undef HAVE_SOCKETPAIR -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STDDEF_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STDINT_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STDLIB_H -/* Define to 1 if you have the `strerror' function. */ +/* Define if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define to 1 if you have the `strftime' function. */ +/* Define if you have the `strftime' function. */ #undef HAVE_STRFTIME -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STRINGS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_STRING_H -/* Define to 1 if you have the `strlcat' function. */ +/* Define if you have the `strlcat' function. */ #undef HAVE_STRLCAT -/* Define to 1 if you have the `strlcpy' function. */ +/* Define if you have the `strlcpy' function. */ #undef HAVE_STRLCPY -/* Define to 1 if you have the `strmode' function. */ +/* Define if you have the `strmode' function. */ #undef HAVE_STRMODE -/* Define to 1 if you have the `strsep' function. */ +/* Define if you have the `strsep' function. */ #undef HAVE_STRSEP -/* Define to 1 if `st_blksize' is member of `struct stat'. */ +/* Define if `st_blksize' is member of `struct stat'. */ #undef HAVE_STRUCT_STAT_ST_BLKSIZE -/* Define to 1 if you have the `sysconf' function. */ +/* Define if you have the `sysconf' function. */ #undef HAVE_SYSCONF -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_BITYPES_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_BSDTTY_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_CDEFS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_MMAN_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_SELECT_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_STAT_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_STROPTS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_SYSMACROS_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_TIME_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_TYPES_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_SYS_UN_H -/* Define to 1 if you have the `tcgetpgrp' function. */ +/* Define if you have the `tcgetpgrp' function. */ #undef HAVE_TCGETPGRP -/* Define to 1 if you have the `time' function. */ +/* Define if you have the `time' function. */ #undef HAVE_TIME -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_TIME_H -/* Define to 1 if you have the `truncate' function. */ +/* Define if you have the `truncate' function. */ #undef HAVE_TRUNCATE -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_TTYENT_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if you have the `updwtmp' function. */ +/* Define if you have the `updwtmp' function. */ #undef HAVE_UPDWTMP -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_USERSEC_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_UTIL_H -/* Define to 1 if you have the `utimes' function. */ +/* Define if you have the `utimes' function. */ #undef HAVE_UTIMES -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_UTIME_H -/* Define to 1 if you have the `utmpname' function. */ +/* Define if you have the `utmpname' function. */ #undef HAVE_UTMPNAME -/* Define to 1 if you have the `utmpxname' function. */ +/* Define if you have the `utmpxname' function. */ #undef HAVE_UTMPXNAME -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_UTMPX_H -/* Define to 1 if you have the header file. */ +/* Define if you have the header file. */ #undef HAVE_UTMP_H -/* Define to 1 if you have the `vhangup' function. */ +/* Define if you have the `vhangup' function. */ #undef HAVE_VHANGUP -/* Define to 1 if you have the `vsnprintf' function. */ +/* Define if you have the `vsnprintf' function. */ #undef HAVE_VSNPRINTF -/* Define to 1 if you have the `waitpid' function. */ +/* Define if you have the `waitpid' function. */ #undef HAVE_WAITPID -/* Define to 1 if you have the `_getpty' function. */ +/* Define if you have the `_getpty' function. */ #undef HAVE__GETPTY -/* Define to 1 if you have the `__b64_ntop' function. */ +/* Define if you have the `__b64_ntop' function. */ #undef HAVE___B64_NTOP -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - /* The size of a `char', as computed by sizeof. */ #undef SIZEOF_CHAR @@ -860,11 +858,11 @@ /* The size of a `short int', as computed by sizeof. */ #undef SIZEOF_SHORT_INT -/* Define to 1 if you have the ANSI C header files. */ +/* Define if you have the ANSI C header files. */ #undef STDC_HEADERS -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ +/* Define if your processor stores words with the most significant byte first + (like Motorola and SPARC, unlike Intel and VAX). */ #undef WORDS_BIGENDIAN /* Number of bits in a file offset, on hosts where this is settable. */ diff -Naur openssh-3.4p1/configure openssh-3.4p1-gsi/configure --- openssh-3.4p1/configure Wed Jun 26 09:08:18 2002 +++ openssh-3.4p1-gsi/configure Tue Jul 2 08:30:14 2002 @@ -1,22 +1,24 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.53. +# Generated by Autoconf 2.52. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi +# 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 +# Sed expression to map a string onto a valid variable name. +as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="sed y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g" # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -26,165 +28,8 @@ set -o posix fi -# NLS nuisances. -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } - - # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || -$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'` - -# PATH needs CR, and LINENO needs CR and PATH. -# 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" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - 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 - - ;; - 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_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - 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=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # 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 before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, 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 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\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 sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac +as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -212,12 +57,22 @@ as_executable_p="test -f" -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="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="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. @@ -226,8 +81,7 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } - +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -242,8 +96,7 @@ ac_default_prefix=/usr/local cross_compiling=no subdirs= -MFLAGS= -MAKEFLAGS= +MFLAGS= MAKEFLAGS= SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. @@ -251,13 +104,6 @@ # only ac_max_sed_lines should be used. : ${ac_max_here_lines=38} -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - ac_unique_file="ssh.c" # Factoring default headers for most tests. ac_includes_default="\ @@ -296,7 +142,6 @@ # include #endif" - # Initialize some variables set by options. ac_init_help= ac_init_version=false @@ -335,6 +180,13 @@ infodir='${prefix}/info' mandir='${prefix}/man' +# Identity of this package. +PACKAGE_NAME= +PACKAGE_TARNAME= +PACKAGE_VERSION= +PACKAGE_STRING= +PACKAGE_BUGREPORT= + ac_prev= for ac_option do @@ -467,7 +319,7 @@ with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) + | --no-cr | --no-c) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -646,7 +498,7 @@ eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -658,19 +510,18 @@ eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done # 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. +# FIXME: should be removed in autoconf 3.0. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -686,23 +537,13 @@ test "$silent" = yes && exec 6>/dev/null - # 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_confdir=`(dirname "$0") 2>/dev/null || -$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'` + ac_prog=$0 + ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` + test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -712,10 +553,10 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { echo "$as_me: error: cannot find sources in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi @@ -759,7 +600,7 @@ 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 + cat <&2 + echo "$as_me: WARNING: no configuration information is in $ac_subdir" >&2 fi cd $ac_popdir done @@ -949,31 +773,31 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\_ACEOF + cat <<\EOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -_ACEOF +EOF exit 0 fi exec 5>config.log -cat >&5 <<_ACEOF +cat >&5 </dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -992,27 +816,17 @@ /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 +PATH = $PATH +_ASUNAME } >&5 -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF +cat >&5 <\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - ac_sep=" " ;; + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + ac_sep=" " ;; + *) ac_configure_args="$ac_configure_args$ac_sep$ac_arg" + ac_sep=" " ;; esac # Get rid of the leading space. done @@ -1041,19 +853,14 @@ # 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: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. 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, + echo >&5 + echo "## ----------------- ##" >&5 + echo "## Cache variables. ##" >&5 + echo "## ----------------- ##" >&5 + echo >&5 + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -1067,24 +874,21 @@ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} - echo - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" 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 && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && +} >&5 + sed "/^$/d" confdefs.h >conftest.log + if test -s conftest.log; then + echo >&5 + echo "## ------------ ##" >&5 + echo "## confdefs.h. ##" >&5 + echo "## ------------ ##" >&5 + echo >&5 + cat conftest.log >&5 + fi + (echo; echo) >&5 + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" >&5 + echo "$as_me: exit $exit_status" >&5 + rm -rf conftest* confdefs* core core.* *.core conf$$* $ac_clean_files && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -1097,33 +901,6 @@ # AIX cpp loses on an empty file, so make sure it contains at least a newline. echo >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 @@ -1135,9 +912,9 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 + { echo "$as_me:915: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 + cat "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -1146,7 +923,7 @@ # 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:926: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -1154,7 +931,7 @@ esac fi else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 + { echo "$as_me:934: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -1170,42 +947,42 @@ 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:950: 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:954: 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:960: 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:962: 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:964: 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. + # Pass precious variables to config.status. It doesn't matter if + # we pass some twice (in addition to the command line arguments). 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'" ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" + ;; 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:983: 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:985: 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 @@ -1216,24 +993,26 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; +esac +echo "#! $SHELL" >conftest.sh +echo "exit 0" >>conftest.sh +chmod +x conftest.sh +if { (echo "$as_me:1005: PATH=\".;.\"; conftest.sh") >&5 + (PATH=".;."; conftest.sh) 2>&5 + ac_status=$? + echo "$as_me:1008: \$? = $ac_status" >&5 + (exit $ac_status); }; then + ac_path_separator=';' +else + ac_path_separator=: +fi +PATH_SEPARATOR="$ac_path_separator" +rm -f conftest.sh ac_config_headers="$ac_config_headers config.h" @@ -1245,7 +1024,7 @@ 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 "$as_me:1027: 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 @@ -1253,28 +1032,25 @@ 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 $as_executable_p "$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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}gcc" +echo "$as_me:1042: found $ac_dir/$ac_word" >&5 +break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 + echo "$as_me:1050: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1053: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1283,7 +1059,7 @@ 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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:1062: 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 @@ -1291,28 +1067,25 @@ 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 $as_executable_p "$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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="gcc" +echo "$as_me:1077: found $ac_dir/$ac_word" >&5 +break done 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 "$as_me:1085: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1088: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1325,7 +1098,7 @@ 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 "$as_me:1101: 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 @@ -1333,28 +1106,25 @@ 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 $as_executable_p "$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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="${ac_tool_prefix}cc" +echo "$as_me:1116: found $ac_dir/$ac_word" >&5 +break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 + echo "$as_me:1124: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1127: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1363,7 +1133,7 @@ ac_ct_CC=$CC # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:1136: 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 @@ -1371,28 +1141,25 @@ 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="cc" +echo "$as_me:1151: found $ac_dir/$ac_word" >&5 +break done 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 "$as_me:1159: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1162: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1405,7 +1172,7 @@ 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 "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:1175: 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 @@ -1414,22 +1181,19 @@ ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no -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 $as_executable_p "$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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then + ac_prog_rejected=yes + continue +fi +ac_cv_prog_CC="cc" +echo "$as_me:1195: found $ac_dir/$ac_word" >&5 +break done if test $ac_prog_rejected = yes; then @@ -1441,7 +1205,7 @@ # 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 "$as_dir/$ac_word" ${1+"$@"} + set dummy "$ac_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi @@ -1450,10 +1214,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 + echo "$as_me:1217: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1220: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1464,7 +1228,7 @@ 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 "$as_me:1231: 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 @@ -1472,28 +1236,25 @@ 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 $as_executable_p "$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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_CC="$ac_tool_prefix$ac_prog" +echo "$as_me:1246: found $ac_dir/$ac_word" >&5 +break done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 + echo "$as_me:1254: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1257: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1506,7 +1267,7 @@ 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 "$as_me:1270: 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 @@ -1514,28 +1275,25 @@ 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 $as_executable_p "$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 -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_CC="$ac_prog" +echo "$as_me:1285: found $ac_dir/$ac_word" >&5 +break done 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 "$as_me:1293: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:1296: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1547,41 +1305,34 @@ fi - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH" >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH" >&2;} +test -z "$CC" && { { echo "$as_me:1308: error: no acceptable cc found in \$PATH" >&5 +echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:$LINENO:" \ +echo "$as_me:1313:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:1316: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1319: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:1321: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1324: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:1326: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1329: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1333 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1595,26 +1346,22 @@ # 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" >&5 +echo "$as_me:1349: checking for C compiler default output" >&5 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:1352: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1355: \$? = $ac_status" >&5 (exit $ac_status); }; then # Find the output, starting from the most likely. This scheme is # not robust to junk in `.', hence go to wildcards (a.*) only as a last # resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -for ac_file in `ls a_out.exe a.exe conftest.exe 2>/dev/null; +for ac_file in `ls a.exe conftest.exe 2>/dev/null; ls a.out conftest 2>/dev/null; ls a.* conftest.* 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; @@ -1628,34 +1375,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:1378: error: C compiler cannot create executables" >&5 echo "$as_me: error: C compiler cannot create executables" >&2;} { (exit 77); exit 77; }; } fi ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "$as_me:1384: result: $ac_file" >&5 echo "${ECHO_T}$ac_file" >&6 # Check 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 "$as_me:1389: 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' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1395: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1398: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. + { { echo "$as_me:1405: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&5 echo "$as_me: error: cannot run C compiled programs. If you meant to cross compile, use \`--host'." >&2;} @@ -1663,24 +1410,24 @@ fi fi fi -echo "$as_me:$LINENO: result: yes" >&5 +echo "$as_me:1413: result: yes" >&5 echo "${ECHO_T}yes" >&6 rm -f a.out a.exe conftest$ac_cv_exeext ac_clean_files=$ac_clean_files_save # Check 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 "$as_me:1420: 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 "$as_me:1422: 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 { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +echo "$as_me:1425: checking for executable suffix" >&5 +echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 +if { (eval echo "$as_me:1427: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1430: \$? = $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 @@ -1696,33 +1443,27 @@ esac done else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link" >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link" >&2;} + { { echo "$as_me:1446: error: cannot compute EXEEXT: cannot compile and link" >&5 +echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "$as_me:1452: 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 +echo "$as_me:1458: checking for object suffix" >&5 +echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1464 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1732,10 +1473,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1476: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1479: \$? = $ac_status" >&5 (exit $ac_status); }; then for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in @@ -1747,32 +1488,26 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile" >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile" >&2;} +{ { echo "$as_me:1491: error: cannot compute OBJEXT: cannot compile" >&5 +echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "$as_me:1498: 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 "$as_me:1502: 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.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1508 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1785,16 +1520,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1523: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1526: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1529: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1532: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1806,27 +1541,21 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:1544: 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 CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo "$as_me:1550: 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 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1556 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1836,16 +1565,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1568: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1571: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1574: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1577: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1855,7 +1584,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:1587: 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 @@ -1882,16 +1611,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1614: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1617: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1620: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1623: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1903,16 +1632,10 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1635 "configure" #include "confdefs.h" #include $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1922,16 +1645,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1648: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1651: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1657: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1941,15 +1664,9 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1667 "configure" #include "confdefs.h" $ac_declaration -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -1959,16 +1676,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1679: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1682: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1685: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1688: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2012,7 +1729,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:1732: 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 @@ -2022,11 +1739,11 @@ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:1742: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking build system type" >&5 +echo "$as_me:1746: 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 @@ -2035,24 +1752,23 @@ test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:1755: 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=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { { echo "$as_me:1759: error: $ac_config_sub $ac_cv_build_alias failed." >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "$as_me:1764: result: $ac_cv_build" >&5 echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - -echo "$as_me:$LINENO: checking host system type" >&5 +echo "$as_me:1771: 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 @@ -2061,38 +1777,31 @@ test -z "$ac_cv_host_alias" && ac_cv_host_alias=$ac_cv_build_alias ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:1780: error: $ac_config_sub $ac_cv_host_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "$as_me:1785: result: $ac_cv_host" >&5 echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo "$as_me:1792: 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 - # See if sys/param.h defines the BYTE_ORDER macro. + ac_cv_c_bigendian=unknown +# See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1800 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2105,30 +1814,24 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1817: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1820: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1823: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1826: \$? = $ac_status" >&5 (exit $ac_status); }; }; then # It does; now see whether it defined to BIG_ENDIAN or not. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1830 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -2141,16 +1844,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:1847: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else @@ -2162,64 +1865,16 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -# It does not; compile a test program. -if test "$cross_compiling" = yes; then - # try to guess the endianess by grep'ing values into an object file - ac_cv_c_bigendian=unknown - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; -short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; -void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } -short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; -short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; -void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ - _ascii (); _ebcdic (); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - if fgrep BIGenDianSyS conftest.$ac_objext >/dev/null ; then - ac_cv_c_bigendian=yes -fi -if fgrep 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 - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 fi rm -f conftest.$ac_objext conftest.$ac_ext +if test $ac_cv_c_bigendian = unknown; then +if test "$cross_compiling" = yes; then + { { echo "$as_me:1872: error: cannot run test program while cross compiling" >&5 +echo "$as_me: error: cannot run test program while cross compiling" >&2;} + { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1877 "configure" #include "confdefs.h" int main () @@ -2235,48 +1890,36 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:1893: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1896: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:1898: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1901: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=no else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) ac_cv_c_bigendian=yes fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "$as_me:1914: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -case $ac_cv_c_bigendian in - yes) +if test $ac_cv_c_bigendian = yes; then -cat >>confdefs.h <<\_ACEOF +cat >>confdefs.h <<\EOF #define WORDS_BIGENDIAN 1 -_ACEOF - ;; - no) - ;; - *) - { { echo "$as_me:$LINENO: error: unknown endianess -presetting ac_cv_c_bigendian=no (or yes) will help" >&5 -echo "$as_me: error: unknown endianess -presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} - { (exit 1); exit 1; }; } ;; -esac +EOF +fi # Checks for programs. ac_ext=c @@ -2284,7 +1927,7 @@ 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 "$as_me:1930: 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 @@ -2305,18 +1948,18 @@ # 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 -#line $LINENO "configure" +#line 1951 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1956: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1962: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2339,17 +1982,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 1985 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:1989: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:1995: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2386,7 +2029,7 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:$LINENO: result: $CPP" >&5 +echo "$as_me:2032: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -2396,18 +2039,18 @@ # 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 -#line $LINENO "configure" +#line 2042 "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2047: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2053: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2430,17 +2073,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2076 "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:2080: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2086: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -2468,7 +2111,7 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:2114: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2482,7 +2125,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2128: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2490,28 +2133,25 @@ if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" +echo "$as_me:2143: found $ac_dir/$ac_word" >&5 +break done fi fi RANLIB=$ac_cv_prog_RANLIB if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 + echo "$as_me:2151: result: $RANLIB" >&5 echo "${ECHO_T}$RANLIB" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2154: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2520,7 +2160,7 @@ ac_ct_RANLIB=$RANLIB # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2163: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2528,18 +2168,15 @@ if test -n "$ac_ct_RANLIB"; then ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + $as_executable_p "$ac_dir/$ac_word" || continue +ac_cv_prog_ac_ct_RANLIB="ranlib" +echo "$as_me:2178: found $ac_dir/$ac_word" >&5 +break done test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" @@ -2547,10 +2184,10 @@ fi ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 + echo "$as_me:2187: result: $ac_ct_RANLIB" >&5 echo "${ECHO_T}$ac_ct_RANLIB" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2190: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2571,48 +2208,43 @@ # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 +echo "$as_me:2211: 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 test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - 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/* | \ - /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 $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - 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="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi + ac_save_IFS=$IFS; IFS=$ac_path_separator + for ac_dir in $PATH; do + IFS=$ac_save_IFS + # Account for people who put trailing slashes in PATH elements. + case $ac_dir/ in + / | ./ | .// | /cC/* \ + | /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 $as_executable_p "$ac_dir/$ac_prog"; then + if test $ac_prog = install && + grep dspmsg "$ac_dir/$ac_prog" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$ac_dir/$ac_prog" >/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 + fi + fi done - done - ;; -esac -done - + ;; + esac + done fi if test "${ac_cv_path_install+set}" = set; then @@ -2625,7 +2257,7 @@ INSTALL=$ac_install_sh fi fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "$as_me:2260: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2638,7 +2270,7 @@ # Extract the first word of "ar", so it can be a program name with args. set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2273: 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 @@ -2648,18 +2280,16 @@ ac_cv_path_AR="$AR" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_AR="$ac_dir/$ac_word" + echo "$as_me:2290: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2668,10 +2298,10 @@ AR=$ac_cv_path_AR if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 + echo "$as_me:2301: result: $AR" >&5 echo "${ECHO_T}$AR" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2304: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2679,7 +2309,7 @@ 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 "$as_me:2312: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PERL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2689,18 +2319,16 @@ ac_cv_path_PERL="$PERL" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PERL="$ac_dir/$ac_word" + echo "$as_me:2329: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2709,20 +2337,19 @@ PERL=$ac_cv_path_PERL if test -n "$PERL"; then - echo "$as_me:$LINENO: result: $PERL" >&5 + echo "$as_me:2340: result: $PERL" >&5 echo "${ECHO_T}$PERL" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2343: result: no" >&5 echo "${ECHO_T}no" >&6 fi test -n "$PERL" && break done - # Extract the first word of "ent", so it can be a program name with args. set dummy ent; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2352: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_ENT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2732,18 +2359,16 @@ ac_cv_path_ENT="$ENT" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_ENT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_ENT="$ac_dir/$ac_word" + echo "$as_me:2369: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2752,19 +2377,18 @@ ENT=$ac_cv_path_ENT if test -n "$ENT"; then - echo "$as_me:$LINENO: result: $ENT" >&5 + echo "$as_me:2380: result: $ENT" >&5 echo "${ECHO_T}$ENT" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2383: result: no" >&5 echo "${ECHO_T}no" >&6 fi - for ac_prog in filepriv 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 "$as_me:2391: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FILEPRIV+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2774,19 +2398,16 @@ ac_cv_path_FILEPRIV="$FILEPRIV" # Let the user override the test with a path. ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="/sbin:/usr/sbin" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_FILEPRIV="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="/sbin:/usr/sbin" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_FILEPRIV="$ac_dir/$ac_word" + echo "$as_me:2408: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2795,10 +2416,10 @@ FILEPRIV=$ac_cv_path_FILEPRIV if test -n "$FILEPRIV"; then - echo "$as_me:$LINENO: result: $FILEPRIV" >&5 + echo "$as_me:2419: result: $FILEPRIV" >&5 echo "${ECHO_T}$FILEPRIV" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2422: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -2808,7 +2429,7 @@ # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2432: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2818,18 +2439,16 @@ ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" + echo "$as_me:2449: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2838,16 +2457,16 @@ TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH if test -n "$TEST_MINUS_S_SH"; then - echo "$as_me:$LINENO: result: $TEST_MINUS_S_SH" >&5 + echo "$as_me:2460: result: $TEST_MINUS_S_SH" >&5 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2463: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "ksh", so it can be a program name with args. set dummy ksh; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2469: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2857,18 +2476,16 @@ ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" + echo "$as_me:2486: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2877,16 +2494,16 @@ TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH if test -n "$TEST_MINUS_S_SH"; then - echo "$as_me:$LINENO: result: $TEST_MINUS_S_SH" >&5 + echo "$as_me:2497: result: $TEST_MINUS_S_SH" >&5 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2500: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2506: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_TEST_MINUS_S_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2896,18 +2513,16 @@ ac_cv_path_TEST_MINUS_S_SH="$TEST_MINUS_S_SH" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_TEST_MINUS_S_SH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_TEST_MINUS_S_SH="$ac_dir/$ac_word" + echo "$as_me:2523: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2916,16 +2531,16 @@ TEST_MINUS_S_SH=$ac_cv_path_TEST_MINUS_S_SH if test -n "$TEST_MINUS_S_SH"; then - echo "$as_me:$LINENO: result: $TEST_MINUS_S_SH" >&5 + echo "$as_me:2534: result: $TEST_MINUS_S_SH" >&5 echo "${ECHO_T}$TEST_MINUS_S_SH" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2537: result: no" >&5 echo "${ECHO_T}no" >&6 fi # Extract the first word of "sh", so it can be a program name with args. set dummy sh; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:2543: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_SH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2935,18 +2550,16 @@ ac_cv_path_SH="$SH" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_SH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_SH="$ac_dir/$ac_word" + echo "$as_me:2560: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -2955,14 +2568,13 @@ SH=$ac_cv_path_SH if test -n "$SH"; then - echo "$as_me:$LINENO: result: $SH" >&5 + echo "$as_me:2571: result: $SH" >&5 echo "${ECHO_T}$SH" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2574: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # System features # Check whether --enable-largefile or --disable-largefile was given. if test "${enable_largefile+set}" = set; then @@ -2971,7 +2583,7 @@ fi; if test "$enable_largefile" != no; then - echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 + echo "$as_me:2586: checking for special C compiler options needed for large files" >&5 echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_largefile_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2983,7 +2595,7 @@ # IRIX 6.2 and later do not support large files by default, # so use the C compiler's -n32 option if that helps. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2598 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2994,12 +2606,6 @@ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3009,16 +2615,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2618: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2621: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2624: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2627: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3028,16 +2634,16 @@ rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2637: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2640: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2643: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2646: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -3051,13 +2657,13 @@ rm -f conftest.$ac_ext fi fi -echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:2660: result: $ac_cv_sys_largefile_CC" >&5 echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:2666: checking for _FILE_OFFSET_BITS value needed for large files" >&5 echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_file_offset_bits+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3065,7 +2671,7 @@ while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2674 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -3076,12 +2682,6 @@ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3091,16 +2691,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2694: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2697: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2700: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2703: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3109,7 +2709,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2712 "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -3121,12 +2721,6 @@ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3136,16 +2730,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2733: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2736: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2739: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2742: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -3156,17 +2750,17 @@ break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:2753: result: $ac_cv_sys_file_offset_bits" >&5 echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 if test "$ac_cv_sys_file_offset_bits" != no; then -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 + echo "$as_me:2763: checking for _LARGE_FILES value needed for large files" >&5 echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 if test "${ac_cv_sys_large_files+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3174,7 +2768,7 @@ while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2771 "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -3185,12 +2779,6 @@ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3200,16 +2788,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2791: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2794: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2797: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2800: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -3218,7 +2806,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2809 "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -3230,12 +2818,6 @@ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3245,16 +2827,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2830: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2833: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2836: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2839: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -3265,36 +2847,35 @@ break done fi -echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:2850: result: $ac_cv_sys_large_files" >&5 echo "${ECHO_T}$ac_cv_sys_large_files" >&6 if test "$ac_cv_sys_large_files" != no; then -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 + { { echo "$as_me:2863: error: *** 'ar' missing, please install or fix your \$PATH ***" >&5 echo "$as_me: error: *** 'ar' missing, please install or fix your \$PATH ***" >&2;} { (exit 1); exit 1; }; } fi # Use LOGIN_PROGRAM from environment if possible if test ! -z "$LOGIN_PROGRAM" ; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:2878: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_LOGIN_PROGRAM_FALLBACK+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3304,18 +2885,16 @@ ac_cv_path_LOGIN_PROGRAM_FALLBACK="$LOGIN_PROGRAM_FALLBACK" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_LOGIN_PROGRAM_FALLBACK="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_LOGIN_PROGRAM_FALLBACK="$ac_dir/$ac_word" + echo "$as_me:2895: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -3324,17 +2903,17 @@ LOGIN_PROGRAM_FALLBACK=$ac_cv_path_LOGIN_PROGRAM_FALLBACK if test -n "$LOGIN_PROGRAM_FALLBACK"; then - echo "$as_me:$LINENO: result: $LOGIN_PROGRAM_FALLBACK" >&5 + echo "$as_me:2906: result: $LOGIN_PROGRAM_FALLBACK" >&5 echo "${ECHO_T}$LOGIN_PROGRAM_FALLBACK" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:2909: result: no" >&5 echo "${ECHO_T}no" >&6 fi if test ! -z "$LOGIN_PROGRAM_FALLBACK" ; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:2925: checking for $CC option to accept ANSI C" >&5 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 if test "${ac_cv_prog_cc_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3352,7 +2930,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 2933 "configure" #include "confdefs.h" #include #include @@ -3382,12 +2960,6 @@ int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); int argc; char **argv; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3407,16 +2979,16 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:2982: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2985: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:2988: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:2991: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -3433,15 +3005,15 @@ case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 + echo "$as_me:3008: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:3011: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -echo "$as_me:$LINENO: checking for inline" >&5 +echo "$as_me:3016: checking for inline" >&5 echo $ECHO_N "checking for inline... $ECHO_C" >&6 if test "${ac_cv_c_inline+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -3449,7 +3021,7 @@ ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3024 "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -3458,16 +3030,16 @@ _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:3033: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3036: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3039: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3042: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -3478,18 +3050,18 @@ done fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 +echo "$as_me:3053: result: $ac_cv_c_inline" >&5 echo "${ECHO_T}$ac_cv_c_inline" >&6 case $ac_cv_c_inline in inline | yes) ;; no) -cat >>confdefs.h <<\_ACEOF +cat >>confdefs.h <<\EOF #define inline -_ACEOF +EOF ;; - *) cat >>confdefs.h <<_ACEOF + *) cat >>confdefs.h <&5 + echo "$as_me:3079: checking if linkage editor ($LD) accepts -blibpath" >&5 echo $ECHO_N "checking if linkage editor ($LD) accepts -blibpath... $ECHO_C" >&6 saved_LDFLAGS="$LDFLAGS" LDFLAGS="$LDFLAGS -blibpath:/usr/lib:/lib:/usr/local/lib" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3084 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3527,39 +3093,39 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3096: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3099: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3102: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3105: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:3108: result: yes" >&5 echo "${ECHO_T}yes" >&6 blibpath="/usr/lib:/lib:/usr/local/lib" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:3115: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LDFLAGS="$saved_LDFLAGS" fi - echo "$as_me:$LINENO: checking for authenticate" >&5 + echo "$as_me:3122: checking for authenticate" >&5 echo $ECHO_N "checking for authenticate... $ECHO_C" >&6 if test "${ac_cv_func_authenticate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3128 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char authenticate (); below. */ @@ -3573,12 +3139,6 @@ char authenticate (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3596,16 +3156,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3159: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3162: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3165: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3168: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_authenticate=yes else @@ -3615,77 +3175,77 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_authenticate" >&5 +echo "$as_me:3178: result: $ac_cv_func_authenticate" >&5 echo "${ECHO_T}$ac_cv_func_authenticate" >&6 if test $ac_cv_func_authenticate = yes; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_AIXAUTHENTICATE 1 -_ACEOF +EOF fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_GETADDRINFO 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_REALPATH 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_LASTLOG 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NEEDS_UTMPX 1 -_ACEOF +EOF ;; *-*-cygwin*) LIBS="$LIBS /usr/lib/textmode.o" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_CYGWIN 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IPV4_DEFAULT 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IP_TOS_IS_BROKEN 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define NO_X11_UNIX_SOCKETS 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_FD_PASSING 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SETGROUPS_NOOP 1 -_ACEOF +EOF ;; *-*-dgux*) - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IP_TOS_IS_BROKEN 1 -_ACEOF +EOF ;; *-*-darwin*) - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_GETADDRINFO 1 -_ACEOF +EOF ;; *-*-hpux10.26) @@ -3694,33 +3254,33 @@ fi CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" IPADDR_IN_DISPLAY=yes - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SECUREWARE 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NO_ENDOPT 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NEEDS_UTMPX 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMP 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SPT_TYPE SPT_PSTAT -_ACEOF +EOF LIBS="$LIBS -lxnet -lsec -lsecpw" disable_ptmx_check=yes @@ -3731,62 +3291,62 @@ fi CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" IPADDR_IN_DISPLAY=yes - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NO_ENDOPT 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NEEDS_UTMPX 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMP 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SPT_TYPE SPT_PSTAT -_ACEOF +EOF LIBS="$LIBS -lxnet -lsec" ;; *-*-hpux11*) CPPFLAGS="$CPPFLAGS -D_HPUX_SOURCE -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1" IPADDR_IN_DISPLAY=yes - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define PAM_SUN_CODEBASE 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NO_ENDOPT 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NEEDS_UTMPX 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMP 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SPT_TYPE SPT_PSTAT -_ACEOF +EOF LIBS="$LIBS -lxnet -lsec" ;; @@ -3794,38 +3354,38 @@ CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS" PATH="$PATH:/usr/etc" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_INET_NTOA 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_ABBREV_NO_TTY 1 -_ACEOF +EOF ;; *-*-irix6*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS" PATH="$PATH:/usr/etc" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_IRIX_ARRAY 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_IRIX_PROJECT 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_IRIX_AUDIT 1 -_ACEOF +EOF - echo "$as_me:$LINENO: checking for jlimit_startjob" >&5 + echo "$as_me:3382: checking for jlimit_startjob" >&5 echo $ECHO_N "checking for jlimit_startjob... $ECHO_C" >&6 if test "${ac_cv_func_jlimit_startjob+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3388 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char jlimit_startjob (); below. */ @@ -3839,12 +3399,6 @@ char jlimit_startjob (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -3862,16 +3416,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3419: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3422: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3425: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3428: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_jlimit_startjob=yes else @@ -3881,41 +3435,41 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_jlimit_startjob" >&5 +echo "$as_me:3438: result: $ac_cv_func_jlimit_startjob" >&5 echo "${ECHO_T}$ac_cv_func_jlimit_startjob" >&6 if test $ac_cv_func_jlimit_startjob = yes; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_IRIX_JOBS 1 -_ACEOF +EOF fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_INET_NTOA 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define WITH_ABBREV_NO_TTY 1 -_ACEOF +EOF ;; *-*-linux*) no_dev_ptmx=1 check_for_libcrypt_later=1 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DONT_TRY_OTHER_AF 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define PAM_TTY_KLUDGE 1 -_ACEOF +EOF inet6_default_4in6=yes ;; mips-sony-bsd|mips-sony-newsos4) - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_NEWS4 1 -_ACEOF +EOF SONY=1 ;; @@ -3930,21 +3484,21 @@ conf_utmp_location=/etc/utmp conf_wtmp_location=/usr/adm/wtmp MAIL=/usr/spool/mail - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_NEXT 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_REALPATH 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_SAVED_UIDS 1 -_ACEOF +EOF CPPFLAGS="$CPPFLAGS -I/usr/local/include" CFLAGS="$CFLAGS" @@ -3953,40 +3507,40 @@ CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib -R/usr/local/lib" need_dash_r=1 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define PAM_SUN_CODEBASE 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NEEDS_UTMPX 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LOGIN_NEEDS_TERM 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define PAM_TTY_KLUDGE 1 -_ACEOF +EOF # hardwire lastlog location (can't detect it on some versions) conf_lastlog_location="/var/adm/lastlog" - echo "$as_me:$LINENO: checking for obsolete utmp and wtmp in solaris2.x" >&5 + echo "$as_me:3528: checking for obsolete utmp and wtmp in solaris2.x" >&5 echo $ECHO_N "checking for obsolete utmp and wtmp in solaris2.x... $ECHO_C" >&6 sol2ver=`echo "$host"| sed -e 's/.*[0-9]\.//'` if test "$sol2ver" -ge 8; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:3532: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMP 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_WTMP 1 -_ACEOF +EOF else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:3543: result: no" >&5 echo "${ECHO_T}no" >&6 fi ;; @@ -3996,13 +3550,13 @@ for ac_func in getpwanam do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:3553: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3559 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4016,12 +3570,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4039,16 +3587,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3590: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3593: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3596: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3599: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4058,35 +3606,35 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3609: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define PAM_SUN_CODEBASE 1 -_ACEOF +EOF conf_utmp_location=/etc/utmp conf_wtmp_location=/var/adm/wtmp conf_lastlog_location=/var/adm/lastlog - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF ;; *-ncr-sysv*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" LIBS="$LIBS -lc89" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF ;; *-sni-sysv*) @@ -4094,13 +3642,13 @@ # /usr/ucblib MUST NOT be searched on ReliantUNIX LDFLAGS="$LDFLAGS -L/usr/local/lib" IPADDR_IN_DISPLAY=yes - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IP_TOS_IS_BROKEN 1 -_ACEOF +EOF # /usr/ucblib/libucb.a no longer needed on ReliantUNIX # Attention: always take care to bind libsocket and libnsl before libc, @@ -4109,17 +3657,17 @@ *-*-sysv4.2*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF ;; *-*-sysv5*) CPPFLAGS="$CPPFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF ;; *-*-sysv*) @@ -4132,38 +3680,36 @@ LIBS="$LIBS -los -lprot -lx -ltinfo -lm" RANLIB=true no_dev_ptmx=1 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_SYS_TERMIO_H 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SECUREWARE 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_SAVED_UIDS 1 -_ACEOF - - +EOF for ac_func in getluid setluid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:3706: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3712 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4177,12 +3723,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4200,16 +3740,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3743: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3746: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4219,12 +3759,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3762: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SECUREWARE 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_FD_PASSING 1 -_ACEOF - - +EOF for ac_func in getluid setluid do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:3799: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 3805 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -4278,12 +3816,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4301,16 +3833,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:3836: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3839: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:3842: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:3845: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -4320,12 +3852,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:3855: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_FD_PASSING 1 -_ACEOF +EOF LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" LIBS="$LIBS -lgen -lrsc" ;; *-dec-osf*) - echo "$as_me:$LINENO: checking for Digital Unix SIA" >&5 + echo "$as_me:3882: checking for Digital Unix SIA" >&5 echo $ECHO_N "checking for Digital Unix SIA... $ECHO_C" >&6 no_osfsia="" @@ -4356,7 +3888,7 @@ withval="$with_osfsia" if test "x$withval" = "xno" ; then - echo "$as_me:$LINENO: result: disabled" >&5 + echo "$as_me:3891: result: disabled" >&5 echo "${ECHO_T}disabled" >&6 no_osfsia=1 fi @@ -4364,44 +3896,44 @@ fi; if test -z "$no_osfsia" ; then if test -f /etc/sia/matrix.conf; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:3899: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_OSF_SIA 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_LOGIN 1 -_ACEOF +EOF LIBS="$LIBS -lsecurity -ldb -lm -laud" else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:3911: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi ;; *-*-nto-qnx) - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PIPES 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define NO_X11_UNIX_SOCKETS 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define MISSING_NFDBITS 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define MISSING_HOWMANY 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define MISSING_FD_MASK 1 -_ACEOF +EOF ;; esac @@ -4416,7 +3948,6 @@ CFLAGS="$CFLAGS $withval" fi - fi; # Check whether --with-cppflags or --without-cppflags was given. @@ -4427,7 +3958,6 @@ CPPFLAGS="$CPPFLAGS $withval" fi - fi; # Check whether --with-ldflags or --without-ldflags was given. @@ -4438,7 +3968,6 @@ LDFLAGS="$LDFLAGS $withval" fi - fi; # Check whether --with-libs or --without-libs was given. @@ -4449,32 +3978,39 @@ LIBS="$LIBS $withval" fi - fi; # Checks for header files. -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 +for ac_header in bstring.h crypt.h endian.h floatingpoint.h \ + getopt.h glob.h lastlog.h limits.h login.h \ + login_cap.h maillock.h netdb.h netgroup.h \ + netinet/in_systm.h paths.h pty.h readpassphrase.h \ + rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ + strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ + sys/mman.h sys/select.h sys/stat.h \ + sys/stropts.h sys/sysmacros.h sys/time.h \ + sys/un.h time.h ttyent.h usersec.h \ + util.h utime.h utmp.h utmpx.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:3997: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4003 "configure" #include "confdefs.h" -#include -#include -#include -#include - +#include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4007: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4013: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -4485,362 +4021,45 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no + eval "$as_ac_Header=no" fi rm -f conftest.err 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 -#line $LINENO "configure" -#include "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 -#line $LINENO "configure" -#include "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* +echo "$as_me:4032: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking for yp_match... $ECHO_C" >&6 +if test "${ac_cv_func_yp_match+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4049 "configure" #include "confdefs.h" -#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)) +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char yp_match (); below. */ +#include +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char yp_match (); +char (*f) (); -#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); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&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 -cat conftest.$ac_ext >&5 -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core core.* *.core 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 eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" -fi -rm -f conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 bstring.h crypt.h endian.h floatingpoint.h \ - getopt.h glob.h lastlog.h limits.h login.h \ - login_cap.h maillock.h netdb.h netgroup.h \ - netinet/in_systm.h paths.h pty.h readpassphrase.h \ - rpc/types.h security/pam_appl.h shadow.h stddef.h stdint.h \ - strings.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h \ - sys/mman.h sys/select.h sys/stat.h \ - sys/stropts.h sys/sysmacros.h sys/time.h \ - sys/un.h time.h ttyent.h usersec.h \ - util.h utime.h utmp.h utmpx.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f 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 -#line $LINENO "configure" -#include "confdefs.h" -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - egrep -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; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 - cat 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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 - - -# Checks for libraries. -echo "$as_me:$LINENO: checking for yp_match" >&5 -echo $ECHO_N "checking for yp_match... $ECHO_C" >&6 -if test "${ac_cv_func_yp_match+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char yp_match (); below. */ -#include -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char yp_match (); -char (*f) (); - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4858,16 +4077,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4080: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4083: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4086: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4089: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_yp_match=yes else @@ -4877,13 +4096,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_yp_match" >&5 +echo "$as_me:4099: result: $ac_cv_func_yp_match" >&5 echo "${ECHO_T}$ac_cv_func_yp_match" >&6 if test $ac_cv_func_yp_match = yes; then : else -echo "$as_me:$LINENO: checking for yp_match in -lnsl" >&5 +echo "$as_me:4105: checking for yp_match in -lnsl" >&5 echo $ECHO_N "checking for yp_match in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_yp_match+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4891,7 +4110,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4113 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -4901,12 +4120,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char yp_match (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4916,16 +4129,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4132: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4135: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4138: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4141: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_yp_match=yes else @@ -4936,12 +4149,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_yp_match" >&5 +echo "$as_me:4152: result: $ac_cv_lib_nsl_yp_match" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_yp_match" >&6 if test $ac_cv_lib_nsl_yp_match = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:4165: checking for setsockopt" >&5 echo $ECHO_N "checking for setsockopt... $ECHO_C" >&6 if test "${ac_cv_func_setsockopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4171 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char setsockopt (); below. */ @@ -4969,12 +4182,6 @@ char setsockopt (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -4992,16 +4199,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4202: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4205: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4208: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4211: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_setsockopt=yes else @@ -5011,13 +4218,13 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_setsockopt" >&5 +echo "$as_me:4221: result: $ac_cv_func_setsockopt" >&5 echo "${ECHO_T}$ac_cv_func_setsockopt" >&6 if test $ac_cv_func_setsockopt = yes; then : else -echo "$as_me:$LINENO: checking for setsockopt in -lsocket" >&5 +echo "$as_me:4227: checking for setsockopt in -lsocket" >&5 echo $ECHO_N "checking for setsockopt in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_setsockopt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5025,7 +4232,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4235 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5035,12 +4242,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char setsockopt (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5050,16 +4251,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4254: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4257: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4260: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4263: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_setsockopt=yes else @@ -5070,12 +4271,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_socket_setsockopt" >&5 +echo "$as_me:4274: result: $ac_cv_lib_socket_setsockopt" >&5 echo "${ECHO_T}$ac_cv_lib_socket_setsockopt" >&6 if test $ac_cv_lib_socket_setsockopt = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + echo "$as_me:4289: checking for innetgr in -lrpc" >&5 echo $ECHO_N "checking for innetgr in -lrpc... $ECHO_C" >&6 if test "${ac_cv_lib_rpc_innetgr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5094,7 +4294,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lrpc -lyp -lrpc $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4297 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5104,12 +4304,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char innetgr (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5119,16 +4313,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4316: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4319: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4322: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4325: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_rpc_innetgr=yes else @@ -5139,7 +4333,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_rpc_innetgr" >&5 +echo "$as_me:4336: result: $ac_cv_lib_rpc_innetgr" >&5 echo "${ECHO_T}$ac_cv_lib_rpc_innetgr" >&6 if test $ac_cv_lib_rpc_innetgr = yes; then LIBS="-lrpc -lyp -lrpc $LIBS" @@ -5148,13 +4342,13 @@ fi fi -echo "$as_me:$LINENO: checking for getspnam" >&5 +echo "$as_me:4345: checking for getspnam" >&5 echo $ECHO_N "checking for getspnam... $ECHO_C" >&6 if test "${ac_cv_func_getspnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4351 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getspnam (); below. */ @@ -5168,12 +4362,6 @@ char getspnam (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5191,16 +4379,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4382: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4385: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4391: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getspnam=yes else @@ -5210,12 +4398,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getspnam" >&5 +echo "$as_me:4401: result: $ac_cv_func_getspnam" >&5 echo "${ECHO_T}$ac_cv_func_getspnam" >&6 if test $ac_cv_func_getspnam = yes; then : else - echo "$as_me:$LINENO: checking for getspnam in -lgen" >&5 + echo "$as_me:4406: checking for getspnam in -lgen" >&5 echo $ECHO_N "checking for getspnam in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_getspnam+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5223,7 +4411,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4414 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5233,12 +4421,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getspnam (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5248,16 +4430,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4433: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4436: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4439: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4442: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_getspnam=yes else @@ -5268,7 +4450,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gen_getspnam" >&5 +echo "$as_me:4453: result: $ac_cv_lib_gen_getspnam" >&5 echo "${ECHO_T}$ac_cv_lib_gen_getspnam" >&6 if test $ac_cv_lib_gen_getspnam = yes; then LIBS="$LIBS -lgen" @@ -5276,8 +4458,6 @@ fi - - # Check whether --with-rpath or --without-rpath was given. if test "${with_rpath+set}" = set; then withval="$with_rpath" @@ -5289,16 +4469,14 @@ need_dash_r=1 fi - fi; - # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" if test "x$withval" = "xno" ; then - { { echo "$as_me:$LINENO: error: *** zlib is required ***" >&5 + { { echo "$as_me:4479: error: *** zlib is required ***" >&5 echo "$as_me: error: *** zlib is required ***" >&2;} { (exit 1); exit 1; }; } fi @@ -5321,11 +4499,9 @@ CPPFLAGS="-I${withval} ${CPPFLAGS}" fi - fi; - -echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +echo "$as_me:4504: checking for deflate in -lz" >&5 echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 if test "${ac_cv_lib_z_deflate+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5333,7 +4509,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4512 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5343,12 +4519,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char deflate (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5358,16 +4528,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4531: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4534: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4537: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4540: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_z_deflate=yes else @@ -5378,29 +4548,28 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +echo "$as_me:4551: result: $ac_cv_lib_z_deflate" >&5 echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 if test $ac_cv_lib_z_deflate = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { { echo "$as_me:4561: error: *** zlib missing - please install first or check config.log ***" >&5 echo "$as_me: error: *** zlib missing - please install first or check config.log ***" >&2;} { (exit 1); exit 1; }; } fi - -echo "$as_me:$LINENO: checking for strcasecmp" >&5 +echo "$as_me:4566: checking for strcasecmp" >&5 echo $ECHO_N "checking for strcasecmp... $ECHO_C" >&6 if test "${ac_cv_func_strcasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4572 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char strcasecmp (); below. */ @@ -5414,12 +4583,6 @@ char strcasecmp (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5437,16 +4600,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4603: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4606: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4609: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4612: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_strcasecmp=yes else @@ -5456,12 +4619,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_strcasecmp" >&5 +echo "$as_me:4622: result: $ac_cv_func_strcasecmp" >&5 echo "${ECHO_T}$ac_cv_func_strcasecmp" >&6 if test $ac_cv_func_strcasecmp = yes; then : else - echo "$as_me:$LINENO: checking for strcasecmp in -lresolv" >&5 + echo "$as_me:4627: checking for strcasecmp in -lresolv" >&5 echo $ECHO_N "checking for strcasecmp in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_strcasecmp+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5469,7 +4632,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4635 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5479,12 +4642,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strcasecmp (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5494,16 +4651,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4654: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4657: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4660: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4663: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_strcasecmp=yes else @@ -5514,22 +4671,21 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "$as_me:4674: result: $ac_cv_lib_resolv_strcasecmp" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_strcasecmp" >&6 if test $ac_cv_lib_resolv_strcasecmp = yes; then LIBS="$LIBS -lresolv" fi - fi -echo "$as_me:$LINENO: checking for utimes" >&5 +echo "$as_me:4682: checking for utimes" >&5 echo $ECHO_N "checking for utimes... $ECHO_C" >&6 if test "${ac_cv_func_utimes+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4688 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char utimes (); below. */ @@ -5543,12 +4699,6 @@ char utimes (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5566,16 +4716,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4719: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4722: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4725: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4728: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_utimes=yes else @@ -5585,12 +4735,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_utimes" >&5 +echo "$as_me:4738: result: $ac_cv_func_utimes" >&5 echo "${ECHO_T}$ac_cv_func_utimes" >&6 if test $ac_cv_func_utimes = yes; then : else - echo "$as_me:$LINENO: checking for utimes in -lc89" >&5 + echo "$as_me:4743: checking for utimes in -lc89" >&5 echo $ECHO_N "checking for utimes in -lc89... $ECHO_C" >&6 if test "${ac_cv_lib_c89_utimes+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5598,7 +4748,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lc89 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4751 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5608,12 +4758,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char utimes (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5623,16 +4767,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4770: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4773: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4776: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4779: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_c89_utimes=yes else @@ -5643,75 +4787,34 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_c89_utimes" >&5 +echo "$as_me:4790: result: $ac_cv_lib_c89_utimes" >&5 echo "${ECHO_T}$ac_cv_lib_c89_utimes" >&6 if test $ac_cv_lib_c89_utimes = yes; then LIBS="$LIBS -lc89" fi - fi - - for ac_header in libutil.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:4801: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f 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 -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 4807 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:4811: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4817: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -5722,52 +4825,25 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$as_ac_Header=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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:4836: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:4846: checking for library containing login" >&5 echo $ECHO_N "checking for library containing login... $ECHO_C" >&6 if test "${ac_cv_search_login+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5775,7 +4851,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_login=no cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4854 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5785,12 +4861,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char login (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5800,16 +4870,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4873: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4876: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4879: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4882: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_login="none required" else @@ -5821,7 +4891,7 @@ for ac_lib in util bsd; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4894 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5831,12 +4901,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char login (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5846,16 +4910,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4913: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4916: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4919: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4922: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_login="-l$ac_lib" break @@ -5868,29 +4932,26 @@ fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_search_login" >&5 +echo "$as_me:4935: result: $ac_cv_search_login" >&5 echo "${ECHO_T}$ac_cv_search_login" >&6 if test "$ac_cv_search_login" != no; then test "$ac_cv_search_login" = "none required" || LIBS="$ac_cv_search_login $LIBS" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_LOGIN 1 -_ACEOF +EOF fi - - - for ac_func in logout updwtmp logwtmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:4948: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 4954 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5904,12 +4965,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -5927,16 +4982,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:4985: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4988: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:4991: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:4994: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5946,28 +5001,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5004: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:5017: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5023 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5981,12 +5034,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6004,16 +5051,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5054: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5057: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5060: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5063: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6023,16 +5070,16 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5073: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:5082: checking for strftime in -lintl" >&5 echo $ECHO_N "checking for strftime in -lintl... $ECHO_C" >&6 if test "${ac_cv_lib_intl_strftime+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6040,7 +5087,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lintl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5090 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6050,12 +5097,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char strftime (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6065,16 +5106,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5115: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5118: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_intl_strftime=yes else @@ -6085,12 +5126,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_intl_strftime" >&5 +echo "$as_me:5129: result: $ac_cv_lib_intl_strftime" >&5 echo "${ECHO_T}$ac_cv_lib_intl_strftime" >&6 if test $ac_cv_lib_intl_strftime = yes; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_STRFTIME 1 -_ACEOF +EOF LIBS="-lintl $LIBS" fi @@ -6098,12 +5139,11 @@ fi done - # Check for ALTDIRFUNC glob() extension -echo "$as_me:$LINENO: checking for GLOB_ALTDIRFUNC support" >&5 +echo "$as_me:5143: checking for GLOB_ALTDIRFUNC support" >&5 echo $ECHO_N "checking for GLOB_ALTDIRFUNC support... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5146 "configure" #include "confdefs.h" #include @@ -6115,28 +5155,26 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "FOUNDIT" >/dev/null 2>&1; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define GLOB_HAS_ALTDIRFUNC 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:5162: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:5167: result: no" >&5 echo "${ECHO_T}no" >&6 - fi rm -f conftest* - # Check for g.gl_matchc glob() extension -echo "$as_me:$LINENO: checking for gl_matchc field in glob_t" >&5 +echo "$as_me:5174: checking for gl_matchc field in glob_t" >&5 echo $ECHO_N "checking for gl_matchc field in glob_t... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5177 "configure" #include "confdefs.h" #include @@ -6146,32 +5184,30 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | egrep "FOUNDIT" >/dev/null 2>&1; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define GLOB_HAS_GL_MATCHC 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:5191: result: yes" >&5 echo "${ECHO_T}yes" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:5196: result: no" >&5 echo "${ECHO_T}no" >&6 - fi rm -f conftest* - -echo "$as_me:$LINENO: checking whether struct dirent allocates space for d_name" >&5 +echo "$as_me:5202: checking whether struct dirent allocates space for d_name" >&5 echo $ECHO_N "checking whether struct dirent allocates space for d_name... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:5205: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5210 "configure" #include "confdefs.h" #include @@ -6180,36 +5216,161 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5219: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5222: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:5229: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:5236: result: no" >&5 echo "${ECHO_T}no" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_ONE_BYTE_DIRENT_D_NAME 1 -_ACEOF - - +EOF fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi +# Check whether the user wants GSI (Globus) support +gsi_path="no" + +# Check whether --with-gsi or --without-gsi was given. +if test "${with_gsi+set}" = set; then + withval="$with_gsi" + + gsi_path="$withval" + +fi; + +# Check whether --with-globus or --without-globus was given. +if test "${with_globus+set}" = set; then + withval="$with_globus" + + gsi_path="$withval" + +fi; + +# Check whether the user has a Globus flavor type +globus_flavor_type="no" + +# Check whether --with-globus-flavor or --without-globus-flavor was given. +if test "${with_globus_flavor+set}" = set; then + withval="$with_globus_flavor" + + globus_flavor_type="$withval" + +fi; + +if test "x$gsi_path" != "xno" ; then + # Globus GSSAPI configuration + cat >>confdefs.h <<\EOF +#define GSSAPI 1 +EOF + + cat >>confdefs.h <<\EOF +#define GSI 1 +EOF + + # Find GLOBUS/GSI installation Directory + echo "$as_me:5287: checking for Globus/GSI installation directory" >&5 +echo $ECHO_N "checking for Globus/GSI installation directory... $ECHO_C" >&6 + + globus_install_dir=$gsi_path + + if test "x$globus_install_dir" = "xyes" ; then + { { echo "$as_me:5293: error: Cannot find Globus/GSI installation directory -- a path must be specified!" >&5 +echo "$as_me: error: Cannot find Globus/GSI installation directory -- a path must be specified!" >&2;} + { (exit 1); exit 1; }; } + fi + echo "$as_me:5297: result: $globus_install_dir" >&5 +echo "${ECHO_T}$globus_install_dir" >&6 + + # Find GLOBUS/GSI development directory + echo "$as_me:5301: checking for Globus/GSI development directory" >&5 +echo $ECHO_N "checking for Globus/GSI development directory... $ECHO_C" >&6 + + if test -d ${globus_install_dir}/lib ; then + # Looks like a flat directory structure from configure/make + # and not globus-install or gsi-install + globus_dev_dir=$globus_install_dir + + else + # Assume a true globus installation with architecture + # directories and run globus-development-path to find + # the development directory + + # Set GLOBUS_INSTALL_PATH + GLOBUS_INSTALL_PATH=$globus_install_dir + export GLOBUS_INSTALL_PATH + + dev_path_program=${globus_install_dir}/bin/globus-development-path + + if test ! -x ${dev_path_program} ; then + { { echo "$as_me:5321: error: Cannot find Globus/GSI installation directory: program ${dev_path_program} does not exist or is not executable" >&5 +echo "$as_me: error: Cannot find Globus/GSI installation directory: program ${dev_path_program} does not exist or is not executable" >&2;} + { (exit 1); exit 1; }; } + fi + + globus_dev_dir=`${dev_path_program}` + + if test -z "$globus_dev_dir" -o "X$globus_dev_dir" = "X" ; then + { { echo "$as_me:5329: error: Cannot find Globus/GSI development directory" >&5 +echo "$as_me: error: Cannot find Globus/GSI development directory" >&2;} + { (exit 1); exit 1; }; } + fi + + if test ! -d "$globus_dev_dir" ; then + { { echo "$as_me:5335: error: Cannot find Globus/GSI development directory: $globus_dev_dir does not exist" >&5 +echo "$as_me: error: Cannot find Globus/GSI development directory: $globus_dev_dir does not exist" >&2;} + { (exit 1); exit 1; }; } + fi + fi + echo "$as_me:5340: result: $globus_dev_dir" >&5 +echo "${ECHO_T}$globus_dev_dir" >&6 + + # Find GLOBUS/GSI flavor Directory + echo "$as_me:5344: checking for Globus flavor type" >&5 +echo $ECHO_N "checking for Globus flavor type... $ECHO_C" >&6 + + if test "x$globus_flavor_type" = "xno" ; then + GSI_LIBS="-lglobus_gss_assist -lglobus_gss -lglobus_gaa" + GSI_LDFLAGS="-L${globus_dev_dir}/lib" + GSI_CFLAGS="-I${globus_dev_dir}/include" + echo "$as_me:5351: result: none" >&5 +echo "${ECHO_T}none" >&6 + else + GLOBUS_FLAVOR_TYPE_INCL_DIR="${globus_dev_dir}/include/${globus_flavor_type}" + + if test ! -d "$GLOBUS_FLAVOR_TYPE_INCL_DIR" ; then + { { echo "$as_me:5357: error: Cannot find Globus flavor-specific include directory: ${GLOBUS_FLAVOR_TYPE_INCL_DIR}" >&5 +echo "$as_me: error: Cannot find Globus flavor-specific include directory: ${GLOBUS_FLAVOR_TYPE_INCL_DIR}" >&2;} + { (exit 1); exit 1; }; } + fi + + echo "$as_me:5362: result: $globus_flavor_type" >&5 +echo "${ECHO_T}$globus_flavor_type" >&6 + GSI_LIBS="${gsi_path}/lib/libglobus_gss_assist_${globus_flavor_type}.a ${gsi_path}/lib/libglobus_gssapi_gsi_${globus_flavor_type}.a" + GSI_CFLAGS="-I${GLOBUS_FLAVOR_TYPE_INCL_DIR}" + fi + + LIBS="$LIBS $GSI_LIBS" + LDFLAGS="$LDFLAGS $GSI_LDFLAGS" + CFLAGS="$CFLAGS $GSI_CFLAGS" +# End Globus/GSI section +fi + # Check whether user wants S/Key support SKEY_MSG="no" @@ -6224,22 +5385,22 @@ LDFLAGS="$LDFLAGS -L${withval}/lib" fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SKEY 1 -_ACEOF +EOF LIBS="-lskey $LIBS" SKEY_MSG="yes" - echo "$as_me:$LINENO: checking for s/key support" >&5 + echo "$as_me:5395: checking for s/key support" >&5 echo $ECHO_N "checking for s/key support... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:5398: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5403 "configure" #include "confdefs.h" #include @@ -6248,27 +5409,26 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5412: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5415: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5417: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5420: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:5422: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:5429: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: ** Incomplete or missing s/key libraries." >&5 + { { echo "$as_me:5431: error: ** Incomplete or missing s/key libraries." >&5 echo "$as_me: error: ** Incomplete or missing s/key libraries." >&2;} { (exit 1); exit 1; }; } @@ -6277,7 +5437,6 @@ fi fi - fi; # Check whether user wants TCP wrappers support @@ -6313,21 +5472,15 @@ fi LIBWRAP="-lwrap" LIBS="$LIBWRAP $LIBS" - echo "$as_me:$LINENO: checking for libwrap" >&5 + echo "$as_me:5475: checking for libwrap" >&5 echo $ECHO_N "checking for libwrap... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5478 "configure" #include "confdefs.h" #include int deny_severity = 0, allow_severity = 0; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6337,24 +5490,23 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5493: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5496: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5499: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5502: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:5505: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define LIBWRAP 1 -_ACEOF - +EOF TCPW_MSG="yes" @@ -6362,86 +5514,17 @@ echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: *** libwrap missing" >&5 + { { echo "$as_me:5517: error: *** libwrap missing" >&5 echo "$as_me: error: *** libwrap missing" >&2;} { (exit 1); exit 1; }; } - fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS="$saved_LIBS" fi - fi; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - for ac_func in arc4random b64_ntop bcopy bindresvport_sa \ clock fchmod fchown freeaddrinfo futimes gai_strerror \ getaddrinfo getcwd getgrouplist getnameinfo getopt \ @@ -6455,13 +5538,13 @@ truncate utimes vhangup vsnprintf waitpid __b64_ntop _getpty do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:5541: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5547 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6475,12 +5558,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6498,16 +5575,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5578: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5581: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5584: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5587: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6517,27 +5594,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5597: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:5608: checking for mmap anon shared" >&5 echo $ECHO_N "checking for mmap anon shared... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:5611: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5616 "configure" #include "confdefs.h" #include @@ -6554,30 +5630,28 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5633: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5636: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5638: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5641: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:5644: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_MMAP_ANON_SHARED 1 -_ACEOF - +EOF else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:5654: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -6585,17 +5659,16 @@ fi fi - for ac_func in dirname do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:5665: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5671 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6609,12 +5682,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6632,16 +5699,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5702: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5705: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5708: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5711: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6651,71 +5718,33 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:5721: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:5731: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f 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 -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 5737 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5741: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5747: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6726,54 +5755,27 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$as_ac_Header=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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:5766: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + echo "$as_me:5778: checking for dirname in -lgen" >&5 echo $ECHO_N "checking for dirname in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_dirname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6781,7 +5783,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lgen $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5786 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6791,12 +5793,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dirname (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -6806,16 +5802,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5805: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5808: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5811: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5814: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_gen_dirname=yes else @@ -6826,11 +5822,11 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_gen_dirname" >&5 +echo "$as_me:5825: result: $ac_cv_lib_gen_dirname" >&5 echo "${ECHO_T}$ac_cv_lib_gen_dirname" >&6 if test $ac_cv_lib_gen_dirname = yes; then - echo "$as_me:$LINENO: checking for broken dirname" >&5 + echo "$as_me:5829: checking for broken dirname" >&5 echo $ECHO_N "checking for broken dirname... $ECHO_C" >&6 if test "${ac_cv_have_broken_dirname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6839,12 +5835,12 @@ save_LIBS="$LIBS" LIBS="$LIBS -lgen" if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:5838: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5843 "configure" #include "confdefs.h" #include @@ -6864,22 +5860,21 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5863: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5866: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5868: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5871: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_broken_dirname="no" else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) ac_cv_have_broken_dirname="yes" fi @@ -6888,73 +5883,34 @@ LIBS="$save_LIBS" fi -echo "$as_me:$LINENO: result: $ac_cv_have_broken_dirname" >&5 +echo "$as_me:5886: result: $ac_cv_have_broken_dirname" >&5 echo "${ECHO_T}$ac_cv_have_broken_dirname" >&6 if test "x$ac_cv_have_broken_dirname" = "xno" ; then LIBS="$LIBS -lgen" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_DIRNAME 1 -_ACEOF - +EOF for ac_header in libgen.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:5897: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f 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 -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 5903 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:5907: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5913: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -6965,72 +5921,41 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$as_ac_Header=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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 +echo "$as_me:5932: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo "$as_me:5952: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 5958 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7044,12 +5969,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7067,16 +5986,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:5989: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5992: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:5995: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:5998: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7086,32 +6005,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6008: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:6021: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6027 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7125,12 +6038,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7148,16 +6055,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6058: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6061: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6064: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6067: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7167,27 +6074,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6077: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:6090: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6096 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7201,12 +6107,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7224,16 +6124,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6127: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6130: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6133: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6136: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7243,31 +6143,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6146: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:6159: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6165 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7281,12 +6176,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7304,16 +6193,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6196: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6199: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6202: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6205: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7323,28 +6212,26 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6215: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:6228: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6234 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7358,12 +6245,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7381,16 +6262,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6265: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6268: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6271: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6274: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -7400,24 +6281,23 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:6284: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:6294: checking for daemon" >&5 echo $ECHO_N "checking for daemon... $ECHO_C" >&6 if test "${ac_cv_func_daemon+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6300 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char daemon (); below. */ @@ -7431,12 +6311,6 @@ char daemon (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7454,16 +6328,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6331: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6334: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6337: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6340: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_daemon=yes else @@ -7473,15 +6347,15 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_daemon" >&5 +echo "$as_me:6350: result: $ac_cv_func_daemon" >&5 echo "${ECHO_T}$ac_cv_func_daemon" >&6 if test $ac_cv_func_daemon = yes; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_DAEMON 1 -_ACEOF +EOF else - echo "$as_me:$LINENO: checking for daemon in -lbsd" >&5 + echo "$as_me:6358: checking for daemon in -lbsd" >&5 echo $ECHO_N "checking for daemon in -lbsd... $ECHO_C" >&6 if test "${ac_cv_lib_bsd_daemon+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7489,7 +6363,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6366 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7499,12 +6373,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char daemon (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7514,16 +6382,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6385: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_bsd_daemon=yes else @@ -7534,26 +6402,24 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_daemon" >&5 +echo "$as_me:6405: result: $ac_cv_lib_bsd_daemon" >&5 echo "${ECHO_T}$ac_cv_lib_bsd_daemon" >&6 if test $ac_cv_lib_bsd_daemon = yes; then - LIBS="$LIBS -lbsd"; cat >>confdefs.h <<\_ACEOF + LIBS="$LIBS -lbsd"; cat >>confdefs.h <<\EOF #define HAVE_DAEMON 1 -_ACEOF +EOF fi - fi - -echo "$as_me:$LINENO: checking for getpagesize" >&5 +echo "$as_me:6416: checking for getpagesize" >&5 echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6 if test "${ac_cv_func_getpagesize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6422 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char getpagesize (); below. */ @@ -7567,12 +6433,6 @@ char getpagesize (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7590,16 +6450,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6453: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6456: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6459: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6462: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_getpagesize=yes else @@ -7609,15 +6469,15 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_func_getpagesize" >&5 +echo "$as_me:6472: result: $ac_cv_func_getpagesize" >&5 echo "${ECHO_T}$ac_cv_func_getpagesize" >&6 if test $ac_cv_func_getpagesize = yes; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_GETPAGESIZE 1 -_ACEOF +EOF else - echo "$as_me:$LINENO: checking for getpagesize in -lucb" >&5 + echo "$as_me:6480: checking for getpagesize in -lucb" >&5 echo $ECHO_N "checking for getpagesize in -lucb... $ECHO_C" >&6 if test "${ac_cv_lib_ucb_getpagesize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7625,7 +6485,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lucb $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6488 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -7635,12 +6495,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getpagesize (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7650,16 +6504,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6507: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6510: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6513: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6516: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_ucb_getpagesize=yes else @@ -7670,30 +6524,28 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_ucb_getpagesize" >&5 +echo "$as_me:6527: result: $ac_cv_lib_ucb_getpagesize" >&5 echo "${ECHO_T}$ac_cv_lib_ucb_getpagesize" >&6 if test $ac_cv_lib_ucb_getpagesize = yes; then - LIBS="$LIBS -lucb"; cat >>confdefs.h <<\_ACEOF + LIBS="$LIBS -lucb"; cat >>confdefs.h <<\EOF #define HAVE_GETPAGESIZE 1 -_ACEOF +EOF fi - fi - # Check for broken snprintf if test "x$ac_cv_func_snprintf" = "xyes" ; then - echo "$as_me:$LINENO: checking whether snprintf correctly terminates long strings" >&5 + echo "$as_me:6540: checking whether snprintf correctly terminates long strings" >&5 echo $ECHO_N "checking whether snprintf correctly terminates long strings... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:6543: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 6548 "configure" #include "confdefs.h" #include @@ -7701,254 +6553,531 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:6556: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6559: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:6561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6564: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:6566: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:6573: result: no" >&5 echo "${ECHO_T}no" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_SNPRINTF 1 -_ACEOF +EOF - { echo "$as_me:$LINENO: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5 + { echo "$as_me:6579: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&5 echo "$as_me: WARNING: ****** Your snprintf() function is broken, complain to your vendor" >&2;} - fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:$LINENO: checking whether getpgrp requires zero arguments" >&5 -echo $ECHO_N "checking whether getpgrp requires zero arguments... $ECHO_C" >&6 -if test "${ac_cv_func_getpgrp_void+set}" = set; then +echo "$as_me:6587: 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 - # Use it with a single arg. -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 6593 "configure" #include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -getpgrp (0); - ; - return 0; -} +#include +#include +#include +#include + _ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 +if { (eval echo "$as_me:6601: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_func_getpgrp_void=no + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:6607: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_cv_func_getpgrp_void=yes + cat conftest.$ac_ext >&5 + ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_getpgrp_void" >&5 -echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 -if test $ac_cv_func_getpgrp_void = yes; then +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 +#line 6629 "configure" +#include "confdefs.h" +#include -cat >>confdefs.h <<\_ACEOF -#define GETPGRP_VOID 1 _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 -# Check for PAM libs -PAM_MSG="no" - -# Check whether --with-pam or --without-pam was given. -if test "${with_pam+set}" = set; then - withval="$with_pam" +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 +#line 6647 "configure" +#include "confdefs.h" +#include - if test "x$withval" != "xno" ; then - if test "x$ac_cv_header_security_pam_appl_h" != "xyes" ; then - { { echo "$as_me:$LINENO: error: PAM headers not found" >&5 -echo "$as_me: error: PAM headers not found" >&2;} - { (exit 1); exit 1; }; } - fi +_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 -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 +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 - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 6668 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char dlopen (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } +#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 () { -dlopen (); - ; - return 0; + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); } _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6694: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + echo "$as_me:6697: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6699: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6702: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dl_dlopen=yes + : else - echo "$as_me: failed program was:" >&5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dl_dlopen=no +ac_cv_header_stdc=no fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -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 - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBDL 1 -_ACEOF +fi +fi +echo "$as_me:6715: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 +if test $ac_cv_header_stdc = yes; then - LIBS="-ldl $LIBS" +cat >>confdefs.h <<\EOF +#define STDC_HEADERS 1 +EOF fi +# On IRIX 5.3, sys/types and inttypes.h are conflicting. -echo "$as_me:$LINENO: checking for pam_set_item in -lpam" >&5 -echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6 -if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then +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:6731: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpam $LIBS" -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 6737 "configure" #include "confdefs.h" - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pam_set_item (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -pam_set_item (); - ; - return 0; -} +$ac_includes_default +#include <$ac_header> _ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6743: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6746: \$? = $ac_status" >&5 (exit $ac_status); } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6749: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:6752: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_pam_pam_set_item=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_pam_pam_set_item=no +eval "$as_ac_Header=no" fi -rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_set_item" >&5 -echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6 -if test $ac_cv_lib_pam_pam_set_item = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBPAM 1 +echo "$as_me:6762: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo $ECHO_N "checking whether getpgrp takes no argument... $ECHO_C" >&6 +if test "${ac_cv_func_getpgrp_void+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # Use it with a single arg. +cat >conftest.$ac_ext <<_ACEOF +#line 6779 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +getpgrp (0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6791: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6794: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6797: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6800: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_func_getpgrp_1=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_func_getpgrp_1=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# Use it with no arg. +cat >conftest.$ac_ext <<_ACEOF +#line 6811 "configure" +#include "confdefs.h" +$ac_includes_default +int +main () +{ +getpgrp (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:6823: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:6826: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:6829: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6832: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_func_getpgrp_0=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_func_getpgrp_0=no +fi +rm -f conftest.$ac_objext conftest.$ac_ext +# If both static checks agree, we are done. +case $ac_func_getpgrp_0:$ac_func_getpgrp_1 in + yes:no) ac_cv_func_getpgrp_void=yes;; + no:yes) ac_cv_func_getpgrp_void=false;; + *) if test "$cross_compiling" = yes; then + { { echo "$as_me:6846: error: cannot check getpgrp if cross compiling" >&5 +echo "$as_me: error: cannot check getpgrp if cross compiling" >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +#line 6851 "configure" +#include "confdefs.h" +$ac_includes_default + +/* + * If this system has a BSD-style getpgrp(), + * which takes a pid argument, exit unsuccessfully. + * + * Snarfed from Chet Ramey's bash pgrp.c test program + */ + +int pid; +int pg1, pg2, pg3, pg4; +int ng, np, s, child; + +int +main () +{ + pid = getpid (); + pg1 = getpgrp (0); + pg2 = getpgrp (); + pg3 = getpgrp (pid); + pg4 = getpgrp (1); + + /* If all of these values are the same, it's pretty sure that we're + on a system that ignores getpgrp's first argument. */ + if (pg2 == pg4 && pg1 == pg3 && pg2 == pg3) + exit (0); + + child = fork (); + if (child < 0) + exit(1); + else if (child == 0) + { + np = getpid (); + /* If this is Sys V, this will not work; pgrp will be set to np + because setpgrp just changes a pgrp to be the same as the + pid. */ + setpgrp (np, pg1); + ng = getpgrp (0); /* Same result for Sys V and BSD */ + if (ng == pg1) + exit (1); + else + exit (0); + } + else + { + wait (&s); + exit (s>>8); + } +} + +_ACEOF +rm -f conftest$ac_exeext +if { (eval echo "$as_me:6905: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6908: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:6910: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6913: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_getpgrp_void=yes +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_func_getpgrp_void=no +fi +rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +fi;; +esac # $ac_func_getpgrp_0:$ac_func_getpgrp_1 + +fi +echo "$as_me:6927: result: $ac_cv_func_getpgrp_void" >&5 +echo "${ECHO_T}$ac_cv_func_getpgrp_void" >&6 +if test $ac_cv_func_getpgrp_void = yes; then + +cat >>confdefs.h <<\EOF +#define GETPGRP_VOID 1 +EOF + +fi + +# Check for PAM libs +PAM_MSG="no" + +# Check whether --with-pam or --without-pam was given. +if test "${with_pam+set}" = set; then + withval="$with_pam" + + if test "x$withval" != "xno" ; then + if test "x$ac_cv_header_security_pam_appl_h" != "xyes" ; then + { { echo "$as_me:6946: error: PAM headers not found" >&5 +echo "$as_me: error: PAM headers not found" >&2;} + { (exit 1); exit 1; }; } + fi + +echo "$as_me:6951: 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_check_lib_save_LIBS=$LIBS +LIBS="-ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 6959 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char dlopen (); +int +main () +{ +dlopen (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:6978: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:6981: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:6984: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:6987: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_dl_dlopen=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_dl_dlopen=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:6998: 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 + cat >>confdefs.h <&5 +echo $ECHO_N "checking for pam_set_item in -lpam... $ECHO_C" >&6 +if test "${ac_cv_lib_pam_pam_set_item+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpam $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 7017 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pam_set_item (); +int +main () +{ +pam_set_item (); + ; + return 0; +} _ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7036: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7039: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7042: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7045: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_pam_pam_set_item=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_pam_pam_set_item=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:7056: result: $ac_cv_lib_pam_pam_set_item" >&5 +echo "${ECHO_T}$ac_cv_lib_pam_pam_set_item" >&6 +if test $ac_cv_lib_pam_pam_set_item = yes; then + cat >>confdefs.h <&5 + { { echo "$as_me:7066: error: *** libpam missing" >&5 echo "$as_me: error: *** libpam missing" >&2;} { (exit 1); exit 1; }; } fi - for ac_func in pam_getenvlist do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo "$as_me:7074: checking for $ac_func" >&5 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7080 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -7962,12 +7091,6 @@ char $ac_func (); char (*f) (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -7985,16 +7108,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7111: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7114: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7117: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7120: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -8004,23 +7127,91 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:7130: result: `eval echo '${'$as_ac_var'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 7149 "configure" +#include "confdefs.h" +/* 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. */ +#ifdef __cplusplus +extern "C" +#endif +/* 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 (); +char (*f) (); + +int +main () +{ +/* 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) +choke me +#else +f = $ac_func; +#endif + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:7180: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:7183: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:7186: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:7189: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +eval "$as_ac_var=no" +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:7199: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then + cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_PAM 1 -_ACEOF +EOF if test $ac_cv_lib_dl_dlopen = yes; then LIBPAM="-lpam -ldl" @@ -8030,27 +7221,20 @@ fi - fi; # Check for older PAM if test "x$PAM_MSG" = "xyes" ; then # Check PAM strerror arguments (old PAM) - echo "$as_me:$LINENO: checking whether pam_strerror takes only one argument" >&5 + echo "$as_me:7229: checking whether pam_strerror takes only one argument" >&5 echo $ECHO_N "checking whether pam_strerror takes only one argument... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7232 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8060,32 +7244,31 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:7247: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7250: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7253: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7256: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7258: result: no" >&5 echo "${ECHO_T}no" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_OLD_PAM 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:7268: result: yes" >&5 echo "${ECHO_T}yes" >&6 PAM_MSG="yes (old library)" - fi rm -f conftest.$ac_objext conftest.$ac_ext fi @@ -8119,11 +7302,23 @@ fi fi - fi; -LIBS="$LIBS -lcrypto" + +# Patch up SSL libraries for GSI authentication as needed +if test "x$globus_flavor_type" != "xno" ; then + # For Globus 2, always link with the static libraries + LIBS="$LIBS ${gsi_path}/lib/libglobus_ssl_utils_${globus_flavor_type}.a ${gsi_path}/lib/libssl_${globus_flavor_type}.a ${gsi_path}/lib/libcrypto_${globus_flavor_type}.a" +else + if test "x$gsi_path" != "xno" ; then + # Older GSI needs -lssl too + LIBS="$LIBS -lssl -lcrypto" + else # if no GSI authentication (i.e., OpenSSL default) + LIBS="$LIBS -lcrypto" + fi +fi # globus_flavor_type + cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7321 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8133,12 +7328,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char RAND_add (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8148,20 +7337,20 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7340: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7343: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7346: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7349: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_OPENSSL 1 -_ACEOF +EOF else echo "$as_me: failed program was:" >&5 @@ -8174,7 +7363,7 @@ fi CPPFLAGS="-I/usr/local/ssl/include ${saved_CPPFLAGS}" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7366 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8184,12 +7373,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char RAND_add (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8199,48 +7382,45 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7385: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7388: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7391: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7394: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_OPENSSL 1 -_ACEOF +EOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - { { echo "$as_me:$LINENO: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5 + { { echo "$as_me:7404: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&5 echo "$as_me: error: *** Can't find recent OpenSSL libcrypto (see config.log for details) ***" >&2;} { (exit 1); exit 1; }; } - fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext - # Sanity check OpenSSL headers -echo "$as_me:$LINENO: checking whether OpenSSL's headers match the library" >&5 +echo "$as_me:7415: checking whether OpenSSL's headers match the library" >&5 echo $ECHO_N "checking whether OpenSSL's headers match the library... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:7418: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7423 "configure" #include "confdefs.h" #include @@ -8249,33 +7429,31 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7432: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7435: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7437: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7440: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:7443: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7451: result: no" >&5 echo "${ECHO_T}no" >&6 - { { echo "$as_me:$LINENO: error: Your OpenSSL headers do not match your library" >&5 + { { echo "$as_me:7453: error: Your OpenSSL headers do not match your library" >&5 echo "$as_me: error: Your OpenSSL headers do not match your library" >&2;} { (exit 1); exit 1; }; } - fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -8283,7 +7461,7 @@ # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the # version in OpenSSL. Skip this for PAM if test "x$PAM_MSG" = "xno" -a "x$check_for_libcrypt_later" = "x1"; then - echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 + echo "$as_me:7464: checking for crypt in -lcrypt" >&5 echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 if test "${ac_cv_lib_crypt_crypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8291,7 +7469,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7472 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -8301,12 +7479,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char crypt (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -8316,16 +7488,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7491: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7494: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7497: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7500: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_crypt_crypt=yes else @@ -8336,7 +7508,7 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "$as_me:7511: result: $ac_cv_lib_crypt_crypt" >&5 echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 if test $ac_cv_lib_crypt_crypt = yes; then LIBS="$LIBS -lcrypt" @@ -8344,19 +7516,18 @@ fi - ### Configure cryptographic random number support # Check wheter OpenSSL seeds itself -echo "$as_me:$LINENO: checking whether OpenSSL's PRNG is internally seeded" >&5 +echo "$as_me:7522: checking whether OpenSSL's PRNG is internally seeded" >&5 echo $ECHO_N "checking whether OpenSSL's PRNG is internally seeded... $ECHO_C" >&6 if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:7525: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 7530 "configure" #include "confdefs.h" #include @@ -8365,39 +7536,36 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:7539: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7542: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:7544: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:7547: \$? = $ac_status" >&5 (exit $ac_status); }; }; then OPENSSL_SEEDS_ITSELF=yes - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:7551: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7559: result: no" >&5 echo "${ECHO_T}no" >&6 # Default to use of the rand helper if OpenSSL doesn't # seed itself USE_RAND_HELPER=yes - fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - # Do we want to force the use of the rand helper? # Check whether --with-rand-helper or --without-rand-helper was given. @@ -8408,7 +7576,7 @@ # Force use of OpenSSL's internal RNG, even if # the previous test showed it to be unseeded. if test -z "$OPENSSL_SEEDS_ITSELF" ; then - { echo "$as_me:$LINENO: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5 + { echo "$as_me:7579: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&5 echo "$as_me: WARNING: *** Forcing use of OpenSSL's non-self-seeding PRNG" >&2;} OPENSSL_SEEDS_ITSELF=yes USE_RAND_HELPER="" @@ -8422,9 +7590,9 @@ # Which randomness source do we use? if test ! -z "$OPENSSL_SEEDS_ITSELF" -a -z "$USE_RAND_HELPER" ; then # OpenSSL only - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define OPENSSL_PRNG_ONLY 1 -_ACEOF +EOF RAND_MSG="OpenSSL internal ONLY" INSTALL_SSH_RAND_HELPER="" @@ -8434,7 +7602,6 @@ INSTALL_SSH_RAND_HELPER="yes" fi - ### Configuration of ssh-rand-helper # PRNGD TCP socket @@ -8450,20 +7617,19 @@ [0-9]*) ;; *) - { { echo "$as_me:$LINENO: error: You must specify a numeric port number for --with-prngd-port" >&5 + { { echo "$as_me:7620: error: You must specify a numeric port number for --with-prngd-port" >&5 echo "$as_me: error: You must specify a numeric port number for --with-prngd-port" >&2;} { (exit 1); exit 1; }; } ;; esac if test ! -z "$withval" ; then PRNGD_PORT="$withval" - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { { echo "$as_me:7651: error: You must specify an absolute path to the entropy socket" >&5 echo "$as_me: error: You must specify an absolute path to the entropy socket" >&2;} { (exit 1); exit 1; }; } ;; @@ -8490,18 +7656,18 @@ if test ! -z "$withval" ; then if test ! -z "$PRNGD_PORT" ; then - { { echo "$as_me:$LINENO: error: You may not specify both a PRNGD/EGD port and socket" >&5 + { { echo "$as_me:7659: error: You may not specify both a PRNGD/EGD port and socket" >&5 echo "$as_me: error: You may not specify both a PRNGD/EGD port and socket" >&2;} { (exit 1); exit 1; }; } fi if test ! -r "$withval" ; then - { echo "$as_me:$LINENO: WARNING: Entropy socket is not readable" >&5 + { echo "$as_me:7664: WARNING: Entropy socket is not readable" >&5 echo "$as_me: WARNING: Entropy socket is not readable" >&2;} fi PRNGD_SOCKET="$withval" - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + echo "$as_me:7678: checking for PRNGD/EGD socket" >&5 echo $ECHO_N "checking for PRNGD/EGD socket... $ECHO_C" >&6 # Insert other locations here for sock in /var/run/egd-pool /dev/egd-pool /etc/entropy; do if test -r $sock && $TEST_MINUS_S_SH -c "test -S $sock -o -p $sock" ; then PRNGD_SOCKET="$sock" - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + echo "$as_me:7692: result: $PRNGD_SOCKET" >&5 echo "${ECHO_T}$PRNGD_SOCKET" >&6 else - echo "$as_me:$LINENO: result: not found" >&5 + echo "$as_me:7695: result: not found" >&5 echo "${ECHO_T}not found" >&6 fi fi - fi; # Change default command timeout for hashing entropy source @@ -8545,12 +7710,10 @@ entropy_timeout=$withval fi - fi; -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:7751: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_LS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8598,18 +7758,16 @@ ac_cv_path_PROG_LS="$PROG_LS" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_LS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_LS="$ac_dir/$ac_word" + echo "$as_me:7768: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8618,10 +7776,10 @@ PROG_LS=$ac_cv_path_PROG_LS if test -n "$PROG_LS"; then - echo "$as_me:$LINENO: result: $PROG_LS" >&5 + echo "$as_me:7779: result: $PROG_LS" >&5 echo "${ECHO_T}$PROG_LS" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7782: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8629,11 +7787,9 @@ PROG_LS="undef" fi - - # Extract the first word of "netstat", so it can be a program name with args. set dummy netstat; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:7792: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_NETSTAT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8643,18 +7799,16 @@ ac_cv_path_PROG_NETSTAT="$PROG_NETSTAT" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_NETSTAT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_NETSTAT="$ac_dir/$ac_word" + echo "$as_me:7809: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8663,10 +7817,10 @@ PROG_NETSTAT=$ac_cv_path_PROG_NETSTAT if test -n "$PROG_NETSTAT"; then - echo "$as_me:$LINENO: result: $PROG_NETSTAT" >&5 + echo "$as_me:7820: result: $PROG_NETSTAT" >&5 echo "${ECHO_T}$PROG_NETSTAT" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7823: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8674,11 +7828,9 @@ PROG_NETSTAT="undef" fi - - # Extract the first word of "arp", so it can be a program name with args. set dummy arp; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:7833: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_ARP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8688,18 +7840,16 @@ ac_cv_path_PROG_ARP="$PROG_ARP" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_ARP="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_ARP="$ac_dir/$ac_word" + echo "$as_me:7850: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8708,10 +7858,10 @@ PROG_ARP=$ac_cv_path_PROG_ARP if test -n "$PROG_ARP"; then - echo "$as_me:$LINENO: result: $PROG_ARP" >&5 + echo "$as_me:7861: result: $PROG_ARP" >&5 echo "${ECHO_T}$PROG_ARP" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7864: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8719,11 +7869,9 @@ PROG_ARP="undef" fi - - # Extract the first word of "ifconfig", so it can be a program name with args. set dummy ifconfig; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:7874: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_IFCONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8733,18 +7881,16 @@ ac_cv_path_PROG_IFCONFIG="$PROG_IFCONFIG" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_IFCONFIG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_IFCONFIG="$ac_dir/$ac_word" + echo "$as_me:7891: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8753,10 +7899,10 @@ PROG_IFCONFIG=$ac_cv_path_PROG_IFCONFIG if test -n "$PROG_IFCONFIG"; then - echo "$as_me:$LINENO: result: $PROG_IFCONFIG" >&5 + echo "$as_me:7902: result: $PROG_IFCONFIG" >&5 echo "${ECHO_T}$PROG_IFCONFIG" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7905: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8764,11 +7910,9 @@ PROG_IFCONFIG="undef" fi - - # Extract the first word of "jstat", so it can be a program name with args. set dummy jstat; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:7915: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_JSTAT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8778,18 +7922,16 @@ ac_cv_path_PROG_JSTAT="$PROG_JSTAT" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_JSTAT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_JSTAT="$ac_dir/$ac_word" + echo "$as_me:7932: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8798,10 +7940,10 @@ PROG_JSTAT=$ac_cv_path_PROG_JSTAT if test -n "$PROG_JSTAT"; then - echo "$as_me:$LINENO: result: $PROG_JSTAT" >&5 + echo "$as_me:7943: result: $PROG_JSTAT" >&5 echo "${ECHO_T}$PROG_JSTAT" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7946: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8809,11 +7951,9 @@ PROG_JSTAT="undef" fi - - # Extract the first word of "ps", so it can be a program name with args. set dummy ps; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:7956: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_PS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8823,18 +7963,16 @@ ac_cv_path_PROG_PS="$PROG_PS" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_PS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_PS="$ac_dir/$ac_word" + echo "$as_me:7973: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8843,10 +7981,10 @@ PROG_PS=$ac_cv_path_PROG_PS if test -n "$PROG_PS"; then - echo "$as_me:$LINENO: result: $PROG_PS" >&5 + echo "$as_me:7984: result: $PROG_PS" >&5 echo "${ECHO_T}$PROG_PS" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:7987: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8854,11 +7992,9 @@ PROG_PS="undef" fi - - # Extract the first word of "sar", so it can be a program name with args. set dummy sar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:7997: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_SAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8868,18 +8004,16 @@ ac_cv_path_PROG_SAR="$PROG_SAR" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_SAR="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_SAR="$ac_dir/$ac_word" + echo "$as_me:8014: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8888,10 +8022,10 @@ PROG_SAR=$ac_cv_path_PROG_SAR if test -n "$PROG_SAR"; then - echo "$as_me:$LINENO: result: $PROG_SAR" >&5 + echo "$as_me:8025: result: $PROG_SAR" >&5 echo "${ECHO_T}$PROG_SAR" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8028: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8899,11 +8033,9 @@ PROG_SAR="undef" fi - - # Extract the first word of "w", so it can be a program name with args. set dummy w; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8038: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_W+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8913,18 +8045,16 @@ ac_cv_path_PROG_W="$PROG_W" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_W="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_W="$ac_dir/$ac_word" + echo "$as_me:8055: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8933,10 +8063,10 @@ PROG_W=$ac_cv_path_PROG_W if test -n "$PROG_W"; then - echo "$as_me:$LINENO: result: $PROG_W" >&5 + echo "$as_me:8066: result: $PROG_W" >&5 echo "${ECHO_T}$PROG_W" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8069: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8944,11 +8074,9 @@ PROG_W="undef" fi - - # Extract the first word of "who", so it can be a program name with args. set dummy who; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8079: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_WHO+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -8958,18 +8086,16 @@ ac_cv_path_PROG_WHO="$PROG_WHO" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_WHO="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_WHO="$ac_dir/$ac_word" + echo "$as_me:8096: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -8978,10 +8104,10 @@ PROG_WHO=$ac_cv_path_PROG_WHO if test -n "$PROG_WHO"; then - echo "$as_me:$LINENO: result: $PROG_WHO" >&5 + echo "$as_me:8107: result: $PROG_WHO" >&5 echo "${ECHO_T}$PROG_WHO" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8110: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -8989,11 +8115,9 @@ PROG_WHO="undef" fi - - # Extract the first word of "last", so it can be a program name with args. set dummy last; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8120: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_LAST+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9003,18 +8127,16 @@ ac_cv_path_PROG_LAST="$PROG_LAST" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_LAST="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_LAST="$ac_dir/$ac_word" + echo "$as_me:8137: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9023,10 +8145,10 @@ PROG_LAST=$ac_cv_path_PROG_LAST if test -n "$PROG_LAST"; then - echo "$as_me:$LINENO: result: $PROG_LAST" >&5 + echo "$as_me:8148: result: $PROG_LAST" >&5 echo "${ECHO_T}$PROG_LAST" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8151: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9034,11 +8156,9 @@ PROG_LAST="undef" fi - - # Extract the first word of "lastlog", so it can be a program name with args. set dummy lastlog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8161: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_LASTLOG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9048,18 +8168,16 @@ ac_cv_path_PROG_LASTLOG="$PROG_LASTLOG" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_LASTLOG="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_LASTLOG="$ac_dir/$ac_word" + echo "$as_me:8178: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9068,10 +8186,10 @@ PROG_LASTLOG=$ac_cv_path_PROG_LASTLOG if test -n "$PROG_LASTLOG"; then - echo "$as_me:$LINENO: result: $PROG_LASTLOG" >&5 + echo "$as_me:8189: result: $PROG_LASTLOG" >&5 echo "${ECHO_T}$PROG_LASTLOG" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8192: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9079,11 +8197,9 @@ PROG_LASTLOG="undef" fi - - # Extract the first word of "df", so it can be a program name with args. set dummy df; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8202: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_DF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9093,18 +8209,16 @@ ac_cv_path_PROG_DF="$PROG_DF" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_DF="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_DF="$ac_dir/$ac_word" + echo "$as_me:8219: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9113,10 +8227,10 @@ PROG_DF=$ac_cv_path_PROG_DF if test -n "$PROG_DF"; then - echo "$as_me:$LINENO: result: $PROG_DF" >&5 + echo "$as_me:8230: result: $PROG_DF" >&5 echo "${ECHO_T}$PROG_DF" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8233: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9124,11 +8238,9 @@ PROG_DF="undef" fi - - # Extract the first word of "vmstat", so it can be a program name with args. set dummy vmstat; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8243: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_VMSTAT+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9138,18 +8250,16 @@ ac_cv_path_PROG_VMSTAT="$PROG_VMSTAT" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_VMSTAT="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_VMSTAT="$ac_dir/$ac_word" + echo "$as_me:8260: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9158,10 +8268,10 @@ PROG_VMSTAT=$ac_cv_path_PROG_VMSTAT if test -n "$PROG_VMSTAT"; then - echo "$as_me:$LINENO: result: $PROG_VMSTAT" >&5 + echo "$as_me:8271: result: $PROG_VMSTAT" >&5 echo "${ECHO_T}$PROG_VMSTAT" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8274: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9169,11 +8279,9 @@ PROG_VMSTAT="undef" fi - - # Extract the first word of "uptime", so it can be a program name with args. set dummy uptime; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8284: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_UPTIME+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9183,18 +8291,16 @@ ac_cv_path_PROG_UPTIME="$PROG_UPTIME" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_UPTIME="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_UPTIME="$ac_dir/$ac_word" + echo "$as_me:8301: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9203,10 +8309,10 @@ PROG_UPTIME=$ac_cv_path_PROG_UPTIME if test -n "$PROG_UPTIME"; then - echo "$as_me:$LINENO: result: $PROG_UPTIME" >&5 + echo "$as_me:8312: result: $PROG_UPTIME" >&5 echo "${ECHO_T}$PROG_UPTIME" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8315: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9214,11 +8320,9 @@ PROG_UPTIME="undef" fi - - # Extract the first word of "ipcs", so it can be a program name with args. set dummy ipcs; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8325: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_IPCS+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9228,18 +8332,16 @@ ac_cv_path_PROG_IPCS="$PROG_IPCS" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_IPCS="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_IPCS="$ac_dir/$ac_word" + echo "$as_me:8342: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9248,10 +8350,10 @@ PROG_IPCS=$ac_cv_path_PROG_IPCS if test -n "$PROG_IPCS"; then - echo "$as_me:$LINENO: result: $PROG_IPCS" >&5 + echo "$as_me:8353: result: $PROG_IPCS" >&5 echo "${ECHO_T}$PROG_IPCS" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8356: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9259,11 +8361,9 @@ PROG_IPCS="undef" fi - - # Extract the first word of "tail", so it can be a program name with args. set dummy tail; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:8366: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_PROG_TAIL+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -9273,18 +8373,16 @@ ac_cv_path_PROG_TAIL="$PROG_TAIL" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_PROG_TAIL="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_PROG_TAIL="$ac_dir/$ac_word" + echo "$as_me:8383: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -9293,10 +8391,10 @@ PROG_TAIL=$ac_cv_path_PROG_TAIL if test -n "$PROG_TAIL"; then - echo "$as_me:$LINENO: result: $PROG_TAIL" >&5 + echo "$as_me:8394: result: $PROG_TAIL" >&5 echo "${ECHO_T}$PROG_TAIL" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:8397: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -9304,7 +8402,6 @@ PROG_TAIL="undef" fi - # restore PATH PATH=$OPATH @@ -9322,29 +8419,21 @@ fi fi - - # Cheap hack to ensure NEWS-OS libraries are arranged right. if test ! -z "$SONY" ; then LIBS="$LIBS -liberty"; fi # Checks for data types -echo "$as_me:$LINENO: checking for char" >&5 +echo "$as_me:8428: checking for char" >&5 echo $ECHO_N "checking for char... $ECHO_C" >&6 if test "${ac_cv_type_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8434 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -9357,16 +8446,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8449: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8452: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8455: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8458: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_char=yes else @@ -9376,306 +8465,188 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_char" >&5 +echo "$as_me:8468: result: $ac_cv_type_char" >&5 echo "${ECHO_T}$ac_cv_type_char" >&6 -echo "$as_me:$LINENO: checking size of char" >&5 +echo "$as_me:8471: checking size of char" >&5 echo $ECHO_N "checking size of char... $ECHO_C" >&6 if test "${ac_cv_sizeof_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_char" = yes; then - # The cast to unsigned long 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. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8480 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= 0)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (char)) >= 0)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8492: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8495: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8498: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8501: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8506 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8518: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8521: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8524: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8527: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (char))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 +ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8543 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) >= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (char)) >= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8555: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8558: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8561: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8564: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` fi rm -f conftest.$ac_objext conftest.$ac_ext done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo= ac_hi= -fi -rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f 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 -#line $LINENO "configure" +#line 8580 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (char))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (char)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8592: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8595: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8598: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8601: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done -case $ac_lo in -?*) ac_cv_sizeof_char=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5 -echo "$as_me: error: cannot compute sizeof (char), 77" >&2;} - { (exit 1); exit 1; }; } ;; -esac +ac_cv_sizeof_char=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:8614: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8619 "configure" #include "confdefs.h" $ac_includes_default -long longval () { return (long) (sizeof (char)); } -unsigned long ulongval () { return (long) (sizeof (char)); } -#include -#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (char))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (char)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (char)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (char))); +fclose (f); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8635: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8638: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8640: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8643: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_char=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (char), 77" >&5 -echo "$as_me: error: cannot compute sizeof (char), 77" >&2;} - { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -9685,28 +8656,21 @@ ac_cv_sizeof_char=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_char" >&5 +echo "$as_me:8659: result: $ac_cv_sizeof_char" >&5 echo "${ECHO_T}$ac_cv_sizeof_char" >&6 -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:8665: checking for short int" >&5 echo $ECHO_N "checking for short int... $ECHO_C" >&6 if test "${ac_cv_type_short_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8671 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -9719,16 +8683,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8686: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8689: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8692: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8695: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_short_int=yes else @@ -9738,306 +8702,188 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_short_int" >&5 +echo "$as_me:8705: result: $ac_cv_type_short_int" >&5 echo "${ECHO_T}$ac_cv_type_short_int" >&6 -echo "$as_me:$LINENO: checking size of short int" >&5 +echo "$as_me:8708: checking size of short int" >&5 echo $ECHO_N "checking size of short int... $ECHO_C" >&6 if test "${ac_cv_sizeof_short_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_short_int" = yes; then - # The cast to unsigned long 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. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8717 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short int))) >= 0)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (short int)) >= 0)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8729: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8732: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8735: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8738: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8743 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8755: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8758: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8761: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8764: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (short int))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 +ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8780 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short int))) >= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (short int)) >= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8792: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8795: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8798: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8801: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` fi rm -f conftest.$ac_objext conftest.$ac_ext done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo= ac_hi= -fi -rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f 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 -#line $LINENO "configure" +#line 8817 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (short int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (short int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8829: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8832: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8835: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8838: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done -case $ac_lo in -?*) ac_cv_sizeof_short_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (short int), 77" >&2;} - { (exit 1); exit 1; }; } ;; -esac +ac_cv_sizeof_short_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:8851: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8856 "configure" #include "confdefs.h" $ac_includes_default -long longval () { return (long) (sizeof (short int)); } -unsigned long ulongval () { return (long) (sizeof (short int)); } -#include -#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (short int))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (short int)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (short int)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (short int))); +fclose (f); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:8872: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8875: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8877: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8880: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_short_int=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (short int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (short int), 77" >&2;} - { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -10047,28 +8893,21 @@ ac_cv_sizeof_short_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_short_int" >&5 +echo "$as_me:8896: result: $ac_cv_sizeof_short_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_short_int" >&6 -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:8902: checking for int" >&5 echo $ECHO_N "checking for int... $ECHO_C" >&6 if test "${ac_cv_type_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8908 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -10081,16 +8920,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8923: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8926: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8929: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8932: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_int=yes else @@ -10100,306 +8939,188 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 +echo "$as_me:8942: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:$LINENO: checking size of int" >&5 +echo "$as_me:8945: checking size of int" >&5 echo $ECHO_N "checking size of int... $ECHO_C" >&6 if test "${ac_cv_sizeof_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_int" = yes; then - # The cast to unsigned long 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. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8954 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= 0)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (int)) >= 0)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8966: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8969: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8972: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8975: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 8980 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:8992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:8995: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:8998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9001: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (int))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 +ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9017 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9029: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9032: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9035: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_lo=$ac_mid; break -else - echo "$as_me: failed program was:" >&5 -cat 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 conftest.$ac_objext conftest.$ac_ext - done + ac_status=$? + echo "$as_me:9038: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_lo= ac_hi= +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` fi rm -f conftest.$ac_objext conftest.$ac_ext + done fi rm -f 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 -#line $LINENO "configure" +#line 9054 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9066: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9069: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9072: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9075: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done -case $ac_lo in -?*) ac_cv_sizeof_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} - { (exit 1); exit 1; }; } ;; -esac +ac_cv_sizeof_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:9088: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9093 "configure" #include "confdefs.h" $ac_includes_default -long longval () { return (long) (sizeof (int)); } -unsigned long ulongval () { return (long) (sizeof (int)); } -#include -#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (int))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (int)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (int)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (int))); +fclose (f); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9109: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9112: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9114: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9117: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_int=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (int), 77" >&2;} - { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -10409,28 +9130,21 @@ ac_cv_sizeof_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 +echo "$as_me:9133: result: $ac_cv_sizeof_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_int" >&6 -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:9139: checking for long int" >&5 echo $ECHO_N "checking for long int... $ECHO_C" >&6 if test "${ac_cv_type_long_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9145 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -10443,16 +9157,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9160: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9163: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9166: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9169: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_long_int=yes else @@ -10462,306 +9176,188 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long_int" >&5 +echo "$as_me:9179: result: $ac_cv_type_long_int" >&5 echo "${ECHO_T}$ac_cv_type_long_int" >&6 -echo "$as_me:$LINENO: checking size of long int" >&5 +echo "$as_me:9182: checking size of long int" >&5 echo $ECHO_N "checking size of long int... $ECHO_C" >&6 if test "${ac_cv_sizeof_long_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_long_int" = yes; then - # The cast to unsigned long 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. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9191 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= 0)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long int)) >= 0)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9203: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9206: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9209: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9212: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9217 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9229: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9232: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9235: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9238: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (long int))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 +ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9254 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long int))) >= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long int)) >= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9266: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9269: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9272: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9275: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` fi rm -f conftest.$ac_objext conftest.$ac_ext done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo= ac_hi= -fi -rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f 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 -#line $LINENO "configure" +#line 9291 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9303: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9306: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9309: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9312: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done -case $ac_lo in -?*) ac_cv_sizeof_long_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (long int), 77" >&2;} - { (exit 1); exit 1; }; } ;; -esac +ac_cv_sizeof_long_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:9325: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9330 "configure" #include "confdefs.h" $ac_includes_default -long longval () { return (long) (sizeof (long int)); } -unsigned long ulongval () { return (long) (sizeof (long int)); } -#include -#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (long int))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (long int)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long int)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (long int))); +fclose (f); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9346: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9349: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9351: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9354: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long_int=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (long int), 77" >&2;} - { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -10771,28 +9367,21 @@ ac_cv_sizeof_long_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_int" >&5 +echo "$as_me:9370: result: $ac_cv_sizeof_long_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_long_int" >&6 -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:9376: checking for long long int" >&5 echo $ECHO_N "checking for long long int... $ECHO_C" >&6 if test "${ac_cv_type_long_long_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9382 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -10805,16 +9394,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9397: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9400: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9403: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9406: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_long_long_int=yes else @@ -10824,306 +9413,188 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_long_long_int" >&5 +echo "$as_me:9416: result: $ac_cv_type_long_long_int" >&5 echo "${ECHO_T}$ac_cv_type_long_long_int" >&6 -echo "$as_me:$LINENO: checking size of long long int" >&5 +echo "$as_me:9419: checking size of long long int" >&5 echo $ECHO_N "checking size of long long int... $ECHO_C" >&6 if test "${ac_cv_sizeof_long_long_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_long_long_int" = yes; then - # The cast to unsigned long 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. if test "$cross_compiling" = yes; then # Depending upon the size, compute the lo and hi bounds. cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9428 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= 0)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long long int)) >= 0)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9440: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9443: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9446: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9449: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9454 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9466: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9469: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9472: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9475: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_lo=`expr $ac_mid + 1`; ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif -int -main () -{ -static int test_array [1 - 2 * !(((long) (sizeof (long long int))) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_hi=-1 ac_mid=-1 +ac_hi=-1 ac_mid=-1 while :; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9491 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long int))) >= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long long int)) >= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9503: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9506: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9509: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9512: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=$ac_mid; break else echo "$as_me: failed program was:" >&5 cat 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` +ac_hi=`expr $ac_mid - 1`; ac_mid=`expr 2 '*' $ac_mid` fi rm -f conftest.$ac_objext conftest.$ac_ext done -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_lo= ac_hi= -fi -rm -f conftest.$ac_objext conftest.$ac_ext fi rm -f 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 -#line $LINENO "configure" +#line 9528 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { -static int test_array [1 - 2 * !(((long) (sizeof (long long int))) <= $ac_mid)]; -test_array [0] = 0 - +int _array_ [1 - 2 * !((sizeof (long long int)) <= $ac_mid)] ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9540: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9543: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9546: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9549: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_hi=$ac_mid else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_lo=`expr '(' $ac_mid ')' + 1` +ac_lo=`expr $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done -case $ac_lo in -?*) ac_cv_sizeof_long_long_int=$ac_lo;; -'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (long long int), 77" >&2;} - { (exit 1); exit 1; }; } ;; -esac +ac_cv_sizeof_long_long_int=$ac_lo else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:9562: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9567 "configure" #include "confdefs.h" $ac_includes_default -long longval () { return (long) (sizeof (long long int)); } -unsigned long ulongval () { return (long) (sizeof (long long int)); } -#include -#include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - exit (1); - if (((long) (sizeof (long long int))) < 0) - { - long i = longval (); - if (i != ((long) (sizeof (long long int)))) - exit (1); - fprintf (f, "%ld\n", i); - } - else - { - unsigned long i = ulongval (); - if (i != ((long) (sizeof (long long int)))) - exit (1); - fprintf (f, "%lu\n", i); - } - exit (ferror (f) || fclose (f) != 0); - +FILE *f = fopen ("conftest.val", "w"); +if (!f) + exit (1); +fprintf (f, "%d", (sizeof (long long int))); +fclose (f); ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:9583: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9586: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9588: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9591: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long_long_int=`cat conftest.val` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) -{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long long int), 77" >&5 -echo "$as_me: error: cannot compute sizeof (long long int), 77" >&2;} - { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -11133,13 +9604,11 @@ ac_cv_sizeof_long_long_int=0 fi fi -echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long_int" >&5 +echo "$as_me:9607: result: $ac_cv_sizeof_long_long_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_long_long_int" >&6 -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:9619: checking for u_int type" >&5 echo $ECHO_N "checking for u_int type... $ECHO_C" >&6 if test "${ac_cv_have_u_int+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9626 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11172,16 +9635,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9638: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9641: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9644: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9647: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_int="yes" else @@ -11193,32 +9656,26 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_u_int" >&5 +echo "$as_me:9659: result: $ac_cv_have_u_int" >&5 echo "${ECHO_T}$ac_cv_have_u_int" >&6 if test "x$ac_cv_have_u_int" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_INT 1 -_ACEOF +EOF have_u_int=1 fi -echo "$as_me:$LINENO: checking for intXX_t types" >&5 +echo "$as_me:9669: checking for intXX_t types" >&5 echo $ECHO_N "checking for intXX_t types... $ECHO_C" >&6 if test "${ac_cv_have_intxx_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9676 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11228,16 +9685,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9688: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9691: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9694: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9697: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_intxx_t="yes" else @@ -11249,12 +9706,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_intxx_t" >&5 +echo "$as_me:9709: result: $ac_cv_have_intxx_t" >&5 echo "${ECHO_T}$ac_cv_have_intxx_t" >&6 if test "x$ac_cv_have_intxx_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_INTXX_T 1 -_ACEOF +EOF have_intxx_t=1 fi @@ -11262,18 +9719,12 @@ if (test -z "$have_intxx_t" && \ test "x$ac_cv_header_stdint_h" = "xyes") then - echo "$as_me:$LINENO: checking for intXX_t types in stdint.h" >&5 + echo "$as_me:9722: checking for intXX_t types in stdint.h" >&5 echo $ECHO_N "checking for intXX_t types in stdint.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9725 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11283,51 +9734,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9737: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9740: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9743: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9746: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_INTXX_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:9753: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:9759: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: checking for int64_t type" >&5 +echo "$as_me:9766: checking for int64_t type" >&5 echo $ECHO_N "checking for int64_t type... $ECHO_C" >&6 if test "${ac_cv_have_int64_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9773 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11337,16 +9782,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9785: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9788: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9791: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9794: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_int64_t="yes" else @@ -11358,29 +9803,23 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_int64_t" >&5 +echo "$as_me:9806: result: $ac_cv_have_int64_t" >&5 echo "${ECHO_T}$ac_cv_have_int64_t" >&6 if test "x$ac_cv_have_int64_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_INT64_T 1 -_ACEOF +EOF have_int64_t=1 fi if test -z "$have_int64_t" ; then - echo "$as_me:$LINENO: checking for int64_t type in sys/socket.h" >&5 + echo "$as_me:9817: checking for int64_t type in sys/socket.h" >&5 echo $ECHO_N "checking for int64_t type in sys/socket.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9820 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11390,29 +9829,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9832: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9835: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9838: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9841: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_INT64_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:9848: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:9854: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11420,18 +9859,12 @@ fi if test -z "$have_int64_t" ; then - echo "$as_me:$LINENO: checking for int64_t type in sys/bitypes.h" >&5 + echo "$as_me:9862: checking for int64_t type in sys/bitypes.h" >&5 echo $ECHO_N "checking for int64_t type in sys/bitypes.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9865 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11441,51 +9874,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9877: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9880: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9883: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9886: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_INT64_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:9893: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:9899: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: checking for u_intXX_t types" >&5 +echo "$as_me:9906: checking for u_intXX_t types" >&5 echo $ECHO_N "checking for u_intXX_t types... $ECHO_C" >&6 if test "${ac_cv_have_u_intxx_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9913 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11495,16 +9922,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9925: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9928: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9931: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9934: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_intxx_t="yes" else @@ -11516,29 +9943,23 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_u_intxx_t" >&5 +echo "$as_me:9946: result: $ac_cv_have_u_intxx_t" >&5 echo "${ECHO_T}$ac_cv_have_u_intxx_t" >&6 if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_INTXX_T 1 -_ACEOF +EOF have_u_intxx_t=1 fi if test -z "$have_u_intxx_t" ; then - echo "$as_me:$LINENO: checking for u_intXX_t types in sys/socket.h" >&5 + echo "$as_me:9957: checking for u_intXX_t types in sys/socket.h" >&5 echo $ECHO_N "checking for u_intXX_t types in sys/socket.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 9960 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11548,51 +9969,45 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:9972: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9975: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:9978: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:9981: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_INTXX_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:9988: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:9994: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: checking for u_int64_t types" >&5 +echo "$as_me:10001: checking for u_int64_t types" >&5 echo $ECHO_N "checking for u_int64_t types... $ECHO_C" >&6 if test "${ac_cv_have_u_int64_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10008 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11602,16 +10017,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10020: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10023: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10026: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10029: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_int64_t="yes" else @@ -11623,29 +10038,23 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_u_int64_t" >&5 +echo "$as_me:10041: result: $ac_cv_have_u_int64_t" >&5 echo "${ECHO_T}$ac_cv_have_u_int64_t" >&6 if test "x$ac_cv_have_u_int64_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_INT64_T 1 -_ACEOF +EOF have_u_int64_t=1 fi if test -z "$have_u_int64_t" ; then - echo "$as_me:$LINENO: checking for u_int64_t type in sys/bitypes.h" >&5 + echo "$as_me:10052: checking for u_int64_t type in sys/bitypes.h" >&5 echo $ECHO_N "checking for u_int64_t type in sys/bitypes.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10055 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11655,29 +10064,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10067: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10070: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10073: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10076: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_INT64_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:10083: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:10089: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11685,24 +10094,18 @@ fi if test -z "$have_u_intxx_t" ; then - echo "$as_me:$LINENO: checking for uintXX_t types" >&5 + echo "$as_me:10097: checking for uintXX_t types" >&5 echo $ECHO_N "checking for uintXX_t types... $ECHO_C" >&6 if test "${ac_cv_have_uintxx_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10104 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11712,16 +10115,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10118: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10121: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10124: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10127: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_uintxx_t="yes" else @@ -11733,29 +10136,23 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_uintxx_t" >&5 +echo "$as_me:10139: result: $ac_cv_have_uintxx_t" >&5 echo "${ECHO_T}$ac_cv_have_uintxx_t" >&6 if test "x$ac_cv_have_uintxx_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_UINTXX_T 1 -_ACEOF +EOF fi fi if test -z "$have_uintxx_t" ; then - echo "$as_me:$LINENO: checking for uintXX_t types in stdint.h" >&5 + echo "$as_me:10150: checking for uintXX_t types in stdint.h" >&5 echo $ECHO_N "checking for uintXX_t types in stdint.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10153 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11765,29 +10162,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10165: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10168: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10171: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10174: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_UINTXX_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:10181: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:10187: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -11797,20 +10194,14 @@ if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \ test "x$ac_cv_header_sys_bitypes_h" = "xyes") then - echo "$as_me:$LINENO: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 + echo "$as_me:10197: checking for intXX_t and u_intXX_t types in sys/bitypes.h" >&5 echo $ECHO_N "checking for intXX_t and u_intXX_t types in sys/bitypes.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10200 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11824,58 +10215,51 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10218: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10221: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10224: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10227: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_INTXX_T 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_INTXX_T 1 -_ACEOF +EOF - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:10238: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:$LINENO: result: no" >&5 +echo "$as_me:10244: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext fi - -echo "$as_me:$LINENO: checking for u_char" >&5 +echo "$as_me:10251: checking for u_char" >&5 echo $ECHO_N "checking for u_char... $ECHO_C" >&6 if test "${ac_cv_have_u_char+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10258 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11885,16 +10269,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10272: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10275: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10278: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10281: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_u_char="yes" else @@ -11906,33 +10290,26 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_u_char" >&5 +echo "$as_me:10293: result: $ac_cv_have_u_char" >&5 echo "${ECHO_T}$ac_cv_have_u_char" >&6 if test "x$ac_cv_have_u_char" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_U_CHAR 1 -_ACEOF +EOF fi - - echo "$as_me:$LINENO: checking for socklen_t" >&5 + echo "$as_me:10302: checking for socklen_t" >&5 echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6 if test "${ac_cv_type_socklen_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10308 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -11945,16 +10322,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10325: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10328: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10331: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10334: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_socklen_t=yes else @@ -11964,13 +10341,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5 +echo "$as_me:10344: result: $ac_cv_type_socklen_t" >&5 echo "${ECHO_T}$ac_cv_type_socklen_t" >&6 if test $ac_cv_type_socklen_t = yes; then : else - echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5 + echo "$as_me:10350: checking for socklen_t equivalent" >&5 echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6 if test "${curl_cv_socklen_t_equiv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -11982,7 +10359,7 @@ for arg2 in "struct sockaddr" void; do for t in int size_t unsigned long "unsigned long"; do cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10362 "configure" #include "confdefs.h" #include @@ -11990,12 +10367,6 @@ int getpeername (int, $arg2 *, $t *); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12008,16 +10379,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10382: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10385: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10388: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10391: \$? = $ac_status" >&5 (exit $ac_status); }; }; then curl_cv_socklen_t_equiv="$t" @@ -12032,40 +10403,32 @@ done if test "x$curl_cv_socklen_t_equiv" = x; then - { { echo "$as_me:$LINENO: error: Cannot find a type to use in place of socklen_t" >&5 + { { echo "$as_me:10406: error: Cannot find a type to use in place of socklen_t" >&5 echo "$as_me: error: Cannot find a type to use in place of socklen_t" >&2;} { (exit 1); exit 1; }; } fi fi - echo "$as_me:$LINENO: result: $curl_cv_socklen_t_equiv" >&5 + echo "$as_me:10413: result: $curl_cv_socklen_t_equiv" >&5 echo "${ECHO_T}$curl_cv_socklen_t_equiv" >&6 -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:10422: checking for sig_atomic_t" >&5 echo $ECHO_N "checking for sig_atomic_t... $ECHO_C" >&6 if test "${ac_cv_type_sig_atomic_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10428 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12078,16 +10441,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10444: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10447: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10450: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10453: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_sig_atomic_t=yes else @@ -12097,36 +10460,28 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_type_sig_atomic_t" >&5 +echo "$as_me:10463: result: $ac_cv_type_sig_atomic_t" >&5 echo "${ECHO_T}$ac_cv_type_sig_atomic_t" >&6 if test $ac_cv_type_sig_atomic_t = yes; then -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:10473: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_have_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10480 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12136,16 +10491,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10494: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10497: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10500: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10503: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_size_t="yes" else @@ -12157,33 +10512,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_size_t" >&5 +echo "$as_me:10515: result: $ac_cv_have_size_t" >&5 echo "${ECHO_T}$ac_cv_have_size_t" >&6 if test "x$ac_cv_have_size_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SIZE_T 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for ssize_t" >&5 +echo "$as_me:10524: checking for ssize_t" >&5 echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 if test "${ac_cv_have_ssize_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10531 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12193,16 +10542,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10545: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10548: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10551: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10554: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_ssize_t="yes" else @@ -12214,33 +10563,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_ssize_t" >&5 +echo "$as_me:10566: result: $ac_cv_have_ssize_t" >&5 echo "${ECHO_T}$ac_cv_have_ssize_t" >&6 if test "x$ac_cv_have_ssize_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SSIZE_T 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for clock_t" >&5 +echo "$as_me:10575: checking for clock_t" >&5 echo $ECHO_N "checking for clock_t... $ECHO_C" >&6 if test "${ac_cv_have_clock_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10582 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12250,16 +10593,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10596: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10599: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10602: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10605: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_clock_t="yes" else @@ -12271,34 +10614,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_clock_t" >&5 +echo "$as_me:10617: result: $ac_cv_have_clock_t" >&5 echo "${ECHO_T}$ac_cv_have_clock_t" >&6 if test "x$ac_cv_have_clock_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_CLOCK_T 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for sa_family_t" >&5 +echo "$as_me:10626: checking for sa_family_t" >&5 echo $ECHO_N "checking for sa_family_t... $ECHO_C" >&6 if test "${ac_cv_have_sa_family_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10633 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12308,35 +10645,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10648: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10651: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10654: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10657: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_sa_family_t="yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10664 "configure" #include "confdefs.h" #include #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12346,16 +10677,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10680: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10683: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10686: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10689: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_sa_family_t="yes" else @@ -12370,33 +10701,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_sa_family_t" >&5 +echo "$as_me:10704: result: $ac_cv_have_sa_family_t" >&5 echo "${ECHO_T}$ac_cv_have_sa_family_t" >&6 if test "x$ac_cv_have_sa_family_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SA_FAMILY_T 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for pid_t" >&5 +echo "$as_me:10713: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_have_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10720 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12406,16 +10731,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10734: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10737: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10740: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10743: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_pid_t="yes" else @@ -12427,33 +10752,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_pid_t" >&5 +echo "$as_me:10755: result: $ac_cv_have_pid_t" >&5 echo "${ECHO_T}$ac_cv_have_pid_t" >&6 if test "x$ac_cv_have_pid_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_PID_T 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for mode_t" >&5 +echo "$as_me:10764: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_have_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10771 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12463,16 +10782,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10785: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10788: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10791: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10794: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_mode_t="yes" else @@ -12484,35 +10803,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_mode_t" >&5 +echo "$as_me:10806: result: $ac_cv_have_mode_t" >&5 echo "${ECHO_T}$ac_cv_have_mode_t" >&6 if test "x$ac_cv_have_mode_t" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_MODE_T 1 -_ACEOF +EOF fi - -echo "$as_me:$LINENO: checking for struct sockaddr_storage" >&5 +echo "$as_me:10815: checking for struct sockaddr_storage" >&5 echo $ECHO_N "checking for struct sockaddr_storage... $ECHO_C" >&6 if test "${ac_cv_have_struct_sockaddr_storage+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10822 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12522,16 +10834,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10837: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10840: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10843: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10846: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_sockaddr_storage="yes" else @@ -12543,34 +10855,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_struct_sockaddr_storage" >&5 +echo "$as_me:10858: result: $ac_cv_have_struct_sockaddr_storage" >&5 echo "${ECHO_T}$ac_cv_have_struct_sockaddr_storage" >&6 if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_STRUCT_SOCKADDR_STORAGE 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for struct sockaddr_in6" >&5 +echo "$as_me:10867: checking for struct sockaddr_in6" >&5 echo $ECHO_N "checking for struct sockaddr_in6... $ECHO_C" >&6 if test "${ac_cv_have_struct_sockaddr_in6+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10874 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12580,16 +10886,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10889: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10892: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10895: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10898: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_sockaddr_in6="yes" else @@ -12601,34 +10907,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_struct_sockaddr_in6" >&5 +echo "$as_me:10910: result: $ac_cv_have_struct_sockaddr_in6" >&5 echo "${ECHO_T}$ac_cv_have_struct_sockaddr_in6" >&6 if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_STRUCT_SOCKADDR_IN6 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for struct in6_addr" >&5 +echo "$as_me:10919: checking for struct in6_addr" >&5 echo $ECHO_N "checking for struct in6_addr... $ECHO_C" >&6 if test "${ac_cv_have_struct_in6_addr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10926 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12638,16 +10938,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10944: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:10947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10950: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_in6_addr="yes" else @@ -12659,35 +10959,29 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_struct_in6_addr" >&5 +echo "$as_me:10962: result: $ac_cv_have_struct_in6_addr" >&5 echo "${ECHO_T}$ac_cv_have_struct_in6_addr" >&6 if test "x$ac_cv_have_struct_in6_addr" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_STRUCT_IN6_ADDR 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for struct addrinfo" >&5 +echo "$as_me:10971: checking for struct addrinfo" >&5 echo $ECHO_N "checking for struct addrinfo... $ECHO_C" >&6 if test "${ac_cv_have_struct_addrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 10978 "configure" #include "confdefs.h" #include #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12697,16 +10991,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:10994: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:10997: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11000: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11003: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_addrinfo="yes" else @@ -12718,31 +11012,25 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_struct_addrinfo" >&5 +echo "$as_me:11015: result: $ac_cv_have_struct_addrinfo" >&5 echo "${ECHO_T}$ac_cv_have_struct_addrinfo" >&6 if test "x$ac_cv_have_struct_addrinfo" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_STRUCT_ADDRINFO 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for struct timeval" >&5 +echo "$as_me:11024: checking for struct timeval" >&5 echo $ECHO_N "checking for struct timeval... $ECHO_C" >&6 if test "${ac_cv_have_struct_timeval+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11031 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -12752,16 +11040,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11043: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11046: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11052: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_struct_timeval="yes" else @@ -12773,12 +11061,12 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_struct_timeval" >&5 +echo "$as_me:11064: result: $ac_cv_have_struct_timeval" >&5 echo "${ECHO_T}$ac_cv_have_struct_timeval" >&6 if test "x$ac_cv_have_struct_timeval" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_STRUCT_TIMEVAL 1 -_ACEOF +EOF have_struct_timeval=1 fi @@ -12791,12 +11079,12 @@ NO_SFTP='#' else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:11082: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11087 "configure" #include "confdefs.h" #include @@ -12824,45 +11112,41 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:11115: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11118: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11120: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11123: \$? = $ac_status" >&5 (exit $ac_status); }; }; then true else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BROKEN_SNPRINTF 1 -_ACEOF - +EOF fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi - - # look for field 'ut_host' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host - echo "$as_me:$LINENO: checking for ut_host field in utmp.h" >&5 + echo "$as_me:11142: checking for ut_host field in utmp.h" >&5 echo $ECHO_N "checking for ut_host field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11149 "configure" #include "confdefs.h" #include @@ -12879,31 +11163,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11166: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_HOST_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11175: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_host' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_host - echo "$as_me:$LINENO: checking for ut_host field in utmpx.h" >&5 + echo "$as_me:11182: checking for ut_host field in utmpx.h" >&5 echo $ECHO_N "checking for ut_host field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11189 "configure" #include "confdefs.h" #include @@ -12920,31 +11203,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11206: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_HOST_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11215: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'syslen' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"syslen - echo "$as_me:$LINENO: checking for syslen field in utmpx.h" >&5 + echo "$as_me:11222: checking for syslen field in utmpx.h" >&5 echo $ECHO_N "checking for syslen field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11229 "configure" #include "confdefs.h" #include @@ -12961,31 +11243,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11246: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SYSLEN_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11255: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_pid' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_pid - echo "$as_me:$LINENO: checking for ut_pid field in utmp.h" >&5 + echo "$as_me:11262: checking for ut_pid field in utmp.h" >&5 echo $ECHO_N "checking for ut_pid field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11269 "configure" #include "confdefs.h" #include @@ -13002,31 +11283,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11286: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_PID_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11295: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_type' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type - echo "$as_me:$LINENO: checking for ut_type field in utmp.h" >&5 + echo "$as_me:11302: checking for ut_type field in utmp.h" >&5 echo $ECHO_N "checking for ut_type field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11309 "configure" #include "confdefs.h" #include @@ -13043,31 +11323,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11326: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_TYPE_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11335: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_type' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_type - echo "$as_me:$LINENO: checking for ut_type field in utmpx.h" >&5 + echo "$as_me:11342: checking for ut_type field in utmpx.h" >&5 echo $ECHO_N "checking for ut_type field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11349 "configure" #include "confdefs.h" #include @@ -13084,31 +11363,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11366: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_TYPE_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11375: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_tv' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv - echo "$as_me:$LINENO: checking for ut_tv field in utmp.h" >&5 + echo "$as_me:11382: checking for ut_tv field in utmp.h" >&5 echo $ECHO_N "checking for ut_tv field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11389 "configure" #include "confdefs.h" #include @@ -13125,31 +11403,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11406: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_TV_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11415: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_id' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id - echo "$as_me:$LINENO: checking for ut_id field in utmp.h" >&5 + echo "$as_me:11422: checking for ut_id field in utmp.h" >&5 echo $ECHO_N "checking for ut_id field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11429 "configure" #include "confdefs.h" #include @@ -13166,31 +11443,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11446: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ID_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11455: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_id' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_id - echo "$as_me:$LINENO: checking for ut_id field in utmpx.h" >&5 + echo "$as_me:11462: checking for ut_id field in utmpx.h" >&5 echo $ECHO_N "checking for ut_id field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11469 "configure" #include "confdefs.h" #include @@ -13207,31 +11483,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11486: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ID_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11495: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_addr' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr - echo "$as_me:$LINENO: checking for ut_addr field in utmp.h" >&5 + echo "$as_me:11502: checking for ut_addr field in utmp.h" >&5 echo $ECHO_N "checking for ut_addr field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11509 "configure" #include "confdefs.h" #include @@ -13248,31 +11523,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11526: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ADDR_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11535: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_addr' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr - echo "$as_me:$LINENO: checking for ut_addr field in utmpx.h" >&5 + echo "$as_me:11542: checking for ut_addr field in utmpx.h" >&5 echo $ECHO_N "checking for ut_addr field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11549 "configure" #include "confdefs.h" #include @@ -13289,31 +11563,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11566: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ADDR_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11575: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_addr_v6' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 - echo "$as_me:$LINENO: checking for ut_addr_v6 field in utmp.h" >&5 + echo "$as_me:11582: checking for ut_addr_v6 field in utmp.h" >&5 echo $ECHO_N "checking for ut_addr_v6 field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11589 "configure" #include "confdefs.h" #include @@ -13330,31 +11603,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11606: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ADDR_V6_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11615: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_addr_v6' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_addr_v6 - echo "$as_me:$LINENO: checking for ut_addr_v6 field in utmpx.h" >&5 + echo "$as_me:11622: checking for ut_addr_v6 field in utmpx.h" >&5 echo $ECHO_N "checking for ut_addr_v6 field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11629 "configure" #include "confdefs.h" #include @@ -13371,31 +11643,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11646: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ADDR_V6_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11655: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_exit' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_exit - echo "$as_me:$LINENO: checking for ut_exit field in utmp.h" >&5 + echo "$as_me:11662: checking for ut_exit field in utmp.h" >&5 echo $ECHO_N "checking for ut_exit field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11669 "configure" #include "confdefs.h" #include @@ -13412,31 +11683,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11686: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_EXIT_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11695: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_time' in header 'utmp.h' ossh_safe=`echo "utmp.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time - echo "$as_me:$LINENO: checking for ut_time field in utmp.h" >&5 + echo "$as_me:11702: checking for ut_time field in utmp.h" >&5 echo $ECHO_N "checking for ut_time field in utmp.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11709 "configure" #include "confdefs.h" #include @@ -13453,31 +11723,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11726: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_TIME_IN_UTMP 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11735: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_time' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_time - echo "$as_me:$LINENO: checking for ut_time field in utmpx.h" >&5 + echo "$as_me:11742: checking for ut_time field in utmpx.h" >&5 echo $ECHO_N "checking for ut_time field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11749 "configure" #include "confdefs.h" #include @@ -13494,31 +11763,30 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11766: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_TIME_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11775: result: no" >&5 echo "${ECHO_T}no" >&6 fi - # look for field 'ut_tv' in header 'utmpx.h' ossh_safe=`echo "utmpx.h" | sed 'y%./+-%__p_%'` ossh_varname="ossh_cv_$ossh_safe""_has_"ut_tv - echo "$as_me:$LINENO: checking for ut_tv field in utmpx.h" >&5 + echo "$as_me:11782: checking for ut_tv field in utmpx.h" >&5 echo $ECHO_N "checking for ut_tv field in utmpx.h... $ECHO_C" >&6 if eval "test \"\${$ossh_varname+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11789 "configure" #include "confdefs.h" #include @@ -13535,35 +11803,28 @@ ossh_result=`eval 'echo $'"$ossh_varname"` if test -n "`echo $ossh_varname`"; then - echo "$as_me:$LINENO: result: $ossh_result" >&5 + echo "$as_me:11806: result: $ossh_result" >&5 echo "${ECHO_T}$ossh_result" >&6 if test "x$ossh_result" = "xyes"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_TV_IN_UTMPX 1 -_ACEOF +EOF fi else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:11815: result: no" >&5 echo "${ECHO_T}no" >&6 fi - -echo "$as_me:$LINENO: checking for struct stat.st_blksize" >&5 +echo "$as_me:11819: checking for struct stat.st_blksize" >&5 echo $ECHO_N "checking for struct stat.st_blksize... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_blksize+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11825 "configure" #include "confdefs.h" $ac_includes_default -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -13575,16 +11836,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11839: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11842: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11845: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11848: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_member_struct_stat_st_blksize=yes else @@ -13594,37 +11855,29 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_blksize" >&5 +echo "$as_me:11858: result: $ac_cv_member_struct_stat_st_blksize" >&5 echo "${ECHO_T}$ac_cv_member_struct_stat_st_blksize" >&6 if test $ac_cv_member_struct_stat_st_blksize = yes; then -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <&5 +echo "$as_me:11868: checking for ss_family field in struct sockaddr_storage" >&5 echo $ECHO_N "checking for ss_family field in struct sockaddr_storage... $ECHO_C" >&6 if test "${ac_cv_have_ss_family_in_struct_ss+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11875 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -13634,16 +11887,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11890: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11893: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11896: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11899: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_ss_family_in_struct_ss="yes" else @@ -13654,34 +11907,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_ss_family_in_struct_ss" >&5 +echo "$as_me:11910: result: $ac_cv_have_ss_family_in_struct_ss" >&5 echo "${ECHO_T}$ac_cv_have_ss_family_in_struct_ss" >&6 if test "x$ac_cv_have_ss_family_in_struct_ss" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SS_FAMILY_IN_SS 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for __ss_family field in struct sockaddr_storage" >&5 +echo "$as_me:11919: checking for __ss_family field in struct sockaddr_storage" >&5 echo $ECHO_N "checking for __ss_family field in struct sockaddr_storage... $ECHO_C" >&6 if test "${ac_cv_have___ss_family_in_struct_ss+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11926 "configure" #include "confdefs.h" #include #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -13691,16 +11938,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11941: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11944: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11947: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11950: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have___ss_family_in_struct_ss="yes" else @@ -13712,33 +11959,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have___ss_family_in_struct_ss" >&5 +echo "$as_me:11962: result: $ac_cv_have___ss_family_in_struct_ss" >&5 echo "${ECHO_T}$ac_cv_have___ss_family_in_struct_ss" >&6 if test "x$ac_cv_have___ss_family_in_struct_ss" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE___SS_FAMILY_IN_SS 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for pw_class field in struct passwd" >&5 +echo "$as_me:11971: checking for pw_class field in struct passwd" >&5 echo $ECHO_N "checking for pw_class field in struct passwd... $ECHO_C" >&6 if test "${ac_cv_have_pw_class_in_struct_passwd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 11978 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -13748,16 +11989,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:11992: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:11995: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:11998: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12001: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_pw_class_in_struct_passwd="yes" else @@ -13769,33 +12010,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_pw_class_in_struct_passwd" >&5 +echo "$as_me:12013: result: $ac_cv_have_pw_class_in_struct_passwd" >&5 echo "${ECHO_T}$ac_cv_have_pw_class_in_struct_passwd" >&6 if test "x$ac_cv_have_pw_class_in_struct_passwd" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_PW_CLASS_IN_PASSWD 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for pw_expire field in struct passwd" >&5 +echo "$as_me:12022: checking for pw_expire field in struct passwd" >&5 echo $ECHO_N "checking for pw_expire field in struct passwd... $ECHO_C" >&6 if test "${ac_cv_have_pw_expire_in_struct_passwd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12029 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -13805,16 +12040,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12043: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12046: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12049: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12052: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_pw_expire_in_struct_passwd="yes" else @@ -13826,33 +12061,27 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5 +echo "$as_me:12064: result: $ac_cv_have_pw_expire_in_struct_passwd" >&5 echo "${ECHO_T}$ac_cv_have_pw_expire_in_struct_passwd" >&6 if test "x$ac_cv_have_pw_expire_in_struct_passwd" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_PW_EXPIRE_IN_PASSWD 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for pw_change field in struct passwd" >&5 +echo "$as_me:12073: checking for pw_change field in struct passwd" >&5 echo $ECHO_N "checking for pw_change field in struct passwd... $ECHO_C" >&6 if test "${ac_cv_have_pw_change_in_struct_passwd+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12080 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -13862,16 +12091,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12094: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12097: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12100: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12103: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_pw_change_in_struct_passwd="yes" else @@ -13883,28 +12112,28 @@ rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_pw_change_in_struct_passwd" >&5 +echo "$as_me:12115: result: $ac_cv_have_pw_change_in_struct_passwd" >&5 echo "${ECHO_T}$ac_cv_have_pw_change_in_struct_passwd" >&6 if test "x$ac_cv_have_pw_change_in_struct_passwd" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_PW_CHANGE_IN_PASSWD 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for msg_accrights field in struct msghdr" >&5 +echo "$as_me:12124: checking for msg_accrights field in struct msghdr" >&5 echo $ECHO_N "checking for msg_accrights field in struct msghdr... $ECHO_C" >&6 if test "${ac_cv_have_accrights_in_msghdr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12131: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12136 "configure" #include "confdefs.h" #include @@ -13921,22 +12150,21 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12153: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12156: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12158: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12161: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_accrights_in_msghdr="yes" else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) ac_cv_have_accrights_in_msghdr="no" fi @@ -13944,28 +12172,28 @@ fi fi -echo "$as_me:$LINENO: result: $ac_cv_have_accrights_in_msghdr" >&5 +echo "$as_me:12175: result: $ac_cv_have_accrights_in_msghdr" >&5 echo "${ECHO_T}$ac_cv_have_accrights_in_msghdr" >&6 if test "x$ac_cv_have_accrights_in_msghdr" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_ACCRIGHTS_IN_MSGHDR 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking for msg_control field in struct msghdr" >&5 +echo "$as_me:12184: checking for msg_control field in struct msghdr" >&5 echo $ECHO_N "checking for msg_control field in struct msghdr... $ECHO_C" >&6 if test "${ac_cv_have_control_in_msghdr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$cross_compiling" = yes; then - { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:12191: error: cannot run test program while cross compiling" >&5 echo "$as_me: error: cannot run test program while cross compiling" >&2;} { (exit 1); exit 1; }; } else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12196 "configure" #include "confdefs.h" #include @@ -13982,22 +12210,21 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12213: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12216: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12218: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12221: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_control_in_msghdr="yes" else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) ac_cv_have_control_in_msghdr="no" fi @@ -14005,31 +12232,25 @@ fi fi -echo "$as_me:$LINENO: result: $ac_cv_have_control_in_msghdr" >&5 +echo "$as_me:12235: result: $ac_cv_have_control_in_msghdr" >&5 echo "${ECHO_T}$ac_cv_have_control_in_msghdr" >&6 if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_CONTROL_IN_MSGHDR 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking if libc defines __progname" >&5 +echo "$as_me:12244: checking if libc defines __progname" >&5 echo $ECHO_N "checking if libc defines __progname... $ECHO_C" >&6 if test "${ac_cv_libc_defines___progname+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12251 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14039,16 +12260,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12263: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12266: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12269: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12272: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_libc_defines___progname="yes" else @@ -14060,33 +12281,27 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_libc_defines___progname" >&5 +echo "$as_me:12284: result: $ac_cv_libc_defines___progname" >&5 echo "${ECHO_T}$ac_cv_libc_defines___progname" >&6 if test "x$ac_cv_libc_defines___progname" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE___PROGNAME 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking whether $CC implements __FUNCTION__" >&5 +echo "$as_me:12293: checking whether $CC implements __FUNCTION__" >&5 echo $ECHO_N "checking whether $CC implements __FUNCTION__... $ECHO_C" >&6 if test "${ac_cv_cc_implements___FUNCTION__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12300 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14096,16 +12311,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12314: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12317: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12320: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12323: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_cc_implements___FUNCTION__="yes" else @@ -14117,33 +12332,27 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_cc_implements___FUNCTION__" >&5 +echo "$as_me:12335: result: $ac_cv_cc_implements___FUNCTION__" >&5 echo "${ECHO_T}$ac_cv_cc_implements___FUNCTION__" >&6 if test "x$ac_cv_cc_implements___FUNCTION__" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE___FUNCTION__ 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking whether $CC implements __func__" >&5 +echo "$as_me:12344: checking whether $CC implements __func__" >&5 echo $ECHO_N "checking whether $CC implements __func__... $ECHO_C" >&6 if test "${ac_cv_cc_implements___func__+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12351 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14153,16 +12362,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12365: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12368: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12371: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12374: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_cc_implements___func__="yes" else @@ -14174,33 +12383,27 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_cc_implements___func__" >&5 +echo "$as_me:12386: result: $ac_cv_cc_implements___func__" >&5 echo "${ECHO_T}$ac_cv_cc_implements___func__" >&6 if test "x$ac_cv_cc_implements___func__" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE___func__ 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking whether getopt has optreset support" >&5 +echo "$as_me:12395: checking whether getopt has optreset support" >&5 echo $ECHO_N "checking whether getopt has optreset support... $ECHO_C" >&6 if test "${ac_cv_have_getopt_optreset+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12402 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14210,16 +12413,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12416: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12419: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12425: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_have_getopt_optreset="yes" else @@ -14231,31 +12434,25 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_have_getopt_optreset" >&5 +echo "$as_me:12437: result: $ac_cv_have_getopt_optreset" >&5 echo "${ECHO_T}$ac_cv_have_getopt_optreset" >&6 if test "x$ac_cv_have_getopt_optreset" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_GETOPT_OPTRESET 1 -_ACEOF +EOF fi -echo "$as_me:$LINENO: checking if libc defines sys_errlist" >&5 +echo "$as_me:12446: checking if libc defines sys_errlist" >&5 echo $ECHO_N "checking if libc defines sys_errlist... $ECHO_C" >&6 if test "${ac_cv_libc_defines_sys_errlist+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12453 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14265,16 +12462,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12465: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12468: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12471: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12474: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_libc_defines_sys_errlist="yes" else @@ -14286,32 +12483,25 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_libc_defines_sys_errlist" >&5 +echo "$as_me:12486: result: $ac_cv_libc_defines_sys_errlist" >&5 echo "${ECHO_T}$ac_cv_libc_defines_sys_errlist" >&6 if test "x$ac_cv_libc_defines_sys_errlist" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SYS_ERRLIST 1 -_ACEOF +EOF fi - -echo "$as_me:$LINENO: checking if libc defines sys_nerr" >&5 +echo "$as_me:12495: checking if libc defines sys_nerr" >&5 echo $ECHO_N "checking if libc defines sys_nerr... $ECHO_C" >&6 if test "${ac_cv_libc_defines_sys_nerr+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12502 "configure" #include "confdefs.h" -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14321,16 +12511,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12514: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12517: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12520: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12523: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_libc_defines_sys_nerr="yes" else @@ -14342,12 +12532,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:$LINENO: result: $ac_cv_libc_defines_sys_nerr" >&5 +echo "$as_me:12535: result: $ac_cv_libc_defines_sys_nerr" >&5 echo "${ECHO_T}$ac_cv_libc_defines_sys_nerr" >&6 if test "x$ac_cv_libc_defines_sys_nerr" = "xyes" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_SYS_NERR 1 -_ACEOF +EOF fi @@ -14374,61 +12564,23 @@ for ac_header in sectok.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo "$as_me:12567: checking for $ac_header" >&5 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f 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 -#line $LINENO "configure" + cat >conftest.$ac_ext <<_ACEOF +#line 12573 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:12577: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12583: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14439,58 +12591,31 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$as_ac_Header=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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:12602: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { { echo "$as_me:12613: error: Can't find sectok.h" >&5 echo "$as_me: error: Can't find sectok.h" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:$LINENO: checking for sectok_open in -lsectok" >&5 +echo "$as_me:12618: checking for sectok_open in -lsectok" >&5 echo $ECHO_N "checking for sectok_open in -lsectok... $ECHO_C" >&6 if test "${ac_cv_lib_sectok_sectok_open+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14498,7 +12623,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsectok $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12626 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14508,12 +12633,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char sectok_open (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14523,16 +12642,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12645: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12648: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12651: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12654: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_sectok_sectok_open=yes else @@ -14543,34 +12662,33 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_sectok_sectok_open" >&5 +echo "$as_me:12665: result: $ac_cv_lib_sectok_sectok_open" >&5 echo "${ECHO_T}$ac_cv_lib_sectok_sectok_open" >&6 if test $ac_cv_lib_sectok_sectok_open = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { { echo "$as_me:12677: error: Can't find libsectok" >&5 echo "$as_me: error: Can't find libsectok" >&2;} { (exit 1); exit 1; }; } fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SMARTCARD 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_SECTOK 1 -_ACEOF +EOF SCARD_MSG="yes, using sectok" fi - fi; # Check whether user wants OpenSC support @@ -14586,7 +12704,7 @@ OPENSC_CONFIG=$opensc_config_prefix/bin/opensc-config # Extract the first word of "opensc-config", so it can be a program name with args. set dummy opensc-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:12707: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_OPENSC_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14596,18 +12714,16 @@ ac_cv_path_OPENSC_CONFIG="$OPENSC_CONFIG" # Let the user override the test with a path. ;; *) - 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 $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_OPENSC_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 + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_OPENSC_CONFIG="$ac_dir/$ac_word" + echo "$as_me:12724: found $ac_dir/$ac_word" >&5 + break +fi done test -z "$ac_cv_path_OPENSC_CONFIG" && ac_cv_path_OPENSC_CONFIG="no" @@ -14617,10 +12733,10 @@ OPENSC_CONFIG=$ac_cv_path_OPENSC_CONFIG if test -n "$OPENSC_CONFIG"; then - echo "$as_me:$LINENO: result: $OPENSC_CONFIG" >&5 + echo "$as_me:12736: result: $OPENSC_CONFIG" >&5 echo "${ECHO_T}$OPENSC_CONFIG" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:12739: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -14629,13 +12745,13 @@ LIBOPENSC_LIBS=`$OPENSC_CONFIG --libs` CPPFLAGS="$CPPFLAGS $LIBOPENSC_CFLAGS" LDFLAGS="$LDFLAGS $LIBOPENSC_LIBS" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define SMARTCARD 1 -_ACEOF +EOF - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define USE_OPENSC 1 -_ACEOF +EOF SCARD_MSG="yes, using OpenSC" fi @@ -14656,23 +12772,17 @@ fi CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include" LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define KRB5 1 -_ACEOF +EOF KRB5_MSG="yes" - echo "$as_me:$LINENO: checking whether we are using Heimdal" >&5 + echo "$as_me:12780: checking whether we are using Heimdal" >&5 echo $ECHO_N "checking whether we are using Heimdal... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12783 "configure" #include "confdefs.h" #include -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14682,33 +12792,32 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:12795: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12798: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12801: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12804: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:12806: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HEIMDAL 1 -_ACEOF +EOF K5LIBS="-lkrb5 -ldes -lcom_err -lasn1 -lroken" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:12817: result: no" >&5 echo "${ECHO_T}no" >&6 K5LIBS="-lkrb5 -lk5crypto -lcom_err" - fi rm -f conftest.$ac_objext conftest.$ac_ext if test ! -z "$need_dash_r" ; then @@ -14718,7 +12827,7 @@ blibpath="$blibpath:${KRB5ROOT}/lib" fi -echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5 +echo "$as_me:12830: checking for dn_expand in -lresolv" >&5 echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14726,7 +12835,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 12838 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -14736,12 +12845,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dn_expand (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14751,16 +12854,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:12857: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12860: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:12863: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:12866: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_dn_expand=yes else @@ -14771,22 +12874,280 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5 +echo "$as_me:12877: result: $ac_cv_lib_resolv_dn_expand" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 if test $ac_cv_lib_resolv_dn_expand = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo $ECHO_N "checking for gss_init_sec_context in -lgssapi... $ECHO_C" >&6 +if test "${ac_cv_lib_gssapi_gss_init_sec_context+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgssapi $K5LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 12896 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gss_init_sec_context (); +int +main () +{ +gss_init_sec_context (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12915: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12918: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12921: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12924: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gssapi_gss_init_sec_context=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gssapi_gss_init_sec_context=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:12935: result: $ac_cv_lib_gssapi_gss_init_sec_context" >&5 +echo "${ECHO_T}$ac_cv_lib_gssapi_gss_init_sec_context" >&6 +if test $ac_cv_lib_gssapi_gss_init_sec_context = yes; then + cat >>confdefs.h <<\EOF +#define GSSAPI 1 +EOF + + K5LIBS="-lgssapi $K5LIBS" +else + echo "$as_me:12944: checking for gss_init_sec_context in -lgssapi_krb5" >&5 +echo $ECHO_N "checking for gss_init_sec_context in -lgssapi_krb5... $ECHO_C" >&6 +if test "${ac_cv_lib_gssapi_krb5_gss_init_sec_context+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lgssapi_krb5 $K5LIBS $LIBS" +cat >conftest.$ac_ext <<_ACEOF +#line 12952 "configure" +#include "confdefs.h" + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gss_init_sec_context (); +int +main () +{ +gss_init_sec_context (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:12971: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:12974: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:12977: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:12980: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_gssapi_krb5_gss_init_sec_context=yes +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 +ac_cv_lib_gssapi_krb5_gss_init_sec_context=no +fi +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:12991: result: $ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&5 +echo "${ECHO_T}$ac_cv_lib_gssapi_krb5_gss_init_sec_context" >&6 +if test $ac_cv_lib_gssapi_krb5_gss_init_sec_context = yes; then + cat >>confdefs.h <<\EOF +#define GSSAPI 1 +EOF + + K5LIBS="-lgssapi_krb5 $K5LIBS" +else + { echo "$as_me:13000: WARNING: Cannot find any suitable gss-api library - build may fail" >&5 +echo "$as_me: WARNING: Cannot find any suitable gss-api library - build may fail" >&2;} +fi + +fi + + echo "$as_me:13006: checking for gssapi.h" >&5 +echo $ECHO_N "checking for gssapi.h... $ECHO_C" >&6 +if test "${ac_cv_header_gssapi_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13012 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:13016: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:13022: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_gssapi_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_gssapi_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:13041: result: $ac_cv_header_gssapi_h" >&5 +echo "${ECHO_T}$ac_cv_header_gssapi_h" >&6 +if test $ac_cv_header_gssapi_h = yes; then + : +else + unset ac_cv_header_gssapi_h + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" + +for ac_header in gssapi.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:13052: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13058 "configure" +#include "confdefs.h" +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:13062: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:13068: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:13087: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <&5 +echo "$as_me: WARNING: Cannot find any suitable gss-api header - build may fail" >&2;} + +fi +done + +fi + + oldCPP="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" + echo "$as_me:13105: checking for gssapi_krb5.h" >&5 +echo $ECHO_N "checking for gssapi_krb5.h... $ECHO_C" >&6 +if test "${ac_cv_header_gssapi_krb5_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13111 "configure" +#include "confdefs.h" +#include +_ACEOF +if { (eval echo "$as_me:13115: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + egrep -v '^ *\+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:13121: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_cv_header_gssapi_krb5_h=yes +else + echo "$as_me: failed program was:" >&5 + cat conftest.$ac_ext >&5 + ac_cv_header_gssapi_krb5_h=no +fi +rm -f conftest.err conftest.$ac_ext +fi +echo "$as_me:13140: result: $ac_cv_header_gssapi_krb5_h" >&5 +echo "${ECHO_T}$ac_cv_header_gssapi_krb5_h" >&6 +if test $ac_cv_header_gssapi_krb5_h = yes; then + : +else + CPPFLAGS="$oldCPP" +fi KRB5=yes fi - fi; # Check whether user wants Kerberos 4 support KRB4_MSG="no" @@ -14811,65 +13172,26 @@ fi fi - for ac_header in krb.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&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 -#line $LINENO "configure" -#include "confdefs.h" -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -cat conftest.$ac_ext >&5 -ac_header_compiler=no -fi -rm -f 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 -#line $LINENO "configure" +echo "$as_me:13178: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +#line 13184 "configure" #include "confdefs.h" #include <$ac_header> _ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +if { (eval echo "$as_me:13188: \"$ac_cpp conftest.$ac_ext\"") >&5 (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 ac_status=$? egrep -v '^ *\+' conftest.er1 >conftest.err rm -f conftest.er1 cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13194: \$? = $ac_status" >&5 (exit $ac_status); } >/dev/null; then if test -s conftest.err; then ac_cpp_err=$ac_c_preproc_warn_flag @@ -14880,57 +13202,30 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_header_preproc=yes + eval "$as_ac_Header=yes" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_header_preproc=no + eval "$as_ac_Header=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 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 preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; - 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: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;};; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=$ac_header_preproc" fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "$as_me:13213: result: `eval echo '${'$as_ac_Header'}'`" >&5 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { echo "$as_me:13224: WARNING: Cannot find krb.h, build may fail" >&5 echo "$as_me: WARNING: Cannot find krb.h, build may fail" >&2;} fi -echo "$as_me:$LINENO: checking for main in -lkrb" >&5 +echo "$as_me:13228: checking for main in -lkrb" >&5 echo $ECHO_N "checking for main in -lkrb... $ECHO_C" >&6 if test "${ac_cv_lib_krb_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14938,16 +13233,9 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lkrb $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13236 "configure" #include "confdefs.h" - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -14957,16 +13245,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13248: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13251: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13254: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13257: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_krb_main=yes else @@ -14977,12 +13265,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_krb_main" >&5 +echo "$as_me:13268: result: $ac_cv_lib_krb_main" >&5 echo "${ECHO_T}$ac_cv_lib_krb_main" >&6 if test $ac_cv_lib_krb_main = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:13281: checking for main in -lkrb4" >&5 echo $ECHO_N "checking for main in -lkrb4... $ECHO_C" >&6 if test "${ac_cv_lib_krb4_main+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -14998,16 +13286,9 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lkrb4 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13289 "configure" #include "confdefs.h" - -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15017,16 +13298,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13301: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13304: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13307: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13310: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_krb4_main=yes else @@ -15037,19 +13318,19 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_krb4_main" >&5 +echo "$as_me:13321: result: $ac_cv_lib_krb4_main" >&5 echo "${ECHO_T}$ac_cv_lib_krb4_main" >&6 if test $ac_cv_lib_krb4_main = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { echo "$as_me:13333: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&5 echo "$as_me: WARNING: Cannot find libkrb nor libkrb4, build may fail" >&2;} else KLIBS="-lkrb4" @@ -15058,7 +13339,7 @@ KLIBS="-lkrb" fi -echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5 +echo "$as_me:13342: checking for des_cbc_encrypt in -ldes" >&5 echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6 if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15066,7 +13347,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldes $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13350 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15076,12 +13357,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char des_cbc_encrypt (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15091,16 +13366,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13369: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13372: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13375: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13378: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_des_des_cbc_encrypt=yes else @@ -15111,12 +13386,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 +echo "$as_me:13389: result: $ac_cv_lib_des_des_cbc_encrypt" >&5 echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6 if test $ac_cv_lib_des_des_cbc_encrypt = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:13402: checking for des_cbc_encrypt in -ldes425" >&5 echo $ECHO_N "checking for des_cbc_encrypt in -ldes425... $ECHO_C" >&6 if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15132,7 +13407,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-ldes425 $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13410 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15142,12 +13417,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char des_cbc_encrypt (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15157,16 +13426,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13429: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13432: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13435: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13438: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_des425_des_cbc_encrypt=yes else @@ -15177,19 +13446,19 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 +echo "$as_me:13449: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5 echo "${ECHO_T}$ac_cv_lib_des425_des_cbc_encrypt" >&6 if test $ac_cv_lib_des425_des_cbc_encrypt = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { echo "$as_me:13461: WARNING: Cannot find libdes nor libdes425, build may fail" >&5 echo "$as_me: WARNING: Cannot find libdes nor libdes425, build may fail" >&2;} else KLIBS="-ldes425" @@ -15198,7 +13467,7 @@ KLIBS="-ldes" fi -echo "$as_me:$LINENO: checking for dn_expand in -lresolv" >&5 +echo "$as_me:13470: checking for dn_expand in -lresolv" >&5 echo $ECHO_N "checking for dn_expand in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_dn_expand+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15206,7 +13475,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13478 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -15216,12 +13485,6 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char dn_expand (); -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15231,16 +13494,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13497: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13500: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13503: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13506: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_dn_expand=yes else @@ -15251,12 +13514,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_dn_expand" >&5 +echo "$as_me:13517: result: $ac_cv_lib_resolv_dn_expand" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_dn_expand" >&6 if test $ac_cv_lib_resolv_dn_expand = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define KRB4 1 -_ACEOF +EOF fi - fi; # Check whether user wants AFS support @@ -15288,7 +13550,7 @@ fi if test -z "$KRB4" ; then - { echo "$as_me:$LINENO: WARNING: AFS requires Kerberos IV support, build may fail" >&5 + { echo "$as_me:13553: WARNING: AFS requires Kerberos IV support, build may fail" >&5 echo "$as_me: WARNING: AFS requires Kerberos IV support, build may fail" >&2;} fi @@ -15296,14 +13558,13 @@ if test ! -z "$AFS_LIBS" ; then LIBS="$LIBS $AFS_LIBS" fi - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define AFS 1 -_ACEOF +EOF AFS_MSG="yes" fi - fi; LIBS="$LIBS $KLIBS $K5LIBS" @@ -15319,11 +13580,8 @@ PRIVSEP_PATH=$withval fi - fi; - - # Check whether --with-xauth or --without-xauth was given. if test "${with_xauth+set}" = set; then withval="$with_xauth" @@ -15336,7 +13594,7 @@ # Extract the first word of "xauth", so it can be a program name with args. set dummy xauth; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo "$as_me:13597: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_xauth_path+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15346,18 +13604,16 @@ ac_cv_path_xauth_path="$xauth_path" # Let the user override the test with a path. ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_xauth_path="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_xauth_path="$ac_dir/$ac_word" + echo "$as_me:13614: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -15366,10 +13622,10 @@ xauth_path=$ac_cv_path_xauth_path if test -n "$xauth_path"; then - echo "$as_me:$LINENO: result: $xauth_path" >&5 + echo "$as_me:13625: result: $xauth_path" >&5 echo "${ECHO_T}$xauth_path" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:13628: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15377,16 +13633,15 @@ xauth_path="/usr/openwin/bin/xauth" fi - fi; if test -z "$xauth_path" ; then XAUTH_PATH="undefined" else - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + echo "$as_me:13661: checking for \"/dev/ptmx\"" >&5 echo $ECHO_N "checking for \"/dev/ptmx\"... $ECHO_C" >&6 if test "${ac_cv_file___dev_ptmx_+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:13667: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r ""/dev/ptmx""; then @@ -15418,28 +13673,27 @@ ac_cv_file___dev_ptmx_=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptmx_" >&5 +echo "$as_me:13676: result: $ac_cv_file___dev_ptmx_" >&5 echo "${ECHO_T}$ac_cv_file___dev_ptmx_" >&6 if test $ac_cv_file___dev_ptmx_ = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:13690: checking for \"/dev/ptc\"" >&5 echo $ECHO_N "checking for \"/dev/ptc\"... $ECHO_C" >&6 if test "${ac_cv_file___dev_ptc_+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 + { { echo "$as_me:13696: error: cannot check for file existence when cross compiling" >&5 echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} { (exit 1); exit 1; }; } if test -r ""/dev/ptc""; then @@ -15448,20 +13702,18 @@ ac_cv_file___dev_ptc_=no fi fi -echo "$as_me:$LINENO: result: $ac_cv_file___dev_ptc_" >&5 +echo "$as_me:13705: result: $ac_cv_file___dev_ptc_" >&5 echo "${ECHO_T}$ac_cv_file___dev_ptc_" >&6 if test $ac_cv_file___dev_ptc_ = yes; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { { echo "$as_me:13728: error: invalid man type: $withval" >&5 echo "$as_me: error: invalid man type: $withval" >&2;} { (exit 1); exit 1; }; } ;; esac - fi; if test -z "$MANTYPE"; then for ac_prog in nroff awf 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 "$as_me:13740: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_NROFF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -15496,19 +13747,16 @@ ac_cv_path_NROFF="$NROFF" # Let the user override the test with a path. ;; *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="/usr/bin:/usr/ucb" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_NROFF="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done + ac_save_IFS=$IFS; IFS=$ac_path_separator +ac_dummy="/usr/bin:/usr/ucb" +for ac_dir in $ac_dummy; do + IFS=$ac_save_IFS + test -z "$ac_dir" && ac_dir=. + if $as_executable_p "$ac_dir/$ac_word"; then + ac_cv_path_NROFF="$ac_dir/$ac_word" + echo "$as_me:13757: found $ac_dir/$ac_word" >&5 + break +fi done ;; @@ -15517,10 +13765,10 @@ NROFF=$ac_cv_path_NROFF if test -n "$NROFF"; then - echo "$as_me:$LINENO: result: $NROFF" >&5 + echo "$as_me:13768: result: $NROFF" >&5 echo "${ECHO_T}$NROFF" >&6 else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:13771: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -15543,7 +13791,6 @@ mansubdir=$MANTYPE; fi - # Check whether to enable MD5 passwords MD5_MSG="no" @@ -15552,14 +13799,13 @@ withval="$with_md5_passwords" if test "x$withval" != "xno" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAVE_MD5_PASSWORDS 1 -_ACEOF +EOF MD5_MSG="yes" fi - fi; # Whether to disable shadow password support @@ -15569,33 +13815,26 @@ withval="$with_shadow" if test "x$withval" = "xno" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_SHADOW 1 -_ACEOF +EOF disable_shadow=yes fi - fi; if test -z "$disable_shadow" ; then - echo "$as_me:$LINENO: checking if the systems has expire shadow information" >&5 + echo "$as_me:13828: checking if the systems has expire shadow information" >&5 echo $ECHO_N "checking if the systems has expire shadow information... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13831 "configure" #include "confdefs.h" #include #include struct spwd sp; -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -15605,35 +13844,34 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:13847: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13850: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13853: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13856: \$? = $ac_status" >&5 (exit $ac_status); }; }; then sp_expire_available=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - fi rm -f conftest.$ac_objext conftest.$ac_ext if test "x$sp_expire_available" = "xyes" ; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:13867: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define HAS_SHADOW_EXPIRE 1 -_ACEOF +EOF else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:13874: result: no" >&5 echo "${ECHO_T}no" >&6 fi fi @@ -15641,9 +13879,9 @@ # Use ip address instead of hostname in $DISPLAY if test ! -z "$IPADDR_IN_DISPLAY" ; then DISPLAY_HACK_MSG="yes" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IPADDR_IN_DISPLAY 1 -_ACEOF +EOF else DISPLAY_HACK_MSG="no" @@ -15653,14 +13891,13 @@ withval="$with_ipaddr_display" if test "x$withval" != "xno" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IPADDR_IN_DISPLAY 1 -_ACEOF +EOF DISPLAY_HACK_MSG="yes" fi - fi; fi @@ -15676,7 +13913,7 @@ withval="$with_default_path" if test "$USES_LOGIN_CONF" = "yes" ; then - { echo "$as_me:$LINENO: WARNING: + { echo "$as_me:13916: WARNING: --with-default-path=PATH has no effect on this system. Edit /etc/login.conf instead." >&5 echo "$as_me: WARNING: @@ -15689,7 +13926,7 @@ else if test "$USES_LOGIN_CONF" = "yes" ; then - { echo "$as_me:$LINENO: WARNING: Make sure the path to scp is in /etc/login.conf" >&5 + { echo "$as_me:13929: WARNING: Make sure the path to scp is in /etc/login.conf" >&5 echo "$as_me: WARNING: Make sure the path to scp is in /etc/login.conf" >&2;} else if test "$cross_compiling" = yes; then @@ -15697,7 +13934,7 @@ else cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 13937 "configure" #include "confdefs.h" /* find out what STDPATH is */ @@ -15730,22 +13967,21 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 +if { (eval echo "$as_me:13970: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13973: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:13975: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:13978: \$? = $ac_status" >&5 (exit $ac_status); }; }; then user_path=`cat conftest.stdpath` else echo "$as_me: program exited with status $ac_status" >&5 echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -( exit $ac_status ) user_path="/usr/bin:/bin:/usr/sbin:/sbin" fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext @@ -15763,7 +13999,7 @@ echo $user_path | grep "^$t_bindir" > /dev/null 2>&1 if test $? -ne 0 ; then user_path=$user_path:$t_bindir - echo "$as_me:$LINENO: result: Adding $t_bindir to USER_PATH so scp will work" >&5 + echo "$as_me:14002: result: Adding $t_bindir to USER_PATH so scp will work" >&5 echo "${ECHO_T}Adding $t_bindir to USER_PATH so scp will work" >&6 fi fi @@ -15771,10 +14007,9 @@ fi; if test "$USES_LOGIN_CONF" != "yes" ; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<_ACEOF + cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IPV4_DEFAULT 1 -_ACEOF +EOF IPV4_HACK_MSG="yes" fi - fi; -echo "$as_me:$LINENO: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 +echo "$as_me:14049: checking if we need to convert IPv4 in IPv6-mapped addresses" >&5 echo $ECHO_N "checking if we need to convert IPv4 in IPv6-mapped addresses... $ECHO_C" >&6 IPV4_IN6_HACK_MSG="no" @@ -15823,34 +14055,33 @@ withval="$with_4in6" if test "x$withval" != "xno" ; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14058: result: yes" >&5 echo "${ECHO_T}yes" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IPV4_IN_IPV6 1 -_ACEOF +EOF IPV4_IN6_HACK_MSG="yes" else - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14066: result: no" >&5 echo "${ECHO_T}no" >&6 fi else if test "x$inet6_default_4in6" = "xyes"; then - echo "$as_me:$LINENO: result: yes (default)" >&5 + echo "$as_me:14073: result: yes (default)" >&5 echo "${ECHO_T}yes (default)" >&6 - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define IPV4_IN_IPV6 1 -_ACEOF +EOF IPV4_IN6_HACK_MSG="yes" else - echo "$as_me:$LINENO: result: no (default)" >&5 + echo "$as_me:14081: result: no (default)" >&5 echo "${ECHO_T}no (default)" >&6 fi - fi; # Whether to enable BSD auth support @@ -15861,14 +14092,13 @@ withval="$with_bsd_auth" if test "x$withval" != "xno" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define BSD_AUTH 1 -_ACEOF +EOF BSD_AUTH_MSG=yes fi - fi; # Where to place sshd.pid @@ -15881,7 +14111,6 @@ esac fi - # Check whether --with-pid-dir or --without-pid-dir was given. if test "${with_pid_dir+set}" = set; then withval="$with_pid_dir" @@ -15889,90 +14118,79 @@ if test "x$withval" != "xno" ; then piddir=$withval if test ! -d $piddir ; then - { echo "$as_me:$LINENO: WARNING: ** no $piddir directory on this system **" >&5 + { echo "$as_me:14121: WARNING: ** no $piddir directory on this system **" >&5 echo "$as_me: WARNING: ** no $piddir directory on this system **" >&2;} fi fi - fi; -cat >>confdefs.h <<_ACEOF +cat >>confdefs.h <>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_LASTLOG 1 -_ACEOF - +EOF fi; # Check whether --enable-utmp or --disable-utmp was given. if test "${enable_utmp+set}" = set; then enableval="$enable_utmp" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMP 1 -_ACEOF - +EOF fi; # Check whether --enable-utmpx or --disable-utmpx was given. if test "${enable_utmpx+set}" = set; then enableval="$enable_utmpx" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMPX 1 -_ACEOF - +EOF fi; # Check whether --enable-wtmp or --disable-wtmp was given. if test "${enable_wtmp+set}" = set; then enableval="$enable_wtmp" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_WTMP 1 -_ACEOF - +EOF fi; # Check whether --enable-wtmpx or --disable-wtmpx was given. if test "${enable_wtmpx+set}" = set; then enableval="$enable_wtmpx" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_WTMPX 1 -_ACEOF - +EOF fi; # Check whether --enable-libutil or --disable-libutil was given. if test "${enable_libutil+set}" = set; then enableval="$enable_libutil" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_LOGIN 1 -_ACEOF - +EOF fi; # Check whether --enable-pututline or --disable-pututline was given. if test "${enable_pututline+set}" = set; then enableval="$enable_pututline" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_PUTUTLINE 1 -_ACEOF - +EOF fi; # Check whether --enable-pututxline or --disable-pututxline was given. if test "${enable_pututxline+set}" = set; then enableval="$enable_pututxline" - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_PUTUTXLINE 1 -_ACEOF - +EOF fi; @@ -15981,22 +14199,20 @@ withval="$with_lastlog" if test "x$withval" = "xno" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_LASTLOG 1 -_ACEOF +EOF else conf_lastlog_location=$withval fi - fi; - -echo "$as_me:$LINENO: checking if your system defines LASTLOG_FILE" >&5 +echo "$as_me:14212: checking if your system defines LASTLOG_FILE" >&5 echo $ECHO_N "checking if your system defines LASTLOG_FILE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 14215 "configure" #include "confdefs.h" #include @@ -16011,12 +14227,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16026,29 +14236,29 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14239: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14242: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:14245: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14248: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14250: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14256: result: no" >&5 echo "${ECHO_T}no" >&6 - echo "$as_me:$LINENO: checking if your system defines _PATH_LASTLOG" >&5 + echo "$as_me:14258: checking if your system defines _PATH_LASTLOG" >&5 echo $ECHO_N "checking if your system defines _PATH_LASTLOG... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 14261 "configure" #include "confdefs.h" #include @@ -16060,12 +14270,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16075,31 +14279,30 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14282: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14285: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:14288: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14291: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14293: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14299: result: no" >&5 echo "${ECHO_T}no" >&6 system_lastlog_path=no fi rm -f conftest.$ac_objext conftest.$ac_ext - fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -16111,23 +14314,23 @@ fi done if test -z "$conf_lastlog_location"; then - { echo "$as_me:$LINENO: WARNING: ** Cannot find lastlog **" >&5 + { echo "$as_me:14317: WARNING: ** Cannot find lastlog **" >&5 echo "$as_me: WARNING: ** Cannot find lastlog **" >&2;} fi fi fi if test -n "$conf_lastlog_location"; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:14330: checking if your system defines UTMP_FILE" >&5 echo $ECHO_N "checking if your system defines UTMP_FILE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 14333 "configure" #include "confdefs.h" #include @@ -16136,12 +14339,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16151,23 +14348,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14351: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14354: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:14357: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14360: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14362: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14367: result: no" >&5 echo "${ECHO_T}no" >&6 system_utmp_path=no @@ -16181,24 +14378,24 @@ fi done if test -z "$conf_utmp_location"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMP 1 -_ACEOF +EOF fi fi fi if test -n "$conf_utmp_location"; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:14395: checking if your system defines WTMP_FILE" >&5 echo $ECHO_N "checking if your system defines WTMP_FILE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 14398 "configure" #include "confdefs.h" #include @@ -16207,12 +14404,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16222,23 +14413,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14416: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14419: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:14422: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14425: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14427: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14432: result: no" >&5 echo "${ECHO_T}no" >&6 system_wtmp_path=no @@ -16252,25 +14443,24 @@ fi done if test -z "$conf_wtmp_location"; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_WTMP 1 -_ACEOF +EOF fi fi fi if test -n "$conf_wtmp_location"; then - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:14460: checking if your system defines UTMPX_FILE" >&5 echo $ECHO_N "checking if your system defines UTMPX_FILE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 14463 "configure" #include "confdefs.h" #include @@ -16282,12 +14472,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16297,23 +14481,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14484: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14487: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:14490: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14493: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14495: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14500: result: no" >&5 echo "${ECHO_T}no" >&6 system_utmpx_path=no @@ -16321,22 +14505,22 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test -z "$conf_utmpx_location"; then if test x"$system_utmpx_path" = x"no" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_UTMPX 1 -_ACEOF +EOF fi else - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 +echo "$as_me:14520: checking if your system defines WTMPX_FILE" >&5 echo $ECHO_N "checking if your system defines WTMPX_FILE... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line $LINENO "configure" +#line 14523 "configure" #include "confdefs.h" #include @@ -16348,12 +14532,6 @@ # include #endif -#ifdef F77_DUMMY_MAIN -# ifdef __cplusplus - extern "C" -# endif - int F77_DUMMY_MAIN() { return 1; } -#endif int main () { @@ -16363,23 +14541,23 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:14544: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14547: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + { (eval echo "$as_me:14550: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 + echo "$as_me:14553: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:$LINENO: result: yes" >&5 + echo "$as_me:14555: result: yes" >&5 echo "${ECHO_T}yes" >&6 else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - echo "$as_me:$LINENO: result: no" >&5 + echo "$as_me:14560: result: no" >&5 echo "${ECHO_T}no" >&6 system_wtmpx_path=no @@ -16387,22 +14565,21 @@ rm -f conftest.$ac_objext conftest.$ac_ext if test -z "$conf_wtmpx_location"; then if test x"$system_wtmpx_path" = x"no" ; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\EOF #define DISABLE_WTMPX 1 -_ACEOF +EOF fi else - cat >>confdefs.h <<_ACEOF + cat >>confdefs.h <&5 + { echo "$as_me:14582: WARNING: Please check and edit -blibpath in LDFLAGS in Makefile" >&5 echo "$as_me: WARNING: Please check and edit -blibpath in LDFLAGS in Makefile" >&2;} fi @@ -16413,7 +14590,6 @@ LIBS=`echo $LIBS | sed 's/-ldl //'` fi - ac_config_files="$ac_config_files Makefile openbsd-compat/Makefile scard/Makefile ssh_prng_cmds" cat >confcache <<\_ACEOF @@ -16492,29 +14668,25 @@ DEFS=-DHAVE_CONFIG_H - : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:14674: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated by $as_me. +# Generated automatically by configure. # Run this file to recreate the current configuration. # Compiler output produced by configure, useful for debugging # configure, is in config.log if it exists. debug=false SHELL=\${CONFIG_SHELL-$SHELL} +ac_cs_invocation="\$0 \$@" + _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF - -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh @@ -16523,167 +14695,8 @@ set -o posix fi -# NLS nuisances. -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - -(set +x; test -n "`(LANG=C; export LANG) 2>&1`") && - { $as_unset LANG || test "${LANG+set}" != set; } || - { LANG=C; export LANG; } -(set +x; test -n "`(LC_ALL=C; export LC_ALL) 2>&1`") && - { $as_unset LC_ALL || test "${LC_ALL+set}" != set; } || - { LC_ALL=C; export LC_ALL; } -(set +x; test -n "`(LC_TIME=C; export LC_TIME) 2>&1`") && - { $as_unset LC_TIME || test "${LC_TIME+set}" != set; } || - { LC_TIME=C; export LC_TIME; } -(set +x; test -n "`(LC_CTYPE=C; export LC_CTYPE) 2>&1`") && - { $as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set; } || - { LC_CTYPE=C; export LC_CTYPE; } -(set +x; test -n "`(LANGUAGE=C; export LANGUAGE) 2>&1`") && - { $as_unset LANGUAGE || test "${LANGUAGE+set}" != set; } || - { LANGUAGE=C; export LANGUAGE; } -(set +x; test -n "`(LC_COLLATE=C; export LC_COLLATE) 2>&1`") && - { $as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set; } || - { LC_COLLATE=C; export LC_COLLATE; } -(set +x; test -n "`(LC_NUMERIC=C; export LC_NUMERIC) 2>&1`") && - { $as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set; } || - { LC_NUMERIC=C; export LC_NUMERIC; } -(set +x; test -n "`(LC_MESSAGES=C; export LC_MESSAGES) 2>&1`") && - { $as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set; } || - { LC_MESSAGES=C; export LC_MESSAGES; } - - # Name of the executable. -as_me=`(basename "$0") 2>/dev/null || -$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'` - -# PATH needs CR, and LINENO needs CR and PATH. -# 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" >conftest.sh - echo "exit 0" >>conftest.sh - chmod +x conftest.sh - if (PATH=".;."; conftest.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conftest.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - 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 - - ;; - 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_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - 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=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # 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 before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, 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 - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -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 sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac +as_me=`echo "$0" |sed 's,.*[\\/],,'` if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -16711,12 +14724,22 @@ as_executable_p="test -f" -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="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="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" +# Support unset when possible. +if (FOO=FOO; unset FOO) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi +# NLS nuisances. +$as_unset LANG || test "${LANG+set}" != set || { LANG=C; export LANG; } +$as_unset LC_ALL || test "${LC_ALL+set}" != set || { LC_ALL=C; export LC_ALL; } +$as_unset LC_TIME || test "${LC_TIME+set}" != set || { LC_TIME=C; export LC_TIME; } +$as_unset LC_CTYPE || test "${LC_CTYPE+set}" != set || { LC_CTYPE=C; export LC_CTYPE; } +$as_unset LANGUAGE || test "${LANGUAGE+set}" != set || { LANGUAGE=C; export LANGUAGE; } +$as_unset LC_COLLATE || test "${LC_COLLATE+set}" != set || { LC_COLLATE=C; export LC_COLLATE; } +$as_unset LC_NUMERIC || test "${LC_NUMERIC+set}" != set || { LC_NUMERIC=C; export LC_NUMERIC; } +$as_unset LC_MESSAGES || test "${LC_MESSAGES+set}" != set || { LC_MESSAGES=C; export LC_MESSAGES; } # IFS # We need space, tab and new line, in precisely that order. @@ -16725,34 +14748,10 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } exec 6>&1 -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by $as_me, which was -generated by GNU Autoconf 2.53. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 _ACEOF # Files that config.status was made for. @@ -16772,7 +14771,7 @@ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\EOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -16796,12 +14795,12 @@ $config_headers Report bugs to ." -_ACEOF +EOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\EOF # 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=: @@ -16834,18 +14833,18 @@ case $1 in # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF +EOF +cat >>$CONFIG_STATUS <<\EOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 + { { echo "$as_me:14847: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -16864,7 +14863,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 + -*) { { echo "$as_me:14866: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -16876,13 +14875,25 @@ shift done -_ACEOF - +exec 5>>config.log +cat >&5 << _ACEOF +## ----------------------- ## +## Running config.status. ## +## ----------------------- ## +This file was extended by $as_me 2.52, executed with + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + > $ac_cs_invocation +on `(hostname || uname -n) 2>/dev/null | sed 1q` +_ACEOF +EOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\EOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in @@ -16892,7 +14903,7 @@ "scard/Makefile" ) CONFIG_FILES="$CONFIG_FILES scard/Makefile" ;; "ssh_prng_cmds" ) CONFIG_FILES="$CONFIG_FILES ssh_prng_cmds" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:14906: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -16929,9 +14940,9 @@ { (exit 1); exit 1; } } -_ACEOF +EOF -cat >>$CONFIG_STATUS <<_ACEOF +cat >>$CONFIG_STATUS <\$tmp/subs.sed <<\\CEOF s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@exec_prefix@,$exec_prefix,;t t s,@prefix@,$prefix,;t t s,@program_transform_name@,$program_transform_name,;t t @@ -16965,13 +14970,19 @@ s,@oldincludedir@,$oldincludedir,;t t s,@infodir@,$infodir,;t t s,@mandir@,$mandir,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t s,@build_alias@,$build_alias,;t t s,@host_alias@,$host_alias,;t t s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t s,@ECHO_C@,$ECHO_C,;t t s,@ECHO_N@,$ECHO_N,;t t s,@ECHO_T@,$ECHO_T,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@DEFS@,$DEFS,;t t s,@LIBS@,$LIBS,;t t s,@CC@,$CC,;t t s,@CFLAGS@,$CFLAGS,;t t @@ -17035,9 +15046,9 @@ s,@piddir@,$piddir,;t t CEOF -_ACEOF +EOF - cat >>$CONFIG_STATUS <<\_ACEOF + 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_lines=48 @@ -17076,8 +15087,8 @@ fi fi # test -n "$CONFIG_FILES" -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +EOF +cat >>$CONFIG_STATUS <<\EOF for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". case $ac_file in @@ -17091,8 +15102,7 @@ esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ @@ -17103,7 +15113,8 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac @@ -17114,68 +15125,48 @@ ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } + test -d "$as_incr_dir" || mkdir "$as_incr_dir" ;; esac done; } - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi + 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'` + else + ac_dir_suffix= ac_dots= + fi -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; + case $srcdir in + .) ac_srcdir=. + if test -z "$ac_dots"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_dots | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir ;; *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac -# Don't blindly perform a `cd "$ac_dir"/$ac_foo && pwd` since $ac_foo can be -# absolute. -ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd` -ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd` -ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd` -ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd` - + ac_srcdir=$ac_dots$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_dots$srcdir ;; + esac case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; + *) ac_INSTALL=$ac_dots$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 + { echo "$as_me:15161: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi # 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. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* config.h. Generated automatically by config.status. */ + configure_input="Generated automatically from `echo $ac_file_in | + sed 's,.*/,,'` by configure." # First look for the input files in the build tree, otherwise in the # src tree. @@ -17185,7 +15176,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:15179: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17198,29 +15189,23 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + { { echo "$as_me:15192: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; esac done` || { (exit 1); exit 1; } -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF +EOF +cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<\_ACEOF +EOF +cat >>$CONFIG_STATUS <<\EOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b s,@configure_input@,$configure_input,;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,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t s,@INSTALL@,$ac_INSTALL,;t t " $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out rm -f $tmp/stdin @@ -17232,8 +15217,8 @@ fi done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF +EOF +cat >>$CONFIG_STATUS <<\EOF # # CONFIG_HEADER section. @@ -17265,7 +15250,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:15253: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -17276,7 +15261,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:15264: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -17289,7 +15274,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 + { { echo "$as_me:15277: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -17298,7 +15283,7 @@ # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -_ACEOF +EOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into @@ -17314,16 +15299,16 @@ # `end' is used to avoid that the second main sed command (meant for # 0-ary CPP macros) applies to n-ary macro definitions. # See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF +cat >confdef2sed.sed <<\EOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp t end s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end -_ACEOF +EOF # If some macros were called several times there might be several times # the same #defines, which is useless. Nevertheless, we may not want to # sort them, since we want the *last* AC-DEFINE to be honored. @@ -17334,9 +15319,9 @@ # This sed command replaces #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.undefs <<\_ACEOF +cat >>conftest.undefs <<\EOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF +EOF # Break up conftest.defines because some shells have a limit on the size # of here documents, and old seds have small limits too (100 cmds). @@ -17393,24 +15378,23 @@ done rm -f conftest.undefs -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\EOF # 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. */ + # /* config.h. Generated automatically by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h + echo "/* Generated automatically by configure. */" >$tmp/config.h else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h fi cat $tmp/in >>$tmp/config.h rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 + { echo "$as_me:15394: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ @@ -17421,7 +15405,8 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - { case "$ac_dir" in + if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then + { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac @@ -17432,15 +15417,12 @@ ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || - mkdir "$as_incr_dir" || - { { echo "$as_me:$LINENO: error: cannot create \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; } + test -d "$as_incr_dir" || mkdir "$as_incr_dir" ;; esac done; } + fi rm -f $ac_file mv $tmp/config.h $ac_file fi @@ -17449,16 +15431,15 @@ rm -f $tmp/config.h fi done -_ACEOF +EOF -cat >>$CONFIG_STATUS <<\_ACEOF +cat >>$CONFIG_STATUS <<\EOF { (exit 0); exit 0; } -_ACEOF +EOF chmod +x $CONFIG_STATUS 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 @@ -17476,7 +15457,6 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi - # Print summary of options diff -Naur openssh-3.4p1/configure.ac openssh-3.4p1-gsi/configure.ac --- openssh-3.4p1/configure.ac Tue Jun 25 17:35:16 2002 +++ openssh-3.4p1-gsi/configure.ac Tue Jul 2 08:29:53 2002 @@ -477,6 +477,107 @@ ] ) +# Check whether the user wants GSI (Globus) support +gsi_path="no" +AC_ARG_WITH(gsi, + [ --with-gsi=PATH Enable GSI/Globus authentication support], + [ + gsi_path="$withval" + ] +) + +AC_ARG_WITH(globus, + [ --with-globus=PATH Enable GSI/Globus authentication support], + [ + gsi_path="$withval" + ] +) + +# Check whether the user has a Globus flavor type +globus_flavor_type="no" +AC_ARG_WITH(globus-flavor, + [ --with-globus-flavor=TYPE Describe Globus flavor type (ex: gcc32dbg, etc.)], + [ + globus_flavor_type="$withval" + ] +) + +if test "x$gsi_path" != "xno" ; then + # Globus GSSAPI configuration + AC_DEFINE(GSSAPI) + AC_DEFINE(GSI) + + # Find GLOBUS/GSI installation Directory + AC_MSG_CHECKING(for Globus/GSI installation directory) + + globus_install_dir=$gsi_path + + if test "x$globus_install_dir" = "xyes" ; then + AC_MSG_ERROR(Cannot find Globus/GSI installation directory -- a path must be specified!) + fi + AC_MSG_RESULT($globus_install_dir) + + # Find GLOBUS/GSI development directory + AC_MSG_CHECKING(for Globus/GSI development directory) + + if test -d ${globus_install_dir}/lib ; then + # Looks like a flat directory structure from configure/make + # and not globus-install or gsi-install + globus_dev_dir=$globus_install_dir + + else + # Assume a true globus installation with architecture + # directories and run globus-development-path to find + # the development directory + + # Set GLOBUS_INSTALL_PATH + GLOBUS_INSTALL_PATH=$globus_install_dir + export GLOBUS_INSTALL_PATH + + dev_path_program=${globus_install_dir}/bin/globus-development-path + + if test ! -x ${dev_path_program} ; then + AC_MSG_ERROR(Cannot find Globus/GSI installation directory: program ${dev_path_program} does not exist or is not executable) + fi + + globus_dev_dir=`${dev_path_program}` + + if test -z "$globus_dev_dir" -o "X$globus_dev_dir" = "X" ; then + AC_MSG_ERROR(Cannot find Globus/GSI development directory) + fi + + if test ! -d "$globus_dev_dir" ; then + AC_MSG_ERROR(Cannot find Globus/GSI development directory: $globus_dev_dir does not exist) + fi + fi + AC_MSG_RESULT($globus_dev_dir) + + # Find GLOBUS/GSI flavor Directory + AC_MSG_CHECKING(for Globus flavor type) + + if test "x$globus_flavor_type" = "xno" ; then + GSI_LIBS="-lglobus_gss_assist -lglobus_gss -lglobus_gaa" + GSI_LDFLAGS="-L${globus_dev_dir}/lib" + GSI_CFLAGS="-I${globus_dev_dir}/include" + AC_MSG_RESULT(none) + else + GLOBUS_FLAVOR_TYPE_INCL_DIR="${globus_dev_dir}/include/${globus_flavor_type}" + + if test ! -d "$GLOBUS_FLAVOR_TYPE_INCL_DIR" ; then + AC_MSG_ERROR(Cannot find Globus flavor-specific include directory: ${GLOBUS_FLAVOR_TYPE_INCL_DIR}) + fi + + AC_MSG_RESULT($globus_flavor_type) + GSI_LIBS="${gsi_path}/lib/libglobus_gss_assist_${globus_flavor_type}.a ${gsi_path}/lib/libglobus_gssapi_gsi_${globus_flavor_type}.a" + GSI_CFLAGS="-I${GLOBUS_FLAVOR_TYPE_INCL_DIR}" + fi + + LIBS="$LIBS $GSI_LIBS" + LDFLAGS="$LDFLAGS $GSI_LDFLAGS" + CFLAGS="$CFLAGS $GSI_CFLAGS" +# End Globus/GSI section +fi + # Check whether user wants S/Key support SKEY_MSG="no" AC_ARG_WITH(skey, @@ -689,6 +790,7 @@ AC_CHECK_LIB(dl, dlopen, , ) AC_CHECK_LIB(pam, pam_set_item, , AC_MSG_ERROR([*** libpam missing])) AC_CHECK_FUNCS(pam_getenvlist) + AC_CHECK_FUNCS(pam_putenv) disable_shadow=yes PAM_MSG="yes" @@ -751,7 +853,20 @@ fi ] ) -LIBS="$LIBS -lcrypto" + +# Patch up SSL libraries for GSI authentication as needed +if test "x$globus_flavor_type" != "xno" ; then + # For Globus 2, always link with the static libraries + LIBS="$LIBS ${gsi_path}/lib/libglobus_ssl_utils_${globus_flavor_type}.a ${gsi_path}/lib/libssl_${globus_flavor_type}.a ${gsi_path}/lib/libcrypto_${globus_flavor_type}.a" +else + if test "x$gsi_path" != "xno" ; then + # Older GSI needs -lssl too + LIBS="$LIBS -lssl -lcrypto" + else # if no GSI authentication (i.e., OpenSSL default) + LIBS="$LIBS -lcrypto" + fi +fi # globus_flavor_type + AC_TRY_LINK_FUNC(RAND_add, AC_DEFINE(HAVE_OPENSSL), [ dnl Check default openssl install dir @@ -1728,6 +1843,31 @@ blibpath="$blibpath:${KRB5ROOT}/lib" fi AC_CHECK_LIB(resolv, dn_expand, , ) + + AC_CHECK_LIB(gssapi,gss_init_sec_context, + [ AC_DEFINE(GSSAPI) + K5LIBS="-lgssapi $K5LIBS" ], + [ AC_CHECK_LIB(gssapi_krb5,gss_init_sec_context, + [ AC_DEFINE(GSSAPI) + K5LIBS="-lgssapi_krb5 $K5LIBS" ], + AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]), + $K5LIBS) + ], + $K5LIBS) + + AC_CHECK_HEADER(gssapi.h, , + [ unset ac_cv_header_gssapi_h + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" + AC_CHECK_HEADERS(gssapi.h, , + AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail]) + ) + ] + ) + + oldCPP="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi" + AC_CHECK_HEADER(gssapi_krb5.h, , + [ CPPFLAGS="$oldCPP" ]) KRB5=yes fi diff -Naur openssh-3.4p1/gss-genr.c openssh-3.4p1-gsi/gss-genr.c --- openssh-3.4p1/gss-genr.c Wed Dec 31 18:00:00 1969 +++ openssh-3.4p1-gsi/gss-genr.c Tue Jul 2 08:29:53 2002 @@ -0,0 +1,571 @@ +/* + * Copyright (c) 2001,2002 Simon Wilkinson. All rights reserved. * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#ifdef GSSAPI + +#include "ssh.h" +#include "ssh2.h" +#include "xmalloc.h" +#include "buffer.h" +#include "bufaux.h" +#include "packet.h" +#include "compat.h" +#include +#include "cipher.h" +#include "kex.h" +#include "log.h" +#include "compat.h" +#include "monitor_wrap.h" + +#include + +#include "ssh-gss.h" + +/* Assorted globals for tracking the clients identity once they've + * authenticated */ + +gss_buffer_desc gssapi_client_name = {0,NULL}; /* Name of our client */ +gss_cred_id_t gssapi_client_creds = GSS_C_NO_CREDENTIAL; /* Their credentials */ +enum ssh_gss_id gssapi_client_type = GSS_LAST_ENTRY; + +unsigned char ssh1_key_digest[16]; /* used for ssh1 gssapi */ + +/* The mechanism name used in the list below is defined in the internet + * draft as the Base 64 encoding of the MD5 hash of the ASN.1 DER encoding + * of the underlying GSSAPI mechanism's OID. + * + * Also from the draft, before considering adding SPNEGO, bear in mind that + * "mechanisms ... MUST NOT use SPNEGO as the underlying GSSAPI mechanism" + */ + +/* These must be in the same order as ssh_gss_id, in ssh-gss.h */ + +ssh_gssapi_mech supported_mechs[]= { +#ifdef KRB5 + /* Official OID - 1.2.850.113554.1.2.2 */ + {"Se3H81ismmOC3OE+FwYCiQ==","Kerberos", + {9, "\x2A\x86\x48\x86\xF7\x12\x01\x02\x02"}}, +#endif +#ifdef GSI + /* gssapi_ssleay 1.3.6.1.4.1.3536.1.1 */ + {"N3+k7/4wGxHyuP8Yxi4RhA==", + "GSI", + {9, "\x2B\x06\x01\x04\x01\x9B\x50\x01\x01"} + }, +#endif /* GSI */ + {NULL,NULL,{0,0}} +}; + +char gssprefix[]=KEX_GSS_SHA1; + +/* Return a list of the gss-group1-sha1-x mechanisms supported by this + * program. + * + * We only support the mechanisms that we've indicated in the list above, + * but we check that they're supported by the GSSAPI mechanism on the + * machine. We also check, before including them in the list, that + * we have the necesary information in order to carry out the key exchange + * (that is, that the user has credentials, the server's creds are accessible, + * etc) + * + * The way that this is done is fairly nasty, as we do a lot of work that + * is then thrown away. This should possibly be implemented with a cache + * that stores the results (in an expanded Gssctxt structure), which are + * then used by the first calls if that key exchange mechanism is chosen. + */ + +char * +ssh_gssapi_mechanisms(int server,char *host) { + gss_OID_set supported; + OM_uint32 maj_status, min_status; + Buffer buf; + int i = 0; + int present; + char * mechs; + Gssctxt * ctx = NULL; + + if (datafellows & SSH_OLD_GSSAPI) return NULL; + + gss_indicate_mechs(&min_status, &supported); + + buffer_init(&buf); + + do { + if ((maj_status=gss_test_oid_set_member(&min_status, + &supported_mechs[i].oid, + supported, + &present))) { + present=0; + } + if (present) { + if ((server && + !GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctx, + &supported_mechs[i].oid)))) + || (!server && + !GSS_ERROR(ssh_gssapi_client_ctx(&ctx, + &supported_mechs[i].oid, + host)))) { + /* Append gss_group1_sha1_x to our list */ + buffer_append(&buf, gssprefix, + strlen(gssprefix)); + buffer_append(&buf, + supported_mechs[i].enc_name, + strlen(supported_mechs[i].enc_name)); + } + } + } while (supported_mechs[++i].name != NULL); + + buffer_put_char(&buf,'\0'); + + mechs=xmalloc(buffer_len(&buf)); + buffer_get(&buf,mechs,buffer_len(&buf)); + buffer_free(&buf); + if (strlen(mechs)==0) + return(NULL); + else + return(mechs); +} + +void ssh_gssapi_supported_oids(gss_OID_set *oidset) { + enum ssh_gss_id i =0; + OM_uint32 maj_status,min_status; + int present; + gss_OID_set supported; + + gss_create_empty_oid_set(&min_status,oidset); + gss_indicate_mechs(&min_status, &supported); + + while (supported_mechs[i].name!=NULL) { + if ((maj_status=gss_test_oid_set_member(&min_status, + &supported_mechs[i].oid, + supported, + &present))) { + present=0; + } + if (present) { + gss_add_oid_set_member(&min_status, + &supported_mechs[i].oid, + oidset); + } + i++; + } +} + +/* Set the contexts OID from a data stream */ +void ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len) { + if (ctx->oid != GSS_C_NO_OID) { + xfree(ctx->oid->elements); + xfree(ctx->oid); + } + ctx->oid=xmalloc(sizeof(gss_OID_desc)); + ctx->oid->length=len; + ctx->oid->elements=xmalloc(len); + memcpy(ctx->oid->elements,data,len); +} + +/* Set the contexts OID */ +void ssh_gssapi_set_oid(Gssctxt *ctx, gss_OID oid) { + ssh_gssapi_set_oid_data(ctx,oid->elements,oid->length); +} + +/* Find out which GSS type (out of the list we define in ssh-gss.h) a + * particular connection is using + */ +enum ssh_gss_id ssh_gssapi_get_ctype(Gssctxt *ctxt) { + enum ssh_gss_id i=0; + + while(supported_mechs[i].name!=NULL && + supported_mechs[i].oid.length != ctxt->oid->length && + (memcmp(supported_mechs[i].oid.elements, + ctxt->oid->elements,ctxt->oid->length) !=0)) { + i++; + } + return(i); +} + +/* Set the GSS context's OID to the oid indicated by the given key exchange + * name. */ +gss_OID ssh_gssapi_id_kex(Gssctxt *ctx, char *name) { + enum ssh_gss_id i=0; + + if (strncmp(name, gssprefix, strlen(gssprefix)-1) !=0) { + return(NULL); + } + + name+=strlen(gssprefix); /* Move to the start of the MIME string */ + + while (supported_mechs[i].name!=NULL && + strcmp(name,supported_mechs[i].enc_name)!=0) { + i++; + } + + if (supported_mechs[i].name==NULL) + return (NULL); + + if (ctx) ssh_gssapi_set_oid(ctx,&supported_mechs[i].oid); + + return &supported_mechs[i].oid; +} + + +/* All this effort to report an error ... */ +static void +ssh_gssapi_error_ex(OM_uint32 major_status,OM_uint32 minor_status, + int send_packet) { + OM_uint32 lmaj, lmin; + gss_buffer_desc msg; + OM_uint32 ctx; + + ctx = 0; + /* The GSSAPI error */ + do { + lmaj = gss_display_status(&lmin, major_status, + GSS_C_GSS_CODE, + GSS_C_NULL_OID, + &ctx, &msg); + if (lmaj == GSS_S_COMPLETE) { + debug((char *)msg.value); + if (send_packet) packet_send_debug((char *)msg.value); + (void) gss_release_buffer(&lmin, &msg); + } + } while (ctx!=0); + + /* The mechanism specific error */ + do { + lmaj = gss_display_status(&lmin, minor_status, + GSS_C_MECH_CODE, + GSS_C_NULL_OID, + &ctx, &msg); + if (lmaj == GSS_S_COMPLETE) { + debug((char *)msg.value); + if (send_packet) packet_send_debug((char *)msg.value); + (void) gss_release_buffer(&lmin, &msg); + } + } while (ctx!=0); +} + +void +ssh_gssapi_error(OM_uint32 major_status,OM_uint32 minor_status) { + ssh_gssapi_error_ex(major_status, minor_status, 0); +} + +void +ssh_gssapi_send_error(OM_uint32 major_status,OM_uint32 minor_status) { + ssh_gssapi_error_ex(major_status, minor_status, 1); +} + + + + +/* Initialise our GSSAPI context. We use this opaque structure to contain all + * of the data which both the client and server need to persist across + * {accept,init}_sec_context calls, so that when we do it from the userauth + * stuff life is a little easier + */ +void +ssh_gssapi_build_ctx(Gssctxt **ctx) +{ + *ctx=xmalloc(sizeof (Gssctxt)); + (*ctx)->context=GSS_C_NO_CONTEXT; + (*ctx)->name=GSS_C_NO_NAME; + (*ctx)->oid=GSS_C_NO_OID; + (*ctx)->creds=GSS_C_NO_CREDENTIAL; + (*ctx)->client=GSS_C_NO_NAME; + (*ctx)->client_creds=GSS_C_NO_CREDENTIAL; +} + +/* Delete our context, providing it has been built correctly */ +void +ssh_gssapi_delete_ctx(Gssctxt **ctx) +{ + OM_uint32 ms; + + /* Return if there's no context */ + if ((*ctx)==NULL) + return; + + if ((*ctx)->context != GSS_C_NO_CONTEXT) + gss_delete_sec_context(&ms,&(*ctx)->context,GSS_C_NO_BUFFER); + if ((*ctx)->name != GSS_C_NO_NAME) + gss_release_name(&ms,&(*ctx)->name); + if ((*ctx)->oid != GSS_C_NO_OID) { + xfree((*ctx)->oid->elements); + xfree((*ctx)->oid); + (*ctx)->oid = GSS_C_NO_OID; + } + if ((*ctx)->creds != GSS_C_NO_CREDENTIAL) + gss_release_cred(&ms,&(*ctx)->creds); + if ((*ctx)->client != GSS_C_NO_NAME) + gss_release_name(&ms,&(*ctx)->client); + if ((*ctx)->client_creds != GSS_C_NO_CREDENTIAL) + gss_release_cred(&ms,&(*ctx)->client_creds); + + xfree(*ctx); + *ctx=NULL; +} + +/* Wrapper to init_sec_context + * Requires that the context contains: + * oid + * server name (from ssh_gssapi_import_name) + */ +OM_uint32 +ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, gss_buffer_desc *recv_tok, + gss_buffer_desc* send_tok, OM_uint32 *flags) +{ + OM_uint32 maj_status, min_status; + int deleg_flag = 0; + + if (deleg_creds) { + deleg_flag=GSS_C_DELEG_FLAG; + debug("Delegating credentials"); + } + + maj_status=gss_init_sec_context(&min_status, + GSS_C_NO_CREDENTIAL, /* def. cred */ + &ctx->context, + ctx->name, + ctx->oid, + GSS_C_MUTUAL_FLAG | + GSS_C_INTEG_FLAG | + deleg_flag, + 0, /* default lifetime */ + NULL, /* no channel bindings */ + recv_tok, + NULL, + send_tok, + flags, + NULL); + ctx->status=maj_status; + if (GSS_ERROR(maj_status)) { + ssh_gssapi_error(maj_status,min_status); + } + return(maj_status); +} + +/* Wrapper arround accept_sec_context + * Requires that the context contains: + * oid + * credentials (from ssh_gssapi_acquire_cred) + */ +OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx,gss_buffer_desc *recv_tok, + gss_buffer_desc *send_tok, OM_uint32 *flags) +{ + OM_uint32 maj_status, min_status; + gss_OID mech; + + maj_status=gss_accept_sec_context(&min_status, + &ctx->context, + ctx->creds, + recv_tok, + GSS_C_NO_CHANNEL_BINDINGS, + &ctx->client, + &mech, + send_tok, + flags, + NULL, + &ctx->client_creds); + if (GSS_ERROR(maj_status)) { + ssh_gssapi_send_error(maj_status,min_status); + } + + if (ctx->client_creds) { + debug("Received some client credentials"); + } else { + debug("Got no client credentials"); + } + + /* FIXME: We should check that the me + * the one that we asked for (in ctx->oid) */ + + ctx->status=maj_status; + + /* Now, if we're complete and we have the right flags, then + * we flag the user as also having been authenticated + */ + + if (((flags==NULL) || ((*flags & GSS_C_MUTUAL_FLAG) && + (*flags & GSS_C_INTEG_FLAG))) && + (maj_status == GSS_S_COMPLETE)) { + if (ssh_gssapi_getclient(ctx,&gssapi_client_type, + &gssapi_client_name, + &gssapi_client_creds)) + fatal("Couldn't convert client name"); + } + + return(maj_status); +} + +/* Create a service name for the given host */ +OM_uint32 +ssh_gssapi_import_name(Gssctxt *ctx, const char *host) { + gss_buffer_desc gssbuf; + OM_uint32 maj_status, min_status; + struct hostent *hostinfo = NULL; + char *xhost; + + /* Make a copy of the host name, in case it was returned by a + * previous call to gethostbyname(). */ + xhost = xstrdup(host); + + /* Make sure we have the FQDN. Some GSSAPI implementations don't do + * this for us themselves */ + + hostinfo = gethostbyname(xhost); + + if ((hostinfo == NULL) || (hostinfo->h_name == NULL)) { + debug("Unable to get FQDN for \"%s\"", xhost); + } else { + xfree(xhost); + xhost = xstrdup(hostinfo->h_name); + } + + gssbuf.length = sizeof("host@")+strlen(xhost); + + gssbuf.value = xmalloc(gssbuf.length); + if (gssbuf.value == NULL) { + xfree(xhost); + return(-1); + } + snprintf(gssbuf.value,gssbuf.length,"host@%s",xhost); + if ((maj_status=gss_import_name(&min_status, + &gssbuf, + GSS_C_NT_HOSTBASED_SERVICE, + &ctx->name))) { + ssh_gssapi_error(maj_status,min_status); + } + + xfree(xhost); + xfree(gssbuf.value); + return(maj_status); +} + +/* Acquire credentials for a server running on the current host. + * Requires that the context structure contains a valid OID + */ + +/* Returns a GSSAPI error code */ +OM_uint32 +ssh_gssapi_acquire_cred(Gssctxt *ctx) { + OM_uint32 maj_status, min_status; + char lname[MAXHOSTNAMELEN]; + gss_OID_set oidset; + + gss_create_empty_oid_set(&min_status,&oidset); + gss_add_oid_set_member(&min_status,ctx->oid,&oidset); + + if (gethostname(lname, MAXHOSTNAMELEN)) { + return(-1); + } + + if ((maj_status=ssh_gssapi_import_name(ctx,lname))) { + return(maj_status); + } + if ((maj_status=gss_acquire_cred(&min_status, + ctx->name, + 0, + oidset, + GSS_C_ACCEPT, + &ctx->creds, + NULL, + NULL))) { + ssh_gssapi_error(maj_status,min_status); + } + + gss_release_oid_set(&min_status, &oidset); + return(maj_status); +} + +/* Extract the client details from a given context. This can only reliably + * be called once for a context */ + +OM_uint32 +ssh_gssapi_getclient(Gssctxt *ctx, enum ssh_gss_id *type, + gss_buffer_desc *name, gss_cred_id_t *creds) { + + OM_uint32 maj_status,min_status; + + *type=ssh_gssapi_get_ctype(ctx); + if ((maj_status=gss_display_name(&min_status,ctx->client,name,NULL))) { + ssh_gssapi_error(maj_status,min_status); + } + + /* This is icky. There appears to be no way to copy this structure, + * rather than the pointer to it, so we simply copy the pointer and + * mark the originator as empty so we don't destroy it. + */ + *creds=ctx->client_creds; + ctx->client_creds=GSS_C_NO_CREDENTIAL; + return(maj_status); +} + +OM_uint32 +ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *buffer, gss_buffer_desc *hash) { + OM_uint32 maj_status,min_status; + + /* ssh1 needs to exchange the hash of the keys */ + /* will us this hash to return it */ + if (!compat20) { + if ((maj_status=gss_wrap(&min_status,ctx->context, + 0, + GSS_C_QOP_DEFAULT, + buffer, + NULL, + hash))) + ssh_gssapi_error(maj_status,min_status); + } + else + + if ((maj_status=gss_get_mic(&min_status,ctx->context, + GSS_C_QOP_DEFAULT, buffer, hash))) { + ssh_gssapi_error(maj_status,min_status); + } + + return(maj_status); +} + +OM_uint32 +ssh_gssapi_server_ctx(Gssctxt **ctx,gss_OID oid) { + if (*ctx) ssh_gssapi_delete_ctx(ctx); + ssh_gssapi_build_ctx(ctx); + ssh_gssapi_set_oid(*ctx,oid); + return(ssh_gssapi_acquire_cred(*ctx)); +} + +OM_uint32 +ssh_gssapi_client_ctx(Gssctxt **ctx,gss_OID oid, char *host) { + gss_buffer_desc token; + OM_uint32 major,minor; + + if (*ctx) ssh_gssapi_delete_ctx(ctx); + ssh_gssapi_build_ctx(ctx); + ssh_gssapi_set_oid(*ctx,oid); + ssh_gssapi_import_name(*ctx,host); + major=ssh_gssapi_init_ctx(*ctx, 0, GSS_C_NO_BUFFER, &token, NULL); + gss_release_buffer(&minor,&token); + return(major); +} + +#endif /* GSSAPI */ diff -Naur openssh-3.4p1/gss-serv.c openssh-3.4p1-gsi/gss-serv.c --- openssh-3.4p1/gss-serv.c Wed Dec 31 18:00:00 1969 +++ openssh-3.4p1-gsi/gss-serv.c Tue Jul 2 08:29:53 2002 @@ -0,0 +1,572 @@ +/* + * Copyright (c) 2001,2002 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#ifdef GSSAPI + +#include "ssh.h" +#include "ssh1.h" +#include "ssh2.h" +#include "xmalloc.h" +#include "buffer.h" +#include "bufaux.h" +#include "packet.h" +#include "compat.h" +#include +#include "cipher.h" +#include "kex.h" +#include "auth.h" +#include "log.h" +#include "channels.h" +#include "session.h" +#include "dispatch.h" +#include "servconf.h" +#include "compat.h" +#include "misc.h" +#include "monitor_wrap.h" + +#include "ssh-gss.h" + +extern ServerOptions options; +extern u_char *session_id2; +extern int session_id2_len; + +typedef struct ssh_gssapi_cred_cache { + char *filename; + char *envvar; + char *envval; + void *data; +} ssh_gssapi_cred_cache; + +static struct ssh_gssapi_cred_cache gssapi_cred_store = {NULL,NULL,NULL}; + +/* + * Environment variables pointing to delegated credentials + */ +static char *delegation_env[] = { + "X509_USER_PROXY", /* GSSAPI/SSLeay */ + "KRB5CCNAME", /* Krb5 and possibly SSLeay */ + NULL +}; + +static void gssapi_unsetenv(const char *var); + +#ifdef KRB5 + +#ifdef HEIMDAL +#include +#else +#include +#define krb5_get_err_text(context,code) error_message(code) +#endif + +static krb5_context krb_context = NULL; + +/* Initialise the krb5 library, so we can use it for those bits that + * GSSAPI won't do */ + +int ssh_gssapi_krb5_init() { + krb5_error_code problem; + + if (krb_context !=NULL) + return 1; + + problem = krb5_init_context(&krb_context); + if (problem) { + log("Cannot initialize krb5 context"); + return 0; + } + krb5_init_ets(krb_context); + + return 1; +} + +/* Check if this user is OK to login. This only works with krb5 - other + * GSSAPI mechanisms will need their own. + * Returns true if the user is OK to log in, otherwise returns 0 + */ + +int +ssh_gssapi_krb5_userok(char *name) { + krb5_principal princ; + int retval; + + if (ssh_gssapi_krb5_init() == 0) + return 0; + + if ((retval=krb5_parse_name(krb_context, gssapi_client_name.value, + &princ))) { + log("krb5_parse_name(): %.100s", + krb5_get_err_text(krb_context,retval)); + return 0; + } + if (krb5_kuserok(krb_context, princ, name)) { + retval = 1; + log("Authorized to %s, krb5 principal %s (krb5_kuserok)",name, + (char *)gssapi_client_name.value); + } + else + retval = 0; + + krb5_free_principal(krb_context, princ); + return retval; +} + +int +ssh_gssapi_krb5_localname(char **user) +{ + krb5_principal princ; + + if (krb5_parse_name(krb_context, gssapi_client_name.value, &princ)) { + return(0); + } + *user = (char *)xmalloc(256); + if (krb5_aname_to_localname(krb_context, princ, 256, *user)) { + xfree(*user); + *user = NULL; + return(0); + } + return(1); +} + +/* Make sure that this is called _after_ we've setuid to the user */ + +/* This writes out any forwarded credentials. Its specific to the Kerberos + * GSSAPI mechanism + * + * We assume that our caller has made sure that the user has selected + * delegated credentials, and that the client_creds structure is correctly + * populated. + */ + +void +ssh_gssapi_krb5_storecreds() { + krb5_ccache ccache; + krb5_error_code problem; + krb5_principal princ; + char ccname[35]; + static char name[40]; + int tmpfd; + OM_uint32 maj_status,min_status; + + + if (gssapi_client_creds==NULL) { + debug("No credentials stored"); + return; + } + + if (ssh_gssapi_krb5_init() == 0) + return; + + if (options.gss_use_session_ccache) { + snprintf(ccname,sizeof(ccname),"/tmp/krb5cc_%d_XXXXXX",geteuid()); + + if ((tmpfd = mkstemp(ccname))==-1) { + log("mkstemp(): %.100s", strerror(errno)); + return; + } + if (fchmod(tmpfd, S_IRUSR | S_IWUSR) == -1) { + log("fchmod(): %.100s", strerror(errno)); + close(tmpfd); + return; + } + } else { + snprintf(ccname,sizeof(ccname),"/tmp/krb5cc_%d",geteuid()); + tmpfd = open(ccname, O_TRUNC | O_CREAT, S_IRUSR | S_IWUSR); + if (tmpfd == -1) { + log("open(): %.100s", strerror(errno)); + return; + } + } + + close(tmpfd); + snprintf(name, sizeof(name), "FILE:%s",ccname); + + if ((problem = krb5_cc_resolve(krb_context, name, &ccache))) { + log("krb5_cc_default(): %.100s", + krb5_get_err_text(krb_context,problem)); + return; + } + + if ((problem = krb5_parse_name(krb_context, gssapi_client_name.value, + &princ))) { + log("krb5_parse_name(): %.100s", + krb5_get_err_text(krb_context,problem)); + krb5_cc_destroy(krb_context,ccache); + return; + } + + if ((problem = krb5_cc_initialize(krb_context, ccache, princ))) { + log("krb5_cc_initialize(): %.100s", + krb5_get_err_text(krb_context,problem)); + krb5_free_principal(krb_context,princ); + krb5_cc_destroy(krb_context,ccache); + return; + } + + krb5_free_principal(krb_context,princ); + + #ifdef HEIMDAL + if ((problem = krb5_cc_copy_cache(krb_context, + gssapi_client_creds->ccache, + ccache))) { + log("krb5_cc_copy_cache(): %.100s", + krb5_get_err_text(krb_context,problem)); + krb5_cc_destroy(krb_context,ccache); + return; + } + #else + if ((maj_status = gss_krb5_copy_ccache(&min_status, + gssapi_client_creds, + ccache))) { + log("gss_krb5_copy_ccache() failed"); + ssh_gssapi_error(maj_status,min_status); + krb5_cc_destroy(krb_context,ccache); + return; + } + #endif + + krb5_cc_close(krb_context,ccache); + + +#ifdef USE_PAM + do_pam_putenv("KRB5CCNAME",name); +#endif + + gssapi_cred_store.filename=strdup(ccname); + gssapi_cred_store.envvar="KRB5CCNAME"; + gssapi_cred_store.envval=strdup(name); + + return; +} + +#endif /* KRB5 */ + +#ifdef GSI +#include + +/* + * Check if this user is OK to login under GSI. User has been authenticated + * as identity in global 'client_name.value' and is trying to log in as passed + * username in 'name'. + * + * Returns non-zero if user is authorized, 0 otherwise. + */ +int +ssh_gssapi_gsi_userok(char *name) +{ + int authorized = 0; + + /* This returns 0 on success */ + authorized = (globus_gss_assist_userok(gssapi_client_name.value, + name) == 0); + + log("GSI user %s is%s authorized as target user %s", + (char *) gssapi_client_name.value, (authorized ? "" : " not"), name); + + return authorized; +} + +/* + * Return the local username associated with the GSI credentials. + */ +int +ssh_gssapi_gsi_localname(char **user) +{ + return(globus_gss_assist_gridmap(gssapi_client_name.value, user) == 0); +} + +/* + * Handle setting up child environment for GSI. + * + * Make sure that this is called _after_ we've setuid to the user. + */ +void +ssh_gssapi_gsi_storecreds() +{ + OM_uint32 major_status; + OM_uint32 minor_status; + + + if (gssapi_client_creds != NULL) + { + char *creds_env = NULL; + + /* + * This is the current hack with the GSI gssapi library to + * export credentials to disk. + */ + + debug("Exporting delegated credentials"); + + minor_status = 0xdee0; /* Magic value */ + major_status = + gss_inquire_cred(&minor_status, + gssapi_client_creds, + (gss_name_t *) &creds_env, + NULL, + NULL, + NULL); + + if ((major_status == GSS_S_COMPLETE) && + (minor_status == 0xdee1) && + (creds_env != NULL)) + { + char *value; + + /* + * String is of the form: + * X509_USER_DELEG_PROXY=filename + * so we parse out the filename + * and then set X509_USER_PROXY + * to point at it. + */ + value = strchr(creds_env, '='); + + if (value != NULL) + { + *value = '\0'; + value++; +#ifdef USE_PAM + do_pam_putenv("X509_USER_PROXY",value); +#endif + gssapi_cred_store.filename=NULL; + gssapi_cred_store.envvar="X509_USER_PROXY"; + gssapi_cred_store.envval=strdup(value); + + return; + } + else + { + log("Failed to parse delegated credentials string '%s'", + creds_env); + } + } + else + { + log("Failed to export delegated credentials (error %ld)", + major_status); + } + } +} + +#endif /* GSI */ + +void +ssh_gssapi_cleanup_creds(void *ignored) +{ + if (gssapi_cred_store.filename!=NULL) { + /* Unlink probably isn't sufficient */ + debug("removing gssapi cred file\"%s\"",gssapi_cred_store.filename); + unlink(gssapi_cred_store.filename); + } +} + +void +ssh_gssapi_storecreds() +{ + switch (gssapi_client_type) { +#ifdef KRB5 + case GSS_KERBEROS: + ssh_gssapi_krb5_storecreds(); + break; +#endif +#ifdef GSI + case GSS_GSI: + ssh_gssapi_gsi_storecreds(); + break; +#endif /* GSI */ + case GSS_LAST_ENTRY: + /* GSSAPI not used in this authentication */ + debug("No GSSAPI credentials stored"); + break; + default: + log("ssh_gssapi_do_child: Unknown mechanism"); + + } + + if (options.gss_cleanup_creds) { + fatal_add_cleanup(ssh_gssapi_cleanup_creds, NULL); + } + +} + +/* This allows GSSAPI methods to do things to the childs environment based + * on the passed authentication process and credentials. + * + * Question: If we didn't use userauth_external for some reason, should we + * still delegate credentials? + */ +void +ssh_gssapi_do_child(char ***envp, u_int *envsizep) +{ + + if (gssapi_cred_store.envvar!=NULL && + gssapi_cred_store.envval!=NULL) { + + debug("Setting %s to %s", gssapi_cred_store.envvar, + gssapi_cred_store.envval); + child_set_env(envp, envsizep, gssapi_cred_store.envvar, + gssapi_cred_store.envval); + } + + switch(gssapi_client_type) { +#ifdef KRB5 + case GSS_KERBEROS: break; +#endif +#ifdef GSI + case GSS_GSI: break; +#endif + case GSS_LAST_ENTRY: + debug("No GSSAPI credentials stored"); + break; + default: + log("ssh_gssapi_do_child: Unknown mechanism"); + } +} + +int +ssh_gssapi_userok(char *user) +{ + if (gssapi_client_name.length==0 || + gssapi_client_name.value==NULL) { + debug("No suitable client data"); + return 0; + } + switch (gssapi_client_type) { +#ifdef KRB5 + case GSS_KERBEROS: + return(ssh_gssapi_krb5_userok(user)); + break; /* Not reached */ +#endif +#ifdef GSI + case GSS_GSI: + return(ssh_gssapi_gsi_userok(user)); + break; /* Not reached */ +#endif /* GSI */ + case GSS_LAST_ENTRY: + debug("Client not GSSAPI"); + break; + default: + debug("Unknown client authentication type"); + } + return(0); +} + +int +ssh_gssapi_localname(char **user) +{ + *user = NULL; + if (gssapi_client_name.length==0 || + gssapi_client_name.value==NULL) { + debug("No suitable client data"); + return(0);; + } + switch (gssapi_client_type) { +#ifdef KRB5 + case GSS_KERBEROS: + return(ssh_gssapi_krb5_localname(user)); + break; /* Not reached */ +#endif +#ifdef GSI + case GSS_GSI: + return(ssh_gssapi_gsi_localname(user)); + break; /* Not reached */ +#endif /* GSI */ + case GSS_LAST_ENTRY: + debug("Client not GSSAPI"); + break; + default: + debug("Unknown client authentication type"); + } + return(0); +} + +/* + * Clean our environment on startup. This means removing any environment + * strings that might inadvertantly been in root's environment and + * could cause serious security problems if we think we set them. + */ +void +ssh_gssapi_clean_env(void) +{ + char *envstr; + int envstr_index; + + + for (envstr_index = 0; + (envstr = delegation_env[envstr_index]) != NULL; + envstr_index++) { + + if (getenv(envstr)) { + debug("Clearing environment variable %s", envstr); + gssapi_unsetenv(envstr); + } + } +} + +/* + * Wrapper around unsetenv. + */ +static void +gssapi_unsetenv(const char *var) +{ +#ifdef HAVE_UNSETENV + unsetenv(var); + +#else /* !HAVE_UNSETENV */ + extern char **environ; + char **p1 = environ; /* New array list */ + char **p2 = environ; /* Current array list */ + int len = strlen(var); + + /* + * Walk through current environ array (p2) copying each pointer + * to new environ array (p1) unless the pointer is to the item + * we want to delete. Copy happens in place. + */ + while (*p2) { + if ((strncmp(*p2, var, len) == 0) && + ((*p2)[len] == '=')) { + /* + * *p2 points at item to be deleted, just skip over it + */ + p2++; + } else { + /* + * *p2 points at item we want to save, so copy it + */ + *p1 = *p2; + p1++; + p2++; + } + } + + /* And make sure new array is NULL terminated */ + *p1 = NULL; +#endif /* HAVE_UNSETENV */ +} + +#endif /* GSSAPI */ diff -Naur openssh-3.4p1/kex.c openssh-3.4p1-gsi/kex.c --- openssh-3.4p1/kex.c Tue Jun 25 18:19:13 2002 +++ openssh-3.4p1-gsi/kex.c Tue Jul 2 08:29:53 2002 @@ -42,6 +42,10 @@ #include "dispatch.h" #include "monitor.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif + #define KEX_COOKIE_LEN 16 /* Use privilege separation for sshd */ @@ -242,6 +246,11 @@ case DH_GEX_SHA1: kexgex(kex); break; +#ifdef GSSAPI + case GSS_GRP1_SHA1: + kexgss(kex); + break; +#endif default: fatal("Unsupported key exchange %d", kex->kex_type); } @@ -297,11 +306,15 @@ { k->name = match_list(client, server, NULL); if (k->name == NULL) - fatal("no kex alg"); + fatal("No key exchange algorithm"); if (strcmp(k->name, KEX_DH1) == 0) { k->kex_type = DH_GRP1_SHA1; } else if (strcmp(k->name, KEX_DHGEX) == 0) { k->kex_type = DH_GEX_SHA1; +#ifdef GSSAPI + } else if (strncmp(k->name, KEX_GSS_SHA1, sizeof(KEX_GSS_SHA1)-1) == 0) { + k->kex_type = GSS_GRP1_SHA1; +#endif } else fatal("bad kex alg %s", k->name); } diff -Naur openssh-3.4p1/kex.h openssh-3.4p1-gsi/kex.h --- openssh-3.4p1/kex.h Thu Jun 6 14:48:16 2002 +++ openssh-3.4p1-gsi/kex.h Tue Jul 2 08:29:53 2002 @@ -56,7 +56,8 @@ enum kex_exchange { DH_GRP1_SHA1, - DH_GEX_SHA1 + DH_GEX_SHA1, + GSS_GRP1_SHA1 }; #define KEX_INIT_SENT 0x0001 @@ -94,6 +95,11 @@ Mac mac; Comp comp; }; + +struct KexOptions { + int gss_deleg_creds; +}; + struct Kex { u_char *session_id; int session_id_len; @@ -107,11 +113,13 @@ Buffer peer; int done; int flags; + char *host; char *client_version_string; char *server_version_string; int (*verify_host_key)(Key *); Key *(*load_host_key)(int); int (*host_key_index)(Key *); + struct KexOptions options; }; Kex *kex_setup(char *[PROPOSAL_MAX]); @@ -123,6 +131,9 @@ void kexdh(Kex *); void kexgex(Kex *); +#ifdef GSSAPI +void kexgss(Kex *); +#endif Newkeys *kex_get_newkeys(int); diff -Naur openssh-3.4p1/kexgss.c openssh-3.4p1-gsi/kexgss.c --- openssh-3.4p1/kexgss.c Wed Dec 31 18:00:00 1969 +++ openssh-3.4p1-gsi/kexgss.c Tue Jul 2 08:29:53 2002 @@ -0,0 +1,464 @@ +/* + * Copyright (c) 2001,2002 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#ifdef GSSAPI + +#include +#include + +#include "xmalloc.h" +#include "buffer.h" +#include "bufaux.h" +#include "kex.h" +#include "log.h" +#include "packet.h" +#include "dh.h" +#include "ssh2.h" +#include "ssh-gss.h" +#include "monitor_wrap.h" + +/* This is now the same as the DH hash ... */ + +u_char * +kex_gssapi_hash( + char *client_version_string, + char *server_version_string, + char *ckexinit, int ckexinitlen, + char *skexinit, int skexinitlen, + u_char *serverhostkeyblob, int sbloblen, + BIGNUM *client_dh_pub, + BIGNUM *server_dh_pub, + BIGNUM *shared_secret) +{ + Buffer b; + static u_char digest[EVP_MAX_MD_SIZE]; + EVP_MD *evp_md = EVP_sha1(); + EVP_MD_CTX md; + + buffer_init(&b); + buffer_put_string(&b, client_version_string, strlen(client_version_string)); + buffer_put_string(&b, server_version_string, strlen(server_version_string)); + + /* kexinit messages: fake header: len+SSH2_MSG_KEXINIT */ + buffer_put_int(&b, ckexinitlen+1); + buffer_put_char(&b, SSH2_MSG_KEXINIT); + buffer_append(&b, ckexinit, ckexinitlen); + buffer_put_int(&b, skexinitlen+1); + buffer_put_char(&b, SSH2_MSG_KEXINIT); + buffer_append(&b, skexinit, skexinitlen); + + buffer_put_string(&b, serverhostkeyblob, sbloblen); + buffer_put_bignum2(&b, client_dh_pub); + buffer_put_bignum2(&b, server_dh_pub); + buffer_put_bignum2(&b, shared_secret); + +#ifdef DEBUG_KEX + buffer_dump(&b); +#endif + EVP_DigestInit(&md, evp_md); + EVP_DigestUpdate(&md, buffer_ptr(&b), buffer_len(&b)); + EVP_DigestFinal(&md, digest, NULL); + + buffer_free(&b); + +#ifdef DEBUG_KEX + dump_digest("hash", digest, evp_md->md_size); +#endif + return digest; +} + +void +kexgss_client(Kex *kex) +{ + gss_buffer_desc gssbuf,send_tok,recv_tok, msg_tok, *token_ptr; + Gssctxt *ctxt; + OM_uint32 maj_status, min_status, ret_flags; + unsigned int klen, kout; + DH *dh; + BIGNUM *dh_server_pub = 0; + BIGNUM *shared_secret = 0; + unsigned char *kbuf; + unsigned char *hash; + unsigned char *serverhostkey; + int type = 0; + int first = 1; + int slen = 0; + + /* Initialise our GSSAPI world */ + ssh_gssapi_build_ctx(&ctxt); + if (ssh_gssapi_id_kex(ctxt,kex->name)==NULL) { + fatal("Couldn't identify host exchange"); + } + if (ssh_gssapi_import_name(ctxt,kex->host)) { + fatal("Couldn't import hostname "); + } + + /* This code should match that in ssh_dh1_client */ + + /* Step 1 - e is dh->pub_key */ + dh = dh_new_group1(); + dh_gen_key(dh, kex->we_need * 8); + + /* This is f, we initialise it now to make life easier */ + dh_server_pub = BN_new(); + if (dh_server_pub == NULL) { + fatal("dh_server_pub == NULL"); + } + + token_ptr = GSS_C_NO_BUFFER; + + do { + debug("Calling gss_init_sec_context"); + + maj_status=ssh_gssapi_init_ctx(ctxt, + kex->options.gss_deleg_creds, + token_ptr,&send_tok, + &ret_flags); + + if (GSS_ERROR(maj_status)) { + fatal("gss_init_context failed"); + } + + /* If we've got an old receive buffer get rid of it */ + if (token_ptr != GSS_C_NO_BUFFER) + (void) gss_release_buffer(&min_status, &recv_tok); + + + if (maj_status == GSS_S_COMPLETE) { + /* If mutual state flag is not true, kex fails */ + if (!(ret_flags & GSS_C_MUTUAL_FLAG)) { + fatal("Mutual authentication failed"); + } + /* If integ avail flag is not true kex fails */ + if (!(ret_flags & GSS_C_INTEG_FLAG)) { + fatal("Integrity check failed"); + } + } + + /* If we have data to send, then the last message that we + * received cannot have been a 'complete'. */ + if (send_tok.length !=0) { + if (first) { + packet_start(SSH2_MSG_KEXGSS_INIT); + packet_put_string(send_tok.value, + send_tok.length); + packet_put_bignum2(dh->pub_key); + first=0; + } else { + packet_start(SSH2_MSG_KEXGSS_CONTINUE); + packet_put_string(send_tok.value, + send_tok.length); + } + packet_send(); + packet_write_wait(); + + + /* If we've sent them data, they'd better be polite + * and reply. */ + + type = packet_read(); + switch (type) { + case SSH2_MSG_KEXGSS_HOSTKEY: + debug("Received KEXGSS_HOSTKEY"); + serverhostkey=packet_get_string(&slen); + break; + case SSH2_MSG_KEXGSS_CONTINUE: + debug("Received GSSAPI_CONTINUE"); + if (maj_status == GSS_S_COMPLETE) + fatal("GSSAPI Continue received from server when complete"); + recv_tok.value=packet_get_string(&recv_tok.length); + break; + case SSH2_MSG_KEXGSS_COMPLETE: + debug("Received GSSAPI_COMPLETE"); + packet_get_bignum2(dh_server_pub); + msg_tok.value= + packet_get_string(&msg_tok.length); + + /* Is there a token included? */ + if (packet_get_char()) { + recv_tok.value= + packet_get_string(&recv_tok.length); + /* If we're already complete - protocol error */ + if (maj_status == GSS_S_COMPLETE) + packet_disconnect("Protocol error: received token when complete"); + } else { + /* No token included */ + if (maj_status != GSS_S_COMPLETE) + packet_disconnect("Protocol error: did not receive final token"); + } + break; + default: + packet_disconnect("Protocol error: didn't expect packet type %d", + type); + } + token_ptr=&recv_tok; + } + + } while (maj_status & GSS_S_CONTINUE_NEEDED); + + /* We _must_ have received a COMPLETE message in reply from the + * server, which will have set dh_server_pub and msg_tok */ + + if (type!=SSH2_MSG_KEXGSS_COMPLETE) + fatal("Didn't receive a SSH2_MSG_KEXGSS_COMPLETE when I expected it"); + + /* Check f in range [1, p-1] */ + if (!dh_pub_is_valid(dh, dh_server_pub)) + packet_disconnect("bad server public DH value"); + + /* compute K=f^x mod p */ + klen = DH_size(dh); + kbuf = xmalloc(klen); + kout = DH_compute_key(kbuf, dh_server_pub, dh); + + shared_secret = BN_new(); + BN_bin2bn(kbuf,kout, shared_secret); + memset(kbuf, 0, klen); + xfree(kbuf); + + hash = kex_gssapi_hash( + kex->client_version_string, + kex->server_version_string, + buffer_ptr(&kex->my), buffer_len(&kex->my), + buffer_ptr(&kex->peer), buffer_len(&kex->peer), + serverhostkey, slen, /* server host key */ + dh->pub_key, /* e */ + dh_server_pub, /* f */ + shared_secret /* K */ + ); + + gssbuf.value=hash; + gssbuf.length=20; + + /* Verify that H matches the token we just got. */ + if ((maj_status = gss_verify_mic(&min_status, + ctxt->context, + &gssbuf, + &msg_tok, + NULL))) { + + packet_disconnect("Hash's MIC didn't verify"); + } + + DH_free(dh); + ssh_gssapi_delete_ctx(&ctxt); + /* save session id */ + if (kex->session_id == NULL) { + kex->session_id_len = 20; + kex->session_id = xmalloc(kex->session_id_len); + memcpy(kex->session_id, hash, kex->session_id_len); + } + + kex_derive_keys(kex, hash, shared_secret); + BN_clear_free(shared_secret); + kex_finish(kex); +} + + + + +void +kexgss_server(Kex *kex) +{ + + OM_uint32 maj_status, min_status; + + /* Some GSSAPI implementations use the input value of ret_flags (an + * output variable) as a means of triggering mechanism specific + * features. Initializing it to zero avoids inadvertently + * activating this non-standard behaviour.*/ + + OM_uint32 ret_flags = 0; + gss_buffer_desc gssbuf,send_tok,recv_tok,msg_tok; + Gssctxt *ctxt = NULL; + unsigned int klen, kout; + unsigned char *kbuf; + unsigned char *hash; + DH *dh; + BIGNUM *shared_secret = NULL; + BIGNUM *dh_client_pub = NULL; + int type =0; + gss_OID oid; + + /* Initialise GSSAPI */ + + debug2("%s: Identifying %s",__func__,kex->name); + oid=ssh_gssapi_id_kex(ctxt,kex->name); + if (oid==NULL) { + packet_disconnect("Unknown gssapi mechanism"); + } + + debug2("%s: Acquiring credentials",__func__); + + if (GSS_ERROR(PRIVSEP(ssh_gssapi_server_ctx(&ctxt,oid)))) + packet_disconnect("Unable to acquire credentials for the server"); + + do { + debug("Wait SSH2_MSG_GSSAPI_INIT"); + type = packet_read(); + switch(type) { + case SSH2_MSG_KEXGSS_INIT: + if (dh_client_pub!=NULL) + packet_disconnect("Received KEXGSS_INIT after initialising"); + recv_tok.value=packet_get_string(&recv_tok.length); + + dh_client_pub = BN_new(); + + if (dh_client_pub == NULL) + fatal("dh_client_pub == NULL"); + packet_get_bignum2(dh_client_pub); + + /* Send SSH_MSG_KEXGSS_HOSTKEY here, if we want */ + break; + case SSH2_MSG_KEXGSS_CONTINUE: + if (dh_client_pub == NULL) + packet_disconnect("Received KEXGSS_CONTINUE without initialising"); + recv_tok.value=packet_get_string(&recv_tok.length); + break; + default: + packet_disconnect("Protocol error: didn't expect packet type %d", + type); + } + + maj_status=PRIVSEP(ssh_gssapi_accept_ctx(ctxt,&recv_tok, + &send_tok, &ret_flags)); + + gss_release_buffer(&min_status,&recv_tok); + +#ifdef GSS_C_GLOBUS_LIMITED_PROXY_FLAG + if (ret_flags & GSS_C_GLOBUS_LIMITED_PROXY_FLAG) { + packet_disconnect("Limited proxy is not allowed in gssapi key exchange."); + } +#endif + + if (maj_status & GSS_S_CONTINUE_NEEDED) { + debug("Sending GSSAPI_CONTINUE"); + packet_start(SSH2_MSG_KEXGSS_CONTINUE); + packet_put_string(send_tok.value,send_tok.length); + packet_send(); + packet_write_wait(); + gss_release_buffer(&min_status, &send_tok); + } + } while (maj_status & GSS_S_CONTINUE_NEEDED); + + if (GSS_ERROR(maj_status)) { + ssh_gssapi_send_error(maj_status,min_status); + packet_disconnect("gssapi key exchange handshake failed"); + } + + debug("gss_complete"); + if (!(ret_flags & GSS_C_MUTUAL_FLAG)) { + ssh_gssapi_send_error(maj_status,min_status); + packet_disconnect("gssapi mutual authentication failed"); + } + + if (!(ret_flags & GSS_C_INTEG_FLAG)) { + ssh_gssapi_send_error(maj_status,min_status); + packet_disconnect("gssapi channel integrity not established"); + } + + dh = dh_new_group1(); + dh_gen_key(dh, kex->we_need * 8); + + if (!dh_pub_is_valid(dh, dh_client_pub)) + packet_disconnect("bad client public DH value"); + + klen = DH_size(dh); + kbuf = xmalloc(klen); + kout = DH_compute_key(kbuf, dh_client_pub, dh); + + shared_secret = BN_new(); + BN_bin2bn(kbuf, kout, shared_secret); + memset(kbuf, 0, klen); + xfree(kbuf); + + hash = kex_gssapi_hash( + kex->client_version_string, + kex->server_version_string, + buffer_ptr(&kex->peer), buffer_len(&kex->peer), + buffer_ptr(&kex->my), buffer_len(&kex->my), + NULL, 0, /* Change this if we start sending host keys */ + dh_client_pub, + dh->pub_key, + shared_secret + ); + BN_free(dh_client_pub); + + if (kex->session_id == NULL) { + kex->session_id_len = 20; + kex->session_id = xmalloc(kex->session_id_len); + memcpy(kex->session_id, hash, kex->session_id_len); + } + + gssbuf.value = hash; + gssbuf.length = 20; /* Hashlen appears to always be 20 */ + + if (GSS_ERROR(PRIVSEP(ssh_gssapi_sign(ctxt,&gssbuf,&msg_tok)))) { + ssh_gssapi_send_error(maj_status,min_status); + packet_disconnect("Couldn't get MIC"); + } + + packet_start(SSH2_MSG_KEXGSS_COMPLETE); + packet_put_bignum2(dh->pub_key); + packet_put_string((char *)msg_tok.value,msg_tok.length); + + if (send_tok.length!=0) { + packet_put_char(1); /* true */ + packet_put_string((char *)send_tok.value,send_tok.length); + } else { + packet_put_char(0); /* false */ + } + packet_send(); + packet_write_wait(); + + /* We used to store the client name and credentials here for later + * use. With privsep, its easier to do this as a by product of the + * call to accept_context, which stores delegated information when + * the context is complete */ + + gss_release_buffer(&min_status, &send_tok); + + /* If we've got a context, delete it. It may be NULL if we've been + * using privsep */ + ssh_gssapi_delete_ctx(&ctxt); + + DH_free(dh); + + kex_derive_keys(kex, hash, shared_secret); + BN_clear_free(shared_secret); + kex_finish(kex); +} + +void +kexgss(Kex *kex) +{ + if (kex->server) + kexgss_server(kex); + else + kexgss_client(kex); +} + +#endif /* GSSAPI */ diff -Naur openssh-3.4p1/key.c openssh-3.4p1-gsi/key.c --- openssh-3.4p1/key.c Sun Jun 23 16:21:31 2002 +++ openssh-3.4p1-gsi/key.c Tue Jul 2 08:29:53 2002 @@ -647,6 +647,8 @@ return KEY_RSA; } else if (strcmp(name, "ssh-dss") == 0) { return KEY_DSA; + } else if (strcmp(name, "null") == 0){ + return KEY_NULL; } debug2("key_type_from_name: unknown key type '%s'", name); return KEY_UNSPEC; diff -Naur openssh-3.4p1/key.h openssh-3.4p1-gsi/key.h --- openssh-3.4p1/key.h Thu Mar 21 19:45:55 2002 +++ openssh-3.4p1-gsi/key.h Tue Jul 2 08:29:53 2002 @@ -34,6 +34,7 @@ KEY_RSA1, KEY_RSA, KEY_DSA, + KEY_NULL, KEY_UNSPEC }; enum fp_type { diff -Naur openssh-3.4p1/log.c openssh-3.4p1-gsi/log.c --- openssh-3.4p1/log.c Tue Feb 26 11:52:15 2002 +++ openssh-3.4p1-gsi/log.c Tue Jul 2 08:29:53 2002 @@ -367,7 +367,7 @@ vsnprintf(msgbuf, sizeof(msgbuf), fmt, args); } if (log_on_stderr) { - fprintf(stderr, "%s\r\n", msgbuf); + fprintf(stderr, "%d: %s\r\n", getpid(), msgbuf); } else { openlog(argv0 ? argv0 : __progname, LOG_PID, log_facility); syslog(pri, "%.500s", msgbuf); diff -Naur openssh-3.4p1/makegssname.pl openssh-3.4p1-gsi/makegssname.pl --- openssh-3.4p1/makegssname.pl Wed Dec 31 18:00:00 1969 +++ openssh-3.4p1-gsi/makegssname.pl Tue Jul 2 08:29:53 2002 @@ -0,0 +1,46 @@ +#!/usr/bin/perl + +use Convert::ASN1 qw(:tag); +use Digest::MD5 qw(md5); +use MIME::Base64; + +$oid=shift; +$encoded=encode_object_id($oid); + +@entries=unpack("C*",$encoded); +shift @entries; # Get rid of the NULL + +print "DER representation: "; +foreach $entry (@entries) { + print "\\x"; + printf "%02X",$entry; +} +print "\n"; + +$digest = md5($encoded); +# We only want the first 10 characters; +# Conversations with the authors suggest that we want to use all of the +# characters of the digest. +#$digest = substr($digest,0,10); +print "gsskeyex representation: ",encode_base64($digest),"\n"; + +sub encode_object_id { + $string=""; + + my @data = ($_[0] =~ /(\d+)/g); + + if(@data < 2) { + @data = (0); + } + else { + my $first = $data[1] + ($data[0] * 40); + splice(@data,0,2,$first); + } + +# my $l = length $string; + $string .= pack("cw*", 0, @data); +# substr($string,$l,1) = asn_encode_length(length($string) - $l - 1); + return $string; +} + + diff -Naur openssh-3.4p1/monitor.c openssh-3.4p1-gsi/monitor.c --- openssh-3.4p1/monitor.c Wed Jun 26 08:27:11 2002 +++ openssh-3.4p1-gsi/monitor.c Tue Jul 2 08:29:53 2002 @@ -59,6 +59,11 @@ #include "ssh2.h" #include "mpaux.h" +#ifdef GSSAPI +#include "ssh-gss.h" +static Gssctxt *gsscontext = NULL; +#endif + /* Imports */ extern ServerOptions options; extern u_int utmp_len; @@ -120,6 +125,18 @@ int mm_answer_pam_start(int, Buffer *); #endif +#ifdef GSSAPI +int mm_answer_gss_setup_ctx(int, Buffer *); +int mm_answer_gss_accept_ctx(int, Buffer *); +int mm_answer_gss_userok(int, Buffer *); +int mm_answer_gss_localname(int, Buffer *); +int mm_answer_gss_sign(int, Buffer *); +#endif + +#ifdef GSI +int mm_answer_gsi_gridmap(int, Buffer *); +#endif + static Authctxt *authctxt; static BIGNUM *ssh1_challenge = NULL; /* used for ssh1 rsa auth */ @@ -150,12 +167,12 @@ struct mon_table mon_dispatch_proto20[] = { {MONITOR_REQ_MODULI, MON_ONCE, mm_answer_moduli}, {MONITOR_REQ_SIGN, MON_ONCE, mm_answer_sign}, - {MONITOR_REQ_PWNAM, MON_ONCE, mm_answer_pwnamallow}, + {MONITOR_REQ_PWNAM, MON_AUTH, mm_answer_pwnamallow}, {MONITOR_REQ_AUTHSERV, MON_ONCE, mm_answer_authserv}, {MONITOR_REQ_AUTH2_READ_BANNER, MON_ONCE, mm_answer_auth2_read_banner}, {MONITOR_REQ_AUTHPASSWORD, MON_AUTH, mm_answer_authpassword}, #ifdef USE_PAM - {MONITOR_REQ_PAM_START, MON_ONCE, mm_answer_pam_start}, + {MONITOR_REQ_PAM_START, MON_ISAUTH, mm_answer_pam_start}, #endif #ifdef BSD_AUTH {MONITOR_REQ_BSDAUTHQUERY, MON_ISAUTH, mm_answer_bsdauthquery}, @@ -165,12 +182,24 @@ {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, #endif +#ifdef GSSAPI + {MONITOR_REQ_GSSSETUP, MON_ISAUTH, mm_answer_gss_setup_ctx}, + {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, + {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, + {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, + {MONITOR_REQ_GSSLOCALNAME, MON_AUTH, mm_answer_gss_localname}, +#endif {MONITOR_REQ_KEYALLOWED, MON_ISAUTH, mm_answer_keyallowed}, {MONITOR_REQ_KEYVERIFY, MON_AUTH, mm_answer_keyverify}, {0, 0, NULL} }; struct mon_table mon_dispatch_postauth20[] = { +#ifdef GSSAPI + {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, + {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, + {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, +#endif {MONITOR_REQ_MODULI, 0, mm_answer_moduli}, {MONITOR_REQ_SIGN, 0, mm_answer_sign}, {MONITOR_REQ_PTY, 0, mm_answer_pty}, @@ -196,13 +225,27 @@ {MONITOR_REQ_SKEYQUERY, MON_ISAUTH, mm_answer_skeyquery}, {MONITOR_REQ_SKEYRESPOND, MON_AUTH, mm_answer_skeyrespond}, #endif +#ifdef GSSAPI + {MONITOR_REQ_GSSSETUP, MON_ISAUTH, mm_answer_gss_setup_ctx}, + {MONITOR_REQ_GSSSTEP, MON_ISAUTH, mm_answer_gss_accept_ctx}, + {MONITOR_REQ_GSSSIGN, MON_ONCE, mm_answer_gss_sign}, + {MONITOR_REQ_GSSUSEROK, MON_AUTH, mm_answer_gss_userok}, +#endif +#ifdef GSI + {MONITOR_REQ_GSIGRIDMAP, MON_PERMIT, mm_answer_gsi_gridmap}, +#endif #ifdef USE_PAM - {MONITOR_REQ_PAM_START, MON_ONCE, mm_answer_pam_start}, + {MONITOR_REQ_PAM_START, MON_ISAUTH, mm_answer_pam_start}, #endif {0, 0, NULL} }; struct mon_table mon_dispatch_postauth15[] = { +#ifdef GSSAPI + {MONITOR_REQ_GSSSETUP, 0, mm_answer_gss_setup_ctx}, + {MONITOR_REQ_GSSSTEP, 0, mm_answer_gss_accept_ctx}, + {MONITOR_REQ_GSSSIGN, 0, mm_answer_gss_sign}, +#endif {MONITOR_REQ_PTY, MON_ONCE, mm_answer_pty}, {MONITOR_REQ_PTYCLEANUP, MON_ONCE, mm_answer_pty_cleanup}, {MONITOR_REQ_TERM, 0, mm_answer_term}, @@ -254,10 +297,22 @@ /* Permit requests for moduli and signatures */ monitor_permit(mon_dispatch, MONITOR_REQ_MODULI, 1); monitor_permit(mon_dispatch, MONITOR_REQ_SIGN, 1); +#ifdef GSSAPI + /* and for the GSSAPI key exchange */ + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSETUP, 1); + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSTEP, 1); + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); +#endif } else { mon_dispatch = mon_dispatch_proto15; monitor_permit(mon_dispatch, MONITOR_REQ_SESSKEY, 1); +#ifdef GSSAPI + monitor_permit(mon_dispatch, MONITOR_REQ_GSSSIGN, 1); +#endif +#ifdef GSI + monitor_permit(mon_dispatch, MONITOR_REQ_GSIGRIDMAP, 1); +#endif } authctxt = authctxt_new(); @@ -496,13 +551,11 @@ debug3("%s", __func__); - if (authctxt->attempt++ != 0) - fatal("%s: multiple attempts for getpwnam", __func__); - login = buffer_get_string(m, NULL); pwent = getpwnamallow(login); + if (authctxt->user) xfree(authctxt->user); authctxt->user = xstrdup(login); setproctitle("%s [priv]", pwent ? login : "unknown"); xfree(login); @@ -1540,3 +1593,146 @@ mon->m_recvfd = pair[0]; mon->m_sendfd = pair[1]; } + +#ifdef GSSAPI + +int +mm_answer_gss_setup_ctx(int socket, Buffer *m) { + gss_OID_desc oid; + OM_uint32 major; + + oid.elements=buffer_get_string(m,&oid.length); + + major=ssh_gssapi_server_ctx(&gsscontext,&oid); + + xfree(oid.elements); + + buffer_clear(m); + buffer_put_int(m,major); + + mm_request_send(socket,MONITOR_ANS_GSSSETUP,m); + + return(0); +} + +int +mm_answer_gss_accept_ctx(int socket, Buffer *m) { + gss_buffer_desc in,out; + OM_uint32 major,minor; + OM_uint32 flags = 0; /* GSI needs this */ + + in.value = buffer_get_string(m,&in.length); + major=ssh_gssapi_accept_ctx(gsscontext,&in,&out,&flags); + xfree(in.value); + + buffer_clear(m); + buffer_put_int(m, major); + buffer_put_string(m, out.value, out.length); + buffer_put_int(m, flags); + mm_request_send(socket,MONITOR_ANS_GSSSTEP,m); + + gss_release_buffer(&minor, &out); + + return(0); +} +int +mm_answer_gss_userok(int socket, Buffer *m) { + int authenticated; + + authenticated = authctxt->valid && ssh_gssapi_userok(authctxt->user); + + buffer_clear(m); + buffer_put_int(m, authenticated); + + debug3("%s: sending result %d", __func__, authenticated); + mm_request_send(socket, MONITOR_ANS_GSSUSEROK, m); + + auth_method="gssapi"; + + /* Monitor loop will terminate if authenticated */ + return(authenticated); +} +int +mm_answer_gss_localname(int socket, Buffer *m) { + char *name; + + ssh_gssapi_localname(&name); + + buffer_clear(m); + if (name) { + buffer_put_cstring(m, name); + debug3("%s: sending result %s", __func__, name); + xfree(name); + } else { + buffer_put_cstring(m, ""); + debug3("%s: sending result \"\"", __func__); + } + + mm_request_send(socket, MONITOR_ANS_GSSLOCALNAME, m); + + return(0); +} + +int +mm_answer_gss_sign(int socket, Buffer *m) { + gss_buffer_desc data,hash; + OM_uint32 major,minor; + + data.value = buffer_get_string(m,&data.length); + if (data.length != 16) { /* HACK - i.e. we are using SSHv1 */ + if (data.length != 20) + fatal("%s: data length incorrect: %d", __func__, data.length); + + /* Save the session ID - only first time round */ + if (session_id2_len == 0) { + session_id2_len=data.length; + session_id2 = xmalloc(session_id2_len); + memcpy(session_id2, data.value, session_id2_len); + } + } /* HACK - end */ + major=ssh_gssapi_sign(gsscontext, &data, &hash); + + xfree(data.value); + + buffer_clear(m); + buffer_put_int(m, major); + buffer_put_string(m, hash.value, hash.length); + + mm_request_send(socket,MONITOR_ANS_GSSSIGN,m); + + gss_release_buffer(&minor,&hash); + + /* Turn on permissions for getpwnam */ + monitor_permit(mon_dispatch, MONITOR_REQ_PWNAM, 1); + + return(0); +} + +#endif /* GSSAPI */ + +#ifdef GSI + +int +mm_answer_gsi_gridmap(int socket, Buffer *m) { + char *subject, *name; + + subject = buffer_get_string(m, NULL); + + gsi_gridmap(subject, &name); + + buffer_clear(m); + if (name) { + buffer_put_cstring(m, name); + debug3("%s: sending result %s", __func__, name); + xfree(name); + } else { + buffer_put_cstring(m, ""); + debug3("%s: sending result \"\"", __func__); + } + + mm_request_send(socket, MONITOR_ANS_GSIGRIDMAP, m); + + return(0); +} + +#endif /* GSI */ diff -Naur openssh-3.4p1/monitor.h openssh-3.4p1-gsi/monitor.h --- openssh-3.4p1/monitor.h Tue Jun 11 11:42:49 2002 +++ openssh-3.4p1-gsi/monitor.h Tue Jul 2 08:29:53 2002 @@ -39,6 +39,12 @@ MONITOR_REQ_BSDAUTHRESPOND, MONITOR_ANS_BSDAUTHRESPOND, MONITOR_REQ_SKEYQUERY, MONITOR_ANS_SKEYQUERY, MONITOR_REQ_SKEYRESPOND, MONITOR_ANS_SKEYRESPOND, + MONITOR_REQ_GSSSETUP,MONITOR_ANS_GSSSETUP, + MONITOR_REQ_GSSSTEP,MONITOR_ANS_GSSSTEP, + MONITOR_REQ_GSSSIGN,MONITOR_ANS_GSSSIGN, + MONITOR_REQ_GSSUSEROK,MONITOR_ANS_GSSUSEROK, + MONITOR_REQ_GSSLOCALNAME,MONITOR_ANS_GSSLOCALNAME, + MONITOR_REQ_GSIGRIDMAP,MONITOR_ANS_GSIGRIDMAP, MONITOR_REQ_KEYALLOWED, MONITOR_ANS_KEYALLOWED, MONITOR_REQ_KEYVERIFY, MONITOR_ANS_KEYVERIFY, MONITOR_REQ_KEYEXPORT, diff -Naur openssh-3.4p1/monitor_wrap.c openssh-3.4p1-gsi/monitor_wrap.c --- openssh-3.4p1/monitor_wrap.c Thu Jun 20 19:43:43 2002 +++ openssh-3.4p1-gsi/monitor_wrap.c Tue Jul 2 08:29:53 2002 @@ -51,6 +51,10 @@ #include "channels.h" #include "session.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif + /* Imports */ extern int compat20; extern Newkeys *newkeys[]; @@ -937,3 +941,137 @@ return (success); } +#ifdef GSSAPI +OM_uint32 +mm_ssh_gssapi_server_ctx(Gssctxt **ctx, gss_OID oid) { + Buffer m; + OM_uint32 major; + + /* Client doesn't get to see the context */ + *ctx=NULL; + + buffer_init(&m); + buffer_put_string(&m,oid->elements,oid->length); + + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSETUP, &m); + + debug3("%s: waiting for MONITOR_ANS_GSSSETUP",__func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSETUP, &m); + major=buffer_get_int(&m); + + return(major); +} + +OM_uint32 +mm_ssh_gssapi_accept_ctx(Gssctxt *ctx, gss_buffer_desc *in, + gss_buffer_desc *out, OM_uint32 *flags) { + + Buffer m; + OM_uint32 major; + + buffer_init(&m); + buffer_put_string(&m, in->value, in->length); + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSTEP, &m); + + debug3("%s: waiting for MONITOR_ANS_GSSSTEP", __func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSTEP, &m); + + major=buffer_get_int(&m); + out->value=buffer_get_string(&m,&out->length); + if (flags) *flags=buffer_get_int(&m); + + return(major); +} + +int +mm_ssh_gssapi_userok(char *user) { + Buffer m; + int authenticated = 0; + + buffer_init(&m); + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSUSEROK, &m); + + debug3("%s: waiting for MONITOR_ANS_GSSUSEROK", __func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSUSEROK, + &m); + + authenticated = buffer_get_int(&m); + + buffer_free(&m); + debug3("%s: user %sauthenticated",__func__, authenticated ? "" : "not "); + return(authenticated); +} + +int +mm_ssh_gssapi_localname(char **lname) +{ + Buffer m; + + buffer_init(&m); + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSLOCALNAME, &m); + + debug3("%s: waiting for MONITOR_ANS_GSSLOCALNAME", __func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSLOCALNAME, + &m); + + *lname = buffer_get_string(&m, NULL); + + buffer_free(&m); + if (lname[0] == '\0') { + debug3("%s: gssapi identity mapping failed", __func__); + } else { + debug3("%s: gssapi identity mapped to %s", __func__, *lname); + } + + return(0); +} + +OM_uint32 +mm_ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *data, gss_buffer_desc *hash) { + Buffer m; + OM_uint32 major; + + buffer_init(&m); + buffer_put_string(&m, data->value, data->length); + + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSSSIGN, &m); + + debug3("%s: waiting for MONITOR_ANS_GSSSIGN",__func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSSSIGN, &m); + major=buffer_get_int(&m); + hash->value = buffer_get_string(&m, &hash->length); + + return(major); +} +#endif /* GSSAPI */ + +#ifdef GSI + +int mm_gsi_gridmap(char *subject_name, char **lname) +{ + Buffer m; + + buffer_init(&m); + buffer_put_cstring(&m, subject_name); + mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_GSIGRIDMAP, &m); + + debug3("%s: waiting for MONITOR_ANS_GSIGRIDMAP", __func__); + mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_GSIGRIDMAP, + &m); + + *lname = buffer_get_string(&m, NULL); + + buffer_free(&m); + if (lname[0] == '\0') { + debug3("%s: gssapi identity %s mapping failed", __func__, + subject_name); + } else { + debug3("%s: gssapi identity %s mapped to %s", __func__, + subject_name, *lname); + } + + return(0); + +} + +#endif /* GSI */ diff -Naur openssh-3.4p1/monitor_wrap.h openssh-3.4p1-gsi/monitor_wrap.h --- openssh-3.4p1/monitor_wrap.h Sun May 12 20:07:42 2002 +++ openssh-3.4p1-gsi/monitor_wrap.h Tue Jul 2 08:29:53 2002 @@ -59,6 +59,21 @@ void mm_start_pam(char *); #endif +#ifdef GSSAPI +#include "ssh-gss.h" +OM_uint32 mm_ssh_gssapi_server_ctx(Gssctxt **ctxt, gss_OID oid); +OM_uint32 mm_ssh_gssapi_accept_ctx(Gssctxt *ctxt, gss_buffer_desc *recv, + gss_buffer_desc *send, OM_uint32 *flags); +OM_uint32 mm_ssh_gssapi_sign(Gssctxt *ctxt, gss_buffer_desc *buffer, + gss_buffer_desc *hash); +int mm_ssh_gssapi_userok(char *user); +int mm_ssh_gssapi_localname(char **user); +#endif + +#ifdef GSI +int mm_gsi_gridmap(char *subject_name, char **mapped_name); +#endif + void mm_terminate(void); int mm_pty_allocate(int *, int *, char *, int); void mm_session_pty_cleanup2(void *); diff -Naur openssh-3.4p1/packet.c openssh-3.4p1-gsi/packet.c --- openssh-3.4p1/packet.c Sun Jun 23 16:49:25 2002 +++ openssh-3.4p1-gsi/packet.c Tue Jul 2 08:29:53 2002 @@ -1159,6 +1159,13 @@ return buffer_get_string(&incoming_packet, length_ptr); } +/* Clears incoming data buffer */ + +void packet_get_all(void) +{ + buffer_clear(&incoming_packet); +} + /* * Sends a diagnostic message from the server to the client. This message * can be sent at any time (but not while constructing another message). The diff -Naur openssh-3.4p1/packet.h openssh-3.4p1-gsi/packet.h --- openssh-3.4p1/packet.h Thu Jun 20 19:43:43 2002 +++ openssh-3.4p1-gsi/packet.h Tue Jul 2 08:29:53 2002 @@ -54,6 +54,7 @@ void packet_get_bignum2(BIGNUM * value); void *packet_get_raw(int *length_ptr); void *packet_get_string(u_int *length_ptr); +void packet_get_all(void); void packet_disconnect(const char *fmt,...) __attribute__((format(printf, 1, 2))); void packet_send_debug(const char *fmt,...) __attribute__((format(printf, 1, 2))); diff -Naur openssh-3.4p1/readconf.c openssh-3.4p1-gsi/readconf.c --- openssh-3.4p1/readconf.c Thu Jun 20 19:41:52 2002 +++ openssh-3.4p1-gsi/readconf.c Tue Jul 2 08:29:53 2002 @@ -97,6 +97,12 @@ #if defined(KRB4) || defined(KRB5) oKerberosAuthentication, #endif +#ifdef GSSAPI + oGssAuthentication, oGssDelegateCreds, +#ifdef GSI + oGssGlobusDelegateLimitedCreds, +#endif /* GSI */ +#endif /* GSSAPI */ #if defined(AFS) || defined(KRB5) oKerberosTgtPassing, #endif @@ -143,6 +149,15 @@ #if defined(KRB4) || defined(KRB5) { "kerberosauthentication", oKerberosAuthentication }, #endif +#ifdef GSSAPI + { "gssapiauthentication", oGssAuthentication }, + { "gssapidelegatecredentials", oGssDelegateCreds }, +#ifdef GSI + /* For backwards compatability with old 1.2.27 client code */ + { "forwardgssapiglobusproxy", oGssDelegateCreds }, /* alias */ + { "forwardgssapiglobuslimitedproxy", oGssGlobusDelegateLimitedCreds }, +#endif /* GSI */ +#endif /* GSSAPI */ #if defined(AFS) || defined(KRB5) { "kerberostgtpassing", oKerberosTgtPassing }, #endif @@ -362,6 +377,23 @@ intptr = &options->kerberos_authentication; goto parse_flag; #endif +#ifdef GSSAPI + case oGssAuthentication: + intptr = &options->gss_authentication; + goto parse_flag; + + case oGssDelegateCreds: + intptr = &options->gss_deleg_creds; + goto parse_flag; + +#ifdef GSI + case oGssGlobusDelegateLimitedCreds: + intptr = &options->gss_globus_deleg_limited_proxy; + goto parse_flag; +#endif /* GSI */ + +#endif /* GSSAPI */ + #if defined(AFS) || defined(KRB5) case oKerberosTgtPassing: intptr = &options->kerberos_tgt_passing; @@ -747,6 +779,14 @@ options->rsa_authentication = -1; options->pubkey_authentication = -1; options->challenge_response_authentication = -1; +#ifdef GSSAPI + options->gss_authentication = -1; + options->gss_deleg_creds = -1; +#ifdef GSI + options->gss_globus_deleg_limited_proxy = -1; +#endif /* GSI */ +#endif /* GSSAPI */ + #if defined(KRB4) || defined(KRB5) options->kerberos_authentication = -1; #endif @@ -823,6 +863,16 @@ options->pubkey_authentication = 1; if (options->challenge_response_authentication == -1) options->challenge_response_authentication = 1; +#ifdef GSSAPI + if (options->gss_authentication == -1) + options->gss_authentication = 1; + if (options->gss_deleg_creds == -1) + options->gss_deleg_creds = 1; +#ifdef GSI + if (options->gss_globus_deleg_limited_proxy == -1) + options->gss_globus_deleg_limited_proxy = 0; +#endif /* GSI */ +#endif /* GSSAPI */ #if defined(KRB4) || defined(KRB5) if (options->kerberos_authentication == -1) options->kerberos_authentication = 1; diff -Naur openssh-3.4p1/readconf.h openssh-3.4p1-gsi/readconf.h --- openssh-3.4p1/readconf.h Sun Jun 9 15:04:03 2002 +++ openssh-3.4p1-gsi/readconf.h Tue Jul 2 08:29:53 2002 @@ -47,6 +47,15 @@ #if defined(AFS) || defined(KRB5) int kerberos_tgt_passing; /* Try Kerberos TGT passing. */ #endif + +#ifdef GSSAPI + int gss_authentication; + int gss_deleg_creds; +#ifdef GSI + int gss_globus_deleg_limited_proxy; +#endif /* GSI */ +#endif /* GSSAPI */ + #ifdef AFS int afs_token_passing; /* Try AFS token passing. */ #endif @@ -77,6 +86,7 @@ char *host_key_alias; /* hostname alias for .ssh/known_hosts */ char *proxy_command; /* Proxy command for connecting the host. */ char *user; /* User to log in as. */ + int implicit; int escape_char; /* Escape character; -2 = none */ char *system_hostfile;/* Path for /etc/ssh/ssh_known_hosts. */ diff -Naur openssh-3.4p1/servconf.c openssh-3.4p1-gsi/servconf.c --- openssh-3.4p1/servconf.c Mon Jun 24 22:22:04 2002 +++ openssh-3.4p1-gsi/servconf.c Tue Jul 2 08:29:53 2002 @@ -86,6 +86,12 @@ options->hostbased_uses_name_from_packet_only = -1; options->rsa_authentication = -1; options->pubkey_authentication = -1; +#ifdef GSSAPI + options->gss_authentication=-1; + options->gss_keyex=-1; + options->gss_use_session_ccache = -1; + options->gss_cleanup_creds = -1; +#endif #if defined(KRB4) || defined(KRB5) options->kerberos_authentication = -1; options->kerberos_or_local_passwd = -1; @@ -199,6 +205,16 @@ options->rsa_authentication = 1; if (options->pubkey_authentication == -1) options->pubkey_authentication = 1; +#ifdef GSSAPI + if (options->gss_authentication == -1) + options->gss_authentication = 1; + if (options->gss_keyex == -1) + options->gss_keyex =1; + if (options->gss_use_session_ccache == -1) + options->gss_use_session_ccache = 1; + if (options->gss_cleanup_creds == -1) + options->gss_cleanup_creds = 1; +#endif #if defined(KRB4) || defined(KRB5) if (options->kerberos_authentication == -1) options->kerberos_authentication = 0; @@ -277,6 +293,9 @@ sPort, sHostKeyFile, sServerKeyBits, sLoginGraceTime, sKeyRegenerationTime, sPermitRootLogin, sLogFacility, sLogLevel, sRhostsAuthentication, sRhostsRSAAuthentication, sRSAAuthentication, +#ifdef GSSAPI + sGssAuthentication, sGssKeyEx, sGssUseSessionCredCache, sGssCleanupCreds, +#endif #if defined(KRB4) || defined(KRB5) sKerberosAuthentication, sKerberosOrLocalPasswd, sKerberosTicketCleanup, #endif @@ -327,6 +346,13 @@ { "rsaauthentication", sRSAAuthentication }, { "pubkeyauthentication", sPubkeyAuthentication }, { "dsaauthentication", sPubkeyAuthentication }, /* alias */ +#ifdef GSSAPI + { "gssapiauthentication", sGssAuthentication }, + { "gssapikeyexchange", sGssKeyEx }, + { "gssusesessionccache", sGssUseSessionCredCache }, + { "gssapiusesessioncredcache", sGssUseSessionCredCache }, + { "gssapicleanupcreds", sGssCleanupCreds }, +#endif #if defined(KRB4) || defined(KRB5) { "kerberosauthentication", sKerberosAuthentication }, { "kerberosorlocalpasswd", sKerberosOrLocalPasswd }, @@ -641,6 +667,20 @@ case sPubkeyAuthentication: intptr = &options->pubkey_authentication; goto parse_flag; +#ifdef GSSAPI + case sGssAuthentication: + intptr = &options->gss_authentication; + goto parse_flag; + case sGssKeyEx: + intptr = &options->gss_keyex; + goto parse_flag; + case sGssUseSessionCredCache: + intptr = &options->gss_use_session_ccache; + goto parse_flag; + case sGssCleanupCreds: + intptr = &options->gss_cleanup_creds; + goto parse_flag; +#endif #if defined(KRB4) || defined(KRB5) case sKerberosAuthentication: intptr = &options->kerberos_authentication; diff -Naur openssh-3.4p1/servconf.h openssh-3.4p1-gsi/servconf.h --- openssh-3.4p1/servconf.h Thu Jun 20 20:09:47 2002 +++ openssh-3.4p1-gsi/servconf.h Tue Jul 2 08:29:53 2002 @@ -73,6 +73,13 @@ int hostbased_uses_name_from_packet_only; /* experimental */ int rsa_authentication; /* If true, permit RSA authentication. */ int pubkey_authentication; /* If true, permit ssh2 pubkey authentication. */ + #ifdef GSSAPI + int gss_authentication; + int gss_keyex; + int gss_use_session_ccache; /* If true, delegated credentials are + * stored in a session specific cache */ + int gss_cleanup_creds; /* If true, destroy cred cache on logout */ +#endif #if defined(KRB4) || defined(KRB5) int kerberos_authentication; /* If true, permit Kerberos * authentication. */ diff -Naur openssh-3.4p1/session.c openssh-3.4p1-gsi/session.c --- openssh-3.4p1/session.c Wed Jun 26 08:51:06 2002 +++ openssh-3.4p1-gsi/session.c Tue Jul 2 08:29:54 2002 @@ -58,6 +58,10 @@ #include "session.h" #include "monitor_wrap.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif + #ifdef HAVE_CYGWIN #include #include @@ -460,6 +464,12 @@ session_proctitle(s); +#if defined(GSSAPI) + temporarily_use_uid(s->pw); + ssh_gssapi_storecreds(); + restore_uid(); +#endif + #if defined(USE_PAM) do_pam_session(s->pw->pw_name, NULL); do_pam_setcred(1); @@ -578,6 +588,12 @@ ptyfd = s->ptyfd; ttyfd = s->ttyfd; +#if defined(GSSAPI) + temporarily_use_uid(s->pw); + ssh_gssapi_storecreds(); + restore_uid(); +#endif + #if defined(USE_PAM) do_pam_session(s->pw->pw_name, s->tty); do_pam_setcred(1); @@ -826,7 +842,7 @@ * Sets the value of the given variable in the environment. If the variable * already exists, its value is overriden. */ -static void +void child_set_env(char ***envp, u_int *envsizep, const char *name, const char *value) { @@ -953,6 +969,13 @@ copy_environment(environ, &env, &envsize); #endif +#ifdef GSSAPI + /* Allow any GSSAPI methods that we've used to alter + * the childs environment as they see fit + */ + ssh_gssapi_do_child(&env,&envsize); +#endif + if (!options.use_login) { /* Set basic environment. */ child_set_env(&env, &envsize, "USER", pw->pw_name); @@ -2034,4 +2057,7 @@ do_authenticated2(Authctxt *authctxt) { server_loop2(authctxt); +#if defined(GSSAPI) + ssh_gssapi_cleanup_creds(NULL); +#endif } diff -Naur openssh-3.4p1/session.h openssh-3.4p1-gsi/session.h --- openssh-3.4p1/session.h Sun Jun 23 16:48:29 2002 +++ openssh-3.4p1-gsi/session.h Tue Jul 2 08:29:54 2002 @@ -68,4 +68,7 @@ Session *session_by_tty(char *); void session_close(Session *); void do_setusercontext(struct passwd *); + +void child_set_env(char ***envp, u_int *envsizep, const char *name, + const char *value); #endif diff -Naur openssh-3.4p1/ssh-gss.h openssh-3.4p1-gsi/ssh-gss.h --- openssh-3.4p1/ssh-gss.h Wed Dec 31 18:00:00 1969 +++ openssh-3.4p1-gsi/ssh-gss.h Tue Jul 2 08:29:54 2002 @@ -0,0 +1,141 @@ +/* + * Copyright (c) 2001,2002 Simon Wilkinson. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR `AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _SSH_GSS_H +#define _SSH_GSS_H + +#ifdef GSSAPI + +#include "kex.h" +#include "buffer.h" + +#include + +#ifdef KRB5 +#ifndef HEIMDAL +#include + +/* MIT Kerberos doesn't seem to define GSS_NT_HOSTBASED_SERVICE */ + +#ifndef GSS_C_NT_HOSTBASED_SERVICE +#define GSS_C_NT_HOSTBASED_SERVICE gss_nt_service_name +#endif /* GSS_C_NT_... */ +#endif /* !HEIMDAL */ +#endif /* KRB5 */ + +/* draft-ietf-secsh-gsskeyex-03 */ +#define SSH2_MSG_KEXGSS_INIT 30 +#define SSH2_MSG_KEXGSS_CONTINUE 31 +#define SSH2_MSG_KEXGSS_COMPLETE 32 +#define SSH2_MSG_KEXGSS_HOSTKEY 33 +#define SSH2_MSG_KEXGSS_ERROR 34 +#define SSH2_MSG_USERAUTH_GSSAPI_RESPONSE 60 +#define SSH2_MSG_USERAUTH_GSSAPI_TOKEN 61 +#define SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE 63 +#define SSH2_MSG_USERAUTH_GSSAPI_ERROR 64 + +#define KEX_GSS_SHA1 "gss-group1-sha1-" + +enum ssh_gss_id { +#ifdef KRB5 + GSS_KERBEROS, +#endif +#ifdef GSI + GSS_GSI, +#endif /* GSI */ + GSS_LAST_ENTRY +}; + +typedef struct ssh_gss_mech_struct { + char *enc_name; + char *name; + gss_OID_desc oid; +} ssh_gssapi_mech; + +typedef struct { + OM_uint32 status; /* both */ + gss_ctx_id_t context; /* both */ + gss_name_t name; /* both */ + gss_OID oid; /* client */ + gss_cred_id_t creds; /* server */ + gss_name_t client; /* server */ + gss_cred_id_t client_creds; /* server */ +} Gssctxt; + +extern ssh_gssapi_mech supported_mechs[]; +extern gss_buffer_desc gssapi_client_name; +extern gss_cred_id_t gssapi_client_creds; +extern enum ssh_gss_id gssapi_client_type; + +char *ssh_gssapi_mechanisms(int server, char *host); +gss_OID ssh_gssapi_id_kex(Gssctxt *ctx, char *name); +void ssh_gssapi_set_oid_data(Gssctxt *ctx, void *data, size_t len); +void ssh_gssapi_set_oid(Gssctxt *ctx, gss_OID oid); +void ssh_gssapi_supported_oids(gss_OID_set *oidset); +enum ssh_gss_id ssh_gssapi_get_ctype(Gssctxt *ctxt); + +OM_uint32 ssh_gssapi_import_name(Gssctxt *ctx, const char *host); +OM_uint32 ssh_gssapi_acquire_cred(Gssctxt *ctx); +OM_uint32 ssh_gssapi_init_ctx(Gssctxt *ctx, int deleg_creds, + gss_buffer_desc *recv_tok, + gss_buffer_desc *send_tok, OM_uint32 *flags); +OM_uint32 ssh_gssapi_accept_ctx(Gssctxt *ctx, + gss_buffer_desc *recv_tok, + gss_buffer_desc *send_tok, + OM_uint32 *flags); +OM_uint32 ssh_gssapi_getclient(Gssctxt *ctx, + enum ssh_gss_id *type, + gss_buffer_desc *name, + gss_cred_id_t *creds); +void ssh_gssapi_error(OM_uint32 major_status,OM_uint32 minor_status); +void ssh_gssapi_send_error(OM_uint32 major_status,OM_uint32 minor_status); +void ssh_gssapi_build_ctx(Gssctxt **ctx); +void ssh_gssapi_delete_ctx(Gssctxt **ctx); +OM_uint32 ssh_gssapi_client_ctx(Gssctxt **ctx,gss_OID oid,char *host); +OM_uint32 ssh_gssapi_server_ctx(Gssctxt **ctx,gss_OID oid); + +/* In the client */ +void ssh_gssapi_client(Kex *kex, char *host, struct sockaddr *hostaddr, + Buffer *client_kexinit, Buffer *server_kexinit); + +/* In the server */ +int ssh_gssapi_userok(char *name); +int ssh_gssapi_localname(char **lname); +void ssh_gssapi_server(Kex *kex, Buffer *client_kexinit, + Buffer *server_kexinit); + +OM_uint32 ssh_gssapi_sign(Gssctxt *ctx, gss_buffer_desc *buffer, + gss_buffer_desc *hash); + +void ssh_gssapi_do_child(char ***envp, u_int *envsizep); +void ssh_gssapi_cleanup_creds(void *ignored); +void ssh_gssapi_storecreds(); +void ssh_gssapi_clean_env(); + +#ifdef GSI +int gsi_gridmap(char *subject_name, char **mapped_name); +#endif +#endif /* GSSAPI */ + +#endif /* _SSH_GSS_H */ diff -Naur openssh-3.4p1/ssh.c openssh-3.4p1-gsi/ssh.c --- openssh-3.4p1/ssh.c Wed Jun 12 11:11:13 2002 +++ openssh-3.4p1-gsi/ssh.c Tue Jul 2 08:29:54 2002 @@ -578,6 +578,34 @@ fatal("Can't open user config file %.100s: " "%.100s", config, strerror(errno)); } else { + /* + * Since the config file parsing code aborts if it sees + * options it doesn't recognize, allow users to put + * options specific to compile-time add-ons in alternate + * config files so their primary config file will + * interoperate SSH versions that don't support those + * options. + */ +#ifdef GSSAPI + snprintf(buf, sizeof buf, "%.100s/%.100s.gssapi", pw->pw_dir, + _PATH_SSH_USER_CONFFILE); + (void)read_config_file(buf, host, &options); +#ifdef GSI + snprintf(buf, sizeof buf, "%.100s/%.100s.gsi", pw->pw_dir, + _PATH_SSH_USER_CONFFILE); + (void)read_config_file(buf, host, &options); +#endif +#if defined(KRB4) || defined(KRB5) + snprintf(buf, sizeof buf, "%.100s/%.100s.krb", pw->pw_dir, + _PATH_SSH_USER_CONFFILE); + (void)read_config_file(buf, host, &options); +#endif +#ifdef AFS + snprintf(buf, sizeof buf, "%.100s/%.100s.afs", pw->pw_dir, + _PATH_SSH_USER_CONFFILE); + (void)read_config_file(buf, host, &options); +#endif +#endif snprintf(buf, sizeof buf, "%.100s/%.100s", pw->pw_dir, _PATH_SSH_USER_CONFFILE); (void)read_config_file(buf, host, &options); @@ -594,8 +622,11 @@ seed_rng(); - if (options.user == NULL) - options.user = xstrdup(pw->pw_name); + if (options.user == NULL) { + options.user = xstrdup(pw->pw_name); + options.implicit = 1; + } + else options.implicit = 0; if (options.hostname != NULL) host = options.hostname; diff -Naur openssh-3.4p1/ssh1.h openssh-3.4p1-gsi/ssh1.h --- openssh-3.4p1/ssh1.h Fri Jun 8 19:17:12 2001 +++ openssh-3.4p1-gsi/ssh1.h Tue Jul 2 08:29:54 2002 @@ -70,6 +70,13 @@ #define SSH_MSG_CHANNEL_INPUT_EOF SSH_MSG_CHANNEL_CLOSE #define SSH_MSG_CHANNEL_OUTPUT_CLOSE SSH_MSG_CHANNEL_CLOSE_CONFIRMATION +/* GSS-API authentication */ +#define SSH_CMSG_AUTH_GSSAPI 88 /* int, strings... */ +#define SSH_SMSG_AUTH_GSSAPI_RESPONSE 89 /* string */ +#define SSH_MSG_AUTH_GSSAPI_TOKEN 90 /* string */ +#define SSH_SMSG_AUTH_GSSAPI_HASH 91 /* string */ +#define SSH_MSG_AUTH_GSSAPI_ABORT 92 /* */ + /* * Authentication methods. New types can be added, but old types should not * be removed for compatibility. The maximum allowed value is 31. @@ -83,6 +90,8 @@ #define SSH_PASS_KERBEROS_TGT 7 /* 8 to 15 are reserved */ #define SSH_PASS_AFS_TOKEN 21 + +#define SSH_AUTH_GSSAPI 24 /* Protocol flags. These are bit masks. */ #define SSH_PROTOFLAG_SCREEN_NUMBER 1 /* X11 forwarding includes screen */ diff -Naur openssh-3.4p1/ssh_config.5 openssh-3.4p1-gsi/ssh_config.5 --- openssh-3.4p1/ssh_config.5 Thu Jun 20 19:59:06 2002 +++ openssh-3.4p1-gsi/ssh_config.5 Tue Jul 2 08:29:54 2002 @@ -50,10 +50,30 @@ .Nm ssh obtains configuration data from the following sources in the following order: -command line options, user's configuration file +command line options, +feature-specific user configuration file(s) (see below), +user's configuration file .Pq Pa $HOME/.ssh/config , and system-wide configuration file .Pq Pa /etc/ssh/ssh_config . +For compatibility with other +.Nm +versions, the following feature-specific user configuration files +will be processed after the command line options but before the user's +main configuration file, so options that other +.Nm +versions may not support don't need to go in the main configuration file: +.Bl -tag -width Ds +.It Pa $HOME/.ssh/config.gssapi +Read if GSSAPI authentication is supported. This is a good place for +the GssapiAuthentication and GssapiDelegateCredentials options. +.It Pa $HOME/.ssh/config.krb +Read if Kerberos authentication is supported. This is a good place +for the KerberosAuthentication and KerberosTgtPassing options. +.It Pa $HOME/.ssh/config.afs +Read if AFS token passing is supported. This is a good place for the +AfsTokenPassing option. +.El .Pp For each parameter, the first obtained value will be used. @@ -285,6 +305,17 @@ Specifies a file to use for the global host key database instead of .Pa /etc/ssh/ssh_known_hosts . +.It Cm GssapiAuthentication +Specifies whether authentication based on GSSAPI may be used, either using +the result of a successful key exchange, or using GSSAPI user +authentication. +The default is +.Dq yes . +.It Cm GssapiDelegateCredentials +Specifies whether GSSAPI credentials will be delegated (forwarded) to +the server. +The default is +.Dq yes . .It Cm HostbasedAuthentication Specifies whether to try rhosts based authentication with public key authentication. @@ -418,7 +449,7 @@ over another method (e.g. .Cm password ) The default for this option is: -.Dq hostbased,publickey,keyboard-interactive,password . +.Dq hostbased,external-keyx,gssapi,publickey,keyboard-interactive,password . .It Cm Protocol Specifies the protocol versions .Nm ssh diff -Naur openssh-3.4p1/sshconnect1.c openssh-3.4p1-gsi/sshconnect1.c --- openssh-3.4p1/sshconnect1.c Thu Jun 6 14:57:34 2002 +++ openssh-3.4p1-gsi/sshconnect1.c Tue Jul 2 08:29:54 2002 @@ -51,6 +51,17 @@ #include "canohost.h" #include "auth.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#include "bufaux.h" + +/* + * MD5 hash of host and session keys for verification. This is filled + * in in ssh_login() and then checked in try_gssapi_authentication(). + */ +unsigned char ssh_key_digest[16]; +#endif /* GSSAPI */ + /* Session id for the current session. */ u_char session_id[16]; u_int supported_authentications = 0; @@ -947,6 +958,438 @@ return 0; } +#ifdef GSSAPI +/* + * This code stolen from the gss-client.c sample program from MIT's + * kerberos 5 distribution. + */ + +gss_cred_id_t gss_cred = GSS_C_NO_CREDENTIAL; + +static void display_status_1(m, code, type) + char *m; + OM_uint32 code; + int type; +{ + OM_uint32 maj_stat, min_stat; + gss_buffer_desc msg; + OM_uint32 msg_ctx; + + msg_ctx = 0; + while (1) { + maj_stat = gss_display_status(&min_stat, code, + type, GSS_C_NULL_OID, + &msg_ctx, &msg); + debug("GSS-API error %s: %s", m, (char *)msg.value); + (void) gss_release_buffer(&min_stat, &msg); + + if (!msg_ctx) + break; + } +} + +static void display_gssapi_status(msg, maj_stat, min_stat) + char *msg; + OM_uint32 maj_stat; + OM_uint32 min_stat; +{ + display_status_1(msg, maj_stat, GSS_C_GSS_CODE); + display_status_1(msg, min_stat, GSS_C_MECH_CODE); +} + +#ifdef GSI +int get_gssapi_cred() +{ + OM_uint32 maj_stat; + OM_uint32 min_stat; + + + debug("calling gss_acquire_cred"); + maj_stat = gss_acquire_cred(&min_stat, + GSS_C_NO_NAME, + GSS_C_INDEFINITE, + GSS_C_NO_OID_SET, + GSS_C_INITIATE, + &gss_cred, + NULL, + NULL); + + if (maj_stat != GSS_S_COMPLETE) { + display_gssapi_status("Failuring acquiring GSSAPI credentials", + maj_stat, min_stat); + gss_cred = GSS_C_NO_CREDENTIAL; /* should not be needed */ + return 0; + } + + return 1; /* Success */ +} + +char * get_gss_our_name() +{ + OM_uint32 maj_stat; + OM_uint32 min_stat; + gss_name_t pname = GSS_C_NO_NAME; + gss_buffer_desc tmpname; + gss_buffer_t tmpnamed = &tmpname; + char *retname; + + debug("calling gss_inquire_cred"); + maj_stat = gss_inquire_cred(&min_stat, + gss_cred, + &pname, + NULL, + NULL, + NULL); + if (maj_stat != GSS_S_COMPLETE) { + return NULL; + } + + maj_stat = gss_export_name(&min_stat, + pname, + tmpnamed); + if (maj_stat != GSS_S_COMPLETE) { + return NULL; + } + debug("gss_export_name finsished"); + retname = (char *)malloc(tmpname.length + 1); + if (!retname) { + return NULL; + } + memcpy(retname, tmpname.value, tmpname.length); + retname[tmpname.length] = '\0'; + + gss_release_name(&min_stat, &pname); + gss_release_buffer(&min_stat, tmpnamed); + + return retname; +} +#endif /* GSI */ + +int try_gssapi_authentication(char *host, Options *options) +{ + char *service_name = NULL; + gss_buffer_desc name_tok; + gss_buffer_desc send_tok; + gss_buffer_desc recv_tok; + gss_buffer_desc *token_ptr; + gss_name_t target_name = NULL; + gss_ctx_id_t gss_context; + gss_OID_desc mech_oid; + gss_OID name_type; + gss_OID_set my_mechs; + int my_mech_num; + OM_uint32 maj_stat; + OM_uint32 min_stat; + int ret_stat = 0; /* 1 == success */ + OM_uint32 req_flags = 0; + OM_uint32 ret_flags; + int type; + char *gssapi_auth_type = NULL; + struct hostent *hostinfo; + + + /* + * host is not guarenteed to be a FQDN, so we need to make sure it is. + */ + hostinfo = gethostbyname(host); + + if ((hostinfo == NULL) || (hostinfo->h_name == NULL)) { + debug("GSSAPI authentication: Unable to get FQDN for \"%s\"", host); + goto cleanup; + } + + /* + * Default flags + */ + req_flags |= GSS_C_REPLAY_FLAG; + + /* Do mutual authentication */ + req_flags |= GSS_C_MUTUAL_FLAG; + +#ifdef KRB5 + + gssapi_auth_type = "GSSAPI/Kerberos 5"; + +#endif + +#ifdef GSI + + gssapi_auth_type = "GSSAPI/GLOBUS"; + +#endif /* GSI */ + + if (gssapi_auth_type == NULL) { + debug("No GSSAPI type defined during compile"); + goto cleanup; + } + + debug("Attempting %s authentication", gssapi_auth_type); + + service_name = (char *) malloc(strlen("host") + + strlen(hostinfo->h_name) + + 2 /* 1 for '@', 1 for NUL */); + + if (service_name == NULL) { + debug("malloc() failed"); + goto cleanup; + } + + + sprintf(service_name, "host@%s", hostinfo->h_name); + + name_type = GSS_C_NT_HOSTBASED_SERVICE; + + debug("Service name is %s", service_name); + + /* Forward credentials? */ + +#ifdef KRB5 + if (options->kerberos_tgt_passing) { + debug("Forwarding Kerberos credentials"); + req_flags |= GSS_C_DELEG_FLAG; + } +#endif /* KRB5 */ + +#ifdef GSSAPI + if(options->gss_deleg_creds) { + debug("Forwarding X509 proxy certificate"); + req_flags |= GSS_C_DELEG_FLAG; + } +#ifdef GSS_C_GLOBUS_LIMITED_DELEG_PROXY_FLAG + /* Forward limited credentials, overrides gss_deleg_creds */ + if(options->gss_globus_deleg_limited_proxy) { + debug("Forwarding limited X509 proxy certificate"); + req_flags |= (GSS_C_DELEG_FLAG | GSS_C_GLOBUS_LIMITED_DELEG_PROXY_FLAG); + } +#endif /* GSS_C_GLOBUS_LIMITED_DELEG_PROXY_FLAG */ + +#endif /* GSSAPI */ + + debug("req_flags = %lu", req_flags); + + name_tok.value = service_name; + name_tok.length = strlen(service_name) + 1; + maj_stat = gss_import_name(&min_stat, &name_tok, + name_type, &target_name); + + free(service_name); + service_name = NULL; + + if (maj_stat != GSS_S_COMPLETE) { + display_gssapi_status("importing service name", maj_stat, min_stat); + goto cleanup; + } + + maj_stat = gss_indicate_mechs(&min_stat, &my_mechs); + + if (maj_stat != GSS_S_COMPLETE) { + display_gssapi_status("indicating mechs", maj_stat, min_stat); + goto cleanup; + } + + /* + * Send over a packet to the daemon, letting it know we're doing + * GSSAPI and our mech_oid(s). + */ + debug("Sending mech oid to server"); + packet_start(SSH_CMSG_AUTH_GSSAPI); + packet_put_int(my_mechs->count); /* Number of mechs we're sending */ + for (my_mech_num = 0; my_mech_num < my_mechs->count; my_mech_num++) + packet_put_string(my_mechs->elements[my_mech_num].elements, + my_mechs->elements[my_mech_num].length); + packet_send(); + packet_write_wait(); + + /* + * Get reply from the daemon to see if our mech was acceptable + */ + type = packet_read(); + + switch (type) { + case SSH_SMSG_AUTH_GSSAPI_RESPONSE: + debug("Server accepted mechanism"); + /* Successful negotiation */ + break; + + case SSH_MSG_AUTH_GSSAPI_ABORT: + debug("Unable to negotiate GSSAPI mechanism type with server"); + packet_get_all(); + goto cleanup; + + default: + packet_disconnect("Protocol error during GSSAPI authentication:" + " packet type %d received", + type); + /* Does not return */ + } + + /* Read the mechanism the server returned */ + mech_oid.elements = packet_get_string((unsigned int *) &(mech_oid.length)); + packet_get_all(); + + /* + * Perform the context-establishement loop. + * + * On each pass through the loop, token_ptr points to the token + * to send to the server (or GSS_C_NO_BUFFER on the first pass). + * Every generated token is stored in send_tok which is then + * transmitted to the server; every received token is stored in + * recv_tok, which token_ptr is then set to, to be processed by + * the next call to gss_init_sec_context. + * + * GSS-API guarantees that send_tok's length will be non-zero + * if and only if the server is expecting another token from us, + * and that gss_init_sec_context returns GSS_S_CONTINUE_NEEDED if + * and only if the server has another token to send us. + */ + + token_ptr = GSS_C_NO_BUFFER; + gss_context = GSS_C_NO_CONTEXT; + + do { + maj_stat = + gss_init_sec_context(&min_stat, + gss_cred, + &gss_context, + target_name, + &mech_oid, + req_flags, + 0, + NULL, /* no channel bindings */ + token_ptr, + NULL, /* ignore mech type */ + &send_tok, + &ret_flags, + NULL); /* ignore time_rec */ + + if (token_ptr != GSS_C_NO_BUFFER) + (void) gss_release_buffer(&min_stat, &recv_tok); + + if (maj_stat != GSS_S_COMPLETE && maj_stat != GSS_S_CONTINUE_NEEDED) { + display_gssapi_status("initializing context", maj_stat, min_stat); + + /* Send an abort message */ + packet_start(SSH_MSG_AUTH_GSSAPI_ABORT); + packet_send(); + packet_write_wait(); + + goto cleanup; + } + + if (send_tok.length != 0) { + debug("Sending authenticaton token..."); + packet_start(SSH_MSG_AUTH_GSSAPI_TOKEN); + packet_put_string((char *) send_tok.value, send_tok.length); + packet_send(); + packet_write_wait(); + + (void) gss_release_buffer(&min_stat, &send_tok); + } + + if (maj_stat == GSS_S_CONTINUE_NEEDED) { + + debug("Continue needed. Reading response..."); + + type = packet_read(); + + switch(type) { + + case SSH_MSG_AUTH_GSSAPI_TOKEN: + /* This is what we expected */ + break; + + case SSH_MSG_AUTH_GSSAPI_ABORT: + debug("Server aborted GSSAPI authentication."); + packet_get_all(); + goto cleanup; + + default: + packet_disconnect("Protocol error during GSSAPI authentication:" + " packet type %d received", + type); + /* Does not return */ + } + + recv_tok.value = packet_get_string((unsigned int *) &recv_tok.length); + packet_get_all(); + token_ptr = &recv_tok; + } + } while (maj_stat == GSS_S_CONTINUE_NEEDED); + + /* Success */ + ret_stat = 1; + + debug("%s authentication successful", gssapi_auth_type); + + /* + * Read hash of host and server keys and make sure it + * matches what we got earlier. + */ + debug("Reading hash of server and host keys..."); + type = packet_read(); + + if (type == SSH_MSG_AUTH_GSSAPI_ABORT) { + debug("Server aborted GSSAPI authentication."); + packet_get_all(); + ret_stat = 0; + goto cleanup; + + } else if (type == SSH_SMSG_AUTH_GSSAPI_HASH) { + gss_buffer_desc wrapped_buf; + gss_buffer_desc unwrapped_buf; + int conf_state; + gss_qop_t qop_state; + + + wrapped_buf.value = packet_get_string(&(wrapped_buf.length)); + packet_get_all(); + + maj_stat = gss_unwrap(&min_stat, + gss_context, + &wrapped_buf, + &unwrapped_buf, + &conf_state, + &qop_state); + + if (maj_stat != GSS_S_COMPLETE) { + display_gssapi_status("unwraping SSHD key hash", + maj_stat, min_stat); + packet_disconnect("Verification of SSHD keys through GSSAPI-secured channel failed: " + "Unwrapping of hash failed."); + } + + if (unwrapped_buf.length != sizeof(ssh_key_digest)) { + packet_disconnect("Verification of SSHD keys through GSSAPI-secured channel failed: " + "Size of key hashes do not match (%d != %d)!", + unwrapped_buf.length, sizeof(ssh_key_digest)); + } + + if (memcmp(ssh_key_digest, unwrapped_buf.value, sizeof(ssh_key_digest)) != 0) { + packet_disconnect("Verification of SSHD keys through GSSAPI-secured channel failed: " + "Hashes don't match!"); + } + + debug("Verified SSHD keys through GSSAPI-secured channel."); + + gss_release_buffer(&min_stat, &unwrapped_buf); + + } else { + packet_disconnect("Protocol error during GSSAPI authentication:" + "packet type %d received", type); + /* Does not return */ + } + + + cleanup: + if (target_name != NULL) + (void) gss_release_name(&min_stat, &target_name); + + return ret_stat; +} + +#endif /* GSSAPI */ + + /* * SSH1 key exchange */ @@ -998,6 +1441,45 @@ log("Warning: This may be due to an old implementation of ssh."); } +#ifdef GSSAPI + { + MD5_CTX md5context; + Buffer buf; + unsigned char *data; + unsigned int data_len; + + /* + * Hash the server and host keys. Later we will check them against + * a hash sent over a secure channel to make sure they are legit. + */ + debug("Calculating MD5 hash of server and host keys..."); + + /* Write all the keys to a temporary buffer */ + buffer_init(&buf); + + /* Server key */ + buffer_put_bignum(&buf, server_key->rsa->e); + buffer_put_bignum(&buf, server_key->rsa->n); + + /* Host key */ + buffer_put_bignum(&buf, host_key->rsa->e); + buffer_put_bignum(&buf, host_key->rsa->n); + + /* Get the resulting data */ + data = (unsigned char *) buffer_ptr(&buf); + data_len = buffer_len(&buf); + + /* And hash it */ + MD5_Init(&md5context); + MD5_Update(&md5context, data, data_len); + MD5_Final(ssh_key_digest, &md5context); + + /* Clean up */ + buffer_clear(&buf); + buffer_free(&buf); + } +#endif /* GSSAPI */ + /* Get protocol flags. */ server_flags = packet_get_int(); packet_set_protocol_flags(server_flags); @@ -1140,6 +1622,12 @@ ssh_userauth1(const char *local_user, const char *server_user, char *host, Sensitive *sensitive) { +#ifdef GSSAPI +#ifdef GSI + const char *save_server_user = NULL; +#endif /* GSI */ +#endif /* GSSAPI */ + #ifdef KRB5 krb5_context context = NULL; krb5_auth_context auth_context = NULL; @@ -1149,12 +1637,64 @@ if (supported_authentications == 0) fatal("ssh_userauth1: server supports no auth methods"); +#ifdef GSSAPI +#ifdef GSI + /* if no user given, tack on the subject name after the server_user. + * This will allow us to run gridmap early to get real user + * This name will start with /C= + */ + if ((supported_authentications & (1 << SSH_AUTH_GSSAPI)) && + options.gss_authentication) { + if (get_gssapi_cred()) { + char * retname; + char * newname; + + + save_server_user = server_user; + + retname = get_gss_our_name(); + + if (retname) { + debug("passing gssapi name '%s'", retname); + if (server_user) { + newname = (char *) malloc(strlen(retname) + strlen(server_user) + 4); + if (newname) { + strcpy(newname, server_user); + if(options.implicit) { + strcat(newname,":i:"); + } else { + strcat(newname,":x:"); + } + strcat(newname, retname); + server_user = newname; + free(retname); + } + } + } + } else { + /* + * If we couldn't successfully get our GSSAPI credentials then + * turn off gssapi authentication + */ + options.gss_authentication = 0; + } + debug("server_user %s", server_user); + } +#endif /* GSI */ +#endif /* GSSAPI */ + /* Send the name of the user to log in as on the server. */ packet_start(SSH_CMSG_USER); packet_put_cstring(server_user); packet_send(); packet_write_wait(); +#if defined(GSI) + if(save_server_user) + { + server_user = save_server_user; + } +#endif /* * The server should respond with success if no authentication is * needed (the user has no password). Otherwise the server responds @@ -1168,6 +1708,31 @@ if (type != SSH_SMSG_FAILURE) packet_disconnect("Protocol error: got %d in response to SSH_CMSG_USER", type); +#ifdef GSSAPI + /* Try GSSAPI authentication */ + if ((supported_authentications & (1 << SSH_AUTH_GSSAPI)) && + options.gss_authentication) + { + debug("Trying GSSAPI authentication..."); + try_gssapi_authentication(host, &options); + + /* + * XXX Hmmm. Kerberos authentication only reads a packet if it thinks + * the authentication went OK, but the server seems to always send + * a packet back. So I'm not sure if I'm missing something or + * the Kerberos code is broken. - vwelch 1/27/99 + */ + + type = packet_read(); + if (type == SSH_SMSG_SUCCESS) + return; /* Successful connection. */ + if (type != SSH_SMSG_FAILURE) + packet_disconnect("Protocol error: got %d in response to Kerberos auth", type); + + debug("GSSAPI authentication failed"); + } +#endif /* GSSAPI */ + #ifdef KRB5 if ((supported_authentications & (1 << SSH_AUTH_KERBEROS)) && options.kerberos_authentication) { diff -Naur openssh-3.4p1/sshconnect2.c openssh-3.4p1-gsi/sshconnect2.c --- openssh-3.4p1/sshconnect2.c Sun Jun 23 16:23:21 2002 +++ openssh-3.4p1-gsi/sshconnect2.c Tue Jul 2 08:29:54 2002 @@ -48,6 +48,10 @@ #include "msg.h" #include "pathnames.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif + /* import */ extern char *client_version_string; extern char *server_version_string; @@ -77,10 +81,26 @@ ssh_kex2(char *host, struct sockaddr *hostaddr) { Kex *kex; +#ifdef GSSAPI + char *orig, *gss; + int len; +#endif xxx_host = host; xxx_hostaddr = hostaddr; +#ifdef GSSAPI + /* Add the GSSAPI mechanisms currently supported on this client to + * the key exchange algorithm proposal */ + orig = myproposal[PROPOSAL_KEX_ALGS]; + gss = ssh_gssapi_mechanisms(0,host); + if (gss) { + len = strlen(orig)+strlen(gss)+2; + myproposal[PROPOSAL_KEX_ALGS]=xmalloc(len); + snprintf(myproposal[PROPOSAL_KEX_ALGS],len,"%s,%s",gss,orig); + } +#endif + if (options.ciphers == (char *)-1) { log("No valid ciphers for protocol version 2 given, using defaults."); options.ciphers = NULL; @@ -108,11 +128,27 @@ myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = options.hostkeyalgorithms; +#ifdef GSSAPI + /* If we've got GSSAPI algorithms, then we also support the + * 'null' hostkey, as a last resort */ + if (gss) { + orig=myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]; + len = strlen(orig)+sizeof(",null"); + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]=xmalloc(len); + snprintf(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS],len,"%s,null",orig); + } +#endif + /* start key exchange */ kex = kex_setup(myproposal); kex->client_version_string=client_version_string; kex->server_version_string=server_version_string; kex->verify_host_key=&verify_host_key_callback; + kex->host=host; + +#ifdef GSSAPI + kex->options.gss_deleg_creds=options.gss_deleg_creds; +#endif xxx_kex = kex; @@ -159,6 +195,8 @@ Sensitive *sensitive; /* kbd-interactive */ int info_req_seen; + /* generic */ + void *methoddata; }; struct Authmethod { char *name; /* string to compare against server's list */ @@ -181,6 +219,14 @@ int userauth_kbdint(Authctxt *); int userauth_hostbased(Authctxt *); +#ifdef GSSAPI +int userauth_external(Authctxt *authctxt); +int userauth_gssapi(Authctxt *authctxt); +void input_gssapi_response(int type, u_int32_t plen, void *ctxt); +void input_gssapi_token(int type, u_int32_t plen, void *ctxt); +void input_gssapi_hash(int type, u_int32_t plen, void *ctxt); +#endif + void userauth(Authctxt *, char *); static int sign_and_send_pubkey(Authctxt *, Key *, sign_cb_fn *); @@ -191,6 +237,16 @@ static char *authmethods_get(void); Authmethod authmethods[] = { +#ifdef GSSAPI + {"external-keyx", + userauth_external, + &options.gss_authentication, + NULL}, + {"gssapi", + userauth_gssapi, + &options.gss_authentication, + NULL}, +#endif {"hostbased", userauth_hostbased, &options.hostbased_authentication, @@ -256,6 +312,7 @@ authctxt.success = 0; authctxt.method = authmethod_lookup("none"); authctxt.authlist = NULL; + authctxt.methoddata = NULL; authctxt.sensitive = sensitive; authctxt.info_req_seen = 0; if (authctxt.method == NULL) @@ -278,6 +335,11 @@ void userauth(Authctxt *authctxt, char *authlist) { + if (authctxt->methoddata!=NULL) { + xfree(authctxt->methoddata); + authctxt->methoddata=NULL; + } + if (authlist == NULL) { authlist = authctxt->authlist; } else { @@ -327,6 +389,8 @@ fatal("input_userauth_success: no authentication context"); if (authctxt->authlist) xfree(authctxt->authlist); + if (authctxt->methoddata) + xfree(authctxt->methoddata); clear_auth_state(authctxt); authctxt->success = 1; /* break out */ } @@ -428,6 +492,161 @@ } +#ifdef GSSAPI +int +userauth_gssapi(Authctxt *authctxt) +{ + int i; + Gssctxt *gssctxt; + static int tries=0; + + /* For now, we only make one attempt at this. We could try offering + * the server different GSSAPI OIDs until we get bored, I suppose. + */ + if (tries++>0) return 0; + + if (datafellows & SSH_OLD_GSSAPI) return 0; + + /* Initialise as much of our context as we can, so failures can be + * trapped before sending any packets. + */ + ssh_gssapi_build_ctx(&gssctxt); + + if (ssh_gssapi_import_name(gssctxt,authctxt->host)) { + return(0); + } + + authctxt->methoddata=(void *)gssctxt; + + packet_start(SSH2_MSG_USERAUTH_REQUEST); + if(options.implicit && !(datafellows & SSH_BUG_GSS_EMPTYUSER)) { + packet_put_cstring(""); + } else { + packet_put_cstring(authctxt->server_user); + } + packet_put_cstring(authctxt->service); + packet_put_cstring(authctxt->method->name); + + /* FIXME: This assumes that our current GSSAPI implementation + * supports all of the mechanisms listed in supported_mechs. + * This may not be the case - we should use something along + * the lines of the code in gss_genr to remove the ones that + * aren't supported */ + packet_put_int(GSS_LAST_ENTRY); + for (i=0;imethoddata; + + /* Setup our OID */ + oidv=packet_get_string(&oidlen); + ssh_gssapi_set_oid_data(gssctxt,oidv,oidlen); + + packet_check_eom(); + + status = ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, + GSS_C_NO_BUFFER, &send_tok, + NULL); + if (GSS_ERROR(status)) { + /* Start again with next method on list */ + debug("Trying to start again"); + userauth(authctxt,NULL); + return; + } + + /* We must have data to send */ + packet_start(SSH2_MSG_USERAUTH_GSSAPI_TOKEN); + packet_put_string(send_tok.value,send_tok.length); + packet_send(); + packet_write_wait(); + gss_release_buffer(&ms, &send_tok); +} + +void +input_gssapi_token(int type, u_int32_t plen, void *ctxt) +{ + Authctxt *authctxt = ctxt; + Gssctxt *gssctxt; + gss_buffer_desc send_tok,recv_tok; + OM_uint32 status; + + if (authctxt == NULL) + fatal("input_gssapi_response: no authentication context"); + gssctxt = authctxt->methoddata; + + recv_tok.value=packet_get_string(&recv_tok.length); + + status=ssh_gssapi_init_ctx(gssctxt, options.gss_deleg_creds, + &recv_tok, &send_tok, NULL); + + packet_check_eom(); + + if (GSS_ERROR(status)) { + /* Start again with the next method in the list */ + userauth(authctxt,NULL); + return; + } + + if (send_tok.length>0) { + packet_start(SSH2_MSG_USERAUTH_GSSAPI_TOKEN); + packet_put_string(send_tok.value,send_tok.length); + packet_send(); + packet_write_wait(); + } + + if (status == GSS_S_COMPLETE) { + /* If that succeeded, send a exchange complete message */ + packet_start(SSH2_MSG_USERAUTH_GSSAPI_EXCHANGE_COMPLETE); + packet_send(); + packet_write_wait(); + } +} + +int +userauth_external(Authctxt *authctxt) +{ + static int attempt =0; + + if (attempt++ >= 1) + return 0; + + debug2("userauth_external"); + packet_start(SSH2_MSG_USERAUTH_REQUEST); + if(options.implicit && !(datafellows & SSH_BUG_GSS_EMPTYUSER)) { + packet_put_cstring(""); + } else { + packet_put_cstring(authctxt->server_user); + } + packet_put_cstring(authctxt->service); + packet_put_cstring(authctxt->method->name); + packet_send(); + packet_write_wait(); + return 1; +} +#endif /* GSSAPI */ + int userauth_none(Authctxt *authctxt) { @@ -438,6 +657,7 @@ packet_put_cstring(authctxt->method->name); packet_send(); return 1; + } int diff -Naur openssh-3.4p1/sshd.c openssh-3.4p1-gsi/sshd.c --- openssh-3.4p1/sshd.c Tue Jun 25 18:24:19 2002 +++ openssh-3.4p1-gsi/sshd.c Tue Jul 2 08:29:54 2002 @@ -85,6 +85,15 @@ #include "monitor_wrap.h" #include "monitor_fdpass.h" +#ifdef GSSAPI +#include "ssh-gss.h" +#endif + +#ifdef GSSAPI +#include +#include "bufaux.h" +#endif /* GSSAPI */ + #ifdef LIBWRAP #include #include @@ -990,10 +999,13 @@ log("Disabling protocol version 1. Could not load host key"); options.protocol &= ~SSH_PROTO_1; } +#ifndef GSSAPI + /* The GSSAPI key exchange can run without a host key */ if ((options.protocol & SSH_PROTO_2) && !sensitive_data.have_ssh2_key) { log("Disabling protocol version 2. Could not load host key"); options.protocol &= ~SSH_PROTO_2; } +#endif if (!(options.protocol & (SSH_PROTO_1|SSH_PROTO_2))) { log("sshd: no hostkeys available -- exiting."); exit(1); @@ -1044,6 +1056,10 @@ if (test_flag) exit(0); +#ifdef GSSAPI + ssh_gssapi_clean_env(); +#endif /* GSSAPI */ + /* * Clear out any supplemental groups we may have inherited. This * prevents inadvertent creation of files with bad modes (in the @@ -1654,6 +1670,10 @@ if (options.afs_token_passing) auth_mask |= 1 << SSH_PASS_AFS_TOKEN; #endif +#ifdef GSSAPI + if (options.gss_authentication) + auth_mask |= 1 << SSH_AUTH_GSSAPI; +#endif if (options.challenge_response_authentication == 1) auth_mask |= 1 << SSH_AUTH_TIS; if (options.password_authentication) @@ -1747,6 +1767,49 @@ for (i = 0; i < 16; i++) session_id[i] = session_key[i] ^ session_key[i + 16]; } + +#ifdef GSSAPI + /* + * Before we destroy the host and server keys, hash them so we can + * send the hash over to the client via a secure channel so that it + * can verify them. + */ + { + MD5_CTX md5context; + Buffer buf; + unsigned char *data; + unsigned int data_len; + extern unsigned char ssh1_key_digest[16]; /* in gss-genr.c */ + + + debug("Calculating MD5 hash of server and host keys..."); + + /* Write all the keys to a temporary buffer */ + buffer_init(&buf); + + /* Server key */ + buffer_put_bignum(&buf, sensitive_data.server_key->rsa->e); + buffer_put_bignum(&buf, sensitive_data.server_key->rsa->n); + + /* Host key */ + buffer_put_bignum(&buf, sensitive_data.ssh1_host_key->rsa->e); + buffer_put_bignum(&buf, sensitive_data.ssh1_host_key->rsa->n); + + /* Get the resulting data */ + data = (unsigned char *) buffer_ptr(&buf); + data_len = buffer_len(&buf); + + /* And hash it */ + MD5_Init(&md5context); + MD5_Update(&md5context, data, data_len); + MD5_Final(ssh1_key_digest, &md5context); + + /* Clean up */ + buffer_clear(&buf); + buffer_free(&buf); + } +#endif /* GSSAPI */ + /* Destroy the private and public keys. No longer. */ destroy_sensitive_data(); @@ -1796,6 +1859,45 @@ myproposal[PROPOSAL_COMP_ALGS_STOC] = "none"; } myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] = list_hostkey_types(); + +#ifdef GSSAPI + { + char *orig; + char *gss = NULL; + char *newstr = NULL; + orig = myproposal[PROPOSAL_KEX_ALGS]; + + /* If we don't have a host key, then all of the algorithms + * currently in myproposal are useless */ + if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])==0) + orig= NULL; + + if (options.gss_keyex) + gss = ssh_gssapi_mechanisms(1,NULL); + else + gss = NULL; + + if (gss && orig) { + int len = strlen(orig) + strlen(gss) +2; + newstr=xmalloc(len); + snprintf(newstr,len,"%s,%s",gss,orig); + } else if (gss) { + newstr=gss; + } else if (orig) { + newstr=orig; + } + /* If we've got GSSAPI mechanisms, then we've also got the 'null' + host key algorithm, but we're not allowed to advertise it, unless + its the only host key algorithm we're supporting */ + if (gss && (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS])) == 0) { + myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]="null"; + } + if (newstr) + myproposal[PROPOSAL_KEX_ALGS]=newstr; + else + fatal("No supported key exchange algorithms"); + } +#endif /* start key exchange */ kex = kex_setup(myproposal); diff -Naur openssh-3.4p1/sshd_config.5 openssh-3.4p1-gsi/sshd_config.5 --- openssh-3.4p1/sshd_config.5 Wed Jun 26 08:05:16 2002 +++ openssh-3.4p1-gsi/sshd_config.5 Tue Jul 2 08:29:54 2002 @@ -233,6 +233,22 @@ and applies to protocol version 2 only. The default is .Dq no . +.It Cm GssapiAuthentication +Specifies whether authentication based on GSSAPI may be used, either using +the result of a successful key exchange, or using GSSAPI user +authentication. +The default is +.Dq yes . +.It Cm GssapiKeyExchange +Specifies whether key exchange based on GSSAPI may be used. When using +GSSAPI key exchange the server need not have a host key. +The default is +.Dq yes . +.It Cm GssapiUseSessionCredCache +Specifies whether a unique credentials cache name should be generated per +session for storing delegated credentials. +The default is +.Dq yes . .It Cm HostKey Specifies a file containing a private host key used by SSH.