home
***
CD-ROM
|
disk
|
FTP
|
other
***
search
/
Geek Gadgets 1
/
ADE-1.bin
/
ade-dist
/
inetutils-1.2-diffs.gz
/
inetutils-1.2-diffs
Wrap
Text File
|
1996-10-13
|
87KB
|
2,896 lines
This file contains patches that transform the baseline version into
the amiga version. Assuming that you have unarchived the baseline
version in the current directory, just run the command:
patch -p1 -E -b .pbak <diff-file
where 'diff-file' is this patch file. After running patch you should
remove all the generated *.pbak files, and look for any *.rej files
that indicate a problem patching the baseline source.
diff -rup --new-file baseline/fsf/inetutils/Product-Info amiga/fsf/inetutils/Product-Info
--- baseline/fsf/inetutils/Product-Info Wed Dec 31 17:00:00 1969
+++ amiga/fsf/inetutils/Product-Info Sat Sep 28 00:00:00 1996
@@ -0,0 +1,27 @@
+.name
+inetutils
+.fullname
+GNU inetutils
+.type
+Programmer Tool
+.short
+Networking utilities and servers
+.description
+This is a distribution of common networking utilities and servers.
+
+They are currently all from the 4.4BSD-Lite2 distribution, with some changes
+to make them compatible with the GNU hurd (in particular, the hurd does not
+define some arbitrary limits, such as MAXPATHLEN), and to remove some minor
+BSD dependencies. A GNU build environment has also been added.
+
+As this release is intended mainly to support the GNU hurd, which is
+source compatible with BSD in many ways, there are probably many BSD
+dependencies remaining.
+.version
+1.2
+.author
+Free Software Foundation
+.distribution
+GNU Public License
+.described-by
+Fred Fish (fnf@amigalib.com)
diff -rup --new-file baseline/fsf/inetutils/config.sub amiga/fsf/inetutils/config.sub
--- baseline/fsf/inetutils/config.sub Sun Jul 7 10:26:19 1996
+++ amiga/fsf/inetutils/config.sub Sat Sep 28 00:00:00 1996
@@ -184,11 +184,11 @@ case $basic_machine in
os=-sysv
;;
amiga | amiga-*)
- basic_machine=m68k-cbm
+ basic_machine=m68k-unknown
;;
- amigados)
- basic_machine=m68k-cbm
- os=-amigados
+ amigaos)
+ basic_machine=m68k-unknown
+ os=-amigaos
;;
amigaunix | amix)
basic_machine=m68k-cbm
@@ -655,7 +655,7 @@ case $os in
-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigados* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
+ | -amigaos* | -msdos* | -newsos* | -unicos* | -aof* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
| -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* \
@@ -785,7 +785,7 @@ case $basic_machine in
os=-sysv
;;
*-cbm)
- os=-amigados
+ os=-amigaos
;;
*-dg)
os=-dgux
diff -rup --new-file baseline/fsf/inetutils/configure amiga/fsf/inetutils/configure
--- baseline/fsf/inetutils/configure Wed Aug 21 09:46:31 1996
+++ amiga/fsf/inetutils/configure Mon Sep 30 22:46:21 1996
@@ -21,11 +21,6 @@ ac_help="$ac_help
--enable-encryption enable encryption"
ac_help="$ac_help
--enable-authentication enable connection authentication"
-ac_help="$ac_help
- --with-PATHVAR=PATH Set the value of PATHVAR to PATH
- PATHVAR is the name of a \`PATH_FOO' variable,
- downcased, with \`_' changed to \`-'
- --without-PATHVAR Never define PATHVAR by any method"
# Initialize some variables set by options.
# The variables have the same names as the options, with
@@ -59,6 +54,9 @@ libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
mandir='${prefix}/man'
# Initialize some other variables.
@@ -173,6 +171,9 @@ Directory and file names:
--includedir=DIR C header files in DIR [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
--infodir=DIR info documentation in DIR [PREFIX/info]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
--mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
@@ -215,6 +216,18 @@ EOF
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
infodir="$ac_optarg" ;;
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
@@ -530,24 +543,6 @@ fi
# Get macros that we use
-# For case-conversion with sed
-IU_UCASE=ABCDEFGHIJKLMNOPQRSTUVWXYZ
-iu_lcase=abcdefghijklmnopqrstuvwxyz
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
# Generate <config.h>; note that we use a `header' subdirectory, which
# contains all include files distributed with inetutils, and an `include'
@@ -743,7 +738,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -770,9 +765,9 @@ fi
echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
+ CFLAGS="-g -O2"
else
- CFLAGS="-O"
+ CFLAGS="-O2"
fi
fi
else
@@ -795,13 +790,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 799 "configure"
+#line 794 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:805: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -810,13 +805,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 814 "configure"
+#line 809 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:815: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -862,6 +857,7 @@ ac_configure=$ac_aux_dir/configure # Thi
# SunOS /usr/etc/install
# IRIX /sbin/install
# AIX /bin/install
+# AmigaOS /c/install
# 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.
@@ -874,7 +870,7 @@ else
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
- /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
+ /|./|.//|/etc/*|/c/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;;
*)
# OSF1 and SCO ODT 3.0 have their own names for install.
for ac_prog in ginstall installbsd scoinst install; do
@@ -1133,12 +1129,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1137 "configure"
+#line 1133 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1171,7 +1167,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1175 "configure"
+#line 1171 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1181,7 +1177,7 @@ else
builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1195,7 +1191,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1225,7 +1221,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1229 "configure"
+#line 1225 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1235,7 +1231,7 @@ else
builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1249,7 +1245,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1276,7 +1272,7 @@ if eval "test \"`echo '$''{'ac_cv_func_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1280 "configure"
+#line 1276 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char setpgid(); below. */
@@ -1286,7 +1282,7 @@ else
builtin and then its argument prototype would still apply. */
char setpgid();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1300,7 +1296,7 @@ setpgid();
; return 0; }
EOF
-if { (eval echo configure:1304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_setpgid=yes"
else
@@ -1323,117 +1319,19 @@ fi
# EWOULDBLOCK is more or less the BSD version of posix EAGAIN.
-
- echo $ac_n "checking for EWOULDBLOCK""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro_ewouldblock'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1333 "configure"
-#include "confdefs.h"
-#include <errno.h>
-#if defined(EWOULDBLOCK)
-IU_CHECK_MACRO_EWOULDBLOCK
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO_EWOULDBLOCK" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro_ewouldblock=yes
-else
- rm -rf conftest*
- inetutils_cv_macro_ewouldblock=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_macro_ewouldblock" 1>&6
-if test "$inetutils_cv_macro_ewouldblock" = yes; then
- :
-else
- cat >> confdefs.h <<\EOF
+IU_CHECK_MACRO(EWOULDBLOCK, #include <errno.h>, ,
+ :, cat >> confdefs.h <<\EOF
#define EWOULDBLOCK EAGAIN
EOF
-
-fi
-
- echo $ac_n "checking whether errno is declared""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_decl_errno'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1368 "configure"
-#include "confdefs.h"
-#include <errno.h>
-
-int main() { return 0; }
-int t() {
-char *iu_x = (char *)errno
-; return 0; }
-EOF
-if { (eval echo configure:1377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_decl_errno=yes
-else
- rm -rf conftest*
- inetutils_cv_decl_errno=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_decl_errno" 1>&6
-
-if test "$inetutils_cv_decl_errno" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_ERRNO_DECL 1
-EOF
-
-else
- :
-fi
+)
+IU_CHECK_DECL(errno, #include <errno.h>)
# __P is the standard name for the ansi-or-not-ansi arg-decl macro.
# We define our own version in <config.h> if the system doesn't supply one.
-
- echo $ac_n "checking for __P""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro___p'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1407 "configure"
-#include "confdefs.h"
-#ifdef HAVE_SYS_CDEFS_H
-#include <sys/cdefs.h>
-#endif
-#if defined(__P)
-IU_CHECK_MACRO___P
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO___P" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro___p=yes
-else
- rm -rf conftest*
- inetutils_cv_macro___p=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_macro___p" 1>&6
-if test "$inetutils_cv_macro___p" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE___P 1
-EOF
-
-else
- :
-fi
+IU_CHECK_MACRO(__P,
+ #ifdef HAVE_SYS_CDEFS_H
+ #include <sys/cdefs.h>
+ #endif )
# libutil is a 4.4BSD library that defines several functions handy for
# inetutil daemons, doing such things as utmp frobbing, and pty setup.
@@ -1445,19 +1343,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lutil $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1449 "configure"
+#line 1347 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char logout();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
logout()
; return 0; }
EOF
-if { (eval echo configure:1461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1487,7 +1385,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1491 "configure"
+#line 1389 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1497,7 +1395,7 @@ else
builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1511,7 +1409,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1538,116 +1436,7 @@ LIBS="$_SAVE_LIBS"
# instead of compile time, which is very handy for distributing binary
# version programs that automatically adapt -- in inetutils case, to whether
# or not crypt is available.
-
- echo $ac_n "checking whether gcc weak references work""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_attr_weak_refs'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1548 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-extern char *not_defined (char *, char *) __attribute__ ((weak));
- if (not_defined) puts ("yes");
-; return 0; }
-EOF
-if { (eval echo configure:1557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_attr_weak_refs=yes
-else
- rm -rf conftest*
- inetutils_cv_attr_weak_refs=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_attr_weak_refs" 1>&6
- if test "$inetutils_cv_weak_refs" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_WEAK_REFS 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_ATTR_WEAK_REFS 1
-EOF
-
- else
- echo $ac_n "checking whether pragma weak references work""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_pragma_weak_refs'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1583 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-extern char *not_defined (char *, char *);
-#pragma weak not_defined
- if (not_defined) puts ("yes");
-; return 0; }
-EOF
-if { (eval echo configure:1593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_pragma_weak_refs=yes
-else
- rm -rf conftest*
- inetutils_cv_pragma_weak_refs=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_pragma_weak_refs" 1>&6
- if test "$inetutils_cv_pragma_weak_refs" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_WEAK_REFS 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_PRAGMA_WEAK_REFS 1
-EOF
-
- else
- echo $ac_n "checking whether asm weak references work""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_asm_weak_refs'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1619 "configure"
-#include "confdefs.h"
-
-int main() { return 0; }
-int t() {
-extern char *not_defined (char *, char *);
- asm (".weak not_defined");
- if (not_defined) puts ("yes");
-; return 0; }
-EOF
-if { (eval echo configure:1629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_asm_weak_refs=yes
-else
- rm -rf conftest*
- inetutils_cv_asm_weak_refs=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_asm_weak_refs" 1>&6
- if test "$inetutils_cv_asm_weak_refs" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_WEAK_REFS 1
-EOF
- cat >> confdefs.h <<\EOF
-#define HAVE_ASM_WEAK_REFS 1
-EOF
-
- fi
- fi
- fi
+IU_CHECK_WEAK_REFS
# See if there's a separate libcrypt (many systems put crypt there)
echo $ac_n "checking for -lcrypt""... $ac_c" 1>&6
@@ -1658,19 +1447,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lcrypt $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1662 "configure"
+#line 1451 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char crypt();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
crypt()
; return 0; }
EOF
-if { (eval echo configure:1674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1699,7 +1488,7 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1703 "configure"
+#line 1492 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
@@ -1709,7 +1498,7 @@ else
builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1723,7 +1512,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1747,104 +1536,17 @@ done
LIBS="$_SAVE_LIBS"
# ... and see if it's declared anywhere
-
- echo $ac_n "checking whether crypt is declared""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_decl_crypt'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1757 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-
-int main() { return 0; }
-int t() {
-char *iu_x = (char *)crypt
-; return 0; }
-EOF
-if { (eval echo configure:1766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_decl_crypt=yes
-else
- rm -rf conftest*
- inetutils_cv_decl_crypt=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_decl_crypt" 1>&6
-
-if test "$inetutils_cv_decl_crypt" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_CRYPT_DECL 1
-EOF
-
-else
- :
-fi
+IU_CHECK_DECL(crypt, #include <unistd.h>)
# Look for the posix SEEK_ macros (for lseek), and if not found, try the
# similar berkeley L_ macros; if neither can be found, use the classic unix
# values.
-
- echo $ac_n "checking for SEEK_ macros""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro_seek__macros'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1797 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-#if defined(SEEK_SET) && defined(SEEK_CUR) && defined(SEEK_END)
-IU_CHECK_MACRO_SEEK__MACROS
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO_SEEK__MACROS" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro_seek__macros=yes
-else
- rm -rf conftest*
- inetutils_cv_macro_seek__macros=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_macro_seek__macros" 1>&6
-if test "$inetutils_cv_macro_seek__macros" = yes; then
- :
-else
- echo $ac_n "checking for L_ seek macros""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro_l__seek_macros'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1826 "configure"
-#include "confdefs.h"
-#include <unistd.h>
-#if defined(L_SET) && defined(L_INCR) && defined(L_XTND)
-IU_CHECK_MACRO_L__SEEK_MACROS
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO_L__SEEK_MACROS" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro_l__seek_macros=yes
-else
- rm -rf conftest*
- inetutils_cv_macro_l__seek_macros=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_macro_l__seek_macros" 1>&6
-if test "$inetutils_cv_macro_l__seek_macros" = yes; then
- cat >> confdefs.h <<\EOF
+IU_CHECK_MACRO(SEEK_ macros,
+ #include <unistd.h>, SEEK_SET SEEK_CUR SEEK_END,
+ :,
+ IU_CHECK_MACRO(L_ seek macros,
+ #include <unistd.h>, L_SET L_INCR L_XTND,
+ cat >> confdefs.h <<\EOF
#define SEEK_SET L_SET
EOF
@@ -1855,9 +1557,8 @@ EOF
cat >> confdefs.h <<\EOF
#define SEEK_END L_XTND
EOF
-
-else
- cat >> confdefs.h <<\EOF
+,
+ cat >> confdefs.h <<\EOF
#define SEEK_SET 0
EOF
@@ -1868,372 +1569,58 @@ EOF
cat >> confdefs.h <<\EOF
#define SEEK_END 2
EOF
-
-fi
-fi
+))
# See where to find fd_set (bit-vectors for select) manipulation macros.
+IU_CHECK_MACRO(fd_set macros, #include <sys/types.h>,
+ FD_ZERO FD_CLR FD_SET FD_ISSET)
+if test "$inetutils_cv_fd_set_macros" = no; then
+ IU_CHECK_MACRO(fd_set macros in <sys/time.h>, #include <sys/time.h>,
+ FD_ZERO FD_CLR FD_SET FD_ISSET)
+fi
- echo $ac_n "checking for fd_set macros""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro_fd_set_macros'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1883 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#if defined(FD_ZERO) && defined(FD_CLR) && defined(FD_SET) && defined(FD_ISSET)
-IU_CHECK_MACRO_FD_SET_MACROS
-#endif
+# See if stat includes sub-second time information (the st_?timespec form is
+# from bsd, and the st_?time_usec form is used by the hurd; the latter will
+# eventually be replaced by the former).
+IU_CHECK_STRUCT_FIELD(stat, st_mtimespec,
+ #include <sys/types.h>
+ #include <sys/stat.h> ,
+ :,
+ IU_CHECK_STRUCT_FIELD(stat, st_mtime_usec,
+ #include <sys/types.h>
+ #include <sys/stat.h>))
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO_FD_SET_MACROS" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro_fd_set_macros=yes
-else
- rm -rf conftest*
- inetutils_cv_macro_fd_set_macros=no
+# See if a termcap library is available (under one of several names)
+IU_LIB_TERMCAP
+# If not, add a bogus version of tgetent to libinetutils, as that's the only
+# function actually used (to check terminal type validity), modulo any
+# dependencies from curses.
+if test -z "$LIBTERMCAP"; then
+ # Some packages include termcap just ;
+ # for those cases, we really don't need termcap.
+ LIBOBJS="$LIBOBJS stub_tgetent.o"
fi
-rm -f conftest*
+# Only talk uses curses, so only check for it if we want that
+if test "$enable_talk" != no; then
+ IU_LIB_CURSES
fi
-
-echo "$ac_t""$inetutils_cv_macro_fd_set_macros" 1>&6
-if test "$inetutils_cv_macro_fd_set_macros" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_FD_SET_MACROS 1
+if test "$enable_talk" = yes -a "$ac_cv_lib_curses_initscr" != yes; then
+ echo "configure: warning: curses is not available" 1>&2
+fi
+enable_talk="$ac_cv_lib_curses_initscr"
+if test "$enable_talk" = yes; then
+ SERVERS="$SERVERS talkd"
+ CLIENTS="$CLIENTS talk"
+ # We may need our own definition for struct osockaddr (equivalent to the
+ # old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
+ IU_CHECK_TYPE(struct osockaddr,
+ #include <sys/types.h>
+ #include <sys/socket.h> ,
+ :, cat >> confdefs.h <<\EOF
+#define HAVE_OSOCKADDR_H 1
EOF
-
-else
- :
-fi
-if test "$inetutils_cv_fd_set_macros" = no; then
-
- echo $ac_n "checking for fd_set macros in <sys/time.h>""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro_fd_set_macros_in_sys_time_h'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1919 "configure"
-#include "confdefs.h"
-#include <sys/time.h>
-#if defined(FD_ZERO) && defined(FD_CLR) && defined(FD_SET) && defined(FD_ISSET)
-IU_CHECK_MACRO_FD_SET_MACROS_IN_SYS_TIME_H
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO_FD_SET_MACROS_IN_SYS_TIME_H" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro_fd_set_macros_in_sys_time_h=yes
-else
- rm -rf conftest*
- inetutils_cv_macro_fd_set_macros_in_sys_time_h=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_macro_fd_set_macros_in_sys_time_h" 1>&6
-if test "$inetutils_cv_macro_fd_set_macros_in_sys_time_h" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_FD_SET_MACROS_IN_SYS_TIME_H 1
-EOF
-
-else
- :
-fi
-fi
-
-# See if stat includes sub-second time information (the st_?timespec form is
-# from bsd, and the st_?time_usec form is used by the hurd; the latter will
-# eventually be replaced by the former).
-
- echo $ac_n "checking whether struct stat has st_mtimespec field""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_struct_stat_st_mtimespec'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1959 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int main() { return 0; }
-int t() {
-struct stat iu_x; int iu_y = sizeof iu_x.st_mtimespec;
-; return 0; }
-EOF
-if { (eval echo configure:1969: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_struct_stat_st_mtimespec=yes
-else
- rm -rf conftest*
- inetutils_cv_struct_stat_st_mtimespec=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_struct_stat_st_mtimespec" 1>&6
-
-if test "$inetutils_cv_struct_stat_st_mtimespec" = yes; then
- :
-else
-
- echo $ac_n "checking whether struct stat has st_mtime_usec field""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_struct_stat_st_mtime_usec'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 1991 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/stat.h>
-
-int main() { return 0; }
-int t() {
-struct stat iu_x; int iu_y = sizeof iu_x.st_mtime_usec;
-; return 0; }
-EOF
-if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_struct_stat_st_mtime_usec=yes
-else
- rm -rf conftest*
- inetutils_cv_struct_stat_st_mtime_usec=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_struct_stat_st_mtime_usec" 1>&6
-
-if test "$inetutils_cv_struct_stat_st_mtime_usec" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_STAT_ST_MTIME_USEC 1
-EOF
-
-else
- :
-fi
-fi
-
-# See if a termcap library is available (under one of several names)
-
- echo $ac_n "checking for -ltermcap""... $ac_c" 1>&6
-ac_lib_var=`echo termcap'_'tgetent | tr './+\055' '__p_'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ltermcap $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2034 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char tgetent();
-
-int main() { return 0; }
-int t() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:2046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBTERMCAP=-ltermcap
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test "$ac_cv_lib_termcap_tgetent" = no; then
- echo $ac_n "checking for -ltermlib""... $ac_c" 1>&6
-ac_lib_var=`echo termlib'_'tgetent | tr './+\055' '__p_'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-ltermlib $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2073 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char tgetent();
-
-int main() { return 0; }
-int t() {
-tgetent()
-; return 0; }
-EOF
-if { (eval echo configure:2085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBTERMCAP=-ltermlib
-else
- echo "$ac_t""no" 1>&6
-fi
-
- fi
-
-# If not, add a bogus version of tgetent to libinetutils, as that's the only
-# function actually used (to check terminal type validity), modulo any
-# dependencies from curses.
-if test -z "$LIBTERMCAP"; then
- # Some packages include termcap just ;
- # for those cases, we really don't need termcap.
- LIBOBJS="$LIBOBJS stub_tgetent.o"
-fi
-
-# Only talk uses curses, so only check for it if we want that
-if test "$enable_talk" != no; then
-
-
- _IU_SAVE_LIBS="$LIBS"
- LIBS="$LIBTERMCAP"
- echo $ac_n "checking for -lcurses""... $ac_c" 1>&6
-ac_lib_var=`echo curses'_'initscr | tr './+\055' '__p_'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- ac_save_LIBS="$LIBS"
-LIBS="-lcurses $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 2128 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char initscr();
-
-int main() { return 0; }
-int t() {
-initscr()
-; return 0; }
-EOF
-if { (eval echo configure:2140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=yes"
-else
- rm -rf conftest*
- eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- LIBCURSES="-lcurses"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- if test "$LIBCURSES" -a "$LIBTERMCAP"; then
- echo $ac_n "checking whether curses needs $LIBTERMCAP""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_curses_needs_termcap'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- LIBS="$LIBCURSES"
- cat > conftest.$ac_ext <<EOF
-#line 2165 "configure"
-#include "confdefs.h"
-#include <curses.h>
-int main() { return 0; }
-int t() {
-initscr ();
-; return 0; }
-EOF
-if { (eval echo configure:2173: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_curses_needs_termcap=no
-else
- rm -rf conftest*
- inetutils_cv_curses_needs_termcap=yes
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_curses_needs_termcap" 1>&6
- if test "$inetutils_cv_curses_needs_termcap" = yes; then
- LIBCURSES="$LIBCURSES $LIBTERMCAP"
- fi
- fi
- LIBS="$_IU_SAVE_LIBS"
-
-fi
-if test "$enable_talk" = yes -a "$ac_cv_lib_curses_initscr" != yes; then
- echo "configure: warning: curses is not available" 1>&2
-fi
-enable_talk="$ac_cv_lib_curses_initscr"
-if test "$enable_talk" = yes; then
- SERVERS="$SERVERS talkd"
- CLIENTS="$CLIENTS talk"
- # We may need our own definition for struct osockaddr (equivalent to the
- # old 4.3BSD struct sockaddr, and used in grotty bsd talk protocol)
-
- echo $ac_n "checking whether struct osockaddr is defined""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_type_struct_osockaddr'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2207 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/socket.h>
-
-int main() { return 0; }
-int t() {
-struct osockaddr iu_x;
-; return 0; }
-EOF
-if { (eval echo configure:2217: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_type_struct_osockaddr=yes
-else
- rm -rf conftest*
- inetutils_cv_type_struct_osockaddr=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_type_struct_osockaddr" 1>&6
-
-if test "$inetutils_cv_type_struct_osockaddr" = yes; then
- :
-else
- cat >> confdefs.h <<\EOF
-#define HAVE_OSOCKADDR_H 1
-EOF
- INCLUDES="$INCLUDES osockaddr.h"
-fi
+ INCLUDES="$INCLUDES osockaddr.h")
fi
# SUBDIRS gets talk subdirs regardless of whether we're building them
SUBDIRS="$SUBDIRS talkd talk"
@@ -2250,19 +1637,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lglob $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2254 "configure"
+#line 1641 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char glob();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
glob()
; return 0; }
EOF
-if { (eval echo configure:2266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2287,7 +1674,7 @@ if eval "test \"`echo '$''{'ac_cv_func_g
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2291 "configure"
+#line 1678 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char glob(); below. */
@@ -2297,7 +1684,7 @@ else
builtin and then its argument prototype would still apply. */
char glob();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2311,7 +1698,7 @@ glob();
; return 0; }
EOF
-if { (eval echo configure:2315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_glob=yes"
else
@@ -2323,38 +1710,9 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_func_'glob`\" = yes"; then
echo "$ac_t""yes" 1>&6
-
- echo $ac_n "checking for system glob is ok""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_macro_system_glob_is_ok'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2333 "configure"
-#include "confdefs.h"
-#include <glob.h>
-#if defined(GLOB_BRACE) && defined(GLOB_TILDE)
-IU_CHECK_MACRO_SYSTEM_GLOB_IS_OK
-#endif
-
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "IU_CHECK_MACRO_SYSTEM_GLOB_IS_OK" >/dev/null 2>&1; then
- rm -rf conftest*
- inetutils_cv_macro_system_glob_is_ok=yes
-else
- rm -rf conftest*
- inetutils_cv_macro_system_glob_is_ok=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_macro_system_glob_is_ok" 1>&6
-if test "$inetutils_cv_macro_system_glob_is_ok" = yes; then
- sys_glob=yes
-else
- :
-fi
+ IU_CHECK_MACRO(system glob is ok,
+ #include <glob.h>, GLOB_BRACE GLOB_TILDE,
+ sys_glob=yes)
else
echo "$ac_t""no" 1>&6
fi
@@ -2380,19 +1738,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-lkrb $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2384 "configure"
+#line 1742 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char krb_mk_req();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
krb_mk_req()
; return 0; }
EOF
-if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2418,19 +1776,19 @@ else
ac_save_LIBS="$LIBS"
LIBS="-ldes $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 2422 "configure"
+#line 1780 "configure"
#include "confdefs.h"
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char des_key_sched();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
des_key_sched()
; return 0; }
EOF
-if { (eval echo configure:2434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -2477,7 +1835,7 @@ if eval "test \"`echo '$''{'ac_cv_func_g
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2481 "configure"
+#line 1839 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char getopt_long(); below. */
@@ -2487,7 +1845,7 @@ else
builtin and then its argument prototype would still apply. */
char getopt_long();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2501,7 +1859,7 @@ getopt_long();
; return 0; }
EOF
-if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_getopt_long=yes"
else
@@ -2527,7 +1885,7 @@ if eval "test \"`echo '$''{'ac_cv_func_v
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2531 "configure"
+#line 1889 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char verrx(); below. */
@@ -2537,7 +1895,7 @@ else
builtin and then its argument prototype would still apply. */
char verrx();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2551,7 +1909,7 @@ verrx();
; return 0; }
EOF
-if { (eval echo configure:2555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_verrx=yes"
else
@@ -2571,150 +1929,10 @@ INCLUDES="$INCLUDES err.h"
fi
-
- echo $ac_n "checking whether struct lastlog is defined""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_type_struct_lastlog'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2581 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-
-int main() { return 0; }
-int t() {
-struct lastlog iu_x;
-; return 0; }
-EOF
-if { (eval echo configure:2590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_type_struct_lastlog=yes
-else
- rm -rf conftest*
- inetutils_cv_type_struct_lastlog=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_type_struct_lastlog" 1>&6
-
-if test "$inetutils_cv_type_struct_lastlog" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_STRUCT_LASTLOG 1
-EOF
-
-else
- :
-fi
-
- echo $ac_n "checking whether struct utmp has ut_type field""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_struct_utmp_ut_type'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2617 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-
-int main() { return 0; }
-int t() {
-struct utmp iu_x; int iu_y = sizeof iu_x.ut_type;
-; return 0; }
-EOF
-if { (eval echo configure:2626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_struct_utmp_ut_type=yes
-else
- rm -rf conftest*
- inetutils_cv_struct_utmp_ut_type=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_struct_utmp_ut_type" 1>&6
-
-if test "$inetutils_cv_struct_utmp_ut_type" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_UTMP_UT_TYPE 1
-EOF
-
-else
- :
-fi
-
- echo $ac_n "checking whether struct utmp has ut_host field""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_struct_utmp_ut_host'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2653 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-
-int main() { return 0; }
-int t() {
-struct utmp iu_x; int iu_y = sizeof iu_x.ut_host;
-; return 0; }
-EOF
-if { (eval echo configure:2662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_struct_utmp_ut_host=yes
-else
- rm -rf conftest*
- inetutils_cv_struct_utmp_ut_host=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_struct_utmp_ut_host" 1>&6
-
-if test "$inetutils_cv_struct_utmp_ut_host" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_UTMP_UT_HOST 1
-EOF
-
-else
- :
-fi
-
- echo $ac_n "checking whether struct utmp has ut_tv field""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_struct_utmp_ut_tv'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2689 "configure"
-#include "confdefs.h"
-#include <utmp.h>
-
-int main() { return 0; }
-int t() {
-struct utmp iu_x; int iu_y = sizeof iu_x.ut_tv;
-; return 0; }
-EOF
-if { (eval echo configure:2698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_struct_utmp_ut_tv=yes
-else
- rm -rf conftest*
- inetutils_cv_struct_utmp_ut_tv=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_struct_utmp_ut_tv" 1>&6
-
-if test "$inetutils_cv_struct_utmp_ut_tv" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_UTMP_UT_TV 1
-EOF
-
-else
- :
-fi
+IU_CHECK_TYPE(struct lastlog, #include <utmp.h>)
+IU_CHECK_STRUCT_FIELD(utmp, ut_type, #include <utmp.h>)
+IU_CHECK_STRUCT_FIELD(utmp, ut_host, #include <utmp.h>)
+IU_CHECK_STRUCT_FIELD(utmp, ut_tv, #include <utmp.h>)
# See if the system has strerror, and replace it if not
echo $ac_n "checking for strerror""... $ac_c" 1>&6
@@ -2722,7 +1940,7 @@ if eval "test \"`echo '$''{'ac_cv_func_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2726 "configure"
+#line 1944 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char strerror(); below. */
@@ -2732,7 +1950,7 @@ else
builtin and then its argument prototype would still apply. */
char strerror();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2746,7 +1964,7 @@ strerror();
; return 0; }
EOF
-if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_strerror=yes"
else
@@ -2771,7 +1989,7 @@ if eval "test \"`echo '$''{'ac_cv_func_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2775 "configure"
+#line 1993 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sys_errlist(); below. */
@@ -2781,7 +1999,7 @@ else
builtin and then its argument prototype would still apply. */
char sys_errlist();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2795,7 +2013,7 @@ sys_errlist();
; return 0; }
EOF
-if { (eval echo configure:2799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_sys_errlist=yes"
else
@@ -2813,46 +2031,11 @@ else
fi
if test "$ac_cv_func_sys_errlist" = yes; then
-
- echo $ac_n "checking whether sys_errlist is declared""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_decl_sys_errlist'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2823 "configure"
-#include "confdefs.h"
-
-#include <stdio.h>
-#ifdef HAVE_ERRNO_H
-#include <errno.h>
-#endif
-
-int main() { return 0; }
-int t() {
-char *iu_x = (char *)sys_errlist
-; return 0; }
-EOF
-if { (eval echo configure:2836: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_decl_sys_errlist=yes
-else
- rm -rf conftest*
- inetutils_cv_decl_sys_errlist=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_decl_sys_errlist" 1>&6
-
-if test "$inetutils_cv_decl_sys_errlist" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_SYS_ERRLIST_DECL 1
-EOF
-
-else
- :
-fi
+ IU_CHECK_DECL(sys_errlist,
+ #include <stdio.h>
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif)
fi
fi
@@ -2862,7 +2045,7 @@ if eval "test \"`echo '$''{'ac_cv_func_h
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2866 "configure"
+#line 2049 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char hstrerror(); below. */
@@ -2872,7 +2055,7 @@ else
builtin and then its argument prototype would still apply. */
char hstrerror();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2886,7 +2069,7 @@ hstrerror();
; return 0; }
EOF
-if { (eval echo configure:2890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_hstrerror=yes"
else
@@ -2905,42 +2088,7 @@ LIBOBJS="$LIBOBJS hstrerror.o"
fi
if test "$ac_cv_func_hstrerror" = yes; then
-
- echo $ac_n "checking whether hstrerror is declared""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_decl_hstrerror'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 2915 "configure"
-#include "confdefs.h"
-#include <netdb.h>
-
-int main() { return 0; }
-int t() {
-char *iu_x = (char *)hstrerror
-; return 0; }
-EOF
-if { (eval echo configure:2924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_decl_hstrerror=yes
-else
- rm -rf conftest*
- inetutils_cv_decl_hstrerror=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_decl_hstrerror" 1>&6
-
-if test "$inetutils_cv_decl_hstrerror" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_HSTRERROR_DECL 1
-EOF
-
-else
- :
-fi
+ IU_CHECK_DECL(hstrerror, #include <netdb.h>)
else
# No hstrerror, so see if the H_ERRLIST variable can be used by ours
echo $ac_n "checking for h_errlist""... $ac_c" 1>&6
@@ -2948,7 +2096,7 @@ if eval "test \"`echo '$''{'ac_cv_func_h
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 2952 "configure"
+#line 2100 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char h_errlist(); below. */
@@ -2958,7 +2106,7 @@ else
builtin and then its argument prototype would still apply. */
char h_errlist();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -2972,7 +2120,7 @@ h_errlist();
; return 0; }
EOF
-if { (eval echo configure:2976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_h_errlist=yes"
else
@@ -2990,42 +2138,7 @@ else
fi
if test "$ac_cv_func_h_errlist" = yes; then
-
- echo $ac_n "checking whether h_errlist is declared""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_decl_h_errlist'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3000 "configure"
-#include "confdefs.h"
-#include <netdb.h>
-
-int main() { return 0; }
-int t() {
-char *iu_x = (char *)h_errlist
-; return 0; }
-EOF
-if { (eval echo configure:3009: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_decl_h_errlist=yes
-else
- rm -rf conftest*
- inetutils_cv_decl_h_errlist=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_decl_h_errlist" 1>&6
-
-if test "$inetutils_cv_decl_h_errlist" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_H_ERRLIST_DECL 1
-EOF
-
-else
- :
-fi
+ IU_CHECK_DECL(h_errlist, #include <netdb.h>)
fi
fi
if test "$ac_cv_func_hstrerror" = yes -o "$ac_cv_func_h_errlist" = yes; then
@@ -3045,7 +2158,7 @@ if eval "test \"`echo '$''{'ac_cv_type_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3049 "configure"
+#line 2162 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
@@ -3063,7 +2176,7 @@ int t() {
int i;
; return 0; }
EOF
-if { (eval echo configure:3067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
@@ -3081,43 +2194,9 @@ EOF
# sig_t is the type of a signal handler (4.4BSD)
-
- echo $ac_n "checking whether sig_t is defined""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'inetutils_cv_type_sig_t'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3091 "configure"
-#include "confdefs.h"
-#include <sys/types.h>
-#include <sys/signal.h>
-
-int main() { return 0; }
-int t() {
-sig_t iu_x;
-; return 0; }
-EOF
-if { (eval echo configure:3101: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
- rm -rf conftest*
- inetutils_cv_type_sig_t=yes
-else
- rm -rf conftest*
- inetutils_cv_type_sig_t=no
-fi
-rm -f conftest*
-
-fi
-
-echo "$ac_t""$inetutils_cv_type_sig_t" 1>&6
-
-if test "$inetutils_cv_type_sig_t" = yes; then
- cat >> confdefs.h <<\EOF
-#define HAVE_SIG_T 1
-EOF
-
-else
- :
-fi
+IU_CHECK_TYPE(sig_t,
+ #include <sys/types.h>
+ #include <sys/signal.h> )
# See if the __PROGNAME variable is defined, otherwise use our own.
echo $ac_n "checking for __progname""... $ac_c" 1>&6
@@ -3125,7 +2204,7 @@ if eval "test \"`echo '$''{'ac_cv_func__
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3129 "configure"
+#line 2208 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char __progname(); below. */
@@ -3135,7 +2214,7 @@ else
builtin and then its argument prototype would still apply. */
char __progname();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -3149,7 +2228,7 @@ __progname();
; return 0; }
EOF
-if { (eval echo configure:3153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func___progname=yes"
else
@@ -3177,7 +2256,7 @@ if eval "test \"`echo '$''{'ac_cv_func_s
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 3181 "configure"
+#line 2260 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char snprintf(); below. */
@@ -3187,7 +2266,7 @@ else
builtin and then its argument prototype would still apply. */
char snprintf();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -3201,7 +2280,7 @@ snprintf();
; return 0; }
EOF
-if { (eval echo configure:3205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:2284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_snprintf=yes"
else
@@ -3239,239 +2318,7 @@ fi
# details.
PATHDEFS_MAKE=pathdefs.make
PATHS_DEFS=paths.defs
-
- ac_safe=`echo "paths.h" | tr './\055' '___'`
-echo $ac_n "checking for paths.h""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- cat > conftest.$ac_ext <<EOF
-#line 3250 "configure"
-#include "confdefs.h"
-#include <paths.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
-else
- echo "$ac_err" >&5
- rm -rf conftest*
- eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-fi
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
- echo "$ac_t""yes" 1>&6
- cat >> confdefs.h <<\EOF
-#define HAVE_PATHS_H 1
-EOF
- iu_paths_h="<paths.h>"
-else
- echo "$ac_t""no" 1>&6
-fi
-
- # If we cannot run a trivial program, we must be cross compiling.
-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6
-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then
- echo $ac_n "(cached) $ac_c" 1>&6
-else
- if test "$cross_compiling" = yes; then
- ac_cv_c_cross=yes
-else
-cat > conftest.$ac_ext <<EOF
-#line 3286 "configure"
-#include "confdefs.h"
-main(){return(0);}
-EOF
-{ (eval echo configure:3290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
-if test -s conftest && (./conftest; exit) 2>/dev/null; then
- ac_cv_c_cross=no
-else
- ac_cv_c_cross=yes
-fi
-fi
-rm -fr conftest*
-fi
-
-echo "$ac_t""$ac_cv_c_cross" 1>&6
-cross_compiling=$ac_cv_c_cross
-
- # Check whether --with-PATHVAR or --without-PATHVAR was given.
-if test "${with_PATHVAR+set}" = set; then
- withval="$with_PATHVAR"
- :
-fi
-
- while read iu_path iu_search; do
- test "$iu_path" = "#" -o -z "$iu_path" && continue
-
- iu_pathvar="`echo $iu_path | sed y/${IU_UCASE}/${iu_lcase}/`"
- echo $ac_n "checking for value of $iu_path""... $ac_c" 1>&6
-
- iu_val='' iu_hdr='' iu_sym=''
- iu_cached='' iu_defaulted=''
- iu_cross_conflict=''
- if test "`eval echo '$'{with_$iu_pathvar+set}`" = set; then
- # User-supplied value
- eval iu_val=\"'$'with_$iu_pathvar\"
- elif test "`eval echo '$'{inetutils_cv_$iu_pathvar+set}`" = set; then
- # Cached value
- eval iu_val=\"'$'inetutils_cv_$iu_pathvar\"
- iu_cached="(cached) "
- elif test "`eval echo '$'{inetutils_cv_hdr_$iu_pathvar+set}`" = set; then
- # Cached non-value
- eval iu_hdr=\"'$'inetutils_cv_hdr_$iu_pathvar\"
- eval iu_sym=\"'$'inetutils_cv_hdr_sym_$iu_pathvar\"
- iu_cached="(cached) "
- else
- # search for a reasonable value
-
- iu_test_type=e # `exists'
- iu_default='' iu_prev_cross_test=''
- for iu_try in $iu_paths_h $iu_search; do
- iu_cross_test=''
- case "$iu_try" in
- "<"*">"*)
- # <HEADER.h> and <HEADER.h>:SYMBOL -- look for SYMBOL in <HEADER.h>
- # SYMBOL defaults to _$iu_path (e.g., _PATH_FOO)
- eval iu_hdr=\'`echo "$iu_try" |sed 's/:.*$//'`\'
- eval iu_sym=\'`echo "$iu_try" |sed -n 's/^<^>*>:\(.*\)$/\1/p'`\'
- test "$iu_sym" || iu_sym="_$iu_path"
- cat > conftest.$ac_ext <<EOF
-#line 3345 "configure"
-#include "confdefs.h"
-#include $iu_hdr
-#ifdef $iu_sym
-HAVE_$iu_sym
-#endif
-EOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- egrep "HAVE_$iu_sym" >/dev/null 2>&1; then
- rm -rf conftest*
- :
-else
- rm -rf conftest*
- iu_hdr='' iu_sym=''
-fi
-rm -f conftest*
-
- ;;
-
- search:*)
- # Do a path search. The syntax here is: search:NAME[:PATH]...
-
- # Path searches always generate potential conflicts
- test "$cross_compiling" = yes && { iu_cross_conflict=yes; continue; }
-
- IFS="${IFS= }"; iu_save_ifs="$IFS"; IFS="${IFS}:"
- read iu_cmd iu_name iu_spath <<EOF
-$iu_try
-EOF
- test "$iu_spath" || iu_spath="$PATH"
- for iu_dir in $iu_spath; do
- test -z "$iu_dir" && iu_dir=.
- if test -$iu_test_type "$iu_dir/$iu_name"; then
- iu_val="$iu_dir/$iu_name"
- break
- fi
- done
- IFS="$iu_save_ifs"
- ;;
-
- no) iu_default=no;;
- x|d|f|c|b) iu_test_type=$iu_try;;
-
- *)
- # Just try the given name, with make-var substitution. Besides
- # yielding a value if found, this also sets the default.
-
- case "$iu_try" in "\""*"\"")
- # strip off quotes
- iu_try="`echo $iu_try | sed -e 's/^.//' -e 's/.$//'`"
- esac
-
- test -z "$iu_default" && iu_default="$iu_try"
- test "$cross_compiling" = yes && { iu_cross_test=yes; continue; }
-
- # See if the value begins with a $(FOO)/${FOO} make variable
- # corresponding to a shell variable, and if so set try_exp to the
- # value thereof. Recurse.
- iu_try_exp="$iu_try"
-
- iu_try_var="`echo "$iu_try_exp" |sed -n 's;^\$[({]\([-_a-zA-Z]*\)[)}].*;\1;p'`"
- while eval test \"$iu_try_var\" && eval test '${'$iu_try_var'+set}'; do
- # yes, and there's a corresponding shell variable, which substitute
- if eval test \"'$'"$iu_try_var"\" = NONE; then
- # Not filled in by configure yet
- case "$iu_try_var" in
- prefix | exec_prefix)
- iu_try_exp="$ac_default_prefix`echo "$iu_try_exp" |sed 's;^\$[({][-_a-zA-Z]*[)}];;'`";;
- esac
- iu_try_var='' # Stop expansion here
- else
- # Use the actual value of the shell variable
- eval iu_try_exp=\"`echo "$iu_try_exp" |sed 's;^\$[({]\([-_a-zA-Z]*\)[)}];\$\1;'`\"
- iu_try_var="`echo "$iu_try_exp" |sed -n 's;^\$[({]\([-_a-zA-Z]*\)[)}].*;\1;p'`"
- fi
- done
-
-
- test -$iu_test_type "$iu_try_exp" && iu_val="$iu_try"
- ;;
-
- esac
-
- test "$iu_val" -o "$iu_hdr" && break
- test "$iu_cross_test" -a "$iu_prev_cross_test" && iu_cross_conflict=yes
- iu_prev_cross_test=$iu_cross_test
- done
-
- if test -z "$iu_val" -a -z "$iu_hdr"; then
- if test -z "$iu_default"; then
- iu_val=no
- else
- iu_val="$iu_default"
- iu_defaulted="(default) "
- fi
- fi
- fi
-
- if test "$iu_val"; then
- echo "$ac_t""${iu_cached}${iu_defaulted}$iu_val" 1>&6
- test "$iu_cross_conflict" -a "$iu_defaulted" \
- && echo "configure: warning: may be incorrect because of cross-compilation" 1>&2
- if test "$iu_val" != no; then
- iu_pathdef="`echo $iu_path | sed 's/^PATH_/PATHDEF_/'`"
- echo $iu_pathdef = -D$iu_path='\"'"$iu_val"'\"'
- fi
- test "$iu_cached" || eval inetutils_cv_$iu_pathvar=\'"$iu_val"\'
- elif test "$iu_hdr"; then
- echo "$ac_t""${iu_cached}from $iu_sym in $iu_hdr" 1>&6
- test "$iu_cached" || eval inetutils_cv_hdr_$iu_pathvar=\'"$iu_hdr"\'
- test "$iu_cached" || eval inetutils_cv_hdr_sym_$iu_pathvar=\'"$iu_sym"\'
- fi
- done <$srcdir/paths >$PATHDEFS_MAKE
-
-
- # Generate a file of #ifdefs that defaults PATH_FOO macros to _PATH_FOO (or
- # some other symbol) (excluding any who's value is set to `no').
- while read iu_path iu_search; do
- test "$iu_path" = "#" -o -z "$iu_path" && continue
- iu_pathvar="`echo $iu_path | sed y/${IU_UCASE}/${iu_lcase}/`"
- test "`eval echo '$'{inetutils_cv_$iu_pathvar}`" = no && continue
- eval iu_sym=\"'$'inetutils_cv_hdr_sym_$iu_pathvar\"
- if test "$iu_sym"; then
- cat <<EOF
-#ifndef $iu_path
-#define $iu_path $iu_sym
-#endif
-EOF
- fi
- done <$srcdir/paths >$PATHS_DEFS
-
+IU_CONFIG_PATHS($srcdir/paths, PATHDEFS_MAKE, PATHS_DEFS)
# Supply optional header files by linking a copy into the object include dir
LINK_SRCS="$LINK_SRCS `for I in $INCLUDES; do echo $ac_n ' 'headers/$I$ac_c; done`"
@@ -3534,7 +2381,9 @@ DEFS=-DHAVE_CONFIG_H
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
@@ -3596,6 +2445,9 @@ s%@libdir@%$libdir%g
s%@includedir@%$includedir%g
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
+s%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
s%@mandir@%$mandir%g
s%@COMMON@%$COMMON%g
s%@SERVERS@%$SERVERS%g
@@ -3623,16 +2475,10 @@ s%@RANLIB@%$RANLIB%g
s%@RM@%$RM%g
s%@LIBUTIL@%$LIBUTIL%g
s%@LIBCRYPT@%$LIBCRYPT%g
-s%@LIBTERMCAP@%$LIBTERMCAP%g
-s%@LIBCURSES@%$LIBCURSES%g
s%@subdirs@%$subdirs%g
s%@LIBGLOB@%$LIBGLOB%g
s%@LIBAUTH@%$LIBAUTH%g
s%@SERVERS_OR_CLIENTS@%$SERVERS_OR_CLIENTS%g
-/@PATHDEFS_MAKE@/r $PATHDEFS_MAKE
-s%@PATHDEFS_MAKE@%%g
-/@PATHS_DEFS@/r $PATHS_DEFS
-s%@PATHS_DEFS@%%g
CEOF
EOF
@@ -3847,6 +2693,7 @@ done
exit 0
EOF
chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/inetutils/glob/configure amiga/fsf/inetutils/glob/configure
--- baseline/fsf/inetutils/glob/configure Sat Mar 2 03:01:02 1996
+++ amiga/fsf/inetutils/glob/configure Mon Sep 30 22:46:32 1996
@@ -1,8 +1,8 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated automatically using autoconf version 2.7
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
+# Generated automatically using autoconf version 2.10
+# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
@@ -44,6 +44,9 @@ libdir='${exec_prefix}/lib'
includedir='${prefix}/include'
oldincludedir='/usr/include'
infodir='${prefix}/info'
+guidedir='${prefix}/guide'
+psdir='${prefix}/ps'
+dvidir='${prefix}/dvi'
mandir='${prefix}/man'
# Initialize some other variables.
@@ -158,6 +161,9 @@ Directory and file names:
--includedir=DIR C header files in DIR [PREFIX/include]
--oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
--infodir=DIR info documentation in DIR [PREFIX/info]
+ --guidedir=DIR Amigaguide documentation in DIR [PREFIX/guide]
+ --psdir=DIR postscript documentation in DIR [PREFIX/ps]
+ --dvidir=DIR TeX dvi documentation in DIR [PREFIX/dvi]
--mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
@@ -200,6 +206,18 @@ EOF
-infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
infodir="$ac_optarg" ;;
+ -guidedir | --guidedir | --guidedi | --guided | --guide | --gui)
+ ac_prev=guidedir ;;
+ -guidedir=* | --guidedir=* | --guidedi=* | --guided=* | --guide=* |--gui=*)+ guidedir="$ac_optarg" ;;
+
+ -psdir | --psdir | --psdi | --psd | --ps)
+ ac_prev=psdir ;;
+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*)+ psdir="$ac_optarg" ;;
+
+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv)
+ ac_prev=dvidir ;;
+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* |--dv=*)+ dvidir="$ac_optarg" ;;
+
-libdir | --libdir | --libdi | --libd)
ac_prev=libdir ;;
-libdir=* | --libdir=* | --libdi=* | --libd=*)
@@ -330,7 +348,7 @@ EOF
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
- echo "configure generated by autoconf version 2.7"
+ echo "configure generated by autoconf version 2.10"
exit 0 ;;
-with-* | --with-*)
@@ -597,7 +615,7 @@ else
yes;
#endif
EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:619: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
@@ -624,9 +642,9 @@ fi
echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
if test $ac_cv_prog_gcc_g = yes; then
- CFLAGS="-g -O"
+ CFLAGS="-g -O2"
else
- CFLAGS="-O"
+ CFLAGS="-O2"
fi
fi
else
@@ -705,13 +723,13 @@ else
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
-#line 709 "configure"
+#line 727 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:733: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -720,13 +738,13 @@ else
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
-#line 724 "configure"
+#line 742 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
@@ -747,7 +765,7 @@ fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking for AIX""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
-#line 751 "configure"
+#line 769 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
@@ -774,12 +792,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 778 "configure"
+#line 796 "configure"
#include "confdefs.h"
#include <minix/config.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -839,7 +857,7 @@ if eval "test \"`echo '$''{'ac_cv_c_cons
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 843 "configure"
+#line 861 "configure"
#include "confdefs.h"
int main() { return 0; }
@@ -889,7 +907,7 @@ ccp = (char const *const *) p;
; return 0; }
EOF
-if { (eval echo configure:893: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_const=yes
else
@@ -917,11 +935,11 @@ else
ac_cv_c_cross=yes
else
cat > conftest.$ac_ext <<EOF
-#line 921 "configure"
+#line 939 "configure"
#include "confdefs.h"
main(){return(0);}
EOF
-{ (eval echo configure:925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_cross=no
else
@@ -939,7 +957,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 943 "configure"
+#line 961 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
@@ -947,7 +965,7 @@ else
#include <float.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:969: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -962,7 +980,7 @@ rm -f conftest*
if test $ac_cv_header_stdc = yes; then
# SunOS 4.x string.h does not declare mem*, contrary to ANSI.
cat > conftest.$ac_ext <<EOF
-#line 966 "configure"
+#line 984 "configure"
#include "confdefs.h"
#include <string.h>
EOF
@@ -980,7 +998,7 @@ 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 <<EOF
-#line 984 "configure"
+#line 1002 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
@@ -1001,7 +1019,7 @@ if test "$cross_compiling" = yes; then
:
else
cat > conftest.$ac_ext <<EOF
-#line 1005 "configure"
+#line 1023 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -1012,7 +1030,7 @@ if (XOR (islower (i), ISLOWER (i)) || to
exit (0); }
EOF
-{ (eval echo configure:1016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
@@ -1039,12 +1057,12 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1043 "configure"
+#line 1061 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1048: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
@@ -1077,7 +1095,7 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1081 "configure"
+#line 1099 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_hdr>
@@ -1086,7 +1104,7 @@ int t() {
DIR *dirp = 0;
; return 0; }
EOF
-if { (eval echo configure:1090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:1108: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_header_dirent_$ac_safe=yes"
else
@@ -1110,22 +1128,26 @@ done
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
if test $ac_header_dirent = dirent.h; then
echo $ac_n "checking for -ldir""... $ac_c" 1>&6
-ac_lib_var=`echo dir | tr '.-/+' '___p'`
+ac_lib_var=`echo dir'_'opendir | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-ldir $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1121 "configure"
+#line 1139 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1145,22 +1167,26 @@ fi
else
echo $ac_n "checking for -lx""... $ac_c" 1>&6
-ac_lib_var=`echo x | tr '.-/+' '___p'`
+ac_lib_var=`echo x'_'opendir | tr './+\055' '__p_'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lx $LIBS"
cat > conftest.$ac_ext <<EOF
-#line 1156 "configure"
+#line 1178 "configure"
#include "confdefs.h"
+/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char opendir();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
opendir()
; return 0; }
EOF
-if { (eval echo configure:1164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_lib_$ac_lib_var=yes"
else
@@ -1188,13 +1214,13 @@ else
ac_cv_func_closedir_void=yes
else
cat > conftest.$ac_ext <<EOF
-#line 1192 "configure"
+#line 1218 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <$ac_header_dirent>
int closedir(); main() { exit(closedir(opendir(".")) != 0); }
EOF
-{ (eval echo configure:1198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_func_closedir_void=no
else
@@ -1219,15 +1245,15 @@ if eval "test \"`echo '$''{'ac_cv_header
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1223 "configure"
+#line 1249 "configure"
#include "confdefs.h"
#include <alloca.h>
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
char *p = alloca(2 * sizeof(int));
; return 0; }
EOF
-if { (eval echo configure:1231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_header_alloca_h=yes
else
@@ -1251,7 +1277,7 @@ if eval "test \"`echo '$''{'ac_cv_func_a
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1255 "configure"
+#line 1281 "configure"
#include "confdefs.h"
#ifdef __GNUC__
@@ -1270,12 +1296,12 @@ char *alloca ();
# endif
#endif
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
char *p = (char *) alloca(1);
; return 0; }
EOF
-if { (eval echo configure:1279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
ac_cv_func_alloca=yes
else
@@ -1310,7 +1336,7 @@ if eval "test \"`echo '$''{'ac_cv_os_cra
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1314 "configure"
+#line 1340 "configure"
#include "confdefs.h"
#if defined(CRAY) && ! defined(CRAY2)
webecray
@@ -1339,15 +1365,17 @@ if eval "test \"`echo '$''{'ac_cv_func_$
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
-#line 1343 "configure"
+#line 1369 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
char $ac_func();
-int main() { return 0; }
+int main() { t(); return 0; }
int t() {
/* The GNU C library defines this for functions which it implements
@@ -1361,7 +1389,7 @@ $ac_func();
; return 0; }
EOF
-if { (eval echo configure:1365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
+if { (eval echo configure:1393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
@@ -1393,7 +1421,7 @@ else
ac_cv_c_stack_direction=0
else
cat > conftest.$ac_ext <<EOF
-#line 1397 "configure"
+#line 1425 "configure"
#include "confdefs.h"
find_stack_direction ()
{
@@ -1412,7 +1440,7 @@ main ()
exit (find_stack_direction() < 0);
}
EOF
-{ (eval echo configure:1416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_c_stack_direction=1
else
@@ -1437,7 +1465,7 @@ else
ac_cv_func_strcoll=no
else
cat > conftest.$ac_ext <<EOF
-#line 1441 "configure"
+#line 1469 "configure"
#include "confdefs.h"
#include <string.h>
main ()
@@ -1447,7 +1475,7 @@ main ()
strcoll ("123", "456") >= 0);
}
EOF
-{ (eval echo configure:1451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
+{ (eval echo configure:1479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_func_strcoll=yes
else
@@ -1532,7 +1560,9 @@ rm -f conftest.defs
: ${CONFIG_STATUS=./config.status}
echo creating $CONFIG_STATUS
-rm -f $CONFIG_STATUS
+# Some systems, like AmigaOS, won't allow you to remove a script that is
+# being executed, so just move it out of the way instead.
+if test -f $CONFIG_STATUS; then mv $CONFIG_STATUS $CONFIG_STATUS.old; else true; fi
cat > $CONFIG_STATUS <<EOF
#! /bin/sh
# Generated automatically by configure.
@@ -1553,7 +1583,7 @@ do
echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion"
exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-version | --version | --versio | --versi | --vers | --ver | --ve | --v)
- echo "$CONFIG_STATUS generated by autoconf version 2.7"
+ echo "$CONFIG_STATUS generated by autoconf version 2.10"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
@@ -1592,6 +1622,9 @@ s%@libdir@%$libdir%g
s%@includedir@%$includedir%g
s%@oldincludedir@%$oldincludedir%g
s%@infodir@%$infodir%g
+s%@guidedir@%$guidedir%g
+s%@psdir@%$psdir%g
+s%@dvidir@%$dvidir%g
s%@mandir@%$mandir%g
s%@CC@%$CC%g
s%@AR@%$AR%g
@@ -1659,6 +1692,7 @@ rm -f conftest.subs
exit 0
EOF
chmod +x $CONFIG_STATUS
+rm -f CONFIG.STATUS.old
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
diff -rup --new-file baseline/fsf/inetutils/manifests/src amiga/fsf/inetutils/manifests/src
--- baseline/fsf/inetutils/manifests/src Wed Dec 31 17:00:00 1969
+++ amiga/fsf/inetutils/manifests/src Sat Sep 28 00:00:00 1996
@@ -0,0 +1,191 @@
+fsf/inetutils/ChangeLog
+fsf/inetutils/INSTALL
+fsf/inetutils/Makefile.in
+fsf/inetutils/NEWS
+fsf/inetutils/Product-Info
+fsf/inetutils/README
+fsf/inetutils/TODO
+fsf/inetutils/config.guess
+fsf/inetutils/config.make.in
+fsf/inetutils/config.sub
+fsf/inetutils/configure
+fsf/inetutils/configure.in
+fsf/inetutils/ftp/Makefile.in
+fsf/inetutils/ftp/cmds.c
+fsf/inetutils/ftp/cmdtab.c
+fsf/inetutils/ftp/domacro.c
+fsf/inetutils/ftp/extern.h
+fsf/inetutils/ftp/ftp.1
+fsf/inetutils/ftp/ftp.c
+fsf/inetutils/ftp/ftp_var.h
+fsf/inetutils/ftp/main.c
+fsf/inetutils/ftp/ruserpass.c
+fsf/inetutils/ftpd/Makefile.in
+fsf/inetutils/ftpd/extern.h
+fsf/inetutils/ftpd/ftpcmd.y
+fsf/inetutils/ftpd/ftpd.8
+fsf/inetutils/ftpd/ftpd.c
+fsf/inetutils/ftpd/popen.c
+fsf/inetutils/glob/COPYING.LIB
+fsf/inetutils/glob/ChangeLog
+fsf/inetutils/glob/Makefile.ami
+fsf/inetutils/glob/Makefile.in
+fsf/inetutils/glob/SCOPTIONS
+fsf/inetutils/glob/SMakefile
+fsf/inetutils/glob/configure
+fsf/inetutils/glob/configure.bat
+fsf/inetutils/glob/configure.in
+fsf/inetutils/glob/fnmatch.c
+fsf/inetutils/glob/fnmatch.h
+fsf/inetutils/glob/glob.c
+fsf/inetutils/glob/glob.h
+fsf/inetutils/headers/Makefile.in
+fsf/inetutils/headers/acconfig.h
+fsf/inetutils/headers/arpa/ftp.h
+fsf/inetutils/headers/arpa/telnet.h
+fsf/inetutils/headers/arpa/tftp.h
+fsf/inetutils/headers/config.h.in
+fsf/inetutils/headers/confpaths.h.in
+fsf/inetutils/headers/crypt.h
+fsf/inetutils/headers/err.h
+fsf/inetutils/headers/getopt.h
+fsf/inetutils/headers/osockaddr.h
+fsf/inetutils/headers/version.h
+fsf/inetutils/inetd/Makefile.in
+fsf/inetutils/inetd/inetd.8
+fsf/inetutils/inetd/inetd.c
+fsf/inetutils/install-sh
+fsf/inetutils/libinetutils/Makefile.in
+fsf/inetutils/libinetutils/cleansess.c
+fsf/inetutils/libinetutils/daemon.c
+fsf/inetutils/libinetutils/getopt.c
+fsf/inetutils/libinetutils/getopt1.c
+fsf/inetutils/libinetutils/hstrerror.c
+fsf/inetutils/libinetutils/localhost.c
+fsf/inetutils/libinetutils/logout.c
+fsf/inetutils/libinetutils/logwtmp.c
+fsf/inetutils/libinetutils/logwtmpko.c
+fsf/inetutils/libinetutils/strdup.c
+fsf/inetutils/libinetutils/strerror.c
+fsf/inetutils/libinetutils/stub_tgetent.c
+fsf/inetutils/libinetutils/ttymsg.c
+fsf/inetutils/libinetutils/version.c
+fsf/inetutils/libtelnet/Makefile.in
+fsf/inetutils/libtelnet/auth-proto.h
+fsf/inetutils/libtelnet/auth.c
+fsf/inetutils/libtelnet/auth.h
+fsf/inetutils/libtelnet/enc-proto.h
+fsf/inetutils/libtelnet/enc_des.c
+fsf/inetutils/libtelnet/encrypt.c
+fsf/inetutils/libtelnet/encrypt.h
+fsf/inetutils/libtelnet/genget.c
+fsf/inetutils/libtelnet/getent.c
+fsf/inetutils/libtelnet/kerberos.c
+fsf/inetutils/libtelnet/kerberos5.c
+fsf/inetutils/libtelnet/key-proto.h
+fsf/inetutils/libtelnet/krb4encpwd.c
+fsf/inetutils/libtelnet/misc-proto.h
+fsf/inetutils/libtelnet/misc.c
+fsf/inetutils/libtelnet/misc.h
+fsf/inetutils/libtelnet/read_password.c
+fsf/inetutils/libtelnet/rsaencpwd.c
+fsf/inetutils/libtelnet/spx.c
+fsf/inetutils/manifests/bin
+fsf/inetutils/manifests/src
+fsf/inetutils/mkinstalldirs
+fsf/inetutils/paths
+fsf/inetutils/rcp/Makefile.in
+fsf/inetutils/rcp/extern.h
+fsf/inetutils/rcp/rcp.1
+fsf/inetutils/rcp/rcp.c
+fsf/inetutils/rcp/util.c
+fsf/inetutils/rexecd/Makefile.in
+fsf/inetutils/rexecd/rexecd.8
+fsf/inetutils/rexecd/rexecd.c
+fsf/inetutils/rlogin/Makefile.in
+fsf/inetutils/rlogin/krb.h
+fsf/inetutils/rlogin/rlogin.1
+fsf/inetutils/rlogin/rlogin.c
+fsf/inetutils/rlogind/Makefile.in
+fsf/inetutils/rlogind/rlogind.8
+fsf/inetutils/rlogind/rlogind.c
+fsf/inetutils/rsh/Makefile.in
+fsf/inetutils/rsh/rsh.1
+fsf/inetutils/rsh/rsh.c
+fsf/inetutils/rshd/Makefile.in
+fsf/inetutils/rshd/rshd.8
+fsf/inetutils/rshd/rshd.c
+fsf/inetutils/rules.make
+fsf/inetutils/syslog/Makefile.in
+fsf/inetutils/syslog/syslog.1
+fsf/inetutils/syslog/syslog.c
+fsf/inetutils/syslogd/Makefile.in
+fsf/inetutils/syslogd/syslog.conf.5
+fsf/inetutils/syslogd/syslogd.8
+fsf/inetutils/syslogd/syslogd.c
+fsf/inetutils/talk/Makefile.in
+fsf/inetutils/talk/ctl.c
+fsf/inetutils/talk/ctl_transact.c
+fsf/inetutils/talk/display.c
+fsf/inetutils/talk/get_addrs.c
+fsf/inetutils/talk/get_names.c
+fsf/inetutils/talk/init_disp.c
+fsf/inetutils/talk/invite.c
+fsf/inetutils/talk/io.c
+fsf/inetutils/talk/look_up.c
+fsf/inetutils/talk/msgs.c
+fsf/inetutils/talk/talk.1
+fsf/inetutils/talk/talk.c
+fsf/inetutils/talk/talk.h
+fsf/inetutils/talk/talk_ctl.h
+fsf/inetutils/talkd/Makefile.in
+fsf/inetutils/talkd/announce.c
+fsf/inetutils/talkd/print.c
+fsf/inetutils/talkd/process.c
+fsf/inetutils/talkd/table.c
+fsf/inetutils/talkd/talkd.8
+fsf/inetutils/talkd/talkd.c
+fsf/inetutils/telnet/Makefile.in
+fsf/inetutils/telnet/authenc.c
+fsf/inetutils/telnet/commands.c
+fsf/inetutils/telnet/defines.h
+fsf/inetutils/telnet/externs.h
+fsf/inetutils/telnet/fdset.h
+fsf/inetutils/telnet/general.h
+fsf/inetutils/telnet/krb4-proto.h
+fsf/inetutils/telnet/main.c
+fsf/inetutils/telnet/network.c
+fsf/inetutils/telnet/ring.c
+fsf/inetutils/telnet/ring.h
+fsf/inetutils/telnet/sys_bsd.c
+fsf/inetutils/telnet/telnet.1
+fsf/inetutils/telnet/telnet.c
+fsf/inetutils/telnet/terminal.c
+fsf/inetutils/telnet/tn3270.c
+fsf/inetutils/telnet/types.h
+fsf/inetutils/telnet/utilities.c
+fsf/inetutils/telnetd/Makefile.in
+fsf/inetutils/telnetd/authenc.c
+fsf/inetutils/telnetd/defs.h
+fsf/inetutils/telnetd/ext.h
+fsf/inetutils/telnetd/global.c
+fsf/inetutils/telnetd/slc.c
+fsf/inetutils/telnetd/state.c
+fsf/inetutils/telnetd/sys_term.c
+fsf/inetutils/telnetd/telnetd.8
+fsf/inetutils/telnetd/telnetd.c
+fsf/inetutils/telnetd/telnetd.h
+fsf/inetutils/telnetd/termstat.c
+fsf/inetutils/telnetd/utility.c
+fsf/inetutils/tftp/Makefile.in
+fsf/inetutils/tftp/extern.h
+fsf/inetutils/tftp/main.c
+fsf/inetutils/tftp/tftp.1
+fsf/inetutils/tftp/tftp.c
+fsf/inetutils/tftp/tftpsubs.c
+fsf/inetutils/tftp/tftpsubs.h
+fsf/inetutils/tftpd/Makefile.in
+fsf/inetutils/tftpd/tftpd.8
+fsf/inetutils/tftpd/tftpd.c
+fsf/inetutils/uucpd/Makefile.in
+fsf/inetutils/uucpd/uucpd.c