diff -uNr --minimal rsync-2.5.4/.cvsignore rsync-2.5.5/.cvsignore --- rsync-2.5.4/.cvsignore Fri Jan 25 13:53:48 2002 +++ rsync-2.5.5/.cvsignore Tue Mar 26 12:27:24 2002 @@ -1,9 +1,13 @@ ID Makefile +autom4te.cache +confdefs.h config.cache config.h config.log config.status +conftest.c +conftest.log gmon.out rsync shconfig @@ -13,6 +17,3 @@ testtmp.* tls zlib/dummy -confdefs.h -conftest.c -conftest.log diff -uNr --minimal rsync-2.5.4/INSTALL rsync-2.5.5/INSTALL --- rsync-2.5.4/INSTALL Wed Nov 28 18:12:09 2001 +++ rsync-2.5.5/INSTALL Wed Mar 27 16:10:44 2002 @@ -14,6 +14,9 @@ and will be used it there is no popt library on your build host, or if the --with-included-popt option is passed to ./configure. +If you configure using --enable-maintainer-mode, then rsync will try +to pop up an xterm on DISPLAY=:0 if it crashes. You might find this +useful, but it should be turned off for production builds. HP-UX NOTES diff -uNr --minimal rsync-2.5.4/Makefile.in rsync-2.5.5/Makefile.in --- rsync-2.5.4/Makefile.in Tue Feb 26 05:48:25 2002 +++ rsync-2.5.5/Makefile.in Mon Mar 25 15:36:56 2002 @@ -12,6 +12,7 @@ LDFLAGS=@LDFLAGS@ INSTALLCMD=@INSTALL@ +INSTALLMAN=@INSTALL@ srcdir=@srcdir@ VPATH=$(srcdir) @@ -39,7 +40,7 @@ TLS_OBJ = tls.o syscall.o lib/permstring.o # Programs we must have to run the test cases -CHECK_PROGS = rsync tls +CHECK_PROGS = rsync tls getgroups trimslash # note that the -I. is needed to handle config.h when using VPATH .c.o: @@ -52,15 +53,15 @@ man: rsync.1 rsyncd.conf.5 install: all - -mkdir -p ${bindir} - ${INSTALLCMD} -m 755 rsync ${bindir} - -mkdir -p ${mandir}/man1 - -mkdir -p ${mandir}/man5 - ${INSTALLCMD} -m 644 $(srcdir)/rsync.1 ${mandir}/man1 - ${INSTALLCMD} -m 644 $(srcdir)/rsyncd.conf.5 ${mandir}/man5 + -mkdir -p ${DESTDIR}${bindir} + ${INSTALLCMD} ${STRIP} -m 755 rsync ${DESTDIR}${bindir} + -mkdir -p ${DESTDIR}${mandir}/man1 + -mkdir -p ${DESTDIR}${mandir}/man5 + ${INSTALLMAN} -m 644 $(srcdir)/rsync.1 ${DESTDIR}${mandir}/man1 + ${INSTALLMAN} -m 644 $(srcdir)/rsyncd.conf.5 ${DESTDIR}${mandir}/man5 install-strip: - $(MAKE) INSTALLCMD='$(INSTALLCMD) -s' install + $(MAKE) STRIP='-s' install rsync: $(OBJS) @echo "Please ignore warnings below about mktemp -- it is used in a safe way" @@ -71,6 +72,13 @@ tls: $(TLS_OBJ) $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TLS_OBJ) $(LIBS) +getgroups: getgroups.o + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ getgroups.o $(LIBS) + +TRIMSLASH_OBJ = trimslash.o syscall.o +trimslash: $(TRIMSLASH_OBJ) + $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(TRIMSLASH_OBJ) $(LIBS) + Makefile: Makefile.in configure config.status echo "WARNING: You need to run ./config.status --recheck" @@ -87,13 +95,23 @@ proto: cat $(srcdir)/*.c $(srcdir)/lib/compat.c | awk -f $(srcdir)/mkproto.awk > $(srcdir)/proto.h -clean: - rm -f *~ $(OBJS) rsync $(TLS_OBJ) tls - rm -rf ./testtmp - rm -f config.cache +clean: cleantests + rm -f *~ $(OBJS) rsync $(TLS_OBJ) $(CHECK_PROGS) +cleantests: + rm -rf ./testtmp* + +# We try to delete built files from both the source and build +# directories, just in case somebody previously configured things in +# the source directory. distclean: clean - rm -f Makefile config.h config.status + rm -f Makefile config.h config.status + rm -f $(srcdir)/Makefile $(srcdir)/config.h $(srcdir)/config.status + + rm -f config.cache config.log + rm -f $(srcdir)/config.cache $(srcdir)/config.log + + rm -f shconfig $(srcdir)/shconfig # this target is really just for my use. It only works on a limited # range of machines and is used to produce a list of potentially @@ -123,16 +141,22 @@ # might lose in the future where POSIX diverges from old sh. check: all $(CHECK_PROGS) - POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh + POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin=`pwd`/rsync srcdir="$(srcdir)" $(srcdir)/runtests.sh # This does *not* depend on building or installing: you can use it to # check a version installed from a binary or some other source tree, # if you want. installcheck: $(CHECK_PROGS) - POSIXLY_CORRECT=1 TLS=`pwd`/tls rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh + POSIXLY_CORRECT=1 TOOLDIR=`pwd` rsync_bin="$(bindir)/rsync" srcdir="$(srcdir)" $(srcdir)/runtests.sh # TODO: Add 'dist' target; need to know which files will be included + +# Run the SPLINT (Secure Programming Lint) tool. +.PHONY: splint +splint: + splint +unixlib +gnuextensions -weak rsync.c + rsync.dvi: doc/rsync.texinfo texi2dvi -o $@ $< diff -uNr --minimal rsync-2.5.4/NEWS rsync-2.5.5/NEWS --- rsync-2.5.4/NEWS Wed Mar 13 11:03:34 2002 +++ rsync-2.5.5/NEWS Tue Apr 2 11:41:58 2002 @@ -1,16 +1,37 @@ -rsync 2.5.4 (13 March 2002) +rsync 2.5.5 "Snowy River" (2 April 2002) + + ENHANCEMENTS: + + * With --progress, when a transfer is complete show the time taken; + otherwise show expected time to complete. (Cameron Simpson) + + * Make "make install-strip" works properly, and "make install" + accepts a DESTDIR variable for help in building binary packages. + (Peter Breitenlohner, Greg Louis) + + * If configured with --enable-maintainer-mode, then on receipt of + a fatal signal rsync will try to open an xterm running gdb, + similarly to Samba's "panic action" or GNOME's bug-buddy. + (Martin Pool) - "Imitation lizard skin" BUG FIXES: - * Additional fix for zlib double-free bug. (Martin Pool, Andrew - Tridgell) (CVE CAN-2002-0059) - - ENHANCEMENTS: + * Fix situation where failure to fork (e.g. because out of process + slots) would cause rsync to kill all processes owned by the + current user. Yes, really! (Paul Haas, Martin Pool) - * Merge in changes from zlib 1.1.3 to zlib 1.1.4. (Jos Backus) - (Note that rsync still uses a custom version of zlib; you can - not just link against a system library. See zlib/README.rsync) + * Fix test suite on Solaris. (Jos Backus, Martin Pool) - * Additional test cases for --compress. (Martin Pool) + * Fix minor memory leak in socket code. (Dave Dykstra, Martin + Pool.) + + * Fix --whole-file problem that caused it to be the default even + for remote connections. (Martin Pool, Frank Schulz) + + * Work around bug in Mac OS X mkdir(2), which cannot handle + trailing slashes. + + (Martin Pool) + + * Improved network error handling. (Greg A. Woods) diff -uNr --minimal rsync-2.5.4/OLDNEWS rsync-2.5.5/OLDNEWS --- rsync-2.5.4/OLDNEWS Tue Mar 12 12:26:01 2002 +++ rsync-2.5.5/OLDNEWS Thu Mar 14 21:33:59 2002 @@ -1,3 +1,21 @@ +rsync 2.5.4 (13 March 2002) + + "Imitation lizard skin" + + BUG FIXES: + + * Additional fix for zlib double-free bug. (Martin Pool, Andrew + Tridgell) (CVE CAN-2002-0059) + + ENHANCEMENTS: + + * Merge in changes from zlib 1.1.3 to zlib 1.1.4. (Jos Backus) + (Note that rsync still uses a custom version of zlib; you can + not just link against a system library. See zlib/README.rsync) + + * Additional test cases for --compress. (Martin Pool) + + rsync 2.5.3 (11 March 2002) "Happy 26" @@ -122,6 +140,7 @@ * Clearer error messages for some conditions. + rsync 2.5.0 (2001-11-30) ANNOUNCEMENTS diff -uNr --minimal rsync-2.5.4/TODO rsync-2.5.5/TODO --- rsync-2.5.4/TODO Wed Mar 13 10:55:33 2002 +++ rsync-2.5.5/TODO Tue Mar 26 10:09:31 2002 @@ -1,20 +1,80 @@ -*- indented-text -*- -URGENT --------------------------------------------------------------- +BUGS --------------------------------------------------------------- +There seems to be a bug with hardlinks -IMPORTANT ------------------------------------------------------------ + mbp/2 build$ ls -l /tmp/a /tmp/b -i + /tmp/a: + total 32 + 2568307 -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a1 + 2568307 -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a2 + 2568307 -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a3 + 2568310 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a4 + 2568310 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a5 + 2568310 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b1 + 2568310 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b2 + 2568310 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b3 -Cross-test versions + /tmp/b: + total 32 + 2568309 -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a1 + 2568309 -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a2 + 2568309 -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a3 + 2568311 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a4 + 2568311 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a5 + 2568311 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b1 + 2568311 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b2 + 2568311 -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b3 + mbp/2 build$ rm -r /tmp/b && ./rsync -avH /tmp/a/ /tmp/b + building file list ... done + created directory /tmp/b + ./ + a1 + a4 + a2 => a1 + a3 => a2 + wrote 350 bytes read 52 bytes 804.00 bytes/sec + total size is 232 speedup is 0.58 + mbp/2 build$ rm -r /tmp/b + mbp/2 build$ ls -l /tmp/b + ls: /tmp/b: No such file or directory + mbp/2 build$ rm -r /tmp/b && ./rsync -avH /tmp/a/ /tmp/b + rm: cannot remove `/tmp/b': No such file or directory + mbp/2 build$ rm -f -r /tmp/b && ./rsync -avH /tmp/a/ /tmp/b + building file list ... done + created directory /tmp/b + ./ + a1 + a4 + a2 => a1 + a3 => a2 + wrote 350 bytes read 52 bytes 804.00 bytes/sec + total size is 232 speedup is 0.58 + mbp/2 build$ ls -l /tmp/b + total 32 + -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a1 + -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a2 + -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a3 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a4 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a5 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b1 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b2 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b3 + mbp/2 build$ ls -l /tmp/a + total 32 + -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a1 + -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a2 + -rw-rw-r-- 3 mbp mbp 29 Mar 25 17:30 a3 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a4 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 a5 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b1 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b2 + -rw-rw-r-- 5 mbp mbp 29 Mar 25 17:30 b3 - Part of the regression suite should be making sure that we don't - break backwards compatibility: old clients vs new servers and so - on. Ideally we would test the cross product of versions. - It might be sufficient to test downloads from well-known public - rsync servers running different versions of rsync. This will give - some testing and also be the most common case for having different - versions and not being able to upgrade. +IMPORTANT ------------------------------------------------------------ + use chroot @@ -194,6 +254,7 @@ which should just take a small change to the parser code. + Errors If we hang or get SIGINT, then explain where we were up to. Perhaps @@ -210,6 +271,11 @@ explaining why the socket is closed. I'm not sure if this would work, but it would certainly make our messages more helpful. + What happens if a directory is missing -x attributes. Do we lose + our load? (Debian #28416) Probably fixed now, but a test case + would be good. + + File attributes Device major/minor numbers should be at least 32 bits each. See @@ -259,6 +325,16 @@ At the connections that just get a list of modules are not logged, but they should be. + If a child of the rsync daemon dies with a signal, we should notice + that when we reap it and log a message. + + Keep stderr and stdout properly separated (Debian #23626) + + Use a separate function for reporting errors; prefix it with + "rsync:" or "rsync(remote)", or perhaps even "rsync(local + generator): ". + + rsyncd over ssh There are already some patches to do this. @@ -321,6 +397,42 @@ the program. For bonus points there would be a test case for the parser. + (Debian #23628) + + +--diff + + Allow people to specify the diff command. (Might want to use wdiff, + gnudiff, etc.) + + Just diff the temporary file with the destination file, and delete + the tmp file rather than moving it into place. + + Interaction with --partial. + + Security interactions with daemon mode? + + (Suggestion from david.e.sewell) + + +Incorrect timestamps (Debian #100295) + + A bit hard to believe, but apparently it happens. + + +Check "refuse options works" + + We need a test case for this... + + Was this broken when we changed to popt? + + +String area code + + Test whether this is actually faster than just using malloc(). If + it's not (anymore), throw it out. + + PLATFORMS ------------------------------------------------------------ @@ -362,9 +474,48 @@ http://devel-home.kde.org/~sewardj/ +TESTING -------------------------------------------------------------- + +Cross-test versions + + Part of the regression suite should be making sure that we don't + break backwards compatibility: old clients vs new servers and so + on. Ideally we would test the cross product of versions. + + It might be sufficient to test downloads from well-known public + rsync servers running different versions of rsync. This will give + some testing and also be the most common case for having different + versions and not being able to upgrade. + +Test large files + + Sparse and non-sparse + +Mutator program + + Insert bytes, delete bytes, swap blocks, ... + +configure option to enable dangerous tests + +If tests are skipped, say why. + +Test daemon feature to disallow particular options. + +Pipe program that makes slow/jerky connections. + +Versions of read() and write() that corrupt the stream, or abruptly fail + +Separate makefile target to run rough tests -- or perhaps just run +them every time? + + DOCUMENTATION -------------------------------------------------------- Update README + +Keep list of open issues and todos on the web site + +Update web site from CVS BUILD FARM ----------------------------------------------------------- diff -uNr --minimal rsync-2.5.4/batch.c rsync-2.5.5/batch.c --- rsync-2.5.4/batch.c Thu Feb 7 08:20:48 2002 +++ rsync-2.5.5/batch.c Mon Mar 25 17:06:29 2002 @@ -396,7 +396,7 @@ struct sum_struct *s) { size_t i; - unsigned int int_zero = 0; + size_t int_zero = 0; extern int csum_length; fdb_open = 1; diff -uNr --minimal rsync-2.5.4/cleanup.c rsync-2.5.5/cleanup.c --- rsync-2.5.4/cleanup.c Fri Mar 23 12:26:04 2001 +++ rsync-2.5.5/cleanup.c Wed Mar 27 12:03:13 2002 @@ -40,12 +40,17 @@ */ void _exit_cleanup(int code, const char *file, int line) { + int ocode = code; extern int keep_partial; extern int log_got_error; signal(SIGUSR1, SIG_IGN); signal(SIGUSR2, SIG_IGN); + if (verbose > 3) + rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): entered\n", + code, file, line); + if (cleanup_child_pid != -1) { int status; if (waitpid(cleanup_child_pid, &status, WNOHANG) == cleanup_child_pid) { @@ -80,6 +85,10 @@ } if (code) log_exit(code, file, line); + + if (verbose > 2) + rprintf(FINFO,"_exit_cleanup(code=%d, file=%s, line=%d): about to call exit(%d)\n", + ocode, file, line, code); exit(code); } diff -uNr --minimal rsync-2.5.4/clientserver.c rsync-2.5.5/clientserver.c --- rsync-2.5.4/clientserver.c Thu Feb 28 10:15:55 2002 +++ rsync-2.5.5/clientserver.c Wed Mar 27 12:03:13 2002 @@ -1,7 +1,7 @@ /* -*- c-file-style: "linux"; -*- Copyright (C) 1998-2001 by Andrew Tridgell - Copyright (C) 2001 by Martin Pool + Copyright (C) 2001-2002 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -29,10 +29,14 @@ char *auth_user; int sanitize_paths = 0; -/* +/** * Run a client connected to an rsyncd. The alternative to this - * function for remote-shell connections is do_cmd. - */ + * function for remote-shell connections is do_cmd(). + * + * After initial server startup, hands over to client_run(). + * + * @return -1 for error in startup, or the result of client_run(). + **/ int start_socket_client(char *host, char *path, int argc, char *argv[]) { int fd, i; @@ -43,6 +47,7 @@ extern int remote_version; extern int am_sender; extern char *shell_cmd; + extern int list_only; extern int kludge_around_eof; extern char *bind_address; extern int default_af_hint; @@ -80,6 +85,9 @@ if (!user) user = getenv("LOGNAME"); if (verbose >= 2) { + /* FIXME: If we're going to use a socket program for + * testing, then this message is wrong. We need to + * say something like "(except really using %s)" */ rprintf(FINFO, "opening tcp connection to %s port %d\n", host, rsync_port); } @@ -101,10 +109,14 @@ io_printf(fd,"@RSYNCD: %d\n", PROTOCOL_VERSION); if (!read_line(fd, line, sizeof(line)-1)) { + rprintf(FERROR, "rsync: did not see server greeting\n"); return -1; } if (sscanf(line,"@RSYNCD: %d", &remote_version) != 1) { + /* note that read_line strips of \n or \r */ + rprintf(FERROR, "rsync: server sent \"%s\" rather than greeting\n", + line); return -1; } @@ -115,10 +127,11 @@ /* Old servers may just drop the connection here, rather than sending a proper EXIT command. Yuck. */ - kludge_around_eof = remote_version < 25; + kludge_around_eof = list_only && (remote_version < 25); while (1) { if (!read_line(fd, line, sizeof(line)-1)) { + rprintf(FERROR, "rsync: didn't get server startup line\n"); return -1; } diff -uNr --minimal rsync-2.5.4/configure rsync-2.5.5/configure --- rsync-2.5.4/configure Wed Mar 13 11:03:50 2002 +++ rsync-2.5.5/configure Tue Apr 2 11:50:46 2002 @@ -1,24 +1,22 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by Autoconf 2.52. +# Generated by GNU Autoconf 2.53. # -# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 # Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -# 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 +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr +else + as_expr=false +fi -# Sed expression to map a string onto a valid variable name. -as_tr_sh="sed y%*+%pp%;s%[^_$as_cr_alnum]%_%g" -# 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" +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -28,8 +26,165 @@ 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=`echo "$0" |sed 's,.*[\\/],,'` +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 if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -57,22 +212,12 @@ as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# 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" -# 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. @@ -81,7 +226,8 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; export CDPATH; } + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -96,7 +242,8 @@ 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. @@ -104,6 +251,13 @@ # 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="byteorder.h" # Factoring default headers for most tests. ac_includes_default="\ @@ -142,6 +296,7 @@ # include #endif" + # Initialize some variables set by options. ac_init_help= ac_init_version=false @@ -180,13 +335,6 @@ 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 @@ -319,7 +467,7 @@ with_fp=no ;; -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) + | --no-cr | --no-c | -n) no_create=yes ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ @@ -498,7 +646,7 @@ eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 { (exit 1); exit 1; }; };; esac done @@ -510,18 +658,19 @@ eval ac_val=$`echo $ac_var` case $ac_val in [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute path for --$ac_var: $ac_val" >&2 + *) { echo "$as_me: error: expected an absolute directory name 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: should be removed in autoconf 3.0. +# FIXME: To remove some day. if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe @@ -537,13 +686,23 @@ 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_prog=$0 - ac_confdir=`echo "$ac_prog" | sed 's%[\\/][^\\/][^\\/]*$%%'` - test "x$ac_confdir" = "x$ac_prog" && ac_confdir=. + 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'` srcdir=$ac_confdir if test ! -r $srcdir/$ac_unique_file; then srcdir=.. @@ -553,10 +712,10 @@ fi if test ! -r $srcdir/$ac_unique_file; then if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources in $ac_confdir or .." >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 { (exit 1); exit 1; }; } else - { echo "$as_me: error: cannot find sources in $srcdir" >&2 + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 { (exit 1); exit 1; }; } fi fi @@ -600,7 +759,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 <&2 + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 fi cd $ac_popdir done @@ -735,31 +916,31 @@ test -n "$ac_init_help" && exit 0 if $ac_init_version; then - cat <<\EOF + cat <<\_ACEOF -Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. -EOF +_ACEOF exit 0 fi exec 5>config.log -cat >&5 <&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. It was created by $as_me, which was -generated by GNU Autoconf 2.52. Invocation command line was +generated by GNU Autoconf 2.53. Invocation command line was $ $0 $@ -EOF +_ACEOF { cat <<_ASUNAME -## ---------- ## -## Platform. ## -## ---------- ## +## --------- ## +## Platform. ## +## --------- ## hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` uname -m = `(uname -m) 2>/dev/null || echo unknown` @@ -778,17 +959,27 @@ /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` /bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -PATH = $PATH - _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 + } >&5 -cat >&5 <&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF -EOF # Keep a trace of the command line. # Strip out --no-create and --no-recursion so they do not pile up. @@ -799,15 +990,17 @@ do case $ac_arg in -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c) ;; + | --no-cr | --no-c | -n ) continue ;; -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;; + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + continue ;; *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - 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=" " ;; + 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=" " ;; esac # Get rid of the leading space. done @@ -815,14 +1008,19 @@ # 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 >&5 - echo "## ----------------- ##" >&5 - echo "## Cache variables. ##" >&5 - echo "## ----------------- ##" >&5 - echo >&5 - # The following way of writing the cache mishandles newlines in values, + { + echo + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, { (set) 2>&1 | case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in @@ -836,21 +1034,24 @@ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; esac; -} >&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 && +} + 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 && exit $exit_status ' 0 for ac_signal in 1 2 13 15; do @@ -863,6 +1064,33 @@ # 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 @@ -874,9 +1102,9 @@ fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then - { echo "$as_me:877: loading site script $ac_site_file" >&5 + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 echo "$as_me: loading site script $ac_site_file" >&6;} - cat "$ac_site_file" >&5 + sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done @@ -885,7 +1113,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:888: loading cache $cache_file" >&5 + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in [\\/]* | ?:[\\/]* ) . $cache_file;; @@ -893,7 +1121,7 @@ esac fi else - { echo "$as_me:896: creating cache $cache_file" >&5 + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi @@ -909,42 +1137,42 @@ eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { echo "$as_me:912: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { echo "$as_me:916: error: \`$ac_var' was not set in the previous run" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:922: error: \`$ac_var' has changed since the previous run:" >&5 + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:924: former value: $ac_old_val" >&5 + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:926: current value: $ac_new_val" >&5 + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 echo "$as_me: current value: $ac_new_val" >&2;} ac_cache_corrupted=: fi;; esac - # Pass precious variables to config.status. It doesn't matter if - # we pass some twice (in addition to the command line arguments). + # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` - ac_configure_args="$ac_configure_args '$ac_arg'" - ;; - *) ac_configure_args="$ac_configure_args $ac_var=$ac_new_val" - ;; + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { echo "$as_me:945: error: changes in the environment can compromise the build" >&5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:947: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} { (exit 1); exit 1; }; } fi @@ -955,37 +1183,38 @@ 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:967: PATH=\".;.\"; conftest.sh") >&5 - (PATH=".;."; conftest.sh) 2>&5 - ac_status=$? - echo "$as_me:970: \$? = $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" -RSYNC_VERSION=2.5.4 -{ echo "$as_me:983: Configuring rsync $RSYNC_VERSION" >&5 + +RSYNC_VERSION=2.5.5 + +{ echo "$as_me:$LINENO: Configuring rsync $RSYNC_VERSION" >&5 echo "$as_me: Configuring rsync $RSYNC_VERSION" >&6;} -cat >>confdefs.h <>confdefs.h <<_ACEOF #define RSYNC_VERSION "$RSYNC_VERSION" -EOF +_ACEOF + LDFLAGS=${LDFLAGS-""} @@ -1006,7 +1235,7 @@ fi done if test -z "$ac_aux_dir"; then - { { echo "$as_me:1009: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} { (exit 1); exit 1; }; } fi @@ -1016,11 +1245,11 @@ # Make sure we can run config.sub. $ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:1019: error: cannot run $ac_config_sub" >&5 + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 echo "$as_me: error: cannot run $ac_config_sub" >&2;} { (exit 1); exit 1; }; } -echo "$as_me:1023: checking build system type" >&5 +echo "$as_me:$LINENO: checking build system type" >&5 echo $ECHO_N "checking build system type... $ECHO_C" >&6 if test "${ac_cv_build+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1029,23 +1258,24 @@ test -z "$ac_cv_build_alias" && ac_cv_build_alias=`$ac_config_guess` test -z "$ac_cv_build_alias" && - { { echo "$as_me:1032: error: cannot guess build type; you must specify one" >&5 + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 echo "$as_me: error: cannot guess build type; you must specify one" >&2;} { (exit 1); exit 1; }; } ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:1036: 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:$LINENO: 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:1041: result: $ac_cv_build" >&5 +echo "$as_me:$LINENO: 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:1048: checking host system type" >&5 + +echo "$as_me:$LINENO: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1054,19 +1284,20 @@ 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:1057: error: $ac_config_sub $ac_cv_host_alias failed" >&5 + { { echo "$as_me:$LINENO: 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:1062: result: $ac_cv_host" >&5 +echo "$as_me:$LINENO: 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:1069: checking target system type" >&5 + +echo "$as_me:$LINENO: checking target system type" >&5 echo $ECHO_N "checking target system type... $ECHO_C" >&6 if test "${ac_cv_target+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1075,18 +1306,19 @@ test "x$ac_cv_target_alias" = "x" && ac_cv_target_alias=$ac_cv_host_alias ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || - { { echo "$as_me:1078: error: $ac_config_sub $ac_cv_target_alias failed" >&5 + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} { (exit 1); exit 1; }; } fi -echo "$as_me:1083: result: $ac_cv_target" >&5 +echo "$as_me:$LINENO: result: $ac_cv_target" >&5 echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` + # The aliases save the names the user supplied, while $host etc. # will get canonicalized. test -n "$target_alias" && @@ -1102,7 +1334,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:1105: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1110,25 +1342,28 @@ if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - 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:1120: found $ac_dir/$ac_word" >&5 -break +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 done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1128: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1131: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1137,7 +1372,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:1140: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1145,25 +1380,28 @@ if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - 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:1155: found $ac_dir/$ac_word" >&5 -break +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 done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1163: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1166: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1176,7 +1414,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:1179: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1184,25 +1422,28 @@ if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - 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:1194: found $ac_dir/$ac_word" >&5 -break +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 done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1202: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1205: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1211,7 +1452,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:1214: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1219,25 +1460,28 @@ if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - 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:1229: found $ac_dir/$ac_word" >&5 -break +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 done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1237: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1240: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1250,7 +1494,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:1253: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1259,19 +1503,22 @@ ac_cv_prog_CC="$CC" # Let the user override the test. else ac_prog_rejected=no - 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:1273: found $ac_dir/$ac_word" >&5 -break +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 done if test $ac_prog_rejected = yes; then @@ -1283,7 +1530,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 "$ac_dir/$ac_word" ${1+"$@"} + set dummy "$as_dir/$ac_word" ${1+"$@"} shift ac_cv_prog_CC="$@" fi @@ -1292,10 +1539,10 @@ fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1295: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1298: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1306,7 +1553,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:1309: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1314,25 +1561,28 @@ if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - 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:1324: found $ac_dir/$ac_word" >&5 -break +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 done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - echo "$as_me:1332: result: $CC" >&5 + echo "$as_me:$LINENO: result: $CC" >&5 echo "${ECHO_T}$CC" >&6 else - echo "$as_me:1335: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1345,7 +1595,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:1348: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -1353,25 +1603,28 @@ if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. else - 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:1363: found $ac_dir/$ac_word" >&5 -break +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 done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - echo "$as_me:1371: result: $ac_ct_CC" >&5 + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 echo "${ECHO_T}$ac_ct_CC" >&6 else - echo "$as_me:1374: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi @@ -1383,34 +1636,41 @@ fi -test -z "$CC" && { { echo "$as_me:1386: error: no acceptable cc found in \$PATH" >&5 -echo "$as_me: error: no acceptable cc found in \$PATH" >&2;} + +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;} { (exit 1); exit 1; }; } # Provide some information about the compiler. -echo "$as_me:1391:" \ +echo "$as_me:$LINENO:" \ "checking for C compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:1394: \"$ac_compiler --version &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 (eval $ac_compiler --version &5) 2>&5 ac_status=$? - echo "$as_me:1397: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1399: \"$ac_compiler -v &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 (eval $ac_compiler -v &5) 2>&5 ac_status=$? - echo "$as_me:1402: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } -{ (eval echo "$as_me:1404: \"$ac_compiler -V &5\"") >&5 +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 (eval $ac_compiler -V &5) 2>&5 ac_status=$? - echo "$as_me:1407: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } cat >conftest.$ac_ext <<_ACEOF -#line 1411 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1424,22 +1684,26 @@ # 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:1427: checking for C compiler default output" >&5 +echo "$as_me:$LINENO: 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:1430: \"$ac_link_default\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 (eval $ac_link_default) 2>&5 ac_status=$? - echo "$as_me:1433: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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. -for ac_file in `ls a.exe conftest.exe 2>/dev/null; + +# 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; 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 ) ;; + *.$ac_ext | *.o | *.obj | *.xcoff | *.tds | *.d | *.pdb | *.xSYM ) ;; a.out ) # We found the default executable, but exeext='' is most # certainly right. break;; @@ -1453,34 +1717,34 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1456: error: C compiler cannot create executables" >&5 +{ { echo "$as_me:$LINENO: 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:1462: result: $ac_file" >&5 +echo "$as_me:$LINENO: 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:1467: checking whether the C compiler works" >&5 +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0 # If not cross compiling, check that we can run a simple program. if test "$cross_compiling" != yes; then if { ac_try='./$ac_file' - { (eval echo "$as_me:1473: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1476: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then cross_compiling=no else if test "$cross_compiling" = maybe; then cross_compiling=yes else - { { echo "$as_me:1483: error: cannot run C compiled programs. + { { echo "$as_me:$LINENO: 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;} @@ -1488,24 +1752,24 @@ fi fi fi -echo "$as_me:1491: result: yes" >&5 +echo "$as_me:$LINENO: 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:1498: checking whether we are cross compiling" >&5 +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:1500: result: $cross_compiling" >&5 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 echo "${ECHO_T}$cross_compiling" >&6 -echo "$as_me:1503: checking for executable suffix" >&5 -echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6 -if { (eval echo "$as_me:1505: \"$ac_link\"") >&5 +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 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:1508: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will @@ -1521,27 +1785,33 @@ esac done else - { { echo "$as_me:1524: error: cannot compute EXEEXT: cannot compile and link" >&5 -echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;} + { { 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;} { (exit 1); exit 1; }; } fi rm -f conftest$ac_cv_exeext -echo "$as_me:1530: result: $ac_cv_exeext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -echo "$as_me:1536: checking for object suffix" >&5 -echo $ECHO_N "checking for object suffix... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 if test "${ac_cv_objext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1542 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1551,10 +1821,10 @@ } _ACEOF rm -f conftest.o conftest.obj -if { (eval echo "$as_me:1554: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1557: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 @@ -1566,26 +1836,32 @@ else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -{ { echo "$as_me:1569: error: cannot compute OBJEXT: cannot compile" >&5 -echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;} +{ { 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;} { (exit 1); exit 1; }; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -echo "$as_me:1576: result: $ac_cv_objext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -echo "$as_me:1580: checking whether we are using the GNU C compiler" >&5 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 if test "${ac_cv_c_compiler_gnu+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1586 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1598,16 +1874,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1601: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1604: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1607: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1610: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_compiler_gnu=yes else @@ -1619,21 +1895,27 @@ ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -echo "$as_me:1622: result: $ac_cv_c_compiler_gnu" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS CFLAGS="-g" -echo "$as_me:1628: checking whether $CC accepts -g" >&5 +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 if test "${ac_cv_prog_cc_g+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 1634 "configure" +#line $LINENO "configure" #include "confdefs.h" +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1643,16 +1925,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1646: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1649: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1652: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1655: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_g=yes else @@ -1662,7 +1944,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:1665: result: $ac_cv_prog_cc_g" >&5 +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS @@ -1689,16 +1971,16 @@ #endif _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1692: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1695: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1698: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1701: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then for ac_declaration in \ ''\ @@ -1710,10 +1992,16 @@ 'void exit (int);' do cat >conftest.$ac_ext <<_ACEOF -#line 1713 "configure" +#line $LINENO "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 () { @@ -1723,16 +2011,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1726: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1729: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1732: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1735: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then : else @@ -1742,9 +2030,15 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 1745 "configure" +#line $LINENO "configure" #include "confdefs.h" $ac_declaration +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -1754,16 +2048,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:1757: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:1760: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:1763: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:1766: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -1795,7 +2089,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:1798: checking how to run the C preprocessor" >&5 +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then @@ -1816,18 +2110,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 1819 "configure" +#line $LINENO "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1824: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:1830: \$? = $ac_status" >&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 @@ -1850,17 +2144,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1853 "configure" +#line $LINENO "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:1857: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:1863: \$? = $ac_status" >&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 @@ -1897,7 +2191,7 @@ else ac_cv_prog_CPP=$CPP fi -echo "$as_me:1900: result: $CPP" >&5 +echo "$as_me:$LINENO: result: $CPP" >&5 echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes @@ -1907,18 +2201,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 1910 "configure" +#line $LINENO "configure" #include "confdefs.h" #include Syntax error _ACEOF -if { (eval echo "$as_me:1915: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:1921: \$? = $ac_status" >&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 @@ -1941,17 +2235,17 @@ # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. cat >conftest.$ac_ext <<_ACEOF -#line 1944 "configure" +#line $LINENO "configure" #include "confdefs.h" #include _ACEOF -if { (eval echo "$as_me:1948: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:1954: \$? = $ac_status" >&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 @@ -1979,7 +2273,7 @@ if $ac_preproc_ok; then : else - { { echo "$as_me:1982: error: C preprocessor \"$CPP\" fails sanity check" >&5 + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check" >&5 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;} { (exit 1); exit 1; }; } fi @@ -2002,43 +2296,48 @@ # 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:2005: checking for a BSD compatible install" >&5 -echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6 +echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 if test -z "$INSTALL"; then if test "${ac_cv_path_install+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - 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 + 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 done - ;; - esac - done + done + ;; +esac +done + fi if test "${ac_cv_path_install+set}" = set; then @@ -2051,7 +2350,7 @@ INSTALL=$ac_install_sh fi fi -echo "$as_me:2054: result: $INSTALL" >&5 +echo "$as_me:$LINENO: result: $INSTALL" >&5 echo "${ECHO_T}$INSTALL" >&6 # Use test -z because SunOS4 sh mishandles braces in ${var-val}. @@ -2062,7 +2361,8 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -echo "$as_me:2065: checking for $CC option to accept ANSI C" >&5 + +echo "$as_me:$LINENO: 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 @@ -2070,7 +2370,7 @@ ac_cv_prog_cc_stdc=no ac_save_CC=$CC cat >conftest.$ac_ext <<_ACEOF -#line 2073 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -2100,6 +2400,12 @@ 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 () { @@ -2119,16 +2425,16 @@ do CC="$ac_save_CC $ac_arg" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2122: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2125: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2128: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2131: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_prog_cc_stdc=$ac_arg break @@ -2145,21 +2451,25 @@ case "x$ac_cv_prog_cc_stdc" in x|xno) - echo "$as_me:2148: result: none needed" >&5 + echo "$as_me:$LINENO: result: none needed" >&5 echo "${ECHO_T}none needed" >&6 ;; *) - echo "$as_me:2151: result: $ac_cv_prog_cc_stdc" >&5 + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 CC="$CC $ac_cv_prog_cc_stdc" ;; esac -cat >>confdefs.h <<\EOF + + + +cat >>confdefs.h <<\_ACEOF #define _GNU_SOURCE 1 -EOF +_ACEOF + if test "$xac_cv_prog_cc_stdc" = xno then - { echo "$as_me:2162: WARNING: rsync requires an ANSI C compiler and you don't seem to have one" >&5 + { echo "$as_me:$LINENO: WARNING: rsync requires an ANSI C compiler and you don't seem to have one" >&5 echo "$as_me: WARNING: rsync requires an ANSI C compiler and you don't seem to have one" >&2;} fi @@ -2168,7 +2478,7 @@ # Please allow this to default to yes, so that your users have more # chance of getting a useful stack trace if problems occur. -echo "$as_me:2171: checking whether to include debugging symbols" >&5 +echo "$as_me:$LINENO: checking whether to include debugging symbols" >&5 echo $ECHO_N "checking whether to include debugging symbols... $ECHO_C" >&6 # Check whether --enable-debug or --disable-debug was given. if test "${enable_debug+set}" = set; then @@ -2178,15 +2488,18 @@ if test x"$enable_debug" = x"no" then - echo "$as_me:2181: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 CFLAGS=${CFLAGS-"-O"} else - echo "$as_me:2185: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 # leave CFLAGS alone; AC_PROG_CC will try to include -g if it can fi + + + # Check whether --enable-profile or --disable-profile was given. if test "${enable_profile+set}" = set; then enableval="$enable_profile" @@ -2197,6 +2510,19 @@ CFLAGS="$CFLAGS -pg" fi + +# Specifically, this turns on panic_action handling. +# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. +if test "${enable_maintainer_mode+set}" = set; then + enableval="$enable_maintainer_mode" + +fi; +if test x"$enable_maintainer_mode" = xyes +then + CFLAGS="$CFLAGS -DMAINTAINER_MODE" +fi + + # This is needed for our included version of popt. Kind of silly, but # I don't want our version too far out of sync. CFLAGS="$CFLAGS -DHAVE_CONFIG_H" @@ -2207,12 +2533,14 @@ CFLAGS="$CFLAGS -Wall -W" fi + # Check whether --with-included-popt or --without-included-popt was given. if test "${with_included_popt+set}" = set; then withval="$with_included_popt" fi; + # Check whether --with-rsync-path or --without-rsync-path was given. if test "${with_rsync_path+set}" = set; then withval="$with_rsync_path" @@ -2221,9 +2549,12 @@ RSYNC_PATH="rsync" fi; -cat >>confdefs.h <>confdefs.h <<_ACEOF #define RSYNC_PATH "$RSYNC_PATH" -EOF +_ACEOF + + # Check whether --with-rsh or --without-rsh was given. if test "${with_rsh+set}" = set; then @@ -2233,7 +2564,7 @@ # Extract the first word of "remsh", so it can be a program name with args. set dummy remsh; ac_word=$2 -echo "$as_me:2236: checking for $ac_word" >&5 +echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_prog_HAVE_REMSH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2241,15 +2572,18 @@ if test -n "$HAVE_REMSH"; then ac_cv_prog_HAVE_REMSH="$HAVE_REMSH" # Let the user override the test. else - 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_HAVE_REMSH="1" -echo "$as_me:2251: found $ac_dir/$ac_word" >&5 -break +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_HAVE_REMSH="1" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done done test -z "$ac_cv_prog_HAVE_REMSH" && ac_cv_prog_HAVE_REMSH="0" @@ -2257,16 +2591,18 @@ fi HAVE_REMSH=$ac_cv_prog_HAVE_REMSH if test -n "$HAVE_REMSH"; then - echo "$as_me:2260: result: $HAVE_REMSH" >&5 + echo "$as_me:$LINENO: result: $HAVE_REMSH" >&5 echo "${ECHO_T}$HAVE_REMSH" >&6 else - echo "$as_me:2263: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_REMSH $HAVE_REMSH -EOF +_ACEOF + if test x"$with_rsh" != x then @@ -2278,13 +2614,15 @@ RSYNC_RSH="rsh" fi -cat >>confdefs.h <>confdefs.h <<_ACEOF #define RSYNC_RSH "$RSYNC_RSH" -EOF +_ACEOF + # arrgh. libc in the current debian stable screws up the largefile # stuff, getting byte range locking wrong -echo "$as_me:2287: checking for broken largefile support" >&5 +echo "$as_me:$LINENO: checking for broken largefile support" >&5 echo $ECHO_N "checking for broken largefile support... $ECHO_C" >&6 if test "${rsync_cv_HAVE_BROKEN_LARGEFILE+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2294,7 +2632,7 @@ rsync_cv_HAVE_BROKEN_LARGEFILE=cross else cat >conftest.$ac_ext <<_ACEOF -#line 2297 "configure" +#line $LINENO "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 @@ -2326,27 +2664,28 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:2329: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2332: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:2334: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2337: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_BROKEN_LARGEFILE=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 ) rsync_cv_HAVE_BROKEN_LARGEFILE=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:2349: result: $rsync_cv_HAVE_BROKEN_LARGEFILE" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_BROKEN_LARGEFILE" >&5 echo "${ECHO_T}$rsync_cv_HAVE_BROKEN_LARGEFILE" >&6 if test x"$rsync_cv_HAVE_BROKEN_LARGEFILE" != x"yes"; then # Check whether --enable-largefile or --disable-largefile was given. @@ -2356,7 +2695,7 @@ fi; if test "$enable_largefile" != no; then - echo "$as_me:2359: checking for special C compiler options needed for large files" >&5 + echo "$as_me:$LINENO: 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 @@ -2368,7 +2707,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 2371 "configure" +#line $LINENO "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2379,6 +2718,12 @@ 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 () { @@ -2388,16 +2733,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2391: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2394: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2397: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2400: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2407,16 +2752,16 @@ rm -f conftest.$ac_objext CC="$CC -n32" rm -f conftest.$ac_objext -if { (eval echo "$as_me:2410: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2413: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2416: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2419: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break else @@ -2430,13 +2775,13 @@ rm -f conftest.$ac_ext fi fi -echo "$as_me:2433: result: $ac_cv_sys_largefile_CC" >&5 +echo "$as_me:$LINENO: 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:2439: checking for _FILE_OFFSET_BITS value needed for large files" >&5 + echo "$as_me:$LINENO: 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 @@ -2444,7 +2789,7 @@ while :; do ac_cv_sys_file_offset_bits=no cat >conftest.$ac_ext <<_ACEOF -#line 2447 "configure" +#line $LINENO "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2455,6 +2800,12 @@ 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 () { @@ -2464,16 +2815,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2467: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2470: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2473: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2476: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2482,7 +2833,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2485 "configure" +#line $LINENO "configure" #include "confdefs.h" #define _FILE_OFFSET_BITS 64 #include @@ -2494,6 +2845,12 @@ 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 () { @@ -2503,16 +2860,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2506: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2509: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2512: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2515: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break else @@ -2523,17 +2880,17 @@ break done fi -echo "$as_me:2526: result: $ac_cv_sys_file_offset_bits" >&5 +echo "$as_me:$LINENO: 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 <>confdefs.h <<_ACEOF #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits -EOF +_ACEOF fi rm -f conftest* - echo "$as_me:2536: checking for _LARGE_FILES value needed for large files" >&5 + echo "$as_me:$LINENO: 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 @@ -2541,7 +2898,7 @@ while :; do ac_cv_sys_large_files=no cat >conftest.$ac_ext <<_ACEOF -#line 2544 "configure" +#line $LINENO "configure" #include "confdefs.h" #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -2552,6 +2909,12 @@ 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 () { @@ -2561,16 +2924,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2564: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2567: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2570: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2573: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then break else @@ -2579,7 +2942,7 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext cat >conftest.$ac_ext <<_ACEOF -#line 2582 "configure" +#line $LINENO "configure" #include "confdefs.h" #define _LARGE_FILES 1 #include @@ -2591,6 +2954,12 @@ 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 () { @@ -2600,16 +2969,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2603: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2606: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2609: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2612: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break else @@ -2620,13 +2989,13 @@ break done fi -echo "$as_me:2623: result: $ac_cv_sys_large_files" >&5 +echo "$as_me:$LINENO: 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 <>confdefs.h <<_ACEOF #define _LARGE_FILES $ac_cv_sys_large_files -EOF +_ACEOF fi rm -f conftest* @@ -2646,7 +3015,7 @@ if test "x$enable_ipv6" != xno then - echo "$as_me:2649: checking ipv6 stack type" >&5 + echo "$as_me:$LINENO: checking ipv6 stack type" >&5 echo $ECHO_N "checking ipv6 stack type... $ECHO_C" >&6 for i in inria kame linux-glibc linux-inet6 toshiba v6d zeta; do case $i in @@ -2654,7 +3023,7 @@ # http://www.kame.net/ cat >conftest.$ac_ext <<_ACEOF -#line 2657 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -2666,9 +3035,10 @@ egrep "yes" >/dev/null 2>&1; then ipv6type=$i; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF + fi rm -f conftest* @@ -2677,7 +3047,7 @@ kame) # http://www.kame.net/ cat >conftest.$ac_ext <<_ACEOF -#line 2680 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -2689,9 +3059,9 @@ egrep "yes" >/dev/null 2>&1; then ipv6type=$i; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF fi rm -f conftest* @@ -2700,7 +3070,7 @@ linux-glibc) # http://www.v6.linux.or.jp/ cat >conftest.$ac_ext <<_ACEOF -#line 2703 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -2712,9 +3082,9 @@ egrep "yes" >/dev/null 2>&1; then ipv6type=$i; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF fi rm -f conftest* @@ -2728,16 +3098,16 @@ ipv6libdir=/usr/inet6/lib ipv6trylibc=yes; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF CFLAGS="-I/usr/inet6/include $CFLAGS" fi ;; toshiba) cat >conftest.$ac_ext <<_ACEOF -#line 2740 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -2751,9 +3121,9 @@ ipv6lib=inet6; ipv6libdir=/usr/local/v6/lib; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF fi rm -f conftest* @@ -2761,7 +3131,7 @@ ;; v6d) cat >conftest.$ac_ext <<_ACEOF -#line 2764 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -2775,9 +3145,9 @@ ipv6lib=v6; ipv6libdir=/usr/local/v6/lib; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF fi rm -f conftest* @@ -2785,7 +3155,7 @@ ;; zeta) cat >conftest.$ac_ext <<_ACEOF -#line 2788 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -2799,9 +3169,9 @@ ipv6lib=inet6; ipv6libdir=/usr/local/v6/lib; -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define INET6 1 -EOF +_ACEOF fi rm -f conftest* @@ -2812,10 +3182,10 @@ break fi done - echo "$as_me:2815: result: $ipv6type" >&5 + echo "$as_me:$LINENO: result: $ipv6type" >&5 echo "${ECHO_T}$ipv6type" >&6 - echo "$as_me:2818: checking for library containing getaddrinfo" >&5 + echo "$as_me:$LINENO: checking for library containing getaddrinfo" >&5 echo $ECHO_N "checking for library containing getaddrinfo... $ECHO_C" >&6 if test "${ac_cv_search_getaddrinfo+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -2823,7 +3193,7 @@ ac_func_search_save_LIBS=$LIBS ac_cv_search_getaddrinfo=no cat >conftest.$ac_ext <<_ACEOF -#line 2826 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2833,6 +3203,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getaddrinfo (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2842,16 +3218,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2845: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2848: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2851: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2854: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_getaddrinfo="none required" else @@ -2863,7 +3239,7 @@ for ac_lib in inet6; do LIBS="-l$ac_lib $ac_func_search_save_LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 2866 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -2873,6 +3249,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char getaddrinfo (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2882,16 +3264,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:2885: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:2888: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:2891: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2894: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_search_getaddrinfo="-l$ac_lib" break @@ -2904,7 +3286,7 @@ fi LIBS=$ac_func_search_save_LIBS fi -echo "$as_me:2907: result: $ac_cv_search_getaddrinfo" >&5 +echo "$as_me:$LINENO: result: $ac_cv_search_getaddrinfo" >&5 echo "${ECHO_T}$ac_cv_search_getaddrinfo" >&6 if test "$ac_cv_search_getaddrinfo" != no; then test "$ac_cv_search_getaddrinfo" = "none required" || LIBS="$ac_cv_search_getaddrinfo $LIBS" @@ -2913,19 +3295,24 @@ fi -echo "$as_me:2916: checking whether byte ordering is bigendian" >&5 +echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 if test "${ac_cv_c_bigendian+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_c_bigendian=unknown -# See if sys/param.h defines the BYTE_ORDER macro. + # See if sys/param.h defines the BYTE_ORDER macro. cat >conftest.$ac_ext <<_ACEOF -#line 2924 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2938,24 +3325,30 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2941: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2944: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2947: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2950: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 2954 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -2968,16 +3361,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:2971: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:2974: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:2977: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:2980: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else @@ -2989,16 +3382,64 @@ 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:2996: 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 3001 "configure" +#line $LINENO "configure" #include "confdefs.h" int main () @@ -3014,51 +3455,73 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:3017: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3020: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3022: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3025: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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:3038: result: $ac_cv_c_bigendian" >&5 +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 echo "${ECHO_T}$ac_cv_c_bigendian" >&6 -if test $ac_cv_c_bigendian = yes; then +case $ac_cv_c_bigendian in + yes) -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define WORDS_BIGENDIAN 1 -EOF +_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 + + + + -fi ac_header_dirent=no for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do as_ac_Header=`echo "ac_cv_header_dirent_$ac_hdr" | $as_tr_sh` -echo "$as_me:3051: checking for $ac_hdr that defines DIR" >&5 +echo "$as_me:$LINENO: checking for $ac_hdr that defines DIR" >&5 echo $ECHO_N "checking for $ac_hdr that defines DIR... $ECHO_C" >&6 if eval "test \"\${$as_ac_Header+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3057 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include <$ac_hdr> +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3069,16 +3532,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3072: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3075: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3078: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3081: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_Header=yes" else @@ -3088,12 +3551,12 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3091: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_hdr" | $as_tr_cpp` 1 -EOF +_ACEOF ac_header_dirent=$ac_hdr; break fi @@ -3101,15 +3564,15 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then - echo "$as_me:3104: checking for opendir in -ldir" >&5 -echo $ECHO_N "checking for opendir in -ldir... $ECHO_C" >&6 -if test "${ac_cv_lib_dir_opendir+set}" = set; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldir $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line 3112 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3119,6 +3582,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3128,42 +3597,91 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3131: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3134: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3137: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3140: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_dir_opendir=yes + ac_cv_search_opendir="none required" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_dir_opendir=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if test "$ac_cv_search_opendir" = no; then + for ac_lib in dir; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "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 opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext 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='test -s 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 + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -echo "$as_me:3151: result: $ac_cv_lib_dir_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_dir_opendir" >&6 -if test $ac_cv_lib_dir_opendir = yes; then - LIBS="$LIBS -ldir" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" + fi else - echo "$as_me:3158: checking for opendir in -lx" >&5 -echo $ECHO_N "checking for opendir in -lx... $ECHO_C" >&6 -if test "${ac_cv_lib_x_opendir+set}" = set; then + echo "$as_me:$LINENO: checking for library containing opendir" >&5 +echo $ECHO_N "checking for library containing opendir... $ECHO_C" >&6 +if test "${ac_cv_search_opendir+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lx $LIBS" + ac_func_search_save_LIBS=$LIBS +ac_cv_search_opendir=no cat >conftest.$ac_ext <<_ACEOF -#line 3166 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -3173,6 +3691,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3182,46 +3706,101 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:3185: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:3188: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:3191: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3194: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_x_opendir=yes + ac_cv_search_opendir="none required" else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_cv_lib_x_opendir=no fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS +if test "$ac_cv_search_opendir" = no; then + for ac_lib in x; do + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "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 opendir (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif +int +main () +{ +opendir (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext 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='test -s 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 + ac_cv_search_opendir="-l$ac_lib" +break +else + echo "$as_me: failed program was:" >&5 +cat conftest.$ac_ext >&5 fi -echo "$as_me:3205: result: $ac_cv_lib_x_opendir" >&5 -echo "${ECHO_T}$ac_cv_lib_x_opendir" >&6 -if test $ac_cv_lib_x_opendir = yes; then - LIBS="$LIBS -lx" +rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext + done +fi +LIBS=$ac_func_search_save_LIBS fi +echo "$as_me:$LINENO: result: $ac_cv_search_opendir" >&5 +echo "${ECHO_T}$ac_cv_search_opendir" >&6 +if test "$ac_cv_search_opendir" != no; then + test "$ac_cv_search_opendir" = "none required" || LIBS="$ac_cv_search_opendir $LIBS" fi -echo "$as_me:3213: checking whether time.h and sys/time.h may both be included" >&5 +fi + +echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 if test "${ac_cv_header_time+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3219 "configure" +#line $LINENO "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 () { @@ -3232,16 +3811,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3235: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3238: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3241: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3244: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_time=yes else @@ -3251,23 +3830,23 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3254: result: $ac_cv_header_time" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 echo "${ECHO_T}$ac_cv_header_time" >&6 if test $ac_cv_header_time = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define TIME_WITH_SYS_TIME 1 -EOF +_ACEOF fi -echo "$as_me:3264: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 if test "${ac_cv_header_sys_wait_h+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3270 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -3278,6 +3857,12 @@ # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -3289,16 +3874,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3292: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3295: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3298: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3301: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_header_sys_wait_h=yes else @@ -3308,36 +3893,37 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3311: result: $ac_cv_header_sys_wait_h" >&5 +echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 if test $ac_cv_header_sys_wait_h = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SYS_WAIT_H 1 -EOF +_ACEOF fi -for ac_header in sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3324: 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 "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 3330 "configure" +#line $LINENO "configure" #include "confdefs.h" -#include <$ac_header> +#include +#include +#include +#include + _ACEOF -if { (eval echo "$as_me:3334: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:3340: \$? = $ac_status" >&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 @@ -3348,92 +3934,238 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_cv_header_stdc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + ac_cv_header_stdc=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 -echo "$as_me:3359: 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 <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* + +fi + +if test $ac_cv_header_stdc = yes; then + # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. + if test "$cross_compiling" = yes; then + : +else + cat >conftest.$ac_ext <<_ACEOF +#line $LINENO "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)) +#endif + +#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) +int +main () +{ + int i; + for (i = 0; i < 256; i++) + if (XOR (islower (i), ISLOWER (i)) + || toupper (i) != TOUPPER (i)) + exit(2); + exit (0); +} +_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:3372: checking for $ac_header" >&5 +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 3378 "configure" +#line $LINENO "configure" #include "confdefs.h" +$ac_includes_default + #include <$ac_header> _ACEOF -if { (eval echo "$as_me:3382: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 ac_status=$? - egrep -v '^ *\+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:3388: \$? = $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 + 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" +cat conftest.$ac_ext >&5 +eval "$as_ac_Header=no" fi -rm -f conftest.err conftest.$ac_ext +rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3407: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -for ac_header in sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h + + + + + + + + + +for ac_header in sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3420: checking for $ac_header" >&5 +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 - cat >conftest.$ac_ext <<_ACEOF -#line 3426 "configure" + # 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 -if { (eval echo "$as_me:3430: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:3436: \$? = $ac_status" >&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 @@ -3444,44 +4176,114 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + 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:3455: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -for ac_header in glob.h alloca.h mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h + + + + + +for ac_header in compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3468: checking for $ac_header" >&5 +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 - cat >conftest.$ac_ext <<_ACEOF -#line 3474 "configure" + # 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 -if { (eval echo "$as_me:3478: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:3484: \$? = $ac_status" >&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 @@ -3492,44 +4294,114 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + 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:3503: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -for ac_header in netdb.h + + + + + +for ac_header in sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3516: checking for $ac_header" >&5 +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 - cat >conftest.$ac_ext <<_ACEOF -#line 3522 "configure" + # 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 -if { (eval echo "$as_me:3526: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:3532: \$? = $ac_status" >&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 @@ -3540,44 +4412,115 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + 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:3551: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -for ac_header in malloc.h + + + + + + +for ac_header in glob.h alloca.h mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3564: checking for $ac_header" >&5 +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 - cat >conftest.$ac_ext <<_ACEOF -#line 3570 "configure" + # 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 -if { (eval echo "$as_me:3574: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:3580: \$? = $ac_status" >&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 @@ -3588,45 +4531,110 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - eval "$as_ac_Header=yes" + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - eval "$as_ac_Header=no" + 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:3599: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -echo "$as_me:3609: 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 netdb.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 - cat >conftest.$ac_ext <<_ACEOF -#line 3615 "configure" + # 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" -#include -#include -#include -#include +$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:3623: \"$ac_cpp conftest.$ac_ext\"") >&5 +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:3629: \$? = $ac_status" >&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 @@ -3637,169 +4645,181 @@ ac_cpp_err=yes fi if test -z "$ac_cpp_err"; then - ac_cv_header_stdc=yes + ac_header_preproc=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 - ac_cv_header_stdc=no + 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 -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 3651 "configure" -#include "confdefs.h" -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "memchr" >/dev/null 2>&1; then - : +# 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 - ac_cv_header_stdc=no + eval "$as_ac_Header=$ac_header_preproc" fi -rm -f conftest* +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 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 3669 "configure" -#include "confdefs.h" -#include - +if test `eval echo '${'$as_ac_Header'}'` = yes; then + cat >>confdefs.h <<_ACEOF +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - egrep "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -#line 3690 "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)) -#endif -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -if { (eval echo "$as_me:3716: \"$ac_link\"") >&5 - (eval $ac_link) 2>&5 - ac_status=$? - echo "$as_me:3719: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:3721: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:3724: \$? = $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 -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:3737: 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 <<\EOF -#define STDC_HEADERS 1 -EOF - -fi +done -# 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 +for ac_header in malloc.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:3753: checking for $ac_header" >&5 +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 - cat >conftest.$ac_ext <<_ACEOF -#line 3759 "configure" + # 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:3765: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3768: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3771: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3774: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - eval "$as_ac_Header=yes" + ac_header_compiler=yes else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -eval "$as_ac_Header=no" +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 -echo "$as_me:3784: result: `eval echo '${'$as_ac_Header'}'`" >&5 +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 <>confdefs.h <<_ACEOF #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -EOF +_ACEOF fi + done -echo "$as_me:3794: checking for int" >&5 + +echo "$as_me:$LINENO: 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 3800 "configure" +#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 () { @@ -3812,16 +4832,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3815: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3818: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3821: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3824: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_int=yes else @@ -3831,188 +4851,306 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:3834: result: $ac_cv_type_int" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_int" >&5 echo "${ECHO_T}$ac_cv_type_int" >&6 -echo "$as_me:3837: checking size of int" >&5 +echo "$as_me:$LINENO: 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 3846 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (int)) >= 0)] +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:3858: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3861: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3864: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3867: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 3872 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3884: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3887: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3890: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3893: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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`; ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 +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 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 3909 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (int)) >= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (int))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3921: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3924: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3927: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3930: \$? = $ac_status" >&5 + 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`; ac_mid=`expr 2 '*' $ac_mid` +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 +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 3946 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (int)) <= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (int))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:3958: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:3961: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:3964: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:3967: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 -ac_cv_sizeof_int=$ac_lo +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 else if test "$cross_compiling" = yes; then - { { echo "$as_me:3980: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:$LINENO: 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 3985 "configure" +#line $LINENO "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); -fprintf (f, "%d", (sizeof (int))); -fclose (f); + + 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); + ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4001: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4004: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4006: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4009: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 @@ -4022,21 +5160,28 @@ ac_cv_sizeof_int=0 fi fi -echo "$as_me:4025: result: $ac_cv_sizeof_int" >&5 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_int" >&5 echo "${ECHO_T}$ac_cv_sizeof_int" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_INT $ac_cv_sizeof_int -EOF +_ACEOF -echo "$as_me:4031: checking for long" >&5 + +echo "$as_me:$LINENO: checking for long" >&5 echo $ECHO_N "checking for long... $ECHO_C" >&6 if test "${ac_cv_type_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4037 "configure" +#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 () { @@ -4049,16 +5194,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4052: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4055: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4058: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4061: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_long=yes else @@ -4068,188 +5213,306 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4071: result: $ac_cv_type_long" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 echo "${ECHO_T}$ac_cv_type_long" >&6 -echo "$as_me:4074: checking size of long" >&5 +echo "$as_me:$LINENO: checking size of long" >&5 echo $ECHO_N "checking size of long... $ECHO_C" >&6 if test "${ac_cv_sizeof_long+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_long" = 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 4083 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (long)) >= 0)] +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4095: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4098: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4101: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4104: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 4109 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4121: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4124: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4127: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4130: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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`; ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 +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))) < 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 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 4146 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (long)) >= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4158: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4161: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4164: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4167: \$? = $ac_status" >&5 + 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`; ac_mid=`expr 2 '*' $ac_mid` +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 +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 4183 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (long)) <= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4195: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4198: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4201: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4204: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 -ac_cv_sizeof_long=$ac_lo +case $ac_lo in +?*) ac_cv_sizeof_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77" >&5 +echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} + { (exit 1); exit 1; }; } ;; +esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:4217: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:$LINENO: 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 4222 "configure" +#line $LINENO "configure" #include "confdefs.h" $ac_includes_default +long longval () { return (long) (sizeof (long)); } +unsigned long ulongval () { return (long) (sizeof (long)); } +#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); -fprintf (f, "%d", (sizeof (long))); -fclose (f); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (long))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (long)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (long)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4238: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4241: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4243: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4246: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_long=`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), 77" >&5 +echo "$as_me: error: cannot compute sizeof (long), 77" >&2;} + { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -4259,21 +5522,28 @@ ac_cv_sizeof_long=0 fi fi -echo "$as_me:4262: result: $ac_cv_sizeof_long" >&5 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 echo "${ECHO_T}$ac_cv_sizeof_long" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_LONG $ac_cv_sizeof_long -EOF +_ACEOF -echo "$as_me:4268: checking for short" >&5 + +echo "$as_me:$LINENO: checking for short" >&5 echo $ECHO_N "checking for short... $ECHO_C" >&6 if test "${ac_cv_type_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4274 "configure" +#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 () { @@ -4286,16 +5556,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4289: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4292: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4295: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4298: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_short=yes else @@ -4305,188 +5575,306 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4308: result: $ac_cv_type_short" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5 echo "${ECHO_T}$ac_cv_type_short" >&6 -echo "$as_me:4311: checking size of short" >&5 +echo "$as_me:$LINENO: checking size of short" >&5 echo $ECHO_N "checking size of short... $ECHO_C" >&6 if test "${ac_cv_sizeof_short+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_short" = 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 4320 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (short)) >= 0)] +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= 0)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4332: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4335: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4338: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4341: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_lo=0 ac_mid=0 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 4346 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4358: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4361: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4364: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4367: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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`; ac_mid=`expr 2 '*' $ac_mid + 1` +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` fi rm -f conftest.$ac_objext conftest.$ac_ext done else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -ac_hi=-1 ac_mid=-1 +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))) < 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 while :; do cat >conftest.$ac_ext <<_ACEOF -#line 4383 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (short)) >= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (short))) >= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4395: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4398: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4401: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4404: \$? = $ac_status" >&5 + 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`; ac_mid=`expr 2 '*' $ac_mid` +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 +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 4420 "configure" +#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 () { -int _array_ [1 - 2 * !((sizeof (short)) <= $ac_mid)] +static int test_array [1 - 2 * !(((long) (sizeof (short))) <= $ac_mid)]; +test_array [0] = 0 + ; return 0; } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4432: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4435: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4438: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4441: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $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 -ac_cv_sizeof_short=$ac_lo +case $ac_lo in +?*) ac_cv_sizeof_short=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (short), 77" >&5 +echo "$as_me: error: cannot compute sizeof (short), 77" >&2;} + { (exit 1); exit 1; }; } ;; +esac else if test "$cross_compiling" = yes; then - { { echo "$as_me:4454: error: cannot run test program while cross compiling" >&5 + { { echo "$as_me:$LINENO: 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 4459 "configure" +#line $LINENO "configure" #include "confdefs.h" $ac_includes_default +long longval () { return (long) (sizeof (short)); } +unsigned long ulongval () { return (long) (sizeof (short)); } +#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); -fprintf (f, "%d", (sizeof (short))); -fclose (f); + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (short))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (short)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (short)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); + ; return 0; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4475: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4478: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4480: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4483: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_sizeof_short=`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), 77" >&5 +echo "$as_me: error: cannot compute sizeof (short), 77" >&2;} + { (exit 1); exit 1; }; } fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi @@ -4496,13 +5884,15 @@ ac_cv_sizeof_short=0 fi fi -echo "$as_me:4499: result: $ac_cv_sizeof_short" >&5 +echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5 echo "${ECHO_T}$ac_cv_sizeof_short" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define SIZEOF_SHORT $ac_cv_sizeof_short -EOF +_ACEOF -echo "$as_me:4505: checking for inline" >&5 + + +echo "$as_me:$LINENO: 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 @@ -4510,7 +5900,7 @@ ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat >conftest.$ac_ext <<_ACEOF -#line 4513 "configure" +#line $LINENO "configure" #include "confdefs.h" #ifndef __cplusplus static $ac_kw int static_foo () {return 0; } @@ -4519,16 +5909,16 @@ _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4522: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4525: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4528: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4531: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_c_inline=$ac_kw; break else @@ -4539,28 +5929,29 @@ done fi -echo "$as_me:4542: result: $ac_cv_c_inline" >&5 +echo "$as_me:$LINENO: 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 <<\EOF +cat >>confdefs.h <<\_ACEOF #define inline -EOF +_ACEOF ;; - *) cat >>confdefs.h <>confdefs.h <<_ACEOF #define inline $ac_cv_c_inline -EOF +_ACEOF ;; esac -echo "$as_me:4557: checking return type of signal handlers" >&5 + +echo "$as_me:$LINENO: checking return type of signal handlers" >&5 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 if test "${ac_cv_type_signal+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4563 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -4573,6 +5964,12 @@ void (*signal ()) (); #endif +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -4582,16 +5979,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4585: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4588: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4591: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4594: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_signal=void else @@ -4601,20 +5998,21 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4604: result: $ac_cv_type_signal" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 echo "${ECHO_T}$ac_cv_type_signal" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define RETSIGTYPE $ac_cv_type_signal -EOF +_ACEOF -echo "$as_me:4611: checking for uid_t in sys/types.h" >&5 + +echo "$as_me:$LINENO: checking for uid_t in sys/types.h" >&5 echo $ECHO_N "checking for uid_t in sys/types.h... $ECHO_C" >&6 if test "${ac_cv_type_uid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4617 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -4628,29 +6026,36 @@ rm -f conftest* fi -echo "$as_me:4631: result: $ac_cv_type_uid_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5 echo "${ECHO_T}$ac_cv_type_uid_t" >&6 if test $ac_cv_type_uid_t = no; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define uid_t int -EOF +_ACEOF -cat >>confdefs.h <<\EOF + +cat >>confdefs.h <<\_ACEOF #define gid_t int -EOF +_ACEOF fi -echo "$as_me:4645: checking for mode_t" >&5 +echo "$as_me:$LINENO: checking for mode_t" >&5 echo $ECHO_N "checking for mode_t... $ECHO_C" >&6 if test "${ac_cv_type_mode_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4651 "configure" +#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 () { @@ -4663,16 +6068,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4666: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4669: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4672: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4675: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_mode_t=yes else @@ -4682,27 +6087,33 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4685: result: $ac_cv_type_mode_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5 echo "${ECHO_T}$ac_cv_type_mode_t" >&6 if test $ac_cv_type_mode_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define mode_t int -EOF +_ACEOF fi -echo "$as_me:4697: checking for off_t" >&5 +echo "$as_me:$LINENO: checking for off_t" >&5 echo $ECHO_N "checking for off_t... $ECHO_C" >&6 if test "${ac_cv_type_off_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4703 "configure" +#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 () { @@ -4715,16 +6126,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4718: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4721: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4724: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4727: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_off_t=yes else @@ -4734,27 +6145,33 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4737: result: $ac_cv_type_off_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 echo "${ECHO_T}$ac_cv_type_off_t" >&6 if test $ac_cv_type_off_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define off_t long -EOF +_ACEOF fi -echo "$as_me:4749: checking for size_t" >&5 +echo "$as_me:$LINENO: checking for size_t" >&5 echo $ECHO_N "checking for size_t... $ECHO_C" >&6 if test "${ac_cv_type_size_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4755 "configure" +#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 () { @@ -4767,16 +6184,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4770: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4773: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4776: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4779: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_size_t=yes else @@ -4786,27 +6203,33 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4789: result: $ac_cv_type_size_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 echo "${ECHO_T}$ac_cv_type_size_t" >&6 if test $ac_cv_type_size_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define size_t unsigned -EOF +_ACEOF fi -echo "$as_me:4801: checking for pid_t" >&5 +echo "$as_me:$LINENO: checking for pid_t" >&5 echo $ECHO_N "checking for pid_t... $ECHO_C" >&6 if test "${ac_cv_type_pid_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4807 "configure" +#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 () { @@ -4819,16 +6242,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4822: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4825: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4828: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4831: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_pid_t=yes else @@ -4838,19 +6261,19 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4841: result: $ac_cv_type_pid_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5 echo "${ECHO_T}$ac_cv_type_pid_t" >&6 if test $ac_cv_type_pid_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define pid_t int -EOF +_ACEOF fi -echo "$as_me:4853: checking type of array argument to getgroups" >&5 +echo "$as_me:$LINENO: checking type of array argument to getgroups" >&5 echo $ECHO_N "checking type of array argument to getgroups... $ECHO_C" >&6 if test "${ac_cv_type_getgroups+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -4859,7 +6282,7 @@ ac_cv_type_getgroups=cross else cat >conftest.$ac_ext <<_ACEOF -#line 4862 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ #include @@ -4885,28 +6308,29 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:4888: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:4891: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:4893: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4896: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_getgroups=gid_t 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_type_getgroups=int fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi if test $ac_cv_type_getgroups = cross; then cat >conftest.$ac_ext <<_ACEOF -#line 4909 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -4921,22 +6345,29 @@ fi fi -echo "$as_me:4924: result: $ac_cv_type_getgroups" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_getgroups" >&5 echo "${ECHO_T}$ac_cv_type_getgroups" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define GETGROUPS_T $ac_cv_type_getgroups -EOF +_ACEOF -echo "$as_me:4931: checking for struct stat.st_rdev" >&5 + +echo "$as_me:$LINENO: checking for struct stat.st_rdev" >&5 echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6 if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4937 "configure" +#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 () { @@ -4948,16 +6379,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:4951: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:4954: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:4957: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:4960: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_member_struct_stat_st_rdev=yes else @@ -4967,25 +6398,33 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:4970: result: $ac_cv_member_struct_stat_st_rdev" >&5 +echo "$as_me:$LINENO: result: $ac_cv_member_struct_stat_st_rdev" >&5 echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6 if test $ac_cv_member_struct_stat_st_rdev = yes; then -cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_STRUCT_STAT_ST_RDEV 1 -EOF +_ACEOF + fi -echo "$as_me:4980: checking for ino_t" >&5 + +echo "$as_me:$LINENO: checking for ino_t" >&5 echo $ECHO_N "checking for ino_t... $ECHO_C" >&6 if test "${ac_cv_type_ino_t+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 4986 "configure" +#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 () { @@ -4998,16 +6437,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5001: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5004: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5007: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5010: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_ino_t=yes else @@ -5017,29 +6456,36 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5020: result: $ac_cv_type_ino_t" >&5 +echo "$as_me:$LINENO: result: $ac_cv_type_ino_t" >&5 echo "${ECHO_T}$ac_cv_type_ino_t" >&6 if test $ac_cv_type_ino_t = yes; then : else -cat >>confdefs.h <>confdefs.h <<_ACEOF #define ino_t unsigned -EOF +_ACEOF fi - echo "$as_me:5032: checking for socklen_t" >&5 + + echo "$as_me:$LINENO: 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 5038 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5052,16 +6498,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5055: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5058: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5061: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5064: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_type_socklen_t=yes else @@ -5071,13 +6517,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5074: result: $ac_cv_type_socklen_t" >&5 +echo "$as_me:$LINENO: 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:5080: checking for socklen_t equivalent" >&5 + echo "$as_me:$LINENO: checking for socklen_t equivalent" >&5 echo $ECHO_N "checking for socklen_t equivalent... $ECHO_C" >&6 if test "${rsync_cv_socklen_t_equiv+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5089,7 +6535,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 5092 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -5097,6 +6543,12 @@ int getpeername (int, $arg2 *, $t *); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5109,16 +6561,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5112: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5115: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5118: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5121: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_socklen_t_equiv="$t" @@ -5133,32 +6585,40 @@ done if test "x$rsync_cv_socklen_t_equiv" = x; then - { { echo "$as_me:5136: error: Cannot find a type to use in place of socklen_t" >&5 + { { echo "$as_me:$LINENO: 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:5143: result: $rsync_cv_socklen_t_equiv" >&5 + echo "$as_me:$LINENO: result: $rsync_cv_socklen_t_equiv" >&5 echo "${ECHO_T}$rsync_cv_socklen_t_equiv" >&6 -cat >>confdefs.h <>confdefs.h <<_ACEOF #define socklen_t $rsync_cv_socklen_t_equiv -EOF +_ACEOF fi -echo "$as_me:5152: checking for errno in errno.h" >&5 + + +echo "$as_me:$LINENO: checking for errno in errno.h" >&5 echo $ECHO_N "checking for errno in errno.h... $ECHO_C" >&6 if test "${rsync_cv_errno+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5159 "configure" +#line $LINENO "configure" #include "confdefs.h" #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5168,16 +6628,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5171: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5174: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5177: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5180: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_errno=yes else @@ -5187,13 +6647,13 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5190: result: $rsync_cv_errno" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_errno" >&5 echo "${ECHO_T}$rsync_cv_errno" >&6 if test x"$rsync_cv_errno" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_ERRNO_DECL 1 -EOF +_ACEOF fi @@ -5209,13 +6669,13 @@ for ac_func in connect do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5212: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 5218 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5229,6 +6689,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5246,16 +6712,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5249: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5252: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5255: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5258: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5265,12 +6731,12 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5268: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done @@ -5279,7 +6745,7 @@ case "$LIBS" in *-lnsl*) ;; *) -echo "$as_me:5282: checking for printf in -lnsl_s" >&5 +echo "$as_me:$LINENO: checking for printf in -lnsl_s" >&5 echo $ECHO_N "checking for printf in -lnsl_s... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_s_printf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5287,7 +6753,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl_s $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5290 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5297,6 +6763,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char printf (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5306,16 +6778,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5309: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5312: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5315: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5318: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_s_printf=yes else @@ -5326,12 +6798,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5329: result: $ac_cv_lib_nsl_s_printf" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_s_printf" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_s_printf" >&6 if test $ac_cv_lib_nsl_s_printf = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBNSL_S 1 -EOF +_ACEOF LIBS="-lnsl_s $LIBS" @@ -5341,7 +6813,7 @@ case "$LIBS" in *-lnsl*) ;; *) -echo "$as_me:5344: checking for printf in -lnsl" >&5 +echo "$as_me:$LINENO: checking for printf in -lnsl" >&5 echo $ECHO_N "checking for printf in -lnsl... $ECHO_C" >&6 if test "${ac_cv_lib_nsl_printf+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5349,7 +6821,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5352 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5359,6 +6831,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char printf (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5368,16 +6846,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5371: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5374: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5377: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5380: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_nsl_printf=yes else @@ -5388,12 +6866,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5391: result: $ac_cv_lib_nsl_printf" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_printf" >&5 echo "${ECHO_T}$ac_cv_lib_nsl_printf" >&6 if test $ac_cv_lib_nsl_printf = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBNSL 1 -EOF +_ACEOF LIBS="-lnsl $LIBS" @@ -5403,7 +6881,7 @@ case "$LIBS" in *-lsocket*) ;; *) -echo "$as_me:5406: checking for connect in -lsocket" >&5 +echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 if test "${ac_cv_lib_socket_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5411,7 +6889,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5414 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5421,6 +6899,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5430,16 +6914,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5433: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5436: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5439: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5442: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else @@ -5450,12 +6934,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5453: result: $ac_cv_lib_socket_connect" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 if test $ac_cv_lib_socket_connect = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBSOCKET 1 -EOF +_ACEOF LIBS="-lsocket $LIBS" @@ -5465,7 +6949,7 @@ case "$LIBS" in *-linet*) ;; *) -echo "$as_me:5468: checking for connect in -linet" >&5 +echo "$as_me:$LINENO: checking for connect in -linet" >&5 echo $ECHO_N "checking for connect in -linet... $ECHO_C" >&6 if test "${ac_cv_lib_inet_connect+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5473,7 +6957,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-linet $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5476 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5483,6 +6967,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char connect (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5492,16 +6982,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5495: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5498: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5501: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5504: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_inet_connect=yes else @@ -5512,12 +7002,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5515: result: $ac_cv_lib_inet_connect" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_inet_connect" >&5 echo "${ECHO_T}$ac_cv_lib_inet_connect" >&6 if test $ac_cv_lib_inet_connect = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBINET 1 -EOF +_ACEOF LIBS="-linet $LIBS" @@ -5529,14 +7019,15 @@ # ac_cv_func_connect=yes # don't! it would cause AC_CHECK_FUNC to succeed next time configure is run -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_CONNECT 1 -EOF +_ACEOF fi fi -echo "$as_me:5539: checking for inet_ntop in -lresolv" >&5 + +echo "$as_me:$LINENO: checking for inet_ntop in -lresolv" >&5 echo $ECHO_N "checking for inet_ntop in -lresolv... $ECHO_C" >&6 if test "${ac_cv_lib_resolv_inet_ntop+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -5544,7 +7035,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 5547 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -5554,6 +7045,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char inet_ntop (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5563,16 +7060,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5566: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5569: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5572: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5575: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_inet_ntop=yes else @@ -5583,27 +7080,30 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:5586: result: $ac_cv_lib_resolv_inet_ntop" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_inet_ntop" >&5 echo "${ECHO_T}$ac_cv_lib_resolv_inet_ntop" >&6 if test $ac_cv_lib_resolv_inet_ntop = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 -EOF +_ACEOF LIBS="-lresolv $LIBS" fi + + + for ac_func in inet_ntop do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5600: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 5606 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5617,6 +7117,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5634,16 +7140,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5637: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5640: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5643: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5646: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5653,28 +7159,29 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5656: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS lib/inet_ntop.$ac_objext" fi done + for ac_func in inet_pton do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5671: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 5677 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5688,6 +7195,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5705,16 +7218,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5708: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5711: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5714: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5717: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5724,28 +7237,30 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5727: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS lib/inet_pton.$ac_objext" fi done + + for ac_func in getaddrinfo do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5742: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 5748 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5759,6 +7274,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5776,16 +7297,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5779: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5782: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5785: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5788: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5795,28 +7316,29 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5798: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS lib/getaddrinfo.$ac_objext" fi done + for ac_func in getnameinfo do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5813: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 5819 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5830,6 +7352,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5847,16 +7375,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:5850: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:5853: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:5856: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5859: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -5866,30 +7394,38 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:5869: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF else LIBOBJS="$LIBOBJS lib/getnameinfo.$ac_objext" fi done -echo "$as_me:5881: checking for struct sockaddr.sa_len" >&5 + +echo "$as_me:$LINENO: checking for struct sockaddr.sa_len" >&5 echo $ECHO_N "checking for struct sockaddr.sa_len... $ECHO_C" >&6 if test "${ac_cv_member_struct_sockaddr_sa_len+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 5887 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include + +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5901,16 +7437,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5904: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5907: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5910: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5913: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_member_struct_sockaddr_sa_len=yes else @@ -5920,22 +7456,29 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:5923: result: $ac_cv_member_struct_sockaddr_sa_len" >&5 +echo "$as_me:$LINENO: result: $ac_cv_member_struct_sockaddr_sa_len" >&5 echo "${ECHO_T}$ac_cv_member_struct_sockaddr_sa_len" >&6 if test $ac_cv_member_struct_sockaddr_sa_len = yes; then - cat >>confdefs.h <<\EOF + cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKADDR_LEN 1 -EOF +_ACEOF fi -echo "$as_me:5932: checking struct sockaddr_storage" >&5 + +echo "$as_me:$LINENO: checking struct sockaddr_storage" >&5 echo $ECHO_N "checking struct sockaddr_storage... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF -#line 5935 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -5945,28 +7488,28 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:5948: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:5951: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:5954: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:5957: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - echo "$as_me:5959: result: yes" >&5 + echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKADDR_STORAGE 1 -EOF +_ACEOF else echo "$as_me: failed program was:" >&5 cat conftest.$ac_ext >&5 -echo "$as_me:5969: result: no" >&5 +echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest.$ac_ext @@ -5977,13 +7520,13 @@ for ac_func in strcasecmp do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:5980: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 5986 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -5997,6 +7540,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6014,16 +7563,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6017: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6020: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6023: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6026: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6033,19 +7582,19 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6036: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done if test x"$ac_cv_func_strcasecmp" = x"no"; then -echo "$as_me:6048: checking for strcasecmp in -lresolv" >&5 +echo "$as_me:$LINENO: 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 @@ -6053,7 +7602,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lresolv $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6056 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6063,6 +7612,12 @@ /* 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 () { @@ -6072,16 +7627,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6075: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6078: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6081: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6084: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_resolv_strcasecmp=yes else @@ -6092,12 +7647,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6095: result: $ac_cv_lib_resolv_strcasecmp" >&5 +echo "$as_me:$LINENO: 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 - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBRESOLV 1 -EOF +_ACEOF LIBS="-lresolv $LIBS" @@ -6105,7 +7660,8 @@ fi -echo "$as_me:6108: checking whether utime accepts a null argument" >&5 + +echo "$as_me:$LINENO: checking whether utime accepts a null argument" >&5 echo $ECHO_N "checking whether utime accepts a null argument... $ECHO_C" >&6 if test "${ac_cv_func_utime_null+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6116,9 +7672,15 @@ ac_cv_func_utime_null=no else cat >conftest.$ac_ext <<_ACEOF -#line 6119 "configure" +#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 () { @@ -6133,48 +7695,57 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6136: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6139: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6141: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6144: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_func_utime_null=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_func_utime_null=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi rm -f core core.* *.core fi -echo "$as_me:6157: result: $ac_cv_func_utime_null" >&5 +echo "$as_me:$LINENO: result: $ac_cv_func_utime_null" >&5 echo "${ECHO_T}$ac_cv_func_utime_null" >&6 if test $ac_cv_func_utime_null = yes; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_UTIME_NULL 1 -EOF +_ACEOF fi rm -f conftest.data + + + + + + + + for ac_func in waitpid wait4 getcwd strdup strerror chown chmod mknod do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6171: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 6177 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6188,6 +7759,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6205,16 +7782,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6208: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6211: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6214: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6217: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6224,26 +7801,34 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6227: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + + + + + + for ac_func in fchmod fstat strchr readlink link utime utimes strftime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6240: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 6246 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6257,6 +7842,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6274,16 +7865,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6277: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6280: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6283: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6286: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6293,26 +7884,34 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6296: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + + + + + + for ac_func in memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6309: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 6315 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6326,6 +7925,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6343,16 +7948,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6346: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6349: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6352: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6355: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6362,26 +7967,31 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6365: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done + + + + + for ac_func in strlcat strlcpy mtrace mallinfo setgroups do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:6378: checking for $ac_func" >&5 +echo "$as_me:$LINENO: 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 6384 "configure" +#line $LINENO "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func (); below. */ @@ -6395,6 +8005,12 @@ char $ac_func (); char (*f) (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6412,16 +8028,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6415: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6418: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6421: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6424: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then eval "$as_ac_var=yes" else @@ -6431,17 +8047,18 @@ fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext fi -echo "$as_me:6434: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "$as_me:$LINENO: 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 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -EOF +_ACEOF fi done -echo "$as_me:6444: checking for working socketpair" >&5 + +echo "$as_me:$LINENO: checking for working socketpair" >&5 echo $ECHO_N "checking for working socketpair... $ECHO_C" >&6 if test "${rsync_cv_HAVE_SOCKETPAIR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6451,7 +8068,7 @@ rsync_cv_HAVE_SOCKETPAIR=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6454 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -6463,37 +8080,38 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6466: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6469: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6471: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6474: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_SOCKETPAIR=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 ) rsync_cv_HAVE_SOCKETPAIR=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6486: result: $rsync_cv_HAVE_SOCKETPAIR" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_SOCKETPAIR" >&5 echo "${ECHO_T}$rsync_cv_HAVE_SOCKETPAIR" >&6 if test x"$rsync_cv_HAVE_SOCKETPAIR" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SOCKETPAIR 1 -EOF +_ACEOF fi -echo "$as_me:6496: checking for working fnmatch" >&5 +echo "$as_me:$LINENO: checking for working fnmatch" >&5 echo $ECHO_N "checking for working fnmatch... $ECHO_C" >&6 if test "${rsync_cv_HAVE_FNMATCH+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6503,47 +8121,48 @@ rsync_cv_HAVE_FNMATCH=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6506 "configure" +#line $LINENO "configure" #include "confdefs.h" #include main() { exit((fnmatch("*.o", "x.o", FNM_PATHNAME) == 0 && fnmatch("a/b/*", "a/b/c/d", FNM_PATHNAME) != 0) ? 0: 1); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6513: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6516: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6518: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6521: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_FNMATCH=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 ) rsync_cv_HAVE_FNMATCH=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6533: result: $rsync_cv_HAVE_FNMATCH" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_FNMATCH" >&5 echo "${ECHO_T}$rsync_cv_HAVE_FNMATCH" >&6 if test x"$rsync_cv_HAVE_FNMATCH" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_FNMATCH 1 -EOF +_ACEOF fi if test x"$with_included_popt" != x"yes" then -echo "$as_me:6546: checking for poptGetContext in -lpopt" >&5 +echo "$as_me:$LINENO: checking for poptGetContext in -lpopt" >&5 echo $ECHO_N "checking for poptGetContext in -lpopt... $ECHO_C" >&6 if test "${ac_cv_lib_popt_poptGetContext+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6551,7 +8170,7 @@ ac_check_lib_save_LIBS=$LIBS LIBS="-lpopt $LIBS" cat >conftest.$ac_ext <<_ACEOF -#line 6554 "configure" +#line $LINENO "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ @@ -6561,6 +8180,12 @@ /* We use char because int might match the return type of a gcc2 builtin and then its argument prototype would still apply. */ char poptGetContext (); +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6570,16 +8195,16 @@ } _ACEOF rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:6573: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6576: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:6579: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6582: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then ac_cv_lib_popt_poptGetContext=yes else @@ -6590,12 +8215,12 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:6593: result: $ac_cv_lib_popt_poptGetContext" >&5 +echo "$as_me:$LINENO: result: $ac_cv_lib_popt_poptGetContext" >&5 echo "${ECHO_T}$ac_cv_lib_popt_poptGetContext" >&6 if test $ac_cv_lib_popt_poptGetContext = yes; then - cat >>confdefs.h <>confdefs.h <<_ACEOF #define HAVE_LIBPOPT 1 -EOF +_ACEOF LIBS="-lpopt $LIBS" @@ -6605,20 +8230,20 @@ fi -echo "$as_me:6608: checking whether to use included libpopt" >&5 +echo "$as_me:$LINENO: checking whether to use included libpopt" >&5 echo $ECHO_N "checking whether to use included libpopt... $ECHO_C" >&6 if test x"$with_included_popt" = x"yes" then - echo "$as_me:6612: result: $srcdir/popt" >&5 + echo "$as_me:$LINENO: result: $srcdir/popt" >&5 echo "${ECHO_T}$srcdir/popt" >&6 BUILD_POPT='$(popt_OBJS)' CFLAGS="$CFLAGS -I$srcdir/popt" else - echo "$as_me:6617: result: no" >&5 + echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi -echo "$as_me:6621: checking for long long" >&5 +echo "$as_me:$LINENO: checking for long long" >&5 echo $ECHO_N "checking for long long... $ECHO_C" >&6 if test "${rsync_cv_HAVE_LONGLONG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6628,43 +8253,44 @@ rsync_cv_HAVE_LONGLONG=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6631 "configure" +#line $LINENO "configure" #include "confdefs.h" #include main() { long long x = 1000000; x *= x; exit(((x/1000000) == 1000000)? 0: 1); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6637: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6640: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6642: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6645: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_LONGLONG=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 ) rsync_cv_HAVE_LONGLONG=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6657: result: $rsync_cv_HAVE_LONGLONG" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_LONGLONG" >&5 echo "${ECHO_T}$rsync_cv_HAVE_LONGLONG" >&6 if test x"$rsync_cv_HAVE_LONGLONG" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_LONGLONG 1 -EOF +_ACEOF fi -echo "$as_me:6667: checking for off64_t" >&5 +echo "$as_me:$LINENO: checking for off64_t" >&5 echo $ECHO_N "checking for off64_t... $ECHO_C" >&6 if test "${rsync_cv_HAVE_OFF64_T+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6674,44 +8300,45 @@ rsync_cv_HAVE_OFF64_T=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6677 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include main() { struct stat64 st; off64_t s; if (sizeof(off_t) == sizeof(off64_t)) exit(1); exit((lstat64("/dev/null", &st)==0)?0:1); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6684: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6687: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6689: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6692: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_OFF64_T=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 ) rsync_cv_HAVE_OFF64_T=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6704: result: $rsync_cv_HAVE_OFF64_T" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_OFF64_T" >&5 echo "${ECHO_T}$rsync_cv_HAVE_OFF64_T" >&6 if test x"$rsync_cv_HAVE_OFF64_T" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_OFF64_T 1 -EOF +_ACEOF fi -echo "$as_me:6714: checking for short ino_t" >&5 +echo "$as_me:$LINENO: checking for short ino_t" >&5 echo $ECHO_N "checking for short ino_t... $ECHO_C" >&6 if test "${rsync_cv_HAVE_SHORT_INO_T+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6721,7 +8348,7 @@ rsync_cv_HAVE_SHORT_INO_T=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6724 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -6729,37 +8356,38 @@ main() { if (sizeof(ino_t) < sizeof(unsigned int)) return 0; return 1; } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6732: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6735: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6737: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6740: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_SHORT_INO_T=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 ) rsync_cv_HAVE_SHORT_INO_T=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6752: result: $rsync_cv_HAVE_SHORT_INO_T" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_SHORT_INO_T" >&5 echo "${ECHO_T}$rsync_cv_HAVE_SHORT_INO_T" >&6 if test x"$rsync_cv_HAVE_SHORT_INO_T" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SHORT_INO_T 1 -EOF +_ACEOF fi -echo "$as_me:6762: checking for unsigned char" >&5 +echo "$as_me:$LINENO: checking for unsigned char" >&5 echo $ECHO_N "checking for unsigned char... $ECHO_C" >&6 if test "${rsync_cv_HAVE_UNSIGNED_CHAR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6769,43 +8397,44 @@ rsync_cv_HAVE_UNSIGNED_CHAR=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6772 "configure" +#line $LINENO "configure" #include "confdefs.h" #include main() { char c; c=250; exit((c > 0)?0:1); } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6778: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6781: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6783: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6786: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_UNSIGNED_CHAR=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 ) rsync_cv_HAVE_UNSIGNED_CHAR=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6798: result: $rsync_cv_HAVE_UNSIGNED_CHAR" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_UNSIGNED_CHAR" >&5 echo "${ECHO_T}$rsync_cv_HAVE_UNSIGNED_CHAR" >&6 if test x"$rsync_cv_HAVE_UNSIGNED_CHAR" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_UNSIGNED_CHAR 1 -EOF +_ACEOF fi -echo "$as_me:6808: checking for broken readdir" >&5 +echo "$as_me:$LINENO: checking for broken readdir" >&5 echo $ECHO_N "checking for broken readdir... $ECHO_C" >&6 if test "${rsync_cv_HAVE_BROKEN_READDIR+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6815,7 +8444,7 @@ rsync_cv_HAVE_BROKEN_READDIR=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6818 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -6824,47 +8453,54 @@ di->d_name[0] == 0) exit(0); exit(1);} _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6827: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6830: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6832: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6835: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_BROKEN_READDIR=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 ) rsync_cv_HAVE_BROKEN_READDIR=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6847: result: $rsync_cv_HAVE_BROKEN_READDIR" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_BROKEN_READDIR" >&5 echo "${ECHO_T}$rsync_cv_HAVE_BROKEN_READDIR" >&6 if test x"$rsync_cv_HAVE_BROKEN_READDIR" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_BROKEN_READDIR 1 -EOF +_ACEOF fi -echo "$as_me:6857: checking for utimbuf" >&5 +echo "$as_me:$LINENO: checking for utimbuf" >&5 echo $ECHO_N "checking for utimbuf... $ECHO_C" >&6 if test "${rsync_cv_HAVE_UTIMBUF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else cat >conftest.$ac_ext <<_ACEOF -#line 6864 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include +#ifdef F77_DUMMY_MAIN +# ifdef __cplusplus + extern "C" +# endif + int F77_DUMMY_MAIN() { return 1; } +#endif int main () { @@ -6874,16 +8510,16 @@ } _ACEOF rm -f conftest.$ac_objext -if { (eval echo "$as_me:6877: \"$ac_compile\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? - echo "$as_me:6880: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:6883: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6886: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_UTIMBUF=yes else @@ -6893,17 +8529,17 @@ fi rm -f conftest.$ac_objext conftest.$ac_ext fi -echo "$as_me:6896: result: $rsync_cv_HAVE_UTIMBUF" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_UTIMBUF" >&5 echo "${ECHO_T}$rsync_cv_HAVE_UTIMBUF" >&6 if test x"$rsync_cv_HAVE_UTIMBUF" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_UTIMBUF 1 -EOF +_ACEOF fi -echo "$as_me:6906: checking if gettimeofday takes tz argument" >&5 +echo "$as_me:$LINENO: checking if gettimeofday takes tz argument" >&5 echo $ECHO_N "checking if gettimeofday takes tz argument... $ECHO_C" >&6 if test "${rsync_cv_HAVE_GETTIMEOFDAY_TZ+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6913,7 +8549,7 @@ rsync_cv_HAVE_GETTIMEOFDAY_TZ=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6916 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -6921,37 +8557,38 @@ main() { struct timeval tv; exit(gettimeofday(&tv, NULL));} _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6924: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6927: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6929: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6932: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_GETTIMEOFDAY_TZ=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 ) rsync_cv_HAVE_GETTIMEOFDAY_TZ=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:6944: result: $rsync_cv_HAVE_GETTIMEOFDAY_TZ" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_GETTIMEOFDAY_TZ" >&5 echo "${ECHO_T}$rsync_cv_HAVE_GETTIMEOFDAY_TZ" >&6 if test x"$rsync_cv_HAVE_GETTIMEOFDAY_TZ" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_GETTIMEOFDAY_TZ 1 -EOF +_ACEOF fi -echo "$as_me:6954: checking for C99 vsnprintf" >&5 +echo "$as_me:$LINENO: checking for C99 vsnprintf" >&5 echo $ECHO_N "checking for C99 vsnprintf... $ECHO_C" >&6 if test "${rsync_cv_HAVE_C99_VSNPRINTF+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -6961,7 +8598,7 @@ rsync_cv_HAVE_C99_VSNPRINTF=cross else cat >conftest.$ac_ext <<_ACEOF -#line 6964 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -6984,37 +8621,39 @@ _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:6987: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:6990: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:6992: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:6995: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_C99_VSNPRINTF=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 ) rsync_cv_HAVE_C99_VSNPRINTF=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:7007: result: $rsync_cv_HAVE_C99_VSNPRINTF" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_C99_VSNPRINTF" >&5 echo "${ECHO_T}$rsync_cv_HAVE_C99_VSNPRINTF" >&6 if test x"$rsync_cv_HAVE_C99_VSNPRINTF" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_C99_VSNPRINTF 1 -EOF +_ACEOF fi -echo "$as_me:7017: checking for secure mkstemp" >&5 + +echo "$as_me:$LINENO: checking for secure mkstemp" >&5 echo $ECHO_N "checking for secure mkstemp... $ECHO_C" >&6 if test "${rsync_cv_HAVE_SECURE_MKSTEMP+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7024,7 +8663,7 @@ rsync_cv_HAVE_SECURE_MKSTEMP=cross else cat >conftest.$ac_ext <<_ACEOF -#line 7027 "configure" +#line $LINENO "configure" #include "confdefs.h" #include #include @@ -7042,37 +8681,39 @@ } _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7045: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7048: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7050: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7053: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_HAVE_SECURE_MKSTEMP=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 ) rsync_cv_HAVE_SECURE_MKSTEMP=no fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:7065: result: $rsync_cv_HAVE_SECURE_MKSTEMP" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_HAVE_SECURE_MKSTEMP" >&5 echo "${ECHO_T}$rsync_cv_HAVE_SECURE_MKSTEMP" >&6 if test x"$rsync_cv_HAVE_SECURE_MKSTEMP" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define HAVE_SECURE_MKSTEMP 1 -EOF +_ACEOF fi -echo "$as_me:7075: checking for broken inet_ntoa" >&5 + +echo "$as_me:$LINENO: checking for broken inet_ntoa" >&5 echo $ECHO_N "checking for broken inet_ntoa... $ECHO_C" >&6 if test "${rsync_cv_REPLACE_INET_NTOA+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7082,7 +8723,7 @@ rsync_cv_REPLACE_INET_NTOA=cross else cat >conftest.$ac_ext <<_ACEOF -#line 7085 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -7095,37 +8736,39 @@ exit(0);} _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7098: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7101: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7103: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7106: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_REPLACE_INET_NTOA=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 ) rsync_cv_REPLACE_INET_NTOA=yes fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:7118: result: $rsync_cv_REPLACE_INET_NTOA" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_REPLACE_INET_NTOA" >&5 echo "${ECHO_T}$rsync_cv_REPLACE_INET_NTOA" >&6 if test x"$rsync_cv_REPLACE_INET_NTOA" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define REPLACE_INET_NTOA 1 -EOF +_ACEOF fi -echo "$as_me:7128: checking for broken inet_aton" >&5 + +echo "$as_me:$LINENO: checking for broken inet_aton" >&5 echo $ECHO_N "checking for broken inet_aton... $ECHO_C" >&6 if test "${rsync_cv_REPLACE_INET_ATON+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7135,7 +8778,7 @@ rsync_cv_REPLACE_INET_ATON=cross else cat >conftest.$ac_ext <<_ACEOF -#line 7138 "configure" +#line $LINENO "configure" #include "confdefs.h" #include @@ -7146,40 +8789,41 @@ if (inet_aton("example", &ip) == 0) exit(0); exit(1);} _ACEOF rm -f conftest$ac_exeext -if { (eval echo "$as_me:7149: \"$ac_link\"") >&5 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 (eval $ac_link) 2>&5 ac_status=$? - echo "$as_me:7152: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (eval echo "$as_me:7154: \"$ac_try\"") >&5 + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 (eval $ac_try) 2>&5 ac_status=$? - echo "$as_me:7157: \$? = $ac_status" >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then rsync_cv_REPLACE_INET_ATON=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 ) rsync_cv_REPLACE_INET_ATON=yes fi rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi fi -echo "$as_me:7169: result: $rsync_cv_REPLACE_INET_ATON" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_REPLACE_INET_ATON" >&5 echo "${ECHO_T}$rsync_cv_REPLACE_INET_ATON" >&6 if test x"$rsync_cv_REPLACE_INET_ATON" = x"yes"; then -cat >>confdefs.h <<\EOF +cat >>confdefs.h <<\_ACEOF #define REPLACE_INET_ATON 1 -EOF +_ACEOF fi # # The following test was mostly taken from the tcl/tk plus patches # -echo "$as_me:7182: checking whether -c -o works" >&5 +echo "$as_me:$LINENO: checking whether -c -o works" >&5 echo $ECHO_N "checking whether -c -o works... $ECHO_C" >&6 if test "${rsync_cv_DASHC_WORKS_WITH_DASHO+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -7198,7 +8842,7 @@ rm -rf conftest* fi -echo "$as_me:7201: result: $rsync_cv_DASHC_WORKS_WITH_DASHO" >&5 +echo "$as_me:$LINENO: result: $rsync_cv_DASHC_WORKS_WITH_DASHO" >&5 echo "${ECHO_T}$rsync_cv_DASHC_WORKS_WITH_DASHO" >&6 if test x"$rsync_cv_DASHC_WORKS_WITH_DASHO" = x"yes"; then OBJ_SAVE="#" @@ -7210,6 +8854,11 @@ CC_SHOBJ_FLAG="" fi + + + + + ac_config_files="$ac_config_files Makefile lib/dummy zlib/dummy popt/dummy shconfig" cat >confcache <<\_ACEOF @@ -7288,25 +8937,29 @@ 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:7294: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL -# Generated automatically by configure. +# Generated by $as_me. # 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 @@ -7315,8 +8968,167 @@ 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=`echo "$0" |sed 's,.*[\\/],,'` +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 if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr @@ -7344,22 +9156,12 @@ as_executable_p="test -f" -# Support unset when possible. -if (FOO=FOO; unset FOO) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi +# 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" -# 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. @@ -7368,10 +9170,34 @@ IFS=" $as_nl" # CDPATH. -$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=:; export CDPATH; } +$as_unset CDPATH || test "${CDPATH+set}" != set || { CDPATH=$PATH_SEPARATOR; 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. @@ -7391,7 +9217,7 @@ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS fi -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF ac_cs_usage="\ \`$as_me' instantiates files from templates according to the @@ -7415,12 +9241,12 @@ $config_headers Report bugs to ." -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.52, +configured by $0, generated by GNU Autoconf 2.53, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001 @@ -7429,9 +9255,9 @@ gives unlimited permission to copy, distribute and modify it." srcdir=$srcdir INSTALL="$INSTALL" -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # If no file are specified by the user, then we need to provide default # value. By we need to know if files were specified by the user. ac_need_defaults=: @@ -7453,18 +9279,18 @@ case $1 in # Handling of the options. -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) echo "running $SHELL $0 " $ac_configure_args " --no-create --no-recursion" exec $SHELL $0 $ac_configure_args --no-create --no-recursion ;; -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF --version | --vers* | -V ) echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:7467: error: ambiguous option: $1 + { { echo "$as_me:$LINENO: 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;} @@ -7483,7 +9309,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:7486: error: unrecognized option: $1 + -*) { { echo "$as_me:$LINENO: 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;} @@ -7495,25 +9321,13 @@ shift done -exec 5>>config.log -cat >&5 << _ACEOF +_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 <<\EOF + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case "$ac_config_target" in @@ -7524,7 +9338,7 @@ "popt/dummy" ) CONFIG_FILES="$CONFIG_FILES popt/dummy" ;; "shconfig" ) CONFIG_FILES="$CONFIG_FILES shconfig" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; - *) { { echo "$as_me:7527: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -7561,9 +9375,9 @@ { (exit 1); exit 1; } } -EOF +_ACEOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF # # CONFIG_FILES section. @@ -7576,6 +9390,12 @@ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$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 @@ -7591,19 +9411,13 @@ 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,@RSYNC_VERSION@,$RSYNC_VERSION,;t t s,@build@,$build,;t t @@ -7637,9 +9451,9 @@ s,@BUILD_POPT@,$BUILD_POPT,;t t CEOF -EOF +_ACEOF - cat >>$CONFIG_STATUS <<\EOF + cat >>$CONFIG_STATUS <<\_ACEOF # 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 @@ -7678,8 +9492,8 @@ fi fi # test -n "$CONFIG_FILES" -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF 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 @@ -7693,7 +9507,8 @@ esac # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ @@ -7704,8 +9519,7 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in + { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac @@ -7716,48 +9530,68 @@ ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_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; }; } ;; esac done; } - 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 + ac_builddir=. - 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 ;; +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 + +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 ;; *) # Relative path. - ac_srcdir=$ac_dots$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_dots$srcdir ;; - esac + 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` + case $INSTALL in [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_dots$INSTALL ;; + *) ac_INSTALL=$ac_top_builddir$INSTALL ;; esac if test x"$ac_file" != x-; then - { echo "$as_me:7752: creating $ac_file" >&5 + { echo "$as_me:$LINENO: 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 automatically by config.status. */ - configure_input="Generated automatically from `echo $ac_file_in | - sed 's,.*/,,'` by configure." + # /* 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." # First look for the input files in the build tree, otherwise in the # src tree. @@ -7767,7 +9601,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7770: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7780,23 +9614,29 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:7783: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: 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; } -EOF -cat >>$CONFIG_STATUS <>$CONFIG_STATUS <<_ACEOF sed "$ac_vpsub $extrasub -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF :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 @@ -7808,8 +9648,8 @@ fi done -EOF -cat >>$CONFIG_STATUS <<\EOF +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF # # CONFIG_HEADER section. @@ -7841,7 +9681,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:7844: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -7852,7 +9692,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:7855: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -7865,7 +9705,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:7868: error: cannot find input file: $f" >&5 + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -7874,7 +9714,7 @@ # Remove the trailing spaces. sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -EOF +_ACEOF # Transform confdefs.h into two sed scripts, `conftest.defines' and # `conftest.undefs', that substitutes the proper values into @@ -7890,16 +9730,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 <<\EOF +cat >confdef2sed.sed <<\_ACEOF s/[\\&,]/\\&/g s,[\\$`],\\&,g t clear : clear -s,^[ ]*#[ ]*define[ ][ ]*\(\([^ (][^ (]*\)([^)]*)\)[ ]*\(.*\)$,${ac_dA}\2${ac_dB}\1${ac_dC}\3${ac_dD},gp +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp t end s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp : end -EOF +_ACEOF # 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. @@ -7910,9 +9750,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 <<\EOF +cat >>conftest.undefs <<\_ACEOF s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -EOF +_ACEOF # 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). @@ -7969,23 +9809,24 @@ done rm -f conftest.undefs -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF # 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 automatically by config.status. */ + # /* config.h. Generated by config.status. */ if test x"$ac_file" = x-; then - echo "/* Generated automatically by configure. */" >$tmp/config.h + echo "/* Generated by configure. */" >$tmp/config.h else - echo "/* $ac_file. Generated automatically by configure. */" >$tmp/config.h + echo "/* $ac_file. Generated 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:7985: $ac_file is unchanged" >&5 + { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else - ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + ac_dir=`(dirname "$ac_file") 2>/dev/null || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ X"$ac_file" : 'X\(/\)' \| \ @@ -7996,8 +9837,7 @@ /^X\(\/\/\)$/{ s//\1/; q; } /^X\(\/\).*/{ s//\1/; q; } s/.*/./; q'` - if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then - { case "$ac_dir" in + { case "$ac_dir" in [\\/]* | ?:[\\/]* ) as_incr_dir=;; *) as_incr_dir=.;; esac @@ -8008,12 +9848,15 @@ ?:) as_incr_dir=$as_mkdir_dir ;; *) as_incr_dir=$as_incr_dir/$as_mkdir_dir - test -d "$as_incr_dir" || mkdir "$as_incr_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; }; } ;; esac done; } - fi rm -f $ac_file mv $tmp/config.h $ac_file fi @@ -8022,15 +9865,16 @@ rm -f $tmp/config.h fi done -EOF +_ACEOF -cat >>$CONFIG_STATUS <<\EOF +cat >>$CONFIG_STATUS <<\_ACEOF { (exit 0); exit 0; } -EOF +_ACEOF 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 @@ -8049,9 +9893,10 @@ $ac_cs_success || { (exit 1); exit 1; } fi -echo "$as_me:8052: result: " >&5 + +echo "$as_me:$LINENO: result: " >&5 echo "${ECHO_T}" >&6 -echo "$as_me:8054: result: rsync ${RSYNC_VERSION} configuration successful" >&5 +echo "$as_me:$LINENO: result: rsync ${RSYNC_VERSION} configuration successful" >&5 echo "${ECHO_T} rsync ${RSYNC_VERSION} configuration successful" >&6 -echo "$as_me:8056: result: " >&5 +echo "$as_me:$LINENO: result: " >&5 echo "${ECHO_T}" >&6 diff -uNr --minimal rsync-2.5.4/configure.in rsync-2.5.5/configure.in --- rsync-2.5.4/configure.in Wed Mar 13 11:03:34 2002 +++ rsync-2.5.5/configure.in Tue Apr 2 11:41:59 2002 @@ -5,7 +5,7 @@ AC_CONFIG_HEADER(config.h) AC_PREREQ(2.52) -RSYNC_VERSION=2.5.4 +RSYNC_VERSION=2.5.5 AC_SUBST(RSYNC_VERSION) AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION]) @@ -62,6 +62,17 @@ if test x"$enable_profile" = xyes then CFLAGS="$CFLAGS -pg" +fi + + +# Specifically, this turns on panic_action handling. +AC_ARG_ENABLE(maintainer-mode, + AC_HELP_STRING([--enable-maintainer-mode], + [turn on extra debug features], + [], [])) +if test x"$enable_maintainer_mode" = xyes +then + CFLAGS="$CFLAGS -DMAINTAINER_MODE" fi diff -uNr --minimal rsync-2.5.4/doc/.cvsignore rsync-2.5.5/doc/.cvsignore --- rsync-2.5.4/doc/.cvsignore Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/doc/.cvsignore Mon Mar 25 13:58:59 2002 @@ -0,0 +1,2 @@ +rsync.pdf +rsync.ps diff -uNr --minimal rsync-2.5.4/doc/rsync.sgml rsync-2.5.5/doc/rsync.sgml --- rsync-2.5.4/doc/rsync.sgml Mon Mar 11 11:58:36 2002 +++ rsync-2.5.5/doc/rsync.sgml Fri Mar 22 17:02:28 2002 @@ -253,10 +253,27 @@ + + + + Why is rsync so much bigger when I build it with + gcc? + + + + + On gcc, rsync builds by default with debug symbols + included. If you strip both executables, they should end + up about the same size. (Use make + install-strip.) + + + + - Is rsync useful for a single large file like an ISO image? + Is rsync useful for a single large file like an ISO image? @@ -319,12 +336,16 @@ This answer, formatted with "real" bullets, can be found at: -[4]http://twiki.org/cgi-bin/view/Wikilearn/RsyncingALargeFileFAQ* - Note: I modified this on Oct. 9. 2001 -- I marked the changes with asterisks. The only deletion - without a corresponding correction was the deletion of an "(IIRC)". - 2001-Oct-09 7:47am rhkramerATfastDOTnet + + + + Other Resources + + + diff -uNr --minimal rsync-2.5.4/flist.c rsync-2.5.5/flist.c --- rsync-2.5.4/flist.c Thu Feb 14 05:30:27 2002 +++ rsync-2.5.5/flist.c Fri Mar 15 08:20:20 2002 @@ -101,12 +101,13 @@ { if (do_progress) { /* This overwrites the progress line */ - rprintf(FINFO, "%d files to consider\n", flist->count); - } else + rprintf(FINFO, "%d file%sto consider\n", + flist->count, flist->count == 1 ? " " : "s "); + } else { rprintf(FINFO, "done\n"); + } } - void show_flist_stats(void) { /* Nothing yet */ @@ -987,8 +988,9 @@ send_file_entry(NULL, f, 0); } - if (show_filelist_p()) + if (show_filelist_p() && f != -1) { finish_filelist_progress(flist); + } clean_flist(flist, 0); diff -uNr --minimal rsync-2.5.4/generator.c rsync-2.5.5/generator.c --- rsync-2.5.4/generator.c Fri Feb 8 03:36:12 2002 +++ rsync-2.5.5/generator.c Mon Mar 25 16:54:31 2002 @@ -32,7 +32,6 @@ extern int preserve_hard_links; extern int update_only; extern int opt_ignore_existing; -extern int whole_file; extern int block_size; extern int csum_length; extern int ignore_times; @@ -127,6 +126,37 @@ } } + +/** + * Perhaps we want to just send an empty checksum set for this file, + * which will force the whole thing to be literally transferred. + * + * When do we do this? If the user's explicitly said they + * want the whole thing, or if { they haven't explicitly + * requested a delta, and it's local but not batch mode.} + * + * Whew. */ +static BOOL disable_deltas_p(void) +{ + extern int whole_file, no_whole_file; + extern int local_server; + extern int write_batch; + + assert(whole_file == 0 || whole_file == 1); + + /* whole_file and no_whole_file are never both on at the same time */ + + if (whole_file) + return True; + else if (no_whole_file) + return False; + else if (write_batch) + return False; + else + return local_server; +} + + /* generate a stream of signatures/checksums that describe a buffer @@ -332,7 +362,7 @@ if (preserve_hard_links && check_hard_link(file)) { if (verbose > 1) - rprintf(FINFO, "\"%s\" is a hard link\n",f_name(file)); + rprintf(FINFO, "recv_generator: \"%s\" is a hard link\n",f_name(file)); return; } @@ -403,7 +433,7 @@ return; } - if (whole_file) { + if (disable_deltas_p()) { write_int(f_out,i); send_sums(NULL,f_out); return; diff -uNr --minimal rsync-2.5.4/getgroups.c rsync-2.5.5/getgroups.c --- rsync-2.5.4/getgroups.c Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/getgroups.c Mon Mar 25 14:18:36 2002 @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2002 by Martin Pool + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/** + * @file getgroups.c + * + * Print out the gids of all groups for the current user. This is + * like `id -G` on Linux, but it's too hard to find a portable + * equivalent. + **/ + +#include "rsync.h" + +#ifndef NGROUPS +/* It ought to be defined, but just in case. */ +# define NGROUPS 32 +#endif + +int main(int argc, char *argv[]) +{ + int n, i; + gid_t list[NGROUPS]; + + if ((n = getgroups(NGROUPS, list)) == -1) { + perror("getgroups"); + return 1; + } + + for (i = 0; i < n; i++) + printf("%u ", list[i]); + printf("\n"); + + return 0; +} diff -uNr --minimal rsync-2.5.4/hlink.c rsync-2.5.5/hlink.c --- rsync-2.5.4/hlink.c Wed Jan 23 18:42:30 2002 +++ rsync-2.5.5/hlink.c Mon Mar 25 18:07:03 2002 @@ -97,14 +97,21 @@ low = mid + 1; } + /* XXX: To me this looks kind of dodgy -- why do we use [low] + * here and [low-1] below? -- mbp */ if (hlink_compare(&hlink_list[low], file) != 0) return 0; if (low > 0 && S_ISREG(hlink_list[low - 1].mode) && file->dev == hlink_list[low - 1].dev && - file->inode == hlink_list[low - 1].inode) + file->inode == hlink_list[low - 1].inode) { + if (verbose >= 2) { + rprintf(FINFO, "check_hard_link: \"%s\" is a hard link to file %d, \"%s\"\n", + f_name(file), low-1, f_name(&hlink_list[low-1])); + } return 1; + } #endif return 0; diff -uNr --minimal rsync-2.5.4/io.c rsync-2.5.5/io.c --- rsync-2.5.4/io.c Tue Feb 19 12:41:20 2002 +++ rsync-2.5.5/io.c Fri Mar 22 16:14:44 2002 @@ -2,7 +2,7 @@ Copyright (C) 1996-2001 by Andrew Tridgell Copyright (C) Paul Mackerras 1996 - Copyright (C) 2001 by Martin Pool + Copyright (C) 2001, 2002 by Martin Pool This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,7 +20,6 @@ */ /** - * * @file io.c * * Socket and pipe IO utilities used in rsync. @@ -624,12 +623,19 @@ +/** + * Read a line of up to @p maxlen characters into @p buf. Does not + * contain a trailing newline or carriage return. + * + * @return 1 for success; 0 for io error or truncation. + **/ int read_line(int f, char *buf, size_t maxlen) { while (maxlen) { buf[0] = 0; read_buf(f, buf, 1); - if (buf[0] == 0) return 0; + if (buf[0] == 0) + return 0; if (buf[0] == '\n') { buf[0] = 0; break; diff -uNr --minimal rsync-2.5.4/loadparm.c rsync-2.5.5/loadparm.c --- rsync-2.5.4/loadparm.c Sun Dec 2 19:16:15 2001 +++ rsync-2.5.5/loadparm.c Mon Mar 25 15:04:23 2002 @@ -3,7 +3,7 @@ /* some fixes * - * Copyright (C) 2001 by Martin Pool + * Copyright (C) 2001, 2002 by Martin Pool */ /* @@ -48,6 +48,8 @@ * */ +/* TODO: Parameter to set debug level on server. */ + #include "rsync.h" #define PTR_DIFF(p1,p2) ((ptrdiff_t)(((char *)(p1)) - (char *)(p2))) #define strequal(a,b) (strcasecmp(a,b)==0) @@ -154,7 +156,16 @@ False, /* transfer logging */ False, /* ignore errors */ "nobody",/* uid */ + + /* TODO: This causes problems on Debian, where it is called + * "nogroup". Debian patch this in their version of the + * package, but it would be nice to be consistent. Possibly + * other systems are different again. + * + * What is the best behaviour? Perhaps always using (gid_t) + * -2? */ "nobody",/* gid */ + NULL, /* hosts allow */ NULL, /* hosts deny */ NULL, /* auth users */ diff -uNr --minimal rsync-2.5.4/main.c rsync-2.5.5/main.c --- rsync-2.5.4/main.c Sat Feb 23 11:17:50 2002 +++ rsync-2.5.5/main.c Wed Mar 27 16:10:44 2002 @@ -640,14 +640,14 @@ } -/* +/** * Start a client for either type of remote connection. Work out * whether the arguments request a remote shell or rsyncd connection, * and call the appropriate connection function, then run_client. * * Calls either start_socket_client (for sockets) or do_cmd and * client_run (for ssh). - */ + **/ static int start_client(int argc, char *argv[]) { char *p; @@ -694,7 +694,7 @@ p = find_colon(argv[0]); if (p) { - if (p[1] == ':') { + if (p[1] == ':') { /* double colon */ *p = 0; return start_socket_client(argv[0], p+2, argc-1, argv+1); } @@ -716,12 +716,6 @@ p = find_colon(argv[argc-1]); if (!p) { local_server = 1; - /* - * disable "rsync algorithm" when both sides local, - * except when creating a batch update - */ - if (!write_batch && whole_file == -1) - whole_file = 1; } else if (p[1] == ':') { *p = 0; return start_socket_client(argv[argc-1], p+2, argc-1, argv); @@ -802,6 +796,39 @@ #endif } + +/** + * This routine catches signals and tries to send them to gdb. + * + * Because it's called from inside a signal handler it ought not to + * use too many library routines. + * + * @todo Perhaps use "screen -X" instead/as well, to help people + * debugging without easy access to X. Perhaps use an environment + * variable, or just call a script? + * + * @todo The /proc/ magic probably only works on Linux (and + * Solaris?) Can we be more portable? + **/ +#ifdef MAINTAINER_MODE +static RETSIGTYPE rsync_panic_handler(int UNUSED(whatsig)) +{ + char cmd_buf[300]; + int ret; + sprintf(cmd_buf, + "xterm -display :0 -T Panic -n Panic " + "-e gdb /proc/%d/exe %d", + getpid(), getpid()); + + /* Unless we failed to execute gdb, we allow the process to + * continue. I'm not sure if that's right. */ + ret = system(cmd_buf); + if (ret) + _exit(ret); +} +#endif + + int main(int argc,char *argv[]) { extern int am_root; @@ -820,6 +847,12 @@ signal(SIGUSR1, sigusr1_handler); signal(SIGUSR2, sigusr2_handler); signal(SIGCHLD, sigchld_handler); +#ifdef MAINTAINER_MODE + signal(SIGSEGV, rsync_panic_handler); + signal(SIGFPE, rsync_panic_handler); + signal(SIGABRT, rsync_panic_handler); + signal(SIGBUS, rsync_panic_handler); +#endif /* def MAINTAINER_MODE */ starttime = time(NULL); am_root = (getuid() == 0); @@ -887,8 +920,10 @@ ret = start_client(argc, argv); if (ret == -1) - exit_cleanup(RERR_STARTCLIENT); + exit_cleanup(RERR_STARTCLIENT); else - exit_cleanup(ret); - return ret; + exit_cleanup(ret); + + exit(ret); + /* NOTREACHED */ } diff -uNr --minimal rsync-2.5.4/options.c rsync-2.5.5/options.c --- rsync-2.5.4/options.c Thu Feb 28 09:49:57 2002 +++ rsync-2.5.5/options.c Wed Mar 20 07:16:42 2002 @@ -22,7 +22,20 @@ #include "popt.h" int make_backups = 0; -int whole_file = -1; + +/** + * Should we send the whole file as literal data rather than trying to + * create an incremental diff? This is on by default when both source + * and destination are local and we're not doing a batch delta, + * because there it's no cheaper to read the whole basis file than to + * just rewrite it. + * + * If both are 0, then look at whether we're local or remote and go by + * that. + **/ +int whole_file = 0; +int no_whole_file = 0; + int copy_links = 0; int preserve_links = 0; int preserve_hard_links = 0; @@ -146,20 +159,28 @@ "Copyright (C) 1996-2002 by Andrew Tridgell and others\n"); rprintf(f, "\n"); rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, " - "%shard links, %ssymlinks, batchfiles, %sIPv6,\n", + "%shard links, %ssymlinks, batchfiles, \n", (int) (sizeof(OFF_T) * 8), - got_socketpair, hardlinks, links, ipv6); + got_socketpair, hardlinks, links); /* Note that this field may not have type ino_t. It depends * on the complicated interaction between largefile feature * macros. */ - rprintf(f, " %d-bit system inums, %d-bit internal inums\n", + rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n", + ipv6, (int) (sizeof(dumstat->st_ino) * 8), (int) (sizeof(INO64_T) * 8)); #ifdef NO_INT64 rprintf(f, "WARNING: no 64-bit integers on this platform!\n"); #endif + + rprintf(f, +"\n" +"rsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n" +"are welcome to redistribute it under certain conditions. See the GNU\n" +"General Public Licence for details.\n" + ); } @@ -167,7 +188,7 @@ { print_rsync_version(F); - rprintf(F,"rsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); + rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n"); rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n"); rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC DEST\n"); @@ -265,86 +286,86 @@ OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO, - OPT_NO_BLOCKING_IO, OPT_NO_WHOLE_FILE, + OPT_NO_BLOCKING_IO, OPT_WHOLE_FILE, OPT_NO_WHOLE_FILE, OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING}; static struct poptOption long_options[] = { /* longName, shortName, argInfo, argPtr, value, descrip, argDesc */ - {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION}, - {"suffix", 0, POPT_ARG_STRING, &backup_suffix}, - {"rsync-path", 0, POPT_ARG_STRING, &rsync_path}, - {"password-file", 0, POPT_ARG_STRING, &password_file}, - {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times}, - {"size-only", 0, POPT_ARG_NONE, &size_only}, - {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW}, - {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system}, - {"delete", 0, POPT_ARG_NONE, &delete_mode}, - {"existing", 0, POPT_ARG_NONE, &only_existing}, - {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing}, - {"delete-after", 0, POPT_ARG_NONE, &delete_after}, - {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED}, - {"force", 0, POPT_ARG_NONE, &force_delete}, - {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids}, - {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE}, - {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE}, - {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM}, - {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM}, - {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks}, - {"help", 'h', POPT_ARG_NONE, 0, 'h'}, - {"backup", 'b', POPT_ARG_NONE, &make_backups}, - {"dry-run", 'n', POPT_ARG_NONE, &dry_run}, - {"sparse", 'S', POPT_ARG_NONE, &sparse_files}, - {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude}, - {"update", 'u', POPT_ARG_NONE, &update_only}, - {"links", 'l', POPT_ARG_NONE, &preserve_links}, - {"copy-links", 'L', POPT_ARG_NONE, ©_links}, - {"whole-file", 'W', POPT_ARG_NONE, &whole_file}, - {"no-whole-file", 0, POPT_ARG_NONE, 0, OPT_NO_WHOLE_FILE}, - {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links}, - {"perms", 'p', POPT_ARG_NONE, &preserve_perms}, - {"owner", 'o', POPT_ARG_NONE, &preserve_uid}, - {"group", 'g', POPT_ARG_NONE, &preserve_gid}, - {"devices", 'D', POPT_ARG_NONE, &preserve_devices}, - {"times", 't', POPT_ARG_NONE, &preserve_times}, - {"checksum", 'c', POPT_ARG_NONE, &always_checksum}, - {"verbose", 'v', POPT_ARG_NONE, 0, 'v'}, - {"quiet", 'q', POPT_ARG_NONE, 0, 'q'}, - {"archive", 'a', POPT_ARG_NONE, 0, 'a'}, - {"server", 0, POPT_ARG_NONE, &am_server}, - {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER}, - {"recursive", 'r', POPT_ARG_NONE, &recurse}, - {"relative", 'R', POPT_ARG_NONE, &relative_paths}, - {"rsh", 'e', POPT_ARG_STRING, &shell_cmd}, - {"block-size", 'B', POPT_ARG_INT, &block_size}, - {"max-delete", 0, POPT_ARG_INT, &max_delete}, - {"timeout", 0, POPT_ARG_INT, &io_timeout}, - {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir}, - {"compare-dest", 0, POPT_ARG_STRING, &compare_dest}, + {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0}, + {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 }, + {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 }, + {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 }, + {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times , 0, 0, 0 }, + {"size-only", 0, POPT_ARG_NONE, &size_only , 0, 0, 0 }, + {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 }, + {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system , 0, 0, 0 }, + {"delete", 0, POPT_ARG_NONE, &delete_mode , 0, 0, 0 }, + {"existing", 0, POPT_ARG_NONE, &only_existing , 0, 0, 0 }, + {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing , 0, 0, 0 }, + {"delete-after", 0, POPT_ARG_NONE, &delete_after , 0, 0, 0 }, + {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 }, + {"force", 0, POPT_ARG_NONE, &force_delete , 0, 0, 0 }, + {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids , 0, 0, 0 }, + {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 }, + {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 }, + {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 }, + {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 }, + {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks , 0, 0, 0 }, + {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 }, + {"backup", 'b', POPT_ARG_NONE, &make_backups , 0, 0, 0 }, + {"dry-run", 'n', POPT_ARG_NONE, &dry_run , 0, 0, 0 }, + {"sparse", 'S', POPT_ARG_NONE, &sparse_files , 0, 0, 0 }, + {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude , 0, 0, 0 }, + {"update", 'u', POPT_ARG_NONE, &update_only , 0, 0, 0 }, + {"links", 'l', POPT_ARG_NONE, &preserve_links , 0, 0, 0 }, + {"copy-links", 'L', POPT_ARG_NONE, ©_links , 0, 0, 0 }, + {"whole-file", 'W', POPT_ARG_NONE, 0, OPT_WHOLE_FILE, 0, 0 }, + {"no-whole-file", 0, POPT_ARG_NONE, 0, OPT_NO_WHOLE_FILE, 0, 0 }, + {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links , 0, 0, 0 }, + {"perms", 'p', POPT_ARG_NONE, &preserve_perms , 0, 0, 0 }, + {"owner", 'o', POPT_ARG_NONE, &preserve_uid , 0, 0, 0 }, + {"group", 'g', POPT_ARG_NONE, &preserve_gid , 0, 0, 0 }, + {"devices", 'D', POPT_ARG_NONE, &preserve_devices , 0, 0, 0 }, + {"times", 't', POPT_ARG_NONE, &preserve_times , 0, 0, 0 }, + {"checksum", 'c', POPT_ARG_NONE, &always_checksum , 0, 0, 0 }, + {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 }, + {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 }, + {"archive", 'a', POPT_ARG_NONE, 0, 'a', 0, 0 }, + {"server", 0, POPT_ARG_NONE, &am_server , 0, 0, 0 }, + {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 }, + {"recursive", 'r', POPT_ARG_NONE, &recurse , 0, 0, 0 }, + {"relative", 'R', POPT_ARG_NONE, &relative_paths , 0, 0, 0 }, + {"rsh", 'e', POPT_ARG_STRING, &shell_cmd , 0, 0, 0 }, + {"block-size", 'B', POPT_ARG_INT, &block_size , 0, 0, 0 }, + {"max-delete", 0, POPT_ARG_INT, &max_delete , 0, 0, 0 }, + {"timeout", 0, POPT_ARG_INT, &io_timeout , 0, 0, 0 }, + {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir , 0, 0, 0 }, + {"compare-dest", 0, POPT_ARG_STRING, &compare_dest , 0, 0, 0 }, /* TODO: Should this take an optional int giving the compression level? */ - {"compress", 'z', POPT_ARG_NONE, &do_compression}, - {"daemon", 0, POPT_ARG_NONE, &am_daemon}, - {"no-detach", 0, POPT_ARG_NONE, &no_detach}, - {"stats", 0, POPT_ARG_NONE, &do_stats}, - {"progress", 0, POPT_ARG_NONE, &do_progress}, - {"partial", 0, POPT_ARG_NONE, &keep_partial}, - {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors}, - {"blocking-io", 0, POPT_ARG_NONE, &blocking_io}, - {"no-blocking-io", 0, POPT_ARG_NONE, 0, OPT_NO_BLOCKING_IO}, - {0, 'P', POPT_ARG_NONE, 0, 'P'}, - {"config", 0, POPT_ARG_STRING, &config_file}, - {"port", 0, POPT_ARG_INT, &rsync_port}, - {"log-format", 0, POPT_ARG_STRING, &log_format}, - {"bwlimit", 0, POPT_ARG_INT, &bwlimit}, - {"address", 0, POPT_ARG_STRING, &bind_address, 0}, - {"backup-dir", 0, POPT_ARG_STRING, &backup_dir}, - {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links}, - {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH}, - {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH}, + {"compress", 'z', POPT_ARG_NONE, &do_compression , 0, 0, 0 }, + {"daemon", 0, POPT_ARG_NONE, &am_daemon , 0, 0, 0 }, + {"no-detach", 0, POPT_ARG_NONE, &no_detach , 0, 0, 0 }, + {"stats", 0, POPT_ARG_NONE, &do_stats , 0, 0, 0 }, + {"progress", 0, POPT_ARG_NONE, &do_progress , 0, 0, 0 }, + {"partial", 0, POPT_ARG_NONE, &keep_partial , 0, 0, 0 }, + {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors , 0, 0, 0 }, + {"blocking-io", 0, POPT_ARG_NONE, &blocking_io , 0, 0, 0 }, + {"no-blocking-io", 0, POPT_ARG_NONE, 0, OPT_NO_BLOCKING_IO, 0, 0 }, + {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 }, + {"config", 0, POPT_ARG_STRING, &config_file , 0, 0, 0 }, + {"port", 0, POPT_ARG_INT, &rsync_port , 0, 0, 0 }, + {"log-format", 0, POPT_ARG_STRING, &log_format , 0, 0, 0 }, + {"bwlimit", 0, POPT_ARG_INT, &bwlimit , 0, 0, 0 }, + {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 }, + {"backup-dir", 0, POPT_ARG_STRING, &backup_dir , 0, 0, 0 }, + {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links , 0, 0, 0 }, + {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 }, + {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 }, #ifdef INET6 - {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET }, - {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 }, + {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET , 0, 0 }, + {0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6 , 0, 0 }, #endif - {0,0,0,0} + {0,0,0,0, 0, 0, 0} }; @@ -463,7 +484,13 @@ add_exclude_file(poptGetOptArg(pc), 1, 1); break; + case OPT_WHOLE_FILE: + whole_file = 1; + no_whole_file = 0; + break; + case OPT_NO_WHOLE_FILE: + no_whole_file = 1; whole_file = 0; break; @@ -590,8 +617,6 @@ int i, x; - if (whole_file == -1) - whole_file = 0; if (blocking_io == -1) blocking_io = 0; @@ -616,8 +641,14 @@ argstr[x++] = 'l'; if (copy_links) argstr[x++] = 'L'; + + assert(whole_file == 0 || whole_file == 1); if (whole_file) argstr[x++] = 'W'; + /* We don't need to send --no-whole-file, because it's the + * default for remote transfers, and in any case old versions + * of rsync will not understand it. */ + if (preserve_hard_links) argstr[x++] = 'H'; if (preserve_uid) @@ -757,7 +788,6 @@ args[ac++] = "--compare-dest"; args[ac++] = compare_dest; } - *argc = ac; } diff -uNr --minimal rsync-2.5.4/packaging/redhat/7.1/rsync.spec rsync-2.5.5/packaging/redhat/7.1/rsync.spec --- rsync-2.5.4/packaging/redhat/7.1/rsync.spec Thu Jan 3 18:11:11 2002 +++ rsync-2.5.5/packaging/redhat/7.1/rsync.spec Tue Mar 26 16:15:09 2002 @@ -1,10 +1,10 @@ Summary: Program for efficient remote updates of files. Name: rsync -Version: 2.5.1 +Version: 2.5.4 Release: 1 Copyright: GPL Group: Applications/Networking -Source: ftp://samba.anu.edu.au/pub/rsync/rsync-2.5.1.tar.gz +Source: ftp://samba.anu.edu.au/pub/rsync/rsync-%{version}.tar.gz URL: http://samba.anu.edu.au/rsync/ Packager: Andrew Tridgell BuildRoot: /tmp/rsync @@ -21,6 +21,9 @@ this package. %changelog +* Mon Sep 11 2000 John H Terpstra + Changed target paths to be Linux Standards Base compliant + * Mon Jan 25 1999 Stefan Hornburg quoted RPM_OPT_FLAGS for the sake of robustness * Mon May 18 1998 Andrew Tridgell @@ -59,23 +62,23 @@ %setup %build -./configure --prefix=/usr +./configure --prefix=/usr --mandir=/usr/share/man make CFLAGS="$RPM_OPT_FLAGS" strip rsync %install -mkdir -p $RPM_BUILD_ROOT/usr/{bin,man/{man1,man5}} +mkdir -p $RPM_BUILD_ROOT/usr/{bin,share/man/{man1,man5}} install -m755 rsync $RPM_BUILD_ROOT/usr/bin -install -m644 rsync.1* $RPM_BUILD_ROOT/usr/man/man1 -install -m644 rsyncd.conf.5* $RPM_BUILD_ROOT/usr/man/man5 +install -m644 rsync.1 $RPM_BUILD_ROOT/usr/share/man/man1 +install -m644 rsyncd.conf.5 $RPM_BUILD_ROOT/usr/share/man/man5 %clean rm -rf $RPM_BUILD_ROOT %files %attr(-,root,root) /usr/bin/rsync -%attr(-,root,root) /usr/man/man1/rsync.1* -%attr(-,root,root) /usr/man/man5/rsyncd.conf.5* +%attr(-,root,root) /usr/share/man/man1/rsync.1* +%attr(-,root,root) /usr/share/man/man5/rsyncd.conf.5* %attr(-,root,root) %doc tech_report.tex %attr(-,root,root) %doc README %attr(-,root,root) %doc COPYING diff -uNr --minimal rsync-2.5.4/patches/jjb-date-only.diff rsync-2.5.5/patches/jjb-date-only.diff --- rsync-2.5.4/patches/jjb-date-only.diff Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/patches/jjb-date-only.diff Tue Mar 26 11:48:59 2002 @@ -0,0 +1,69 @@ +Greetings, and thanks for all of your work on the wonderful rsync! + +I recently had the need to transfer files only with different mod +dates (and to *not* transfer them based on file size differences). +This is because I'm backing up files remotely on an untrusted machine, +so I'm encrypting them with gpg before transfer. I discovered that +rsync didn't already have a --date-only flag, so I added one and am +enclosing the diffs in case you (as I hope) decide to include this +option in future releases. + +Again, thanks! + +Best Regards, +Jeremy Bornstein +diff rsync-2.5.4/README rsync-2.5.4-patched/README +70a71 +> --date-only only use modification date when determining if a file should be transferred +Common subdirectories: rsync-2.5.4/doc and rsync-2.5.4-patched/doc +diff rsync-2.5.4/generator.c rsync-2.5.4-patched/generator.c +39a40 +> extern int date_only; +50a52,56 +> if (date_only) { +> return (cmp_modtime(st->st_mtime,file->modtime) == 0); +> } +> +> +Common subdirectories: rsync-2.5.4/lib and rsync-2.5.4-patched/lib +diff rsync-2.5.4/options.c rsync-2.5.4-patched/options.c +64a65 +> int date_only=0; +223a225 +> rprintf(F," --date-only only use modification date when determining if a file should be transferred\n"); +265c267 +< OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, +--- +> OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_DATE_ONLY, OPT_ADDRESS, +278a281 +> {"date-only", 0, POPT_ARG_NONE, &date_only}, +704a708,710 +> +> if (date_only) +> args[ac++] = "--date-only"; +Common subdirectories: rsync-2.5.4/packaging and rsync-2.5.4-patched/packaging +Common subdirectories: rsync-2.5.4/popt and rsync-2.5.4-patched/popt +diff rsync-2.5.4/rsync.1 rsync-2.5.4-patched/rsync.1 +289a290 +> --date-only only use modification date when determining if a file should be transferred +363a365,371 +> .IP +> .IP "\fB--date-only\fP" +> Normally rsync will skip any files that are +> already the same length and have the same time-stamp\&. With the +> --date-only option files will be skipped if they have the same timestamp, +> regardless of size\&. This may be useful when the remote files have passed +> through a size-changing filter, e.g. for encryption\&. +diff rsync-2.5.4/rsync.yo rsync-2.5.4-patched/rsync.yo +260a261 +> --date-only only use modification date when determining if a file should be transferred +326a328,333 +> +> dit(bf(--date-only)) Normally rsync will skip any files that are +> already the same length and have the same time-stamp. With the +> --date-only option files will be skipped if they have the same +> timestamp, regardless of size. This may be useful when the remote +> files have passed through a size-changing filter, e.g. for encryption. +Common subdirectories: rsync-2.5.4/testhelp and rsync-2.5.4-patched/testhelp +Common subdirectories: rsync-2.5.4/testsuite and rsync-2.5.4-patched/testsuite +Common subdirectories: rsync-2.5.4/zlib and rsync-2.5.4-patched/zlib diff -uNr --minimal rsync-2.5.4/patches/jw_rsync3.diff rsync-2.5.5/patches/jw_rsync3.diff --- rsync-2.5.4/patches/jw_rsync3.diff Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/patches/jw_rsync3.diff Fri Mar 22 15:50:20 2002 @@ -0,0 +1,199 @@ +Please CC me. I'm not subscribed. + +Attached is a patch against 2.5.4pre1 CVS current to add the +--link-dest option so rsync will create hardlinks for +unchanged regular files to a directory on the destination. +This is like --compare-dest except that the result is not a +sparse tree. + +Also included is extension to --(ex|in)clude-from to allow - +for stdin. + +Could one of the maintainers please add this to the +mainline? + +Thanks to Dave Dykstra for feedback on this. + +-- +________________________________________________________________ + J.W. Schultz Pegasystems Technologies + email address: jw@pegasys.ws + + Remember Cernan and Schmitt +? options-merge.c +Index: exclude.c +=================================================================== +RCS file: /cvsroot/rsync/exclude.c,v +retrieving revision 1.42 +diff -u -r1.42 exclude.c +--- exclude.c 18 Feb 2002 19:10:28 -0000 1.42 ++++ exclude.c 21 Mar 2002 23:31:25 -0000 +@@ -219,8 +219,14 @@ + int fatal, int include) + { + struct exclude_struct **list=list1; +- FILE *f = fopen(fname,"r"); ++ FILE *f; + char line[MAXPATHLEN]; ++ ++ if (strcmp(fname, "-")) { ++ f = fopen(fname,"r"); ++ } else { ++ f = fdopen(0, "r"); ++ } + if (!f) { + if (fatal) { + rsyserr(FERROR, errno, +Index: generator.c +=================================================================== +RCS file: /cvsroot/rsync/generator.c,v +retrieving revision 1.37 +diff -u -r1.37 generator.c +--- generator.c 19 Mar 2002 20:16:42 -0000 1.37 ++++ generator.c 21 Mar 2002 23:31:26 -0000 +@@ -41,6 +41,7 @@ + extern int always_checksum; + extern int modify_window; + extern char *compare_dest; ++extern int link_dest; + + + /* choose whether to skip a particular file */ +@@ -50,6 +51,15 @@ + if (st->st_size != file->length) { + return 0; + } ++ if (link_dest) { ++ if((st->st_mode & ~_S_IFMT) != (file->mode & ~_S_IFMT)) { ++ return 0; ++ } ++ if (st->st_uid != file->uid || st->st_gid != file->gid) { ++ return 0; ++ } ++ } ++ + + /* if always checksum is set then we use the checksum instead + of the file time to determine whether to sync */ +@@ -382,6 +392,17 @@ + statret = -1; + if (statret == -1) + errno = saveerrno; ++#if HAVE_LINK ++ else if (link_dest) ++ if (do_link(fnamecmpbuf, fname) != 0) { ++ if (verbose > 0) ++ rprintf(FINFO,"link %s => %s : %s\n", ++ fnamecmpbuf, ++ fname, ++ strerror(errno)); ++ fnamecmp = fnamecmpbuf; ++ } ++#endif + else + fnamecmp = fnamecmpbuf; + } +Index: options.c +=================================================================== +RCS file: /cvsroot/rsync/options.c,v +retrieving revision 1.89 +diff -u -r1.89 options.c +--- options.c 19 Mar 2002 20:16:42 -0000 1.89 ++++ options.c 21 Mar 2002 23:31:27 -0000 +@@ -113,6 +113,7 @@ + char *rsync_path = RSYNC_PATH; + char *backup_dir = NULL; + int rsync_port = RSYNC_PORT; ++int link_dest = 0; + + int verbose = 0; + int quiet = 0; +@@ -282,7 +283,7 @@ + OPT_EXCLUDE_FROM, OPT_DELETE, OPT_DELETE_EXCLUDED, OPT_NUMERIC_IDS, + OPT_RSYNC_PATH, OPT_FORCE, OPT_TIMEOUT, OPT_DAEMON, OPT_CONFIG, OPT_PORT, + OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS, +- OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, ++ OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST, OPT_LINK_DEST, + OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS, + OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR, + OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO, +@@ -341,6 +342,7 @@ + {"timeout", 0, POPT_ARG_INT, &io_timeout , 0, 0, 0 }, + {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir , 0, 0, 0 }, + {"compare-dest", 0, POPT_ARG_STRING, &compare_dest , 0, 0, 0 }, ++ {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, + /* TODO: Should this take an optional int giving the compression level? */ + {"compress", 'z', POPT_ARG_NONE, &do_compression , 0, 0, 0 }, + {"daemon", 0, POPT_ARG_NONE, &am_daemon , 0, 0, 0 }, +@@ -562,6 +564,19 @@ + /* popt stores the filename in batch_prefix for us */ + read_batch = 1; + break; ++ case OPT_LINK_DEST: ++#if HAVE_LINK ++ compare_dest = poptGetOptArg(pc); ++ link_dest = 1; ++ break; ++#else ++ snprintf(err_buf,sizeof(err_buf), ++ "hard links are not supported on this %s\n", ++ am_server ? "server" : "client"); ++ rprintf(FERROR,"ERROR: hard links not supported on this platform\n"); ++ return 0; ++#endif ++ + + default: + /* FIXME: If --daemon is specified, then errors for later +@@ -785,7 +800,7 @@ + * and it may be an older version that doesn't know this + * option, so don't send it if client is the sender. + */ +- args[ac++] = "--compare-dest"; ++ args[ac++] = link_dest ? "--link-dest" : "--compare-dest"; + args[ac++] = compare_dest; + } + +Index: rsync.yo +=================================================================== +RCS file: /cvsroot/rsync/rsync.yo,v +retrieving revision 1.95 +diff -u -r1.95 rsync.yo +--- rsync.yo 6 Feb 2002 21:20:49 -0000 1.95 ++++ rsync.yo 21 Mar 2002 23:31:28 -0000 +@@ -261,6 +261,7 @@ + --modify-window=NUM Timestamp window (seconds) for file match (default=0) + -T --temp-dir=DIR create temporary files in directory DIR + --compare-dest=DIR also compare destination files relative to DIR ++ --link-dest=DIR create hardlinks to DIR for unchanged files + -P equivalent to --partial --progress + -z, --compress compress file data + --exclude=PATTERN exclude files matching PATTERN +@@ -531,6 +532,7 @@ + option, but instead it adds all exclude patterns listed in the file + FILE to the exclude list. Blank lines in FILE and lines starting with + ';' or '#' are ignored. ++If \fIFILE\fP is \fB-\fP the list will be read from standard input. + + dit(bf(--include=PATTERN)) This option tells rsync to not exclude the + specified pattern of filenames. This is useful as it allows you to +@@ -541,6 +543,7 @@ + + dit(bf(--include-from=FILE)) This specifies a list of include patterns + from a file. ++If \fIFILE\fP is \fB-\fP the list will be read from standard input. + + dit(bf(-C, --cvs-exclude)) This is a useful shorthand for excluding a + broad range of files that you often don't want to transfer between +@@ -595,6 +598,11 @@ + --partial because partially transferred files will remain in the new + temporary destination until they have a chance to be completed. If DIR is + a relative path, it is relative to the destination directory. ++ ++dit(bf(--link-dest=DIR)) This option behaves like \fB--compare-dest\fP but ++also will create hard links from \fIDIR\fP to the destination directory for ++unchanged files. Files with changed ownership or permissions will not be ++linked. + + dit(bf(-z, --compress)) With this option, rsync compresses any data from + the files that it sends to the destination machine. This diff -uNr --minimal rsync-2.5.4/patches/rsync_zoong_tru64.diff rsync-2.5.5/patches/rsync_zoong_tru64.diff --- rsync-2.5.4/patches/rsync_zoong_tru64.diff Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/patches/rsync_zoong_tru64.diff Tue Apr 2 11:35:42 2002 @@ -0,0 +1,220 @@ +Hi Eckert, + +On Thu, Mar 21, 2002 at 03:15:39PM -0500, Eckert, Robert D wrote: +> Greetings, here is the output of the 'configure' step and +> the compile step (using the Compaq cc compiler that comes +> with Tru64 V5.1A. The configure reported success and most of +> the compile steps cam through error/warning free except for +> the one that stumbled. Can someone help me out here? I am willing +> to provide a binary for Tru64 V5.1A if we can swat this bug. + +I had the same problem. I managed to have rsync compiled OK on my +Tru64 5.1 box with helps from couple of people from this list. +Try with the patch I attach here. +I am not a C programmer so you'd better check to make sure it is +correct. + +> We depend greatly on Rsync to keep a fresh backup of our +> 70gb storage system that is the backend of http://www.indiana.edu/, +> Indiana University's main web site to the Internet. + +I plan to do the same here instead of Tru64 vdump and vrestore +once I am sure backups by rsync is as reliable as vdump/vrestore. +Do you use rsync for root, usr partitions and and database files? +Have you had any problem with rsync so far? + +Cheers, +-- +Zoong Pham zpham@mercy.com.au +UNIX Systems Administrator Mercy Health and Aged Care Inc. + +To get my PGP public key, email me with the subject: +Request for Zoong Pham's PGP public key + + + + +diff -u -r rsync-2.5.4/batch.c rsync-2.5.4.new/batch.c +--- rsync-2.5.4/batch.c Thu Feb 7 08:20:48 2002 ++++ rsync-2.5.4.new/batch.c Fri Mar 22 09:24:01 2002 +@@ -405,7 +405,15 @@ + + /* FIXME: This will break if s->count is ever not exactly an int. */ + write_batch_csums_file(flist_entry, sizeof(int)); ++ if (s) { ++ write_batch_csums_file(&s->count, sizeof(int)); ++ } ++ else if (!s) { ++ write_batch_csums_file(&int_zero, sizeof(int)); ++ } ++ /* + write_batch_csums_file(s ? &s->count : &int_zero, sizeof(int)); ++ */ + + if (s) { + for (i = 0; i < s->count; i++) { +diff -u -r rsync-2.5.4/config.h.in rsync-2.5.4.new/config.h.in +--- rsync-2.5.4/config.h.in Thu Feb 28 10:15:55 2002 ++++ rsync-2.5.4.new/config.h.in Fri Mar 22 09:24:01 2002 +@@ -140,6 +140,9 @@ + /* Define if you have the `mknod' function. */ + #undef HAVE_MKNOD + ++/* Define if you have the `mkfifo' function. */ ++#undef HAVE_MKFIFO ++ + /* Define if you have the `mtrace' function. */ + #undef HAVE_MTRACE + +@@ -244,6 +247,9 @@ + + /* Define if you have the header file. */ + #undef HAVE_SYS_SOCKET_H ++ ++/* Define if you have the header file. */ ++#undef HAVE_SYS_UN_H + + /* Define if you have the header file. */ + #undef HAVE_SYS_STAT_H +diff -u -r rsync-2.5.4/configure rsync-2.5.4.new/configure +--- rsync-2.5.4/configure Wed Mar 13 11:03:50 2002 ++++ rsync-2.5.4.new/configure Fri Mar 22 09:24:01 2002 +@@ -3414,7 +3414,7 @@ + fi + done + +-for ac_header in sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h ++for ac_header in sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h sys/un.h + do + as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` + echo "$as_me:3420: checking for $ac_header" >&5 +@@ -6165,7 +6165,7 @@ + fi + rm -f conftest.data + +-for ac_func in waitpid wait4 getcwd strdup strerror chown chmod mknod ++for ac_func in waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo + do + as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` + echo "$as_me:6171: checking for $ac_func" >&5 +diff -u -r rsync-2.5.4/configure.in rsync-2.5.4.new/configure.in +--- rsync-2.5.4/configure.in Wed Mar 13 11:03:34 2002 ++++ rsync-2.5.4.new/configure.in Fri Mar 22 09:24:01 2002 +@@ -242,7 +242,7 @@ + AC_HEADER_SYS_WAIT + AC_CHECK_HEADERS(sys/fcntl.h sys/select.h fcntl.h sys/time.h sys/unistd.h unistd.h utime.h grp.h) + AC_CHECK_HEADERS(compat.h sys/param.h ctype.h sys/wait.h sys/ioctl.h) +-AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h) ++AC_CHECK_HEADERS(sys/filio.h string.h stdlib.h sys/socket.h sys/mode.h sys/un.h) + AC_CHECK_HEADERS(glob.h alloca.h mcheck.h sys/sysctl.h arpa/inet.h arpa/nameser.h) + AC_CHECK_HEADERS(netdb.h) + AC_CHECK_HEADERS(malloc.h) +@@ -315,7 +315,19 @@ + AC_CHECK_FUNCS(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) + AC_CHECK_FUNCS(inet_pton, , AC_LIBOBJ(lib/inet_pton)) + +-AC_CHECK_FUNCS(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo)) ++# Tru64 UNIX has getaddrinfo() but has it renamed in libc as ++# something else so we must include to get the ++# redefinition. ++AC_MSG_CHECKING([for getaddrinfo]) ++AC_TRY_LINK([#include ++#include ++#include ],[getaddrinfo(NULL, NULL, NULL, NULL);], ++ [AC_MSG_RESULT([yes]) ++ AC_DEFINE(HAVE_GETADDRINFO, 1, ++ [Define if you have the `getaddrinfo' function.])], ++ [AC_MSG_RESULT([no]) ++ AC_LIBOBJ(lib/getaddrinfo)]) ++ + AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo)) + + AC_CHECK_MEMBER([struct sockaddr.sa_len], +@@ -348,7 +360,7 @@ + dnl AC_FUNC_MEMCMP + + AC_FUNC_UTIME_NULL +-AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod) ++AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod mkfifo) + AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes strftime) + AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk) + AC_CHECK_FUNCS(strlcat strlcpy mtrace mallinfo setgroups) +diff -u -r rsync-2.5.4/lib/getaddrinfo.c rsync-2.5.4.new/lib/getaddrinfo.c +--- rsync-2.5.4/lib/getaddrinfo.c Fri Dec 14 16:33:12 2001 ++++ rsync-2.5.4.new/lib/getaddrinfo.c Fri Mar 22 09:24:10 2002 +@@ -41,6 +41,20 @@ + + #include + ++/****** Start Zoong added here */ ++ ++#define EAI_BADHINTS 12 ++#define EAI_PROTOCOL 13 ++#define EAI_MAX 14 ++ ++#define AI_PASSIVE 0x00000001 /* get address to use bind() */ ++#define AI_CANONNAME 0x00000002 /* fill ai_canonname */ ++#define AI_NUMERICHOST 0x00000004 /* prevent name resolution */ ++#define AI_MASK (AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST) ++ ++/****** End Zoong added here */ ++ ++ + #if defined(__KAME__) && defined(INET6) + # define FAITH + #endif +diff -u -r rsync-2.5.4/rsync.h rsync-2.5.4.new/rsync.h +--- rsync-2.5.4/rsync.h Sat Feb 23 11:17:50 2002 ++++ rsync-2.5.4.new/rsync.h Fri Mar 22 09:24:01 2002 +@@ -109,6 +109,11 @@ + #include + #endif + ++#ifdef HAVE_SYS_UN_H ++#define _SOCKADDR_LEN ++#include ++#endif ++ + #ifdef HAVE_STRING_H + #include + #endif +diff -u -r rsync-2.5.4/syscall.c rsync-2.5.4.new/syscall.c +--- rsync-2.5.4/syscall.c Tue Feb 19 09:44:23 2002 ++++ rsync-2.5.4.new/syscall.c Fri Mar 22 09:24:01 2002 +@@ -67,6 +67,36 @@ + { + if (dry_run) return 0; + CHECK_RO ++ ++#if HAVE_MKFIFO ++ if (S_ISFIFO(mode)) { ++ return mkfifo(pathname, mode); ++ } ++#endif ++ ++#if HAVE_SYS_UN_H ++ if (S_ISSOCK(mode)) { ++ int sock; ++ struct sockaddr_un saddr; ++ int len = strlen(pathname) + 1; /* include null */ ++ ++ saddr.sun_family = AF_UNIX; ++ strncpy(saddr.sun_path, pathname, sizeof(saddr.sun_path)); ++ saddr.sun_len = len > sizeof(saddr.sun_path) ? sizeof(saddr.sun_path): len; ++ ++ if ((sock = socket(PF_UNIX, SOCK_STREAM, 0)) < 0) { ++ return -1; ++ } ++ unlink(pathname); ++ if ((bind(sock, (struct sockaddr*)&saddr, sizeof(saddr))) < 0) { ++ return -1; ++ } ++ close(sock); ++ return do_chmod(pathname, mode); ++ } ++#endif ++ ++ + return mknod(pathname, mode, dev); + } + #endif diff -uNr --minimal rsync-2.5.4/popt/README.rsync rsync-2.5.5/popt/README.rsync --- rsync-2.5.4/popt/README.rsync Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/popt/README.rsync Mon Mar 25 20:42:39 2002 @@ -0,0 +1,5 @@ +Unlike zlib, this is a perfectly ordinary copy of libpopt. It's only +used on platforms that don't have a sufficiently up-to-date copy of +their own. If you build rsync on a platform which has popt, this +directory should not be used. (You can control that using +--with-included-popt.) diff -uNr --minimal rsync-2.5.4/proto.h rsync-2.5.5/proto.h --- rsync-2.5.4/proto.h Sat Feb 23 11:05:06 2002 +++ rsync-2.5.5/proto.h Mon Mar 25 14:51:17 2002 @@ -91,6 +91,7 @@ char *f_name(struct file_struct *f); void recv_generator(char *fname,struct file_list *flist,int i,int f_out); void generate_files(int f,struct file_list *flist,char *local_name,int f_recv); +int main(int argc, char *argv[]); void init_hard_links(struct file_list *flist); int check_hard_link(struct file_struct *file); void do_hard_links(void); @@ -205,6 +206,7 @@ int do_open(char *pathname, int flags, mode_t mode); int do_chmod(const char *path, mode_t mode); int do_rename(char *fname1, char *fname2); +void trim_trailing_slashes(char *name); int do_mkdir(char *fname, mode_t mode); int do_mkstemp(char *template, mode_t perms); int do_stat(const char *fname, STRUCT_STAT *st); @@ -219,6 +221,7 @@ int n,int toklen); int recv_token(int f,char **data); void see_token(char *data, int toklen); +int main(int argc, char **argv); void add_uid(uid_t uid); void add_gid(gid_t gid); void send_uid_list(int f); diff -uNr --minimal rsync-2.5.4/rsync.h rsync-2.5.5/rsync.h --- rsync-2.5.4/rsync.h Sat Feb 23 11:17:50 2002 +++ rsync-2.5.5/rsync.h Mon Mar 25 18:29:43 2002 @@ -217,6 +217,8 @@ #include #endif +#include + #define BOOL int @@ -564,19 +566,24 @@ /* handler for null strings in printf format */ #define NS(s) ((s)?(s):"") +#if !defined(__GNUC__) || defined(APPLE) +/* Apparently the OS X port of gcc gags on __attribute__. + * + * */ +#define __attribute__(x) + +#endif + + /* use magic gcc attributes to catch format errors */ void rprintf(enum logcode , const char *, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 2, 3))) -#endif + __attribute__((format (printf, 2, 3))) ; /* This is just like rprintf, but it also tries to print some * representation of the error code. Normally errcode = errno. */ void rsyserr(enum logcode, int, const char *, ...) -#ifdef __GNUC__ - __attribute__ ((format (printf, 3, 4))) -#endif + __attribute__((format (printf, 3, 4))) ; #ifdef REPLACE_INET_NTOA @@ -610,8 +617,4 @@ int isc_net_pton(int af, const char *src, void *dst); #endif -#ifdef __GNUC__ -# define UNUSED(x) x __attribute__((__unused__)) -#else -# define UNUSED(x) x -#endif /* ndef __GNUC__ */ +#define UNUSED(x) x __attribute__((__unused__)) diff -uNr --minimal rsync-2.5.4/runtests.sh rsync-2.5.5/runtests.sh --- rsync-2.5.4/runtests.sh Sat Feb 9 14:36:33 2002 +++ rsync-2.5.5/runtests.sh Tue Mar 26 12:25:48 2002 @@ -125,6 +125,9 @@ RUNSHFLAGS='-e' +# for Solaris +PATH="/usr/xpg4/bin/:$PATH" + if [ -n "$loglevel" ] && [ "$loglevel" -gt 8 ] then if set -x @@ -139,6 +142,20 @@ echo " rsync_bin=$rsync_bin" echo " srcdir=$srcdir" +testuser=`whoami || echo UNKNOWN` + +echo " testuser=$testuser" +echo " os=`uname -a`" + +# It must be "yes", not just nonnull +if test "x$preserve_scratch" = xyes +then + echo " preserve_scratch=yes" +else + echo " preserve_scratch=no" +fi + + if test ! -f $rsync_bin then echo "rsync_bin $rsync_bin is not a file" >&2 @@ -212,7 +229,8 @@ maybe_discard_scratch ;; 77) - echo "SKIP $testbase" + # backticks will fill the whole file onto one line, which is a feature + echo "SKIP $testbase (`cat \"$scratchdir/whyskipped\"`)" skipped=`expr $skipped + 1` maybe_discard_scratch ;; diff -uNr --minimal rsync-2.5.4/socket.c rsync-2.5.5/socket.c --- rsync-2.5.4/socket.c Sat Feb 23 12:00:33 2002 +++ rsync-2.5.5/socket.c Sat Mar 16 20:00:44 2002 @@ -122,12 +122,14 @@ for (r = bres_all; r; r = r->ai_next) { if (bind(s, r->ai_addr, r->ai_addrlen) == -1) continue; + freeaddrinfo(bres_all); return s; } /* no error message; there might be some problem that allows * creation of the socket but not binding, perhaps if the * machine has no ipv6 address of this name. */ + freeaddrinfo(bres_all); return -1; } @@ -329,7 +331,8 @@ close(s); continue; } - + + freeaddrinfo(all_ai); return s; } diff -uNr --minimal rsync-2.5.4/syscall.c rsync-2.5.5/syscall.c --- rsync-2.5.4/syscall.c Tue Feb 19 09:44:23 2002 +++ rsync-2.5.5/syscall.c Mon Mar 25 14:51:17 2002 @@ -111,19 +111,31 @@ } -int do_mkdir(char *fname, mode_t mode) +void trim_trailing_slashes(char *name) { int l; - if (dry_run) - return 0; - CHECK_RO; - /* Some BSD systems cannot make a directory if the name * contains a trailing slash. * */ - if ((l = strlen(fname)) && (fname[l-1] == '/')) - fname[l-1] = '/'; + /* Don't change empty string; and also we can't improve on + * "/" */ + + l = strlen(name); + while (l > 1) { + if (name[--l] != '/') + break; + name[l] = '\0'; + } +} + + +int do_mkdir(char *fname, mode_t mode) +{ + if (dry_run) + return 0; + CHECK_RO; + trim_trailing_slashes(fname); return mkdir(fname, mode); } diff -uNr --minimal rsync-2.5.4/testsuite/chgrp.test rsync-2.5.5/testsuite/chgrp.test --- rsync-2.5.4/testsuite/chgrp.test Tue Feb 19 09:14:46 2002 +++ rsync-2.5.5/testsuite/chgrp.test Mon Mar 25 14:01:37 2002 @@ -18,7 +18,9 @@ fromdir="$scratchdir/from" todir="$scratchdir/to" -mygrps="`groups`" || fail "Can't get groups" +# TODO: I guess some systems will not have 'id', and therefore we have +# to ship or emulate it. +mygrps="`rsync_getgroups`" || fail "Can't get groups" mkdir "$fromdir" for g in $mygrps diff -uNr --minimal rsync-2.5.4/testsuite/chown.test rsync-2.5.5/testsuite/chown.test --- rsync-2.5.4/testsuite/chown.test Sat Feb 9 18:43:13 2002 +++ rsync-2.5.5/testsuite/chown.test Fri Mar 22 17:07:50 2002 @@ -26,10 +26,10 @@ echo "This is the file" > "$name1" echo "This is the other file" > "$name2" -chown 5000 "$name1" || test_skipped "Can't chown" -chown 5001 "$name2" || test_skipped "Can't chown" -chgrp 5002 "$name1" || test_skipped "Can't chgrp" -chgrp 5003 "$name2" || test_skipped "Can't chgrp" +chown 5000 "$name1" || test_skipped "Can't chown (probably need root)" +chown 5001 "$name2" || test_skipped "Can't chown (probably need root)" +chgrp 5002 "$name1" || test_skipped "Can't chgrp (probably need root)" +chgrp 5003 "$name2" || test_skipped "Can't chgrp (probably need root)" checkit "rsync -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" diff -uNr --minimal rsync-2.5.4/testsuite/devices.test rsync-2.5.5/testsuite/devices.test --- rsync-2.5.4/testsuite/devices.test Fri Jan 25 21:56:43 2002 +++ rsync-2.5.5/testsuite/devices.test Fri Mar 22 17:09:09 2002 @@ -19,8 +19,8 @@ # TODO: Need to test whether hardlinks are possible on this OS/filesystem mkdir "$fromdir" -mknod "$fromdir/char" c 42 69 || test_skipped "Can't create char device node?" -mknod "$fromdir/block" b 42 69 || test_skipped "Can't create block device node?" +mknod "$fromdir/char" c 42 69 || test_skipped "Can't create char device node unless root" +mknod "$fromdir/block" b 42 69 || test_skipped "Can't create block device node unless root" checkit "rsync -aHvv \"$fromdir/\" \"$todir/\"" "$fromdir" "$todir" diff -uNr --minimal rsync-2.5.4/testsuite/duplicates.test rsync-2.5.5/testsuite/duplicates.test --- rsync-2.5.4/testsuite/duplicates.test Wed Jan 23 18:28:38 2002 +++ rsync-2.5.5/testsuite/duplicates.test Fri Mar 22 17:07:50 2002 @@ -21,8 +21,7 @@ . $srcdir/testsuite/rsync.fns -echo "SKIP THIS FOR NOW; It's a known bug" -exit 77 +test_skipped "Known minor bug in this code" set -x diff -uNr --minimal rsync-2.5.4/testsuite/hands.test rsync-2.5.5/testsuite/hands.test --- rsync-2.5.4/testsuite/hands.test Sun Dec 2 18:22:54 2001 +++ rsync-2.5.5/testsuite/hands.test Tue Mar 26 21:36:45 2002 @@ -1,7 +1,7 @@ #!/bin/sh -# Copyright (C) 1998,1999 Philip Hands -# Copyright (C) 2001 by Martin Pool +# Copyright (C) 1998, 1999 by Philip Hands +# Copyright (C) 2001, 2002 by Martin Pool # # This program is distributable under the terms of the GNU GPL (see COPYING) @@ -25,6 +25,4 @@ cp ${FROM}/text ${TO}/ThisShouldGo runtest " --delete" 'checkit "$RSYNC --delete -avH ${FROM}/ ${TO}" ${FROM}/ ${TO}' -checkforlogs ${LOG}.? - -hands_cleanup \ No newline at end of file +exit 0 diff -uNr --minimal rsync-2.5.4/testsuite/rsync.fns rsync-2.5.5/testsuite/rsync.fns --- rsync-2.5.4/testsuite/rsync.fns Tue Mar 12 11:04:03 2002 +++ rsync-2.5.5/testsuite/rsync.fns Tue Mar 26 21:28:57 2002 @@ -24,6 +24,9 @@ LOG=${TMP}/log RSYNC="$rsync_bin" +# Berkley's nice. +PATH="$PATH:/usr/ucb" + runtest() { echo $ECHO_N "Test $1: $ECHO_C" if eval "$2" @@ -42,7 +45,11 @@ rsync_ls_lR() { - find "$@" -print | sort | xargs $TLS + find "$@" -print | sort | xargs "$TOOLDIR/tls" +} + +rsync_getgroups() { + "$TOOLDIR/getgroups" } @@ -95,13 +102,6 @@ } -hands_cleanup() { - rm -r "$TMP" -} - - - - #################### # Many machines do not have "mkdir -p", so we have to build up long paths. # How boring. @@ -134,6 +134,11 @@ # Run a test (in '$1') then compare directories $2 and $3 to see if # there are any difference. If there are, explain them. +# So normally basically $1 should be an rsync command, and $2 and $3 +# the source and destination directories. This is only good when you +# expect to transfer the whole directory exactly as is. If some files +# should be excluded, you might need to use something else. + checkit() { failed= @@ -169,21 +174,6 @@ } -# In fact, we need a more general feature of capturing all stderr/log files, -# and dumping them if something goes wrong. - -checkforlogs() { - # skip it if we're under debian-test - if test -n "${Debian}" ; then return 0 ; fi - - if [ -f $1 -a -s $1 ] ; then - echo "Failures have occurred. $1 follows:" >&2 - cat $1 >&2 - exit 1 - fi -} - - build_rsyncd_conf() { # Build an appropriate configuration file conf="$scratchdir/test-rsyncd.conf" @@ -201,6 +191,12 @@ hosts allow = localhost, 127.0.0.1 log file = $logfile +# We don't know if this machine has "nobody" or "nogroup", so use the quasi-canonical +# values of (uint16_t) -2. + +uid = 65534 +gid = 65534 + [test-from] path = $FROM read only = yes @@ -230,6 +226,7 @@ test_skipped() { echo "$@" >&2 + echo "$@" > "$TMP/whyskipped" exit 77 } @@ -241,5 +238,42 @@ exit 78 } -# be reproducible -umask 077 \ No newline at end of file +# Determine what shell command will appropriately test for links. +ln -s foo "$scratchdir/testlink" +for cmd in test /bin/test /usr/bin/test /usr/ucb/bin/test /usr/ucb/test +do + for switch in -h -L + do + if $cmd $switch "$scratchdir/testlink" 2>/dev/null + then + # how nice + TEST_SYMLINK_CMD="$cmd $switch" + # i wonder if break 2 is portable? + break 2 + fi + done +done + + +if [ "x$TEST_SYMLINK_CMD" = 'x' ] +then + test_fail "Couldn't determine how to test for symlinks" +else + echo "Testing for symlinks using '$TEST_SYMLINK_CMD'" +fi + + +# Test whether something is a link, allowing for shell peculiarities +is_a_link() { + # note the variable contains the first option and therefore is not quoted + $TEST_SYMLINK_CMD "$1" +} + + +# We need to set the umask to be reproducible. Note also that when we +# do some daemon tests as root, we will setuid() and therefore the +# directory has to be writable by the nobody user in some cases. The +# best thing is probably to explicitly chmod those directories after +# creation. + +umask 022 \ No newline at end of file diff -uNr --minimal rsync-2.5.4/testsuite/ssh-basic.test rsync-2.5.5/testsuite/ssh-basic.test --- rsync-2.5.4/testsuite/ssh-basic.test Fri Aug 31 15:48:19 2001 +++ rsync-2.5.5/testsuite/ssh-basic.test Fri Mar 22 17:07:50 2002 @@ -12,18 +12,15 @@ if [ "x$rsync_enable_ssh_tests" != xyes ] then - echo "Skipping SSH tests because \$rsync_enable_ssh_tests is not set" - exit 77 + test_skipped "Skipping SSH tests because \$rsync_enable_ssh_tests is not set" fi if ! type ssh >/dev/null ; then - echo "Skipping SSH tests because ssh is not in the path" - exit 77 + test_skipped "Skipping SSH tests because ssh is not in the path" fi if ! [ "`ssh -o'BatchMode yes' localhost echo yes`" = "yes" ]; then - echo "Skipping SSH tests because ssh conection to localhost not authorised" - exit 77 + test_skipped "Skipping SSH tests because ssh conection to localhost not authorised" fi runtest "ssh: basic test" 'checkit "$RSYNC -avH -e ssh --rsync-path=$RSYNC ${FROM}/ localhost:${TO}" ${FROM}/ ${TO}' diff -uNr --minimal rsync-2.5.4/testsuite/symlink-ignore.test rsync-2.5.5/testsuite/symlink-ignore.test --- rsync-2.5.4/testsuite/symlink-ignore.test Tue Feb 19 10:09:50 2002 +++ rsync-2.5.5/testsuite/symlink-ignore.test Fri Mar 15 12:08:53 2002 @@ -20,17 +20,17 @@ [ -f "${todir}/referent" ] || test_fail "referent was not copied" [ -d "${todir}/from" ] && test_fail "extra level of directories" -if [ -L "${todir}/dangling" ] +if is_a_link "${todir}/dangling" then test_fail "dangling symlink was copied" fi -if [ -L "${todir}/relative" ] +if is_a_link "${todir}/relative" then test_fail "relative symlink was copied" fi -if [ -L "${todir}/absolute" ] +if is_a_link "${todir}/absolute" then test_fail "absolute symlink was copied" fi diff -uNr --minimal rsync-2.5.4/testsuite/trimslash.test rsync-2.5.5/testsuite/trimslash.test --- rsync-2.5.4/testsuite/trimslash.test Thu Jan 1 10:00:00 1970 +++ rsync-2.5.5/testsuite/trimslash.test Mon Mar 25 14:51:18 2002 @@ -0,0 +1,29 @@ +#! /bin/sh + +# Copyright (C) 2002 by Martin Pool + +# This program is distributable under the terms of the GNU GPL (see +# COPYING). + +# Test tiny function to trim trailing slashes. + +. $srcdir/testsuite/rsync.fns + +set -x + +"$TOOLDIR/trimslash" "/usr/local/bin" "/usr/local/bin/" "/usr/local/bin///" \ + "//a//" "////" \ + "/Users/Wierd Macintosh Name/// Ooh, translucent plastic/" \ + > "$scratchdir/slash.out" +diff -c "$scratchdir/slash.out" - < 1024*1024) { diff -uNr --minimal rsync-2.5.4/zlib/README.rsync rsync-2.5.5/zlib/README.rsync --- rsync-2.5.4/zlib/README.rsync Fri May 22 22:20:07 1998 +++ rsync-2.5.5/zlib/README.rsync Mon Mar 25 20:42:36 2002 @@ -1,3 +1,5 @@ +READ THIS BEFORE TRYING TO DYNAMICALLY LINK RSYNC AND ZLIB! + zlib has been adapted slightly for use in rsync. Please don't bother the zlib authors with problems related to the use of zlib in rsync as any bugs are likely to be our fault and not theirs. @@ -15,5 +17,15 @@ - include rsync.h to ensure that we get a consistent set of includes for all C code in rsync and to take advantage of autoconf --- -Paul Mackerras and Andrew Tridgell +As a result of the first item, the streams from rsync's version of +zlib are *not compatible* with those produced by the upstream version +of rsync. In other words, if you link rsync against your system's +copy, it will not be able to interoperate with any other version if +the -z option is used. (Sorry. Sometimes standard is better than +better.) + +The rsync maintainers hope to fix this problem in the future by either +merging our changes into the upstream version, or backing them out of +rsync in a way that preserves wire compatibility. But in the meantime +this version must be maintained in parallel. +