Vanilla Netrek Server Development Archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[VANILLA-L:685] Re: [VANILLA-L:680] Small patches
Bob Tanner wrote:
> I made a couple of patches to 2.7pl7.
Received. Reviewed. I've reduced them to remove the per-file revision
information and the duplicate diff output. I've also removed changes
which appeared to be cosmetic or testing changes, such as the addition
of -g to the sequencer/Makefile and the changes to sequencer/30.
The revised patch is attached. Bob, can you view the lower section,
after the configure changes, and let me know if that agrees with your
perception of your changes? You may wish to diff the diff with your
diff to see the diff, so to speak. ;-)
I'm particularly worried about the change that casts something to
"struct sockadd", which I thought would have been "struct sockaddr". I
haven't tried a compile yet.
It would be good to get "make patches" to work on your platform. Not
all platforms have CVS, or an equivalent, and not all developers have
the knowledge of how to use it appropriately.
Change control systems provide:
- reduced disk usage for multiple concurrent version operation,
- control over concurrent reservation of elements (many people),
- retention of change control history,
- ability to revert to any previous version.
I'd prefer to avoid CVS, RCS, SCCS, and any change control system
because I don't think the use of them is appropriate for this "project".
My reasons are:
- disk space is cheap, and each version .tar.gz takes only 500k,
- there is usually only one developer on each site,
- the reservation of elements is confined to the site,
- coordination of concurrent changes is done by mail,
- the project has a code librarian for merging concurrent fixes,
- change control history is kept short, and in CHANGES,
- history is retained by accumulating patches or old versions.
> I made some changes to configure.in to make it a little smarter
> looking for the RSA stuff. I included the configure script itself in
> case you do not have autoconf.
The configure script is included in the manifest anyway. The intention
is that installers of the server need only the server kit, not autoconf.
[ps: I'm curious as to how this message's subject line will appear, as I
see a message in my inbox which suggests that the mail server is not
removing previous message numbering. The old list did that.]
--
James Cameron (cameron@stl.dec.com)
Digital Equipment Corporation (Australia) Pty. Ltd. A.C.N. 000 446 800
Index: Server/configure
diff -c Server/configure:1.1 Server/configure:1.2
*** Server/configure:1.1 Wed Oct 15 17:51:24 1997
--- Server/configure Wed Oct 15 19:23:34 1997
***************
*** 1,8 ****
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.2
! # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc.
#
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
--- 1,8 ----
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.12
! # 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.
***************
*** 39,47 ****
--- 39,62 ----
verbose=
x_includes=NONE
x_libraries=NONE
+ bindir='${exec_prefix}/bin'
+ sbindir='${exec_prefix}/sbin'
+ libexecdir='${exec_prefix}/libexec'
+ datadir='${prefix}/share'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
+ libdir='${exec_prefix}/lib'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ infodir='${prefix}/info'
+ mandir='${prefix}/man'
# Initialize some other variables.
subdirs=
+ MFLAGS= MAKEFLAGS=
+ # Maximum number of lines to put in a shell here document.
+ ac_max_here_lines=12
ac_prev=
for ac_option
***************
*** 63,71 ****
case "$ac_option" in
! -build | --build | --buil | --bui | --bu | --b)
ac_prev=build ;;
! -build=* | --build=* | --buil=* | --bui=* | --bu=* | --b=*)
build="$ac_optarg" ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
--- 78,91 ----
case "$ac_option" in
! -bindir | --bindir | --bindi | --bind | --bin | --bi)
! ac_prev=bindir ;;
! -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
! bindir="$ac_optarg" ;;
!
! -build | --build | --buil | --bui | --bu)
ac_prev=build ;;
! -build=* | --build=* | --buil=* | --bui=* | --bu=*)
build="$ac_optarg" ;;
-cache-file | --cache-file | --cache-fil | --cache-fi \
***************
*** 75,80 ****
--- 95,106 ----
| --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
cache_file="$ac_optarg" ;;
+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
+ ac_prev=datadir ;;
+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
+ | --da=*)
+ datadir="$ac_optarg" ;;
+
-disable-* | --disable-*)
ac_feature=`echo $ac_option|sed -e 's/-*disable-//'`
# Reject names that are not valid shell variable names.
***************
*** 125,136 ****
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
! --exec-prefix=PREFIX install architecture-dependent files in PREFIX
[same as prefix]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
! --program-transform-name=PROGRAM run sed PROGRAM on installed program names
Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed]
--- 151,179 ----
Directory and file names:
--prefix=PREFIX install architecture-independent files in PREFIX
[$ac_default_prefix]
! --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
[same as prefix]
+ --bindir=DIR user executables in DIR [EPREFIX/bin]
+ --sbindir=DIR system admin executables in DIR [EPREFIX/sbin]
+ --libexecdir=DIR program executables in DIR [EPREFIX/libexec]
+ --datadir=DIR read-only architecture-independent data in DIR
+ [PREFIX/share]
+ --sysconfdir=DIR read-only single-machine data in DIR [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data in DIR
+ [PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data in DIR [PREFIX/var]
+ --libdir=DIR object code libraries in DIR [EPREFIX/lib]
+ --includedir=DIR C header files in DIR [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc in DIR [/usr/include]
+ --infodir=DIR info documentation in DIR [PREFIX/info]
+ --mandir=DIR man documentation in DIR [PREFIX/man]
--srcdir=DIR find the sources in DIR [configure dir or ..]
--program-prefix=PREFIX prepend PREFIX to installed program names
--program-suffix=SUFFIX append SUFFIX to installed program names
! --program-transform-name=PROGRAM
! run sed PROGRAM on installed program names
! EOF
! cat << EOF
Host type:
--build=BUILD configure for building on BUILD [BUILD=HOST]
--host=HOST configure for HOST [guessed]
***************
*** 142,149 ****
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
- --enable and --with options recognized:$ac_help
EOF
exit 0 ;;
-host | --host | --hos | --ho)
--- 185,194 ----
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--x-includes=DIR X include files are in DIR
--x-libraries=DIR X library files are in DIR
EOF
+ if test -n "$ac_help"; then
+ echo "--enable and --with options recognized:$ac_help"
+ fi
exit 0 ;;
-host | --host | --hos | --ho)
***************
*** 151,156 ****
--- 196,239 ----
-host=* | --host=* | --hos=* | --ho=*)
host="$ac_optarg" ;;
+ -includedir | --includedir | --includedi | --included | --include \
+ | --includ | --inclu | --incl | --inc)
+ ac_prev=includedir ;;
+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
+ | --includ=* | --inclu=* | --incl=* | --inc=*)
+ includedir="$ac_optarg" ;;
+
+ -infodir | --infodir | --infodi | --infod | --info | --inf)
+ ac_prev=infodir ;;
+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
+ infodir="$ac_optarg" ;;
+
+ -libdir | --libdir | --libdi | --libd)
+ ac_prev=libdir ;;
+ -libdir=* | --libdir=* | --libdi=* | --libd=*)
+ libdir="$ac_optarg" ;;
+
+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
+ | --libexe | --libex | --libe)
+ ac_prev=libexecdir ;;
+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
+ | --libexe=* | --libex=* | --libe=*)
+ libexecdir="$ac_optarg" ;;
+
+ -localstatedir | --localstatedir | --localstatedi | --localstated \
+ | --localstate | --localstat | --localsta | --localst \
+ | --locals | --local | --loca | --loc | --lo)
+ ac_prev=localstatedir ;;
+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \
+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
+ localstatedir="$ac_optarg" ;;
+
+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
+ ac_prev=mandir ;;
+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
+ mandir="$ac_optarg" ;;
+
-nfp | --nfp | --nf)
# Obsolete; use --without-fp.
with_fp=no ;;
***************
*** 163,168 ****
--- 246,260 ----
| --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
no_recursion=yes ;;
+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
+ | --oldin | --oldi | --old | --ol | --o)
+ ac_prev=oldincludedir ;;
+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
+ oldincludedir="$ac_optarg" ;;
+
-prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
ac_prev=prefix ;;
-prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
***************
*** 203,208 ****
--- 295,317 ----
| -silent | --silent | --silen | --sile | --sil)
silent=yes ;;
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+ | --sbi=* | --sb=*)
+ sbindir="$ac_optarg" ;;
+
+ -sharedstatedir | --sharedstatedir | --sharedstatedi \
+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
+ | --sharedst | --shareds | --shared | --share | --shar \
+ | --sha | --sh)
+ ac_prev=sharedstatedir ;;
+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
+ | --sha=* | --sh=*)
+ sharedstatedir="$ac_optarg" ;;
+
-site | --site | --sit)
ac_prev=site ;;
-site=* | --site=* | --sit=*)
***************
*** 213,218 ****
--- 322,334 ----
-srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
srcdir="$ac_optarg" ;;
+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
+ | --syscon | --sysco | --sysc | --sys | --sy)
+ ac_prev=sysconfdir ;;
+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
+ sysconfdir="$ac_optarg" ;;
+
-target | --target | --targe | --targ | --tar | --ta | --t)
ac_prev=target ;;
-target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
***************
*** 222,228 ****
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
! echo "configure generated by autoconf version 2.2"
exit 0 ;;
-with-* | --with-*)
--- 338,344 ----
verbose=yes ;;
-version | --version | --versio | --versi | --vers)
! echo "configure generated by autoconf version 2.12"
exit 0 ;;
-with-* | --with-*)
***************
*** 268,274 ****
-*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
! *)
if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
echo "configure: warning: $ac_option: invalid host type" 1>&2
fi
--- 384,390 ----
-*) { echo "configure: error: $ac_option: invalid option; use --help to show usage" 1>&2; exit 1; }
;;
! *)
if test -n "`echo $ac_option| sed 's/[-a-z0-9.]//g'`"; then
echo "configure: warning: $ac_option: invalid host type" 1>&2
fi
***************
*** 324,334 ****
done
# NLS nuisances.
! # Only set LANG and LC_ALL to C if already set.
! # These must not be set unconditionally because not all systems understand
! # e.g. LANG=C (notably SCO).
! if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
if test "${LANG+set}" = set; then LANG=C; export LANG; fi
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
--- 440,453 ----
done
# NLS nuisances.
! # Only set these to C if already set. These must not be set unconditionally
! # because not all systems understand e.g. LANG=C (notably SCO).
! # Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'!
! # Non-C LC_CTYPE values break the ctype check.
if test "${LANG+set}" = set; then LANG=C; export LANG; fi
+ if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi
+ if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi
+ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi
# confdefs.h avoids OS command line length limits that DEFS can exceed.
rm -rf conftest* confdefs.h
***************
*** 388,395 ****
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&5 2>&5'
! ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&5 2>&5'
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
--- 507,515 ----
ac_ext=c
# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
ac_cpp='$CPP $CPPFLAGS'
! ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
! cross_compiling=$ac_cv_prog_cc_cross
if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
# Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
***************
*** 411,416 ****
--- 531,537 ----
#----------------------------------------------------
echo $ac_n "checking for used sources""... $ac_c" 1>&6
+ echo "configure:535: checking for used sources" >&5
if test -f "$srcdir/playerlist.c"; then
code=cow
echo "$ac_t""COW" 1>&6
***************
*** 485,495 ****
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
! IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
--- 606,617 ----
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
# ./install, which can be erroneously created by make from ./install.sh.
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
+ echo "configure:610: checking for a BSD compatible install" >&5
if test -z "$INSTALL"; then
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
! IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:"
for ac_dir in $PATH; do
# Account for people who put trailing slashes in PATH elements.
case "$ac_dir/" in
***************
*** 512,522 ****
;;
esac
done
! IFS="$ac_save_ifs"
! # As a last resort, use the slow shell script.
! test -z "$ac_cv_path_install" && ac_cv_path_install="$ac_install_sh"
fi
! INSTALL="$ac_cv_path_install"
fi
echo "$ac_t""$INSTALL" 1>&6
--- 634,651 ----
;;
esac
done
! IFS="$ac_save_IFS"
!
fi
! if test "${ac_cv_path_install+set}" = set; then
! INSTALL="$ac_cv_path_install"
! else
! # As a last resort, use the slow shell script. We don't cache a
! # path for INSTALL within a source directory, because that will
! # break other packages using the cache if that directory is
! # removed, or if the path is relative.
! INSTALL="$ac_install_sh"
! fi
fi
echo "$ac_t""$INSTALL" 1>&6
***************
*** 529,534 ****
--- 658,664 ----
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:662: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 544,550 ****
fi
done
IFS="$ac_save_ifs"
- test -z "$ac_cv_prog_CC" && ac_cv_prog_CC="cc"
fi
fi
CC="$ac_cv_prog_CC"
--- 674,679 ----
***************
*** 554,561 ****
--- 683,780 ----
echo "$ac_t""no" 1>&6
fi
+ if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+ set dummy cc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:691: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:"
+ ac_prog_rejected=no
+ for ac_dir in $PATH; do
+ test -z "$ac_dir" && ac_dir=.
+ if test -f $ac_dir/$ac_word; then
+ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
+ break
+ fi
+ done
+ IFS="$ac_save_ifs"
+ if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# -gt 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ set dummy "$ac_dir/$ac_word" "$@"
+ shift
+ ac_cv_prog_CC="$@"
+ fi
+ fi
+ fi
+ fi
+ CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+ echo "$ac_t""$CC" 1>&6
+ else
+ echo "$ac_t""no" 1>&6
+ fi
+
+ test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+ fi
+
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+ echo "configure:739: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
+
+ cat > conftest.$ac_ext <<EOF
+ #line 749 "configure"
+ #include "confdefs.h"
+ main(){return(0);}
+ EOF
+ if { (eval echo configure:753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+ ac_cv_prog_cc_works=yes
+ # If we can't run a trivial program, we are probably using a cross compiler.
+ if (./conftest; exit) 2>/dev/null; then
+ ac_cv_prog_cc_cross=no
+ else
+ ac_cv_prog_cc_cross=yes
+ fi
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ ac_cv_prog_cc_works=no
+ fi
+ rm -fr conftest*
+
+ echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+ if test $ac_cv_prog_cc_works = no; then
+ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+ fi
+ echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+ echo "configure:773: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+ echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+ cross_compiling=$ac_cv_prog_cc_cross
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+ echo "configure:778: checking whether we are using GNU C" >&5
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 564,598 ****
yes;
#endif
EOF
! if ${CC-cc} -E conftest.c 2>&5 | egrep yes >/dev/null 2>&1; then
ac_cv_prog_gcc=yes
else
ac_cv_prog_gcc=no
fi
fi
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
if test $ac_cv_prog_gcc = yes; then
GCC=yes
! if test "${CFLAGS+set}" != set; then
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
! ac_cv_prog_gcc_g=yes
else
! ac_cv_prog_gcc_g=no
fi
rm -f conftest*
fi
! echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6
! if test $ac_cv_prog_gcc_g = yes; then
! CFLAGS="-g -O"
! else
! CFLAGS="-O"
! fi
fi
else
GCC=
--- 783,824 ----
yes;
#endif
EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:787: \"$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
fi
fi
+
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+
if test $ac_cv_prog_gcc = yes; then
GCC=yes
! ac_test_CFLAGS="${CFLAGS+set}"
! ac_save_CFLAGS="$CFLAGS"
! CFLAGS=
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:802: checking whether ${CC-cc} accepts -g" >&5
! if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
echo 'void f(){}' > conftest.c
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
! ac_cv_prog_cc_g=yes
else
! ac_cv_prog_cc_g=no
fi
rm -f conftest*
fi
!
! echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
! if test "$ac_test_CFLAGS" = set; then
! CFLAGS="$ac_save_CFLAGS"
! elif test $ac_cv_prog_cc_g = yes; then
! CFLAGS="-g -O2"
! else
! CFLAGS="-O2"
fi
else
GCC=
***************
*** 600,605 ****
--- 826,832 ----
fi
echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+ echo "configure:830: checking how to run the C preprocessor" >&5
# On Suns, sometimes $CPP names a directory.
if test -n "$CPP" && test -d "$CPP"; then
CPP=
***************
*** 614,644 ****
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 618 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 632 "configure"
#include "confdefs.h"
#include <assert.h>
Syntax Error
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
rm -rf conftest*
CPP=/lib/cpp
fi
--- 841,877 ----
# On the NeXT, cc -E runs the code through the compiler's parser,
# not just through cpp.
cat > conftest.$ac_ext <<EOF
! #line 845 "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:851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
CPP="${CC-cc} -E -traditional-cpp"
cat > conftest.$ac_ext <<EOF
! #line 862 "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:868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
CPP=/lib/cpp
fi
***************
*** 647,657 ****
rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
fi
- CPP="$ac_cv_prog_CPP"
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
--- 880,893 ----
rm -f conftest*
ac_cv_prog_CPP="$CPP"
fi
+ CPP="$ac_cv_prog_CPP"
+ else
+ ac_cv_prog_CPP="$CPP"
fi
echo "$ac_t""$CPP" 1>&6
echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+ echo "configure:891: checking whether ln -s works" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
***************
*** 673,680 ****
echo $ac_n "checking for AIX""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
! #line 678 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
--- 909,917 ----
echo $ac_n "checking for AIX""... $ac_c" 1>&6
+ echo "configure:913: checking for AIX" >&5
cat > conftest.$ac_ext <<EOF
! #line 915 "configure"
#include "confdefs.h"
#ifdef _AIX
yes
***************
*** 697,725 ****
echo $ac_n "checking for inline""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
! #line 707 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
} $ac_kw foo() {
; return 0; }
EOF
! if eval $ac_compile; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
fi
rm -f conftest*
-
done
fi
echo "$ac_t""$ac_cv_c_inline" 1>&6
case "$ac_cv_c_inline" in
inline | yes) ;;
--- 934,965 ----
echo $ac_n "checking for inline""... $ac_c" 1>&6
+ echo "configure:938: checking for inline" >&5
if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_cv_c_inline=no
for ac_kw in inline __inline__ __inline; do
cat > conftest.$ac_ext <<EOF
! #line 945 "configure"
#include "confdefs.h"
! int main() {
} $ac_kw foo() {
; return 0; }
EOF
! if { (eval echo configure:952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_c_inline=$ac_kw; break
+ else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
fi
rm -f conftest*
done
fi
+
echo "$ac_t""$ac_cv_c_inline" 1>&6
case "$ac_cv_c_inline" in
inline | yes) ;;
***************
*** 745,766 ****
#--------------------------------------------------------------------
echo $ac_n "checking if fd_set requires sys/select.h""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
! #line 750 "configure"
#include "confdefs.h"
#include <sys/types.h>
! int main() { return 0; }
! int t() {
fd_set readMask, writeMask;
; return 0; }
EOF
! if eval $ac_compile; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
else
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
! #line 764 "configure"
#include "confdefs.h"
#include <sys/select.h>
EOF
--- 985,1008 ----
#--------------------------------------------------------------------
echo $ac_n "checking if fd_set requires sys/select.h""... $ac_c" 1>&6
+ echo "configure:989: checking if fd_set requires sys/select.h" >&5
cat > conftest.$ac_ext <<EOF
! #line 991 "configure"
#include "confdefs.h"
#include <sys/types.h>
! int main() {
fd_set readMask, writeMask;
; return 0; }
EOF
! if { (eval echo configure:998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
echo "$ac_t""no" 1>&6
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
cat > conftest.$ac_ext <<EOF
! #line 1006 "configure"
#include "confdefs.h"
#include <sys/select.h>
EOF
***************
*** 783,838 ****
fi
rm -f conftest*
-
#--------------------------------------------------------------------
# Check for various typedefs and provide substitutes if
# they don't exist.
#--------------------------------------------------------------------
- # 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 802 "configure"
- #include "confdefs.h"
- main(){return(0);}
- EOF
- eval $ac_link
- 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
- cross_compiling=$ac_cv_c_cross
- echo "$ac_t""$ac_cv_c_cross" 1>&6
-
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 823 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <float.h>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_header_stdc=yes
else
echo "$ac_err" >&5
rm -rf conftest*
ac_cv_header_stdc=no
fi
--- 1025,1058 ----
fi
rm -f conftest*
#--------------------------------------------------------------------
# Check for various typedefs and provide substitutes if
# they don't exist.
#--------------------------------------------------------------------
echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
+ echo "configure:1035: checking for ANSI C header files" >&5
if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1040 "configure"
#include "confdefs.h"
#include <stdlib.h>
#include <stdarg.h>
#include <string.h>
#include <float.h>
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; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
ac_cv_header_stdc=yes
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
ac_cv_header_stdc=no
fi
***************
*** 841,847 ****
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 845 "configure"
#include "confdefs.h"
#include <string.h>
EOF
--- 1061,1067 ----
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 1065 "configure"
#include "confdefs.h"
#include <string.h>
EOF
***************
*** 859,865 ****
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 863 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
--- 1079,1085 ----
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 1083 "configure"
#include "confdefs.h"
#include <stdlib.h>
EOF
***************
*** 877,886 ****
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
! ac_cv_header_stdc=no
else
! cat > conftest.$ac_ext <<EOF
! #line 884 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
--- 1097,1106 ----
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 <<EOF
! #line 1104 "configure"
#include "confdefs.h"
#include <ctype.h>
#define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
***************
*** 891,906 ****
exit (0); }
EOF
! eval $ac_link
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
:
else
ac_cv_header_stdc=no
fi
- fi
rm -fr conftest*
fi
fi
echo "$ac_t""$ac_cv_header_stdc" 1>&6
if test $ac_cv_header_stdc = yes; then
cat >> confdefs.h <<\EOF
--- 1111,1131 ----
exit (0); }
EOF
! if { (eval echo configure:1115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
! then
:
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
ac_cv_header_stdc=no
fi
rm -fr conftest*
fi
+
+ fi
fi
+
echo "$ac_t""$ac_cv_header_stdc" 1>&6
if test $ac_cv_header_stdc = yes; then
cat >> confdefs.h <<\EOF
***************
*** 911,933 ****
for ac_hdr in unistd.h memory.h
do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $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 921 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
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
--- 1136,1162 ----
for ac_hdr in unistd.h memory.h
do
! ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ echo "configure:1142: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1147 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1152: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
***************
*** 935,941 ****
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
--- 1164,1170 ----
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
***************
*** 947,969 ****
for ac_hdr in sys/timeb.h sys/ptyio.h sys/fcntl.h fcntl.h
do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $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 957 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
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
--- 1176,1202 ----
for ac_hdr in sys/timeb.h sys/ptyio.h sys/fcntl.h fcntl.h
do
! ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ echo "configure:1182: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1187 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1192: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
***************
*** 971,977 ****
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
--- 1204,1210 ----
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
***************
*** 983,1005 ****
for ac_hdr in ctype.h machine/endian.h sys/resource.h
do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $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 993 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
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
--- 1216,1242 ----
for ac_hdr in ctype.h machine/endian.h sys/resource.h
do
! ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ echo "configure:1222: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1227 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1232: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
***************
*** 1007,1013 ****
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
--- 1244,1250 ----
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
***************
*** 1019,1041 ****
for ac_hdr in sys/wait.h netinet/in.h
do
! ac_safe=`echo "$ac_hdr" | tr './\055' '___'`
echo $ac_n "checking for $ac_hdr""... $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 1029 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
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
--- 1256,1282 ----
for ac_hdr in sys/wait.h netinet/in.h
do
! ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+ echo "configure:1262: checking for $ac_hdr" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1267 "configure"
#include "confdefs.h"
#include <$ac_hdr>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1272: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
***************
*** 1043,1049 ****
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | tr '[a-z]./\055' '[A-Z]___'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
--- 1284,1290 ----
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
cat >> confdefs.h <<EOF
#define $ac_tr_hdr 1
EOF
***************
*** 1055,1068 ****
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_func_wait3'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
! ac_cv_func_wait3=no
else
! cat > conftest.$ac_ext <<EOF
! #line 1066 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
--- 1296,1310 ----
echo $ac_n "checking for wait3 that fills in rusage""... $ac_c" 1>&6
! echo "configure:1300: checking for wait3 that fills in rusage" >&5
! if eval "test \"`echo '$''{'ac_cv_func_wait3_rusage'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
! ac_cv_func_wait3_rusage=no
else
! cat > conftest.$ac_ext <<EOF
! #line 1308 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <sys/time.h>
***************
*** 1093,1109 ****
}
}
EOF
! eval $ac_link
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
! ac_cv_func_wait3=yes
else
! ac_cv_func_wait3=no
! fi
fi
rm -fr conftest*
fi
! echo "$ac_t""$ac_cv_func_wait3" 1>&6
! if test $ac_cv_func_wait3 = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_WAIT3 1
EOF
--- 1335,1356 ----
}
}
EOF
! if { (eval echo configure:1339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
! then
! ac_cv_func_wait3_rusage=yes
else
! echo "configure: failed program was:" >&5
! cat conftest.$ac_ext >&5
! rm -fr conftest*
! ac_cv_func_wait3_rusage=no
fi
rm -fr conftest*
fi
!
! fi
!
! echo "$ac_t""$ac_cv_func_wait3_rusage" 1>&6
! if test $ac_cv_func_wait3_rusage = yes; then
cat >> confdefs.h <<\EOF
#define HAVE_WAIT3 1
EOF
***************
*** 1111,1129 ****
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1119 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
! egrep "pid_t" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_pid_t=yes
else
--- 1358,1378 ----
fi
echo $ac_n "checking for pid_t""... $ac_c" 1>&6
+ echo "configure:1362: checking for pid_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1367 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
+ #include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
! egrep "pid_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_pid_t=yes
else
***************
*** 1142,1152 ****
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1150 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
--- 1391,1402 ----
fi
echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
+ echo "configure:1395: checking for uid_t in sys/types.h" >&5
if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1400 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
***************
*** 1161,1166 ****
--- 1411,1417 ----
rm -f conftest*
fi
+
echo "$ac_t""$ac_cv_type_uid_t" 1>&6
if test $ac_cv_type_uid_t = no; then
cat >> confdefs.h <<\EOF
***************
*** 1174,1192 ****
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1182 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
! egrep "size_t" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_size_t=yes
else
--- 1425,1445 ----
fi
echo $ac_n "checking for size_t""... $ac_c" 1>&6
+ echo "configure:1429: checking for size_t" >&5
if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1434 "configure"
#include "confdefs.h"
#include <sys/types.h>
#if STDC_HEADERS
#include <stdlib.h>
+ #include <stddef.h>
#endif
EOF
if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
! egrep "size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then
rm -rf conftest*
ac_cv_type_size_t=yes
else
***************
*** 1204,1226 ****
fi
! ac_safe=`echo "vfork.h" | tr './\055' '___'`
echo $ac_n "checking for vfork.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 1214 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
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
--- 1457,1483 ----
fi
! ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
+ echo "configure:1463: checking for vfork.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1468 "configure"
#include "confdefs.h"
#include <vfork.h>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1473: \"$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
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_header_$ac_safe=no"
fi
***************
*** 1237,1250 ****
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
! ac_cv_func_vfork=no
else
! cat > conftest.$ac_ext <<EOF
! #line 1248 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
--- 1494,1555 ----
fi
echo $ac_n "checking for working vfork""... $ac_c" 1>&6
! echo "configure:1498: checking for working vfork" >&5
! if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
! echo $ac_n "checking for vfork""... $ac_c" 1>&6
! echo "configure:1504: checking for vfork" >&5
! if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then
! echo $ac_n "(cached) $ac_c" 1>&6
else
! cat > conftest.$ac_ext <<EOF
! #line 1509 "configure"
! #include "confdefs.h"
! /* System header to define __stub macros and hopefully few prototypes,
! which can conflict with char vfork(); 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 vfork();
!
! int main() {
!
! /* The GNU C library defines this for functions which it implements
! to always fail with ENOSYS. Some functions are actually named
! something starting with __ and the normal name is an alias. */
! #if defined (__stub_vfork) || defined (__stub___vfork)
! choke me
! #else
! vfork();
! #endif
!
! ; return 0; }
! EOF
! if { (eval echo configure:1532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
! rm -rf conftest*
! eval "ac_cv_func_vfork=yes"
! else
! echo "configure: failed program was:" >&5
! cat conftest.$ac_ext >&5
! rm -rf conftest*
! eval "ac_cv_func_vfork=no"
! fi
! rm -f conftest*
! fi
!
! if eval "test \"`echo '$ac_cv_func_'vfork`\" = yes"; then
! echo "$ac_t""yes" 1>&6
! :
! else
! echo "$ac_t""no" 1>&6
! fi
!
! else
! cat > conftest.$ac_ext <<EOF
! #line 1553 "configure"
#include "confdefs.h"
/* Thanks to Paul Eggert for this test. */
#include <stdio.h>
***************
*** 1272,1279 ****
static pid_t child;
if (!child) {
child = vfork ();
! if (child < 0)
perror ("vfork");
if (!child) {
arg = getpid();
write(-1, "", 0);
--- 1577,1586 ----
static pid_t child;
if (!child) {
child = vfork ();
! if (child < 0) {
perror ("vfork");
+ _exit(2);
+ }
if (!child) {
arg = getpid();
write(-1, "", 0);
***************
*** 1337,1353 ****
}
}
EOF
! eval $ac_link
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
! ac_cv_func_vfork=yes
else
! ac_cv_func_vfork=no
! fi
fi
rm -fr conftest*
fi
! echo "$ac_t""$ac_cv_func_vfork" 1>&6
! if test $ac_cv_func_vfork = no; then
cat >> confdefs.h <<\EOF
#define vfork fork
EOF
--- 1644,1665 ----
}
}
EOF
! if { (eval echo configure:1648: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
! then
! ac_cv_func_vfork_works=yes
else
! echo "configure: failed program was:" >&5
! cat conftest.$ac_ext >&5
! rm -fr conftest*
! ac_cv_func_vfork_works=no
fi
rm -fr conftest*
fi
!
! fi
!
! echo "$ac_t""$ac_cv_func_vfork_works" 1>&6
! if test $ac_cv_func_vfork_works = no; then
cat >> confdefs.h <<\EOF
#define vfork fork
EOF
***************
*** 1355,1383 ****
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1363 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
! int main() { return 0; }
! int t() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
! if eval $ac_compile; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
rm -rf conftest*
ac_cv_struct_tm=sys/time.h
fi
rm -f conftest*
-
fi
echo "$ac_t""$ac_cv_struct_tm" 1>&6
if test $ac_cv_struct_tm = sys/time.h; then
cat >> confdefs.h <<\EOF
--- 1667,1697 ----
fi
echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
+ echo "configure:1671: checking whether struct tm is in sys/time.h or time.h" >&5
if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 1676 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <time.h>
! int main() {
struct tm *tp; tp->tm_sec;
; return 0; }
EOF
! if { (eval echo configure:1684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_struct_tm=time.h
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
ac_cv_struct_tm=sys/time.h
fi
rm -f conftest*
fi
+
echo "$ac_t""$ac_cv_struct_tm" 1>&6
if test $ac_cv_struct_tm = sys/time.h; then
cat >> confdefs.h <<\EOF
***************
*** 1388,1395 ****
echo $ac_n "checking for itimer in time.h""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
! #line 1393 "configure"
#include "confdefs.h"
#include <time.h>
EOF
--- 1702,1710 ----
echo $ac_n "checking for itimer in time.h""... $ac_c" 1>&6
+ echo "configure:1706: checking for itimer in time.h" >&5
cat > conftest.$ac_ext <<EOF
! #line 1708 "configure"
#include "confdefs.h"
#include <time.h>
EOF
***************
*** 1408,1421 ****
echo $ac_n "checking size of long""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
! cat > conftest.$ac_ext <<EOF
! #line 1419 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
--- 1723,1737 ----
echo $ac_n "checking size of long""... $ac_c" 1>&6
+ echo "configure:1727: checking size of long" >&5
if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
! cat > conftest.$ac_ext <<EOF
! #line 1735 "configure"
#include "confdefs.h"
#include <stdio.h>
main()
***************
*** 1426,1440 ****
exit(0);
}
EOF
! eval $ac_link
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_sizeof_long=`cat conftestval`
else
ac_cv_sizeof_long=0
fi
- fi
rm -fr conftest*
fi
echo "$ac_t""$ac_cv_sizeof_long" 1>&6
cat >> confdefs.h <<EOF
#define SIZEOF_LONG $ac_cv_sizeof_long
--- 1742,1760 ----
exit(0);
}
EOF
! if { (eval echo configure:1746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
! then
ac_cv_sizeof_long=`cat conftestval`
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
ac_cv_sizeof_long=0
fi
rm -fr conftest*
fi
+
+ fi
echo "$ac_t""$ac_cv_sizeof_long" 1>&6
cat >> confdefs.h <<EOF
#define SIZEOF_LONG $ac_cv_sizeof_long
***************
*** 1443,1450 ****
echo $ac_n "checking for u_int in sys/types.h""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
! #line 1448 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
--- 1763,1771 ----
echo $ac_n "checking for u_int in sys/types.h""... $ac_c" 1>&6
+ echo "configure:1767: checking for u_int in sys/types.h" >&5
cat > conftest.$ac_ext <<EOF
! #line 1769 "configure"
#include "confdefs.h"
#include <sys/types.h>
EOF
***************
*** 1463,1470 ****
echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6
cat > conftest.$ac_ext <<EOF
! #line 1468 "configure"
#include "confdefs.h"
#include <limits.h>
--- 1784,1792 ----
echo $ac_n "checking for PATH_MAX in limits.h""... $ac_c" 1>&6
+ echo "configure:1788: checking for PATH_MAX in limits.h" >&5
cat > conftest.$ac_ext <<EOF
! #line 1790 "configure"
#include "confdefs.h"
#include <limits.h>
***************
*** 1490,1499 ****
# Check for gmp and mp
#--------------------------------------------------------------------
! echo Searching for mp or gmp
# Check whether --with-gmp-incdir or --without-gmp-incdir was given.
! withval="$with_gmp_incdir"
! if test -n "$withval"; then
MPINC="-I$withval" search=false
else
MPINC=nope
--- 1812,1822 ----
# Check for gmp and mp
#--------------------------------------------------------------------
! echo $ac_n "checking for mp.h or gmp.h""... $ac_c" 1>&6
! echo "configure:1817: checking for mp.h or gmp.h" >&5
# Check whether --with-gmp-incdir or --without-gmp-incdir was given.
! if test "${with_gmp_incdir+set}" = set; then
! withval="$with_gmp_incdir"
MPINC="-I$withval" search=false
else
MPINC=nope
***************
*** 1501,1507 ****
if test "$MPINC" = nope; then
cat > conftest.$ac_ext <<EOF
! #line 1505 "configure"
#include "confdefs.h"
#include <mp.h>
--- 1824,1830 ----
if test "$MPINC" = nope; then
cat > conftest.$ac_ext <<EOF
! #line 1828 "configure"
#include "confdefs.h"
#include <mp.h>
***************
*** 1526,1531 ****
--- 1849,1855 ----
for i in $dirs; do
if test -r $i/gmp.h; then
MPINC="-I$i"
+ echo "$ac_t""yes" 1>&6
fi
done
fi
***************
*** 1533,1566 ****
if test "$code" = cow; then
# mp not supported with new mkkey.
cat > conftest.$ac_ext <<EOF
! #line 1537 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
MPINC=nope
else
echo "$ac_err" >&5
rm -rf conftest*
MPINC=nope
fi
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
! #line 1554 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
MPINC=""
else
echo "$ac_err" >&5
rm -rf conftest*
MPINC=nope
fi
--- 1857,1896 ----
if test "$code" = cow; then
# mp not supported with new mkkey.
cat > conftest.$ac_ext <<EOF
! #line 1861 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1866: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
MPINC=nope
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
MPINC=nope
fi
rm -f conftest*
else
cat > conftest.$ac_ext <<EOF
! #line 1881 "configure"
#include "confdefs.h"
#include <mp.h>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
MPINC=""
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
MPINC=nope
fi
***************
*** 1574,1582 ****
fi
# Check whether --with-gmp-libdir or --without-gmp-libdir was given.
! withval="$with_gmp_libdir"
! if test -n "$withval"; then
MPLIB="-L$withval -lmp -lgmp" search=false
else
MPLIB=nope
--- 1904,1914 ----
fi
+ echo $ac_n "checking for libgmp.a""... $ac_c" 1>&6
+ echo "configure:1909: checking for libgmp.a" >&5
# Check whether --with-gmp-libdir or --without-gmp-libdir was given.
! if test "${with_gmp_libdir+set}" = set; then
! withval="$with_gmp_libdir"
MPLIB="-L$withval -lmp -lgmp" search=false
else
MPLIB=nope
***************
*** 1586,1618 ****
if test "$search" = true; then
MPLIB=nope
else
! echo $ac_n "checking for -lgmp""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_gmp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1597 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_gmp=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_gmp=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'gmp`\" = yes"; then
echo "$ac_t""yes" 1>&6
MPLIB="-lmp -lgmp"
else
--- 1918,1953 ----
if test "$search" = true; then
MPLIB=nope
else
! echo $ac_n "checking for main in -lgmp""... $ac_c" 1>&6
! echo "configure:1923: checking for main in -lgmp" >&5
! ac_lib_var=`echo gmp'_'main | sed 'y%./+-%__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="-lgmp $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1931 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:1938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
MPLIB="-lmp -lgmp"
else
***************
*** 1627,1665 ****
for i in $dirs; do
if test -r $i/libgmp.a; then
MPLIB="-L$i -lmp -lgmp"
fi
done
fi
fi
if test "$MPLIB" = nope; then
if test "$code" = cow; then
! echo $ac_n "checking for -lmp""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_mp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1644 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_mp=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_mp=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'mp`\" = yes"; then
echo "$ac_t""yes" 1>&6
MPLIB=bsdmp
else
--- 1962,2004 ----
for i in $dirs; do
if test -r $i/libgmp.a; then
MPLIB="-L$i -lmp -lgmp"
+ echo "$ac_t""yes" 1>&6
fi
done
fi
fi
if test "$MPLIB" = nope; then
if test "$code" = cow; then
! echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
! echo "configure:1974: checking for main in -lmp" >&5
! ac_lib_var=`echo mp'_'main | sed 'y%./+-%__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="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1982 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:1989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
MPLIB=bsdmp
else
***************
*** 1668,1700 ****
fi
else
! echo $ac_n "checking for -lmp""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_mp'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1679 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_mp=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_mp=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'mp`\" = yes"; then
echo "$ac_t""yes" 1>&6
MPLIB="-lmp"
else
--- 2007,2042 ----
fi
else
! echo $ac_n "checking for main in -lmp""... $ac_c" 1>&6
! echo "configure:2012: checking for main in -lmp" >&5
! ac_lib_var=`echo mp'_'main | sed 'y%./+-%__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="-lmp $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2020 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
MPLIB="-lmp"
else
***************
*** 1718,1727 ****
if test "$code" = cow; then
if test -r "$srcdir/mkkey.c"; then
! echo " RSA utilities found."
else
echo
! echo Warning RSA utilities not found, turning RSA off.
NORSA="#"
echo Check your favorite ftp site for a blessed client.
echo In case you can not find one contact brmbugs.
--- 2060,2069 ----
if test "$code" = cow; then
if test -r "$srcdir/mkkey.c"; then
! echo " RSA utilities for cow build found."
else
echo
! echo Warning RSA utilities for cow build not found, turning RSA off.
NORSA="#"
echo Check your favorite ftp site for a blessed client.
echo In case you can not find one contact brmbugs.
***************
*** 1729,1739 ****
fi
fi
if test "$code" = server; then
if test -r "$srcdir/ntserv/rsa_util.c"; then
! echo " RSA utilities found."
else
! echo
! echo Warning RSA utilities not found, turning RSA off.
NORSA="#"
echo
fi
--- 2071,2083 ----
fi
fi
if test "$code" = server; then
+ echo $ac_n "checking ntserv/rsa_util.c""... $ac_c" 1>&6
+ echo "configure:2076: checking ntserv/rsa_util.c" >&5
if test -r "$srcdir/ntserv/rsa_util.c"; then
! echo "$ac_t""RSA utilities found" 1>&6
! RSAINC="-I`pwd`/res-rsa"
else
! echo "$ac_t""Warning RSA utilities for server build not found" 1>&6
NORSA="#"
echo
fi
***************
*** 1741,1746 ****
--- 2085,2092 ----
+
+
#--------------------------------------------------------------------
# Locate the X11 header files and the X11 library archive.
***************
*** 1751,1774 ****
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
# Check whether --with-x or --without-x was given.
! withval="$with_x"
! if test -n "$withval"; then
:
fi
if test "x$with_x" = xno; then
! no_x=yes
else
if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
! no_x=
else
! if eval "test \"`echo '$''{'ac_cv_path_x'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# One or both of the vars are not set, and there is no cached value.
! no_x=yes
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
--- 2097,2124 ----
# Uses ac_ vars as temps to allow command line to override cache and checks.
# --without-x overrides everything else, but does not touch the cache.
echo $ac_n "checking for X""... $ac_c" 1>&6
+ echo "configure:2101: checking for X" >&5
# Check whether --with-x or --without-x was given.
! if test "${with_x+set}" = set; then
! withval="$with_x"
:
fi
+ # $have_x is `yes', `no', `disabled', or empty when we do not yet know.
if test "x$with_x" = xno; then
! # The user explicitly disabled X.
! have_x=disabled
else
if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then
! # Both variables are already set.
! have_x=yes
else
! if eval "test \"`echo '$''{'ac_cv_have_x'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
# One or both of the vars are not set, and there is no cached value.
! ac_x_includes=NO ac_x_libraries=NO
rm -fr conftestdir
if mkdir conftestdir; then
cd conftestdir
***************
*** 1778,1792 ****
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
- no_x=
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
! eval `make acfindx 2>/dev/null | grep -v make`
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
! if test ! -f $ac_im_usrlibdir/libX11.a && test -f $ac_im_libdir/libX11.a
! then
! ac_im_usrlibdir=$ac_im_libdir
! fi
! # Screen out bogus values from the imake configuration.
case "$ac_im_incroot" in
/usr/include) ;;
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
--- 2128,2145 ----
@echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"'
EOF
if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
! eval `${MAKE-make} acfindx 2>/dev/null | grep -v make`
# Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR.
! for ac_extension in a so sl; do
! if test ! -f $ac_im_usrlibdir/libX11.$ac_extension &&
! test -f $ac_im_libdir/libX11.$ac_extension; then
! ac_im_usrlibdir=$ac_im_libdir; break
! fi
! done
! # Screen out bogus values from the imake configuration. They are
! # bogus both because they are the default anyway, and because
! # using them would break gcc on systems where it needs fixed includes.
case "$ac_im_incroot" in
/usr/include) ;;
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
***************
*** 1800,1844 ****
rm -fr conftestdir
fi
! if test "$no_x" = yes; then
! test -z "$x_direct_test_library" && x_direct_test_library=Xt
! test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
! test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
cat > conftest.$ac_ext <<EOF
! #line 1809 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
! no_x= ac_x_includes=
else
echo "$ac_err" >&5
rm -rf conftest*
! for ac_dir in \
/usr/X11R6/include \
/usr/X11R5/include \
/usr/X11R4/include \
\
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
\
/usr/local/X11R6/include \
/usr/local/X11R5/include \
/usr/local/X11R4/include \
\
/usr/local/include/X11R6 \
/usr/local/include/X11R5 \
/usr/local/include/X11R4 \
\
- /usr/X11/include \
- /usr/include/X11 \
- /usr/local/X11/include \
- /usr/local/include/X11 \
- \
/usr/X386/include \
/usr/x386/include \
/usr/XFree86/include/X11 \
--- 2153,2203 ----
rm -fr conftestdir
fi
! if test "$ac_x_includes" = NO; then
! # Guess where to find include files, by looking for this one X11 .h file.
! test -z "$x_direct_test_include" && x_direct_test_include=X11/Intrinsic.h
!
! # First, try using that file with no special directory specified.
cat > conftest.$ac_ext <<EOF
! #line 2163 "configure"
#include "confdefs.h"
#include <$x_direct_test_include>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
rm -rf conftest*
! # We can compile using X headers with no special include directory.
! ac_x_includes=
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
! # Look for the header file in a standard set of common directories.
! # Check X11 before X11Rn because it is often a symlink to the current release.
! for ac_dir in \
! /usr/X11/include \
/usr/X11R6/include \
/usr/X11R5/include \
/usr/X11R4/include \
\
+ /usr/include/X11 \
/usr/include/X11R6 \
/usr/include/X11R5 \
/usr/include/X11R4 \
\
+ /usr/local/X11/include \
/usr/local/X11R6/include \
/usr/local/X11R5/include \
/usr/local/X11R4/include \
\
+ /usr/local/include/X11 \
/usr/local/include/X11R6 \
/usr/local/include/X11R5 \
/usr/local/include/X11R4 \
\
/usr/X386/include \
/usr/x386/include \
/usr/XFree86/include/X11 \
***************
*** 1855,1910 ****
; \
do
if test -r "$ac_dir/$x_direct_test_include"; then
! no_x= ac_x_includes=$ac_dir
break
fi
done
fi
rm -f conftest*
! # Check for the libraries.
! # See if we find them without any special options.
! # Don't add to $LIBS permanently.
! ac_save_LIBS="$LIBS"
! LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1872 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
${x_direct_test_function}()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! LIBS="$ac_save_LIBS" no_x= ac_x_libraries=
else
rm -rf conftest*
LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
/usr/X11R6/lib \
/usr/X11R5/lib \
/usr/X11R4/lib \
\
/usr/lib/X11R6 \
/usr/lib/X11R5 \
/usr/lib/X11R4 \
\
/usr/local/X11R6/lib \
/usr/local/X11R5/lib \
/usr/local/X11R4/lib \
\
/usr/local/lib/X11R6 \
/usr/local/lib/X11R5 \
/usr/local/lib/X11R4 \
\
- /usr/X11/lib \
- /usr/lib/X11 \
- /usr/local/X11/lib \
- /usr/local/lib/X11 \
- \
/usr/X386/lib \
/usr/x386/lib \
/usr/XFree86/lib/X11 \
--- 2214,2278 ----
; \
do
if test -r "$ac_dir/$x_direct_test_include"; then
! ac_x_includes=$ac_dir
break
fi
done
fi
rm -f conftest*
+ fi # $ac_x_includes = NO
! if test "$ac_x_libraries" = NO; then
! # Check for the libraries.
!
! test -z "$x_direct_test_library" && x_direct_test_library=Xt
! test -z "$x_direct_test_function" && x_direct_test_function=XtMalloc
!
! # See if we find them without any special options.
! # Don't add to $LIBS permanently.
! ac_save_LIBS="$LIBS"
! LIBS="-l$x_direct_test_library $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2237 "configure"
#include "confdefs.h"
! int main() {
${x_direct_test_function}()
; return 0; }
EOF
! if { (eval echo configure:2244: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! LIBS="$ac_save_LIBS"
! # We can link X programs with no special library path.
! ac_x_libraries=
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
LIBS="$ac_save_LIBS"
# First see if replacing the include by lib works.
+ # Check X11 before X11Rn because it is often a symlink to the current release.
for ac_dir in `echo "$ac_x_includes" | sed s/include/lib/` \
+ /usr/X11/lib \
/usr/X11R6/lib \
/usr/X11R5/lib \
/usr/X11R4/lib \
\
+ /usr/lib/X11 \
/usr/lib/X11R6 \
/usr/lib/X11R5 \
/usr/lib/X11R4 \
\
+ /usr/local/X11/lib \
/usr/local/X11R6/lib \
/usr/local/X11R5/lib \
/usr/local/X11R4/lib \
\
+ /usr/local/lib/X11 \
/usr/local/lib/X11R6 \
/usr/local/lib/X11R5 \
/usr/local/lib/X11R4 \
\
/usr/X386/lib \
/usr/x386/lib \
/usr/XFree86/lib/X11 \
***************
*** 1915,1920 ****
--- 2283,2289 ----
/usr/athena/lib \
/usr/local/x11r5/lib \
/usr/lpp/Xamples/lib \
+ /lib/usr/lib/X11 \
\
/usr/openwin/lib \
/usr/openwin/share/lib \
***************
*** 1922,1952 ****
do
for ac_extension in a so sl; do
if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
! no_x= ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
rm -f conftest*
! fi
! if test "$no_x" = yes; then
! ac_cv_path_x="no_x=yes"
! else
! ac_cv_path_x="no_x= ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
fi
fi
fi
! eval "$ac_cv_path_x"
fi # $with_x != no
! if test "$no_x" = yes; then
! echo "$ac_t""no" 1>&6
else
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
! ac_cv_path_x="no_x= ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
fi
--- 2291,2328 ----
do
for ac_extension in a so sl; do
if test -r $ac_dir/lib${x_direct_test_library}.$ac_extension; then
! ac_x_libraries=$ac_dir
break 2
fi
done
done
fi
rm -f conftest*
+ fi # $ac_x_libraries = NO
! if test "$ac_x_includes" = NO || test "$ac_x_libraries" = NO; then
! # Didn't find X anywhere. Cache the known absence of X.
! ac_cv_have_x="have_x=no"
! else
! # Record where we found X for the cache.
! ac_cv_have_x="have_x=yes \
! ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries"
fi
fi
fi
! eval "$ac_cv_have_x"
fi # $with_x != no
! if test "$have_x" != yes; then
! echo "$ac_t""$have_x" 1>&6
! no_x=yes
else
+ # If each of the values was on the command line, it overrides each guess.
test "x$x_includes" = xNONE && x_includes=$ac_x_includes
test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries
! # Update the cache value to reflect the command line values.
! ac_cv_have_x="have_x=yes \
! ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
echo "$ac_t""libraries $x_libraries, headers $x_includes" 1>&6
fi
***************
*** 1955,1970 ****
echo checking for X11 header files
XINCLUDES=""
cat > conftest.$ac_ext <<EOF
! #line 1959 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
! eval "$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
rm -rf conftest*
XINCLUDES="nope"
fi
--- 2331,2349 ----
echo checking for X11 header files
XINCLUDES=""
cat > conftest.$ac_ext <<EOF
! #line 2335 "configure"
#include "confdefs.h"
#include <X11/Intrinsic.h>
EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out`
if test -z "$ac_err"; then
:
else
echo "$ac_err" >&5
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
XINCLUDES="nope"
fi
***************
*** 1988,2020 ****
fi
echo "checking for X11 library archive"
! echo $ac_n "checking for -lX11""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_X11'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 1999 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_X11=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_X11=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'X11`\" = yes"; then
echo "$ac_t""yes" 1>&6
XLIBSW="-lX11"
else
--- 2367,2402 ----
fi
echo "checking for X11 library archive"
! echo $ac_n "checking for main in -lX11""... $ac_c" 1>&6
! echo "configure:2372: checking for main in -lX11" >&5
! ac_lib_var=`echo X11'_'main | sed 'y%./+-%__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="-lX11 $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2380 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
XLIBSW="-lX11"
else
***************
*** 2035,2067 ****
done
fi
if test "$XLIBSW" = nope ; then
! echo $ac_n "checking for -lXwindow""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_Xwindow'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lXwindow $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2046 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_Xwindow=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_Xwindow=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'Xwindow`\" = yes"; then
echo "$ac_t""yes" 1>&6
XLIBSW=-lXwindow
else
--- 2417,2452 ----
done
fi
if test "$XLIBSW" = nope ; then
! echo $ac_n "checking for main in -lXwindow""... $ac_c" 1>&6
! echo "configure:2422: checking for main in -lXwindow" >&5
! ac_lib_var=`echo Xwindow'_'main | sed 'y%./+-%__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="-lXwindow $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2430 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
XLIBSW=-lXwindow
else
***************
*** 2094,2126 ****
# command line generated by Make.
#--------------------------------------------------------------------
! echo $ac_n "checking for -lXbsd""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_Xbsd'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lXbsd $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2105 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_Xbsd=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_Xbsd=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'Xbsd`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lXbsd"
else
--- 2479,2514 ----
# command line generated by Make.
#--------------------------------------------------------------------
! echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
! echo "configure:2484: checking for main in -lXbsd" >&5
! ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__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="-lXbsd $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2492 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lXbsd"
else
***************
*** 2129,2293 ****
# AC _CHECK_LIB(V3, main, [LIBS="$LIBS -lV3"])
# AC _CHECK_LIB(PW, main, [LIBS="$LIBS -lPW"])
! echo $ac_n "checking for -lsocket""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_socket'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2140 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_socket=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_socket=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'socket`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lsocket"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -linet""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_inet'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2173 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_inet=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_inet=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'inet`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -linet"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -lnsl""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_nsl'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2206 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_nsl=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_nsl=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'nsl`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lnsl"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -lseq""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_seq'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lseq $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2239 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_seq=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_seq=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'seq`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lseq"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -lsun""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_sun'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2272 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_sun=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_sun=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'sun`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lsun"
else
--- 2517,2696 ----
# AC _CHECK_LIB(V3, main, [LIBS="$LIBS -lV3"])
# AC _CHECK_LIB(PW, main, [LIBS="$LIBS -lPW"])
! echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6
! echo "configure:2522: checking for main in -lsocket" >&5
! ac_lib_var=`echo socket'_'main | sed 'y%./+-%__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="-lsocket $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2530 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lsocket"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -linet""... $ac_c" 1>&6
! echo "configure:2558: checking for main in -linet" >&5
! ac_lib_var=`echo inet'_'main | sed 'y%./+-%__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="-linet $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2566 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -linet"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6
! echo "configure:2594: checking for main in -lnsl" >&5
! ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__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="-lnsl $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2602 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lnsl"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -lseq""... $ac_c" 1>&6
! echo "configure:2630: checking for main in -lseq" >&5
! ac_lib_var=`echo seq'_'main | sed 'y%./+-%__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="-lseq $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2638 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lseq"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -lsun""... $ac_c" 1>&6
! echo "configure:2666: checking for main in -lsun" >&5
! ac_lib_var=`echo sun'_'main | sed 'y%./+-%__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="-lsun $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2674 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lsun"
else
***************
*** 2296,2394 ****
if test "$code" = server; then
! echo $ac_n "checking for -lipc""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_ipc'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2307 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_ipc=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_ipc=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'ipc`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lipc"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -lshm""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_shm'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lshm $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2340 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_shm=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_shm=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'shm`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lshm"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -lstuff""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_stuff'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lstuff $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2373 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_stuff=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_stuff=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'stuff`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lstuff"
else
--- 2699,2806 ----
if test "$code" = server; then
! echo $ac_n "checking for main in -lipc""... $ac_c" 1>&6
! echo "configure:2704: checking for main in -lipc" >&5
! ac_lib_var=`echo ipc'_'main | sed 'y%./+-%__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="-lipc $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2712 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lipc"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -lshm""... $ac_c" 1>&6
! echo "configure:2740: checking for main in -lshm" >&5
! ac_lib_var=`echo shm'_'main | sed 'y%./+-%__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="-lshm $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2748 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lshm"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -lstuff""... $ac_c" 1>&6
! echo "configure:2776: checking for main in -lstuff" >&5
! ac_lib_var=`echo stuff'_'main | sed 'y%./+-%__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="-lstuff $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2784 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:2791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lstuff"
else
***************
*** 2402,2412 ****
#--------------------------------------------------------------------
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2410 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
--- 2814,2825 ----
#--------------------------------------------------------------------
echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
+ echo "configure:2818: checking return type of signal handlers" >&5
if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2823 "configure"
#include "confdefs.h"
#include <sys/types.h>
#include <signal.h>
***************
*** 2414,2437 ****
#undef signal
#endif
#ifdef __cplusplus
! extern "C"
! #endif
void (*signal ()) ();
! int main() { return 0; }
! int t() {
int i;
; return 0; }
EOF
! if eval $ac_compile; then
rm -rf conftest*
ac_cv_type_signal=void
else
rm -rf conftest*
ac_cv_type_signal=int
fi
rm -f conftest*
-
fi
echo "$ac_t""$ac_cv_type_signal" 1>&6
cat >> confdefs.h <<EOF
#define RETSIGTYPE $ac_cv_type_signal
--- 2827,2853 ----
#undef signal
#endif
#ifdef __cplusplus
! extern "C" void (*signal (int, void (*)(int)))(int);
! #else
void (*signal ()) ();
! #endif
!
! int main() {
int i;
; return 0; }
EOF
! if { (eval echo configure:2840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
rm -rf conftest*
ac_cv_type_signal=void
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
ac_cv_type_signal=int
fi
rm -f conftest*
fi
+
echo "$ac_t""$ac_cv_type_signal" 1>&6
cat >> confdefs.h <<EOF
#define RETSIGTYPE $ac_cv_type_signal
***************
*** 2439,2452 ****
echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
! cat > conftest.$ac_ext <<EOF
! #line 2450 "configure"
#include "confdefs.h"
/* Exit 0 (true) if wait returns something other than -1,
i.e. the pid of the child, which means that wait was restarted
--- 2855,2869 ----
echo $ac_n "checking for restartable system calls""... $ac_c" 1>&6
+ echo "configure:2859: checking for restartable system calls" >&5
if eval "test \"`echo '$''{'ac_cv_sys_restartable_syscalls'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
if test "$cross_compiling" = yes; then
{ echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
else
! cat > conftest.$ac_ext <<EOF
! #line 2867 "configure"
#include "confdefs.h"
/* Exit 0 (true) if wait returns something other than -1,
i.e. the pid of the child, which means that wait was restarted
***************
*** 2464,2478 ****
}
EOF
! eval $ac_link
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
ac_cv_sys_restartable_syscalls=yes
else
ac_cv_sys_restartable_syscalls=no
fi
- fi
rm -fr conftest*
fi
echo "$ac_t""$ac_cv_sys_restartable_syscalls" 1>&6
if test $ac_cv_sys_restartable_syscalls = yes; then
cat >> confdefs.h <<\EOF
--- 2881,2900 ----
}
EOF
! if { (eval echo configure:2885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
! then
ac_cv_sys_restartable_syscalls=yes
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
ac_cv_sys_restartable_syscalls=no
fi
rm -fr conftest*
fi
+
+ fi
+
echo "$ac_t""$ac_cv_sys_restartable_syscalls" 1>&6
if test $ac_cv_sys_restartable_syscalls = yes; then
cat >> confdefs.h <<\EOF
***************
*** 2489,2496 ****
else
! cat > conftest.$ac_ext <<EOF
! #line 2494 "configure"
#include "confdefs.h"
#include <signal.h>
--- 2911,2918 ----
else
! cat > conftest.$ac_ext <<EOF
! #line 2916 "configure"
#include "confdefs.h"
#include <signal.h>
***************
*** 2510,2537 ****
exit(0);}
EOF
! eval $ac_link
! if test -s conftest && (./conftest; exit) 2>/dev/null; then
cat >> confdefs.h <<\EOF
#define BSD_SIGNALS 1
EOF
else
echo $ac_n "checking for sigset""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_sigset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2526 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sigset(); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
! char sigset();
! int main() { return 0; }
! int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
--- 2932,2964 ----
exit(0);}
EOF
! if { (eval echo configure:2936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
! then
cat >> confdefs.h <<\EOF
#define BSD_SIGNALS 1
EOF
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ rm -fr conftest*
echo $ac_n "checking for sigset""... $ac_c" 1>&6
+ echo "configure:2947: checking for sigset" >&5
if eval "test \"`echo '$''{'ac_cv_func_sigset'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2952 "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char sigset(); 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 sigset();
! int main() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
***************
*** 2544,2559 ****
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
eval "ac_cv_func_sigset=yes"
else
rm -rf conftest*
eval "ac_cv_func_sigset=no"
fi
rm -f conftest*
-
fi
if eval "test \"`echo '$ac_cv_func_'sigset`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
--- 2971,2988 ----
; return 0; }
EOF
! if { (eval echo configure:2975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_sigset=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_sigset=no"
fi
rm -f conftest*
fi
+
if eval "test \"`echo '$ac_cv_func_'sigset`\" = yes"; then
echo "$ac_t""yes" 1>&6
cat >> confdefs.h <<\EOF
***************
*** 2569,2637 ****
fi
fi
- fi
rm -fr conftest*
! echo $ac_n "checking for -lBSD""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_BSD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lBSD $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2583 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_BSD=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_BSD=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'BSD`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lBSD"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for -lbsd""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_bsd'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2616 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_bsd=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_bsd=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'bsd`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lbsd"
else
--- 2998,3073 ----
fi
fi
rm -fr conftest*
+ fi
!
! echo $ac_n "checking for main in -lBSD""... $ac_c" 1>&6
! echo "configure:3007: checking for main in -lBSD" >&5
! ac_lib_var=`echo BSD'_'main | sed 'y%./+-%__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="-lBSD $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 3015 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lBSD"
else
echo "$ac_t""no" 1>&6
fi
! echo $ac_n "checking for main in -lbsd""... $ac_c" 1>&6
! echo "configure:3043: checking for main in -lbsd" >&5
! ac_lib_var=`echo bsd'_'main | sed 'y%./+-%__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="-lbsd $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 3051 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:3058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lbsd"
else
***************
*** 2642,2661 ****
for ac_func in usleep random setstate strftime ftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2650 "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. */
! char $ac_func();
! int main() { return 0; }
! int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
--- 3078,3099 ----
for ac_func in usleep random setstate strftime ftime
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:3082: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 3087 "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() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
***************
*** 2668,2686 ****
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
--- 3106,3126 ----
; return 0; }
EOF
! if { (eval echo configure:3110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
+
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
***************
*** 2691,2723 ****
done
! echo $ac_n "checking for -lm""... $ac_c" 1>&6
! if eval "test \"`echo '$''{'ac_cv_lib_m'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
LIBS="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 2702 "configure"
#include "confdefs.h"
! int main() { return 0; }
! int t() {
main()
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
! eval "ac_cv_lib_m=yes"
else
rm -rf conftest*
! eval "ac_cv_lib_m=no"
fi
rm -f conftest*
LIBS="$ac_save_LIBS"
fi
! if eval "test \"`echo '$ac_cv_lib_'m`\" = yes"; then
echo "$ac_t""yes" 1>&6
LIBS="$LIBS -lm"
else
--- 3131,3166 ----
done
! echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
! echo "configure:3136: checking for main in -lm" >&5
! ac_lib_var=`echo m'_'main | sed 'y%./+-%__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="-lm $LIBS"
cat > conftest.$ac_ext <<EOF
! #line 3144 "configure"
#include "confdefs.h"
! int main() {
main()
; return 0; }
EOF
! if { (eval echo configure:3151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
! eval "ac_cv_lib_$ac_lib_var=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
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
LIBS="$LIBS -lm"
else
***************
*** 2727,2746 ****
for ac_func in nint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2735 "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. */
! char $ac_func();
! int main() { return 0; }
! int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
--- 3170,3191 ----
for ac_func in nint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:3174: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 3179 "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() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
***************
*** 2753,2771 ****
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_func=HAVE_`echo $ac_func | tr '[a-z]' '[A-Z]'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
--- 3198,3218 ----
; return 0; }
EOF
! if { (eval echo configure:3202: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
+
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
cat >> confdefs.h <<EOF
#define $ac_tr_func 1
EOF
***************
*** 2776,2782 ****
done
cat > conftest.$ac_ext <<EOF
! #line 2780 "configure"
#include "confdefs.h"
#include <math.h>
EOF
--- 3223,3229 ----
done
cat > conftest.$ac_ext <<EOF
! #line 3227 "configure"
#include "confdefs.h"
#include <math.h>
EOF
***************
*** 2797,2816 ****
for ac_func in setstate strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2805 "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. */
! char $ac_func();
! int main() { return 0; }
! int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
--- 3244,3265 ----
for ac_func in setstate strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:3248: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 3253 "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() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
***************
*** 2823,2867 ****
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! :
else
echo "$ac_t""no" 1>&6
LIBOBJS="$LIBOBJS ${ac_func}.o"
fi
-
done
fi
if test "$code" = server; then
for ac_func in random strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 2856 "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. */
! char $ac_func();
! int main() { return 0; }
! int t() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
--- 3272,3324 ----
; return 0; }
EOF
! if { (eval echo configure:3276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
+
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
! cat >> confdefs.h <<EOF
! #define $ac_tr_func 1
! EOF
!
else
echo "$ac_t""no" 1>&6
LIBOBJS="$LIBOBJS ${ac_func}.o"
fi
done
+
fi
if test "$code" = server; then
for ac_func in random strdup rint
do
echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+ echo "configure:3307: checking for $ac_func" >&5
if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
cat > conftest.$ac_ext <<EOF
! #line 3312 "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() {
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
***************
*** 2874,2899 ****
; return 0; }
EOF
! if eval $ac_link; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
-
fi
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! :
else
echo "$ac_t""no" 1>&6
LIBOBJS="$LIBOBJS ${ac_func}.o"
fi
-
done
fi
#--------------------------------------------------------------------
--- 3331,3362 ----
; return 0; }
EOF
! if { (eval echo configure:3335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
rm -rf conftest*
eval "ac_cv_func_$ac_func=yes"
else
+ echo "configure: failed program was:" >&5
+ cat conftest.$ac_ext >&5
rm -rf conftest*
eval "ac_cv_func_$ac_func=no"
fi
rm -f conftest*
fi
+
if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
echo "$ac_t""yes" 1>&6
! ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
! cat >> confdefs.h <<EOF
! #define $ac_tr_func 1
! EOF
!
else
echo "$ac_t""no" 1>&6
LIBOBJS="$LIBOBJS ${ac_func}.o"
fi
done
+
fi
#--------------------------------------------------------------------
***************
*** 2902,2924 ****
if test "$code" = server; then
! echo searching for netstat and uptime
dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
NETSTAT="nice -20 /usr/ucb/netstat -f inet"
for i in $dirs; do
if test -x $i/netstat; then
NETSTAT="nice -20 ${i}/netstat -a"
fi
if test -x $i/uptime; then
cat >> confdefs.h <<EOF
#define UPTIME "${i}/uptime"
EOF
fi
done
- cat >> confdefs.h <<EOF
- #define NETSTAT "$NETSTAT"
- EOF
fi
--- 3365,3399 ----
if test "$code" = server; then
! echo $ac_n "checking for netstat""... $ac_c" 1>&6
! echo "configure:3370: checking for netstat" >&5
dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
NETSTAT="nice -20 /usr/ucb/netstat -f inet"
for i in $dirs; do
if test -x $i/netstat; then
NETSTAT="nice -20 ${i}/netstat -a"
+ cat >> confdefs.h <<EOF
+ #define NETSTAT "$NETSTAT"
+ EOF
+
+ echo "$ac_t""yes" 1>&6
+ break
fi
+ done
+
+ echo $ac_n "checking for uptime""... $ac_c" 1>&6
+ echo "configure:3386: checking for uptime" >&5
+ dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
+ for i in $dirs; do
if test -x $i/uptime; then
cat >> confdefs.h <<EOF
#define UPTIME "${i}/uptime"
EOF
+ echo "$ac_t""yes" 1>&6
+ break
fi
done
fi
***************
*** 2940,2950 ****
# --recheck option to rerun configure.
#
EOF
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
! sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \
! >> confcache
if cmp -s $cache_file confcache; then
:
else
--- 3415,3439 ----
# --recheck option to rerun configure.
#
EOF
+ # The following way of writing the cache mishandles newlines in values,
+ # but we know of no workaround that is simple, portable, and efficient.
+ # So, don't put newlines in cache variables' values.
# Ultrix sh set writes to stderr and can't be redirected directly,
# and sets the high bit in the cache file unless we assign to the vars.
(set) 2>&1 |
! case `(ac_space=' '; set) 2>&1` in
! *ac_space=\ *)
! # `set' does not quote correctly, so add quotes (double-quote substitution
! # turns \\\\ into \\, and sed turns \\ into \).
! sed -n \
! -e "s/'/'\\\\''/g" \
! -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
! ;;
! *)
! # `set' quotes correctly as required by POSIX, so do not add quotes.
! sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
! ;;
! esac >> confcache
if cmp -s $cache_file confcache; then
:
else
***************
*** 2999,3005 ****
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.2"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
--- 3488,3494 ----
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.12"
exit 0 ;;
-help | --help | --hel | --he | --h)
echo "\$ac_cs_usage"; exit 0 ;;
***************
*** 3010,3020 ****
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
! trap 'rm -fr `echo system.mk config.h | tr : " "` conftest*; exit 1' 1 2 15
! # Protect against being on the right side of a sed subst in config.status.
! sed 's/%@/@@/; s/@%/@@/; s/%g$/@g/; /@g$/s/[\\\\&%]/\\\\&/g;
! s/@@/%@/; s/@@/@%/; s/@g$/%g/' > conftest.subs <<\CEOF
$ac_vpsub
$extrasub
s%@CFLAGS@%$CFLAGS%g
--- 3499,3511 ----
ac_given_srcdir=$srcdir
ac_given_INSTALL="$INSTALL"
! trap 'rm -fr `echo "system.mk config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
! EOF
! cat >> $CONFIG_STATUS <<EOF
! # Protect against being on the right side of a sed subst in config.status.
! sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g;
! s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF
$ac_vpsub
$extrasub
s%@CFLAGS@%$CFLAGS%g
***************
*** 3026,3032 ****
--- 3517,3534 ----
s%@exec_prefix@%$exec_prefix%g
s%@prefix@%$prefix%g
s%@program_transform_name@%$program_transform_name%g
+ s%@bindir@%$bindir%g
+ s%@sbindir@%$sbindir%g
+ s%@libexecdir@%$libexecdir%g
+ s%@datadir@%$datadir%g
+ s%@sysconfdir@%$sysconfdir%g
+ s%@sharedstatedir@%$sharedstatedir%g
+ s%@localstatedir@%$localstatedir%g
s%@libdir@%$libdir%g
+ s%@includedir@%$includedir%g
+ s%@oldincludedir@%$oldincludedir%g
+ s%@infodir@%$infodir%g
+ s%@mandir@%$mandir%g
s%@LOGNAME@%$LOGNAME%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
***************
*** 3035,3040 ****
--- 3537,3543 ----
s%@LN_S@%$LN_S%g
s%@MPINC@%$MPINC%g
s%@MPLIB@%$MPLIB%g
+ s%@RSAINC@%$RSAINC%g
s%@NORSA@%$NORSA%g
s%@XINCLUDES@%$XINCLUDES%g
s%@XLIBSW@%$XLIBSW%g
***************
*** 3043,3062 ****
CEOF
EOF
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"system.mk"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
! # Support "outfile[:infile]", defaulting infile="outfile.in".
case "$ac_file" in
! *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
! # Adjust relative srcdir, etc. for subdirectories.
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
--- 3546,3601 ----
CEOF
EOF
+
+ cat >> $CONFIG_STATUS <<\EOF
+
+ # Split the substitutions into bite-sized pieces for seds with
+ # small command number limits, like on Digital OSF/1 and HP-UX.
+ ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script.
+ ac_file=1 # Number of current file.
+ ac_beg=1 # First line for current file.
+ ac_end=$ac_max_sed_cmds # Line after last line for current file.
+ ac_more_lines=:
+ ac_sed_cmds=""
+ while $ac_more_lines; do
+ if test $ac_beg -gt 1; then
+ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file
+ else
+ sed "${ac_end}q" conftest.subs > conftest.s$ac_file
+ fi
+ if test ! -s conftest.s$ac_file; then
+ ac_more_lines=false
+ rm -f conftest.s$ac_file
+ else
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds="sed -f conftest.s$ac_file"
+ else
+ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file"
+ fi
+ ac_file=`expr $ac_file + 1`
+ ac_beg=$ac_end
+ ac_end=`expr $ac_end + $ac_max_sed_cmds`
+ fi
+ done
+ if test -z "$ac_sed_cmds"; then
+ ac_sed_cmds=cat
+ fi
+ EOF
+
cat >> $CONFIG_STATUS <<EOF
CONFIG_FILES=\${CONFIG_FILES-"system.mk"}
EOF
cat >> $CONFIG_STATUS <<\EOF
for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
! # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case "$ac_file" in
! *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
! # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories.
# Remove last slash and all that follows it. Not all systems have dirname.
ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
***************
*** 3084,3089 ****
--- 3623,3629 ----
[/$]*) INSTALL="$ac_given_INSTALL" ;;
*) INSTALL="$ac_dots$ac_given_INSTALL" ;;
esac
+
echo creating "$ac_file"
rm -f "$ac_file"
configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure."
***************
*** 3092,3105 ****
# $configure_input" ;;
*) ac_comsub= ;;
esac
sed -e "$ac_comsub
s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
s%@top_srcdir@%$top_srcdir%g
s%@INSTALL@%$INSTALL%g
! " -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file
fi; done
! rm -f conftest.subs
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
--- 3632,3647 ----
# $configure_input" ;;
*) ac_comsub= ;;
esac
+
+ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
sed -e "$ac_comsub
s%@configure_input@%$configure_input%g
s%@srcdir@%$srcdir%g
s%@top_srcdir@%$top_srcdir%g
s%@INSTALL@%$INSTALL%g
! " $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file
fi; done
! rm -f conftest.s*
# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
# NAME is the cpp macro being defined and VALUE is the value it is being given.
***************
*** 3120,3130 ****
ac_eC=' '
ac_eD='%g'
! CONFIG_HEADERS=${CONFIG_HEADERS-"config.h"}
for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
! # Support "outfile[:infile]", defaulting infile="outfile.in".
case "$ac_file" in
! *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
--- 3662,3678 ----
ac_eC=' '
ac_eD='%g'
! if test "${CONFIG_HEADERS+set}" != set; then
! EOF
! cat >> $CONFIG_STATUS <<EOF
! CONFIG_HEADERS="config.h"
! EOF
! cat >> $CONFIG_STATUS <<\EOF
! fi
for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then
! # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
case "$ac_file" in
! *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'`
ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
*) ac_file_in="${ac_file}.in" ;;
esac
***************
*** 3132,3150 ****
echo creating $ac_file
rm -f conftest.frag conftest.in conftest.out
! cp $ac_given_srcdir/$ac_file_in conftest.in
EOF
# Transform confdefs.h into a sed script conftest.vals that substitutes
# the proper values into config.h.in to produce config.h. And first:
! # Protect against being on the right side of a sed subst in config.status.
# Protect against being in an unquoted here document in config.status.
rm -f conftest.vals
cat > conftest.hdr <<\EOF
s/[\\&%]/\\&/g
s%[\\$`]%\\&%g
! s%#define \([A-Za-z_][A-Za-z0-9_]*\) \(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%ac_d%ac_u%gp
s%ac_u%ac_e%gp
EOF
--- 3680,3699 ----
echo creating $ac_file
rm -f conftest.frag conftest.in conftest.out
! ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"`
! cat $ac_file_inputs > conftest.in
EOF
# Transform confdefs.h into a sed script conftest.vals that substitutes
# the proper values into config.h.in to produce config.h. And first:
! # Protect against being on the right side of a sed subst in config.status.
# Protect against being in an unquoted here document in config.status.
rm -f conftest.vals
cat > conftest.hdr <<\EOF
s/[\\&%]/\\&/g
s%[\\$`]%\\&%g
! s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD}%gp
s%ac_d%ac_u%gp
s%ac_u%ac_e%gp
EOF
***************
*** 3160,3167 ****
# Break up conftest.vals because some shells have a limit on
# the size of here documents, and old seds have small limits too.
- # Maximum number of lines to put in a single here document.
- ac_max_here_lines=12
rm -f conftest.tail
while :
--- 3709,3714 ----
***************
*** 3192,3206 ****
--- 3739,3764 ----
echo "$ac_file is unchanged"
rm -f conftest.h
else
+ # Remove last slash and all that follows it. Not all systems have dirname.
+ ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'`
+ if test "$ac_dir" != "$ac_file" && test "$ac_dir" != .; then
+ # The file is in a subdirectory.
+ test ! -d "$ac_dir" && mkdir "$ac_dir"
+ fi
rm -f $ac_file
mv conftest.h $ac_file
fi
fi; done
+ EOF
+ cat >> $CONFIG_STATUS <<EOF
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
exit 0
EOF
chmod +x $CONFIG_STATUS
rm -fr confdefs* $ac_clean_files
test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
+
Index: Server/configure.in
diff -c Server/configure.in:1.1 Server/configure.in:1.2
*** Server/configure.in:1.1 Wed Oct 15 17:51:24 1997
--- Server/configure.in Wed Oct 15 19:23:35 1997
***************
*** 107,113 ****
# Check for gmp and mp
#--------------------------------------------------------------------
! echo Searching for mp or gmp
AC_ARG_WITH(gmp-incdir,[ --with-gmp-incdir GMP Include Dir], MPINC="-I$withval" search=false, MPINC=nope)
if test "$MPINC" = nope; then
AC_EGREP_CPP( GNU_MP,[
--- 107,113 ----
# Check for gmp and mp
#--------------------------------------------------------------------
! AC_MSG_CHECKING(for mp.h or gmp.h)
AC_ARG_WITH(gmp-incdir,[ --with-gmp-incdir GMP Include Dir], MPINC="-I$withval" search=false, MPINC=nope)
if test "$MPINC" = nope; then
AC_EGREP_CPP( GNU_MP,[
***************
*** 122,127 ****
--- 122,128 ----
for i in $dirs; do
if test -r $i/gmp.h; then
MPINC="-I$i"
+ AC_MSG_RESULT(yes)
fi
done
fi
***************
*** 140,145 ****
--- 141,147 ----
fi
AC_SUBST(MPINC)
+ AC_MSG_CHECKING(for libgmp.a)
AC_ARG_WITH(gmp-libdir,[ --with-gmp-libdir GMP Library Dir], MPLIB="-L$withval -lmp -lgmp" search=false, MPLIB=nope)
if test "$MPLIB" = nope; then
if test "$search" = true; then
***************
*** 153,158 ****
--- 155,161 ----
for i in $dirs; do
if test -r $i/libgmp.a; then
MPLIB="-L$i -lmp -lgmp"
+ AC_MSG_RESULT(yes)
fi
done
fi
***************
*** 178,187 ****
if test "$code" = cow; then
if test -r "$srcdir/mkkey.c"; then
! echo " RSA utilities found."
else
echo
! echo Warning RSA utilities not found, turning RSA off.
NORSA="#"
echo Check your favorite ftp site for a blessed client.
echo In case you can not find one contact brmbugs.
--- 181,190 ----
if test "$code" = cow; then
if test -r "$srcdir/mkkey.c"; then
! echo " RSA utilities for cow build found."
else
echo
! echo Warning RSA utilities for cow build not found, turning RSA off.
NORSA="#"
echo Check your favorite ftp site for a blessed client.
echo In case you can not find one contact brmbugs.
***************
*** 189,204 ****
fi
fi
if test "$code" = server; then
if test -r "$srcdir/ntserv/rsa_util.c"; then
! echo " RSA utilities found."
else
! echo
! echo Warning RSA utilities not found, turning RSA off.
NORSA="#"
echo
fi
fi
AC_SUBST(NORSA)
--- 192,210 ----
fi
fi
if test "$code" = server; then
+ AC_MSG_CHECKING(ntserv/rsa_util.c)
if test -r "$srcdir/ntserv/rsa_util.c"; then
! AC_MSG_RESULT(RSA utilities found)
! RSAINC="-I`pwd`/res-rsa"
else
! AC_MSG_RESULT(Warning RSA utilities for server build not found, turning RSA off)
NORSA="#"
echo
fi
fi
+ AC_SUBST(RSAINC)
+
AC_SUBST(NORSA)
***************
*** 337,354 ****
if test "$code" = server; then
! echo searching for netstat and uptime
dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
NETSTAT="nice -20 /usr/ucb/netstat -f inet"
for i in $dirs; do
if test -x $i/netstat; then
NETSTAT="nice -20 ${i}/netstat -a"
fi
if test -x $i/uptime; then
AC_DEFINE_UNQUOTED(UPTIME,"${i}/uptime")
fi
done
! AC_DEFINE_UNQUOTED(NETSTAT,"$NETSTAT")
fi
--- 343,370 ----
if test "$code" = server; then
! AC_MSG_CHECKING(for netstat)
dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
NETSTAT="nice -20 /usr/ucb/netstat -f inet"
for i in $dirs; do
if test -x $i/netstat; then
NETSTAT="nice -20 ${i}/netstat -a"
+ AC_DEFINE_UNQUOTED(NETSTAT,"$NETSTAT")
+ AC_MSG_RESULT(yes)
+ break
fi
+ done
+
+ AC_MSG_CHECKING(for uptime)
+ dirs="/bsd /usr/bsd /etc /bin /usr/bin /usr/etc"
+ for i in $dirs; do
if test -x $i/uptime; then
AC_DEFINE_UNQUOTED(UPTIME,"${i}/uptime")
+ AC_MSG_RESULT(yes)
+ break
fi
done
!
fi
Index: Server/patchlevel.h
diff -c Server/patchlevel.h:1.1 Server/patchlevel.h:1.2
*** Server/patchlevel.h:1.1 Wed Oct 15 17:51:23 1997
--- Server/patchlevel.h Wed Oct 15 19:23:36 1997
***************
*** 13,19 ****
--- 13,21 ----
* (b) increment this number before each patch release.
*/
#define PATCHLEVEL 7
+ #if !defined(NULL)
#define NULL 0
+ #endif
#if 0
/*
Index: Server/system.mk.in
diff -c Server/system.mk.in:1.1 Server/system.mk.in:1.2
*** Server/system.mk.in:1.1 Wed Oct 15 17:51:24 1997
--- Server/system.mk.in Wed Oct 15 19:23:37 1997
***************
*** 83,89 ****
RSA_FLAGS = @NORSA@ -DRSA
RSA_OBJS = @NORSA@ rsa_key.o rsa_util.o
RSA_SRC = @NORSA@ rsa_key.c rsa_util.c
! RSA_INCS = @MPINC@
RSA_LIBS = @MPLIB@
FLAGS = $(EXTRAFLAGS) $(RSA_FLAGS)
--- 83,89 ----
RSA_FLAGS = @NORSA@ -DRSA
RSA_OBJS = @NORSA@ rsa_key.o rsa_util.o
RSA_SRC = @NORSA@ rsa_key.c rsa_util.c
! RSA_INCS = @MPINC@ # @RSAINC@
RSA_LIBS = @MPLIB@
FLAGS = $(EXTRAFLAGS) $(RSA_FLAGS)
Index: Server/docs/CUSTOMIZATION
diff -c Server/docs/CUSTOMIZATION:1.1 Server/docs/CUSTOMIZATION:1.2
*** Server/docs/CUSTOMIZATION:1.1 Wed Oct 15 17:51:39 1997
--- Server/docs/CUSTOMIZATION Wed Oct 15 19:23:41 1997
***************
*** 282,287 ****
*.ecst.csuchico.edu would include all machines in the .ecst.csuchico.edu
domain.
!
--- 282,292 ----
*.ecst.csuchico.edu would include all machines in the .ecst.csuchico.edu
domain.
+ Under Solaris 2.5.1 the wildcard "*" does not work. If wish to ban
+ all login attempts from rpi.edu, I must have something like this in my
+ .banne file:
! leemy@rpi.edu
+ If I do a leemy@*.rpi.edu the ban does not work. If the "*" wildcard
+ method does not work try this way.
Index: Server/docs/README
diff -c Server/docs/README:1.1 Server/docs/README:1.2
*** Server/docs/README:1.1 Wed Oct 15 17:51:40 1997
--- Server/docs/README Wed Oct 15 19:23:42 1997
***************
*** 1,27 ****
** MAIN README FILE FOR SERVER **
! README of 24-Jul-1996
If you have any comments or improvements you would like to offer then please
! email them to vanilla-l@anthrax.ecst.csuchico.edu which is the distribution
! list for the server development team. See the end of this document for how
! to send your changes back.
! NOTE!!! If you need to get RSA working then you will have to get the
res-rsa.tar.Z.crypt file. This contains the RSA specific code. It has to be
encrypted because of US government legality over cryptography getting exported
outside the US. If you are from outside the US then there is a PGP equivalent.
! To get the crypt key please email vanilla-l@anthrax.ecst.csuchico.edu or
! mcp@cs.umd.edu and say that you are a US or Canadian citizen and you will get
! the key.
Do you really need to obtain and install the RSA component? Perhaps not.
If you are setting up a Netrek Server behind a firewall, such that nobody on
! the rest of the Internet will be able to play on the server, you do not need
! to bother with RSA client authentication. The Netrek Server will work fine
without it.
RSA is only really required on the Internet, where you cannot track down and
--- 1,26 ----
** MAIN README FILE FOR SERVER **
! README of $Date: 1997/10/16 00:23:42 $
If you have any comments or improvements you would like to offer then please
! email them to vanilla-l@us.netrek.org which is the distribution list for the
! server development team. See the end of this document for how to send your
! changes back.
! NOTE!!! If you need to get RSA working then you will have to get the
res-rsa.tar.Z.crypt file. This contains the RSA specific code. It has to be
encrypted because of US government legality over cryptography getting exported
outside the US. If you are from outside the US then there is a PGP equivalent.
! To get the crypt key please email vanilla-l@us.netrek.org or mcp@cs.umd.edu and
! say that you are a US or Canadian citizen and you will get the key.
Do you really need to obtain and install the RSA component? Perhaps not.
If you are setting up a Netrek Server behind a firewall, such that nobody on
! the rest of the Internet will be able to play on the server, you do not need to
! bother with RSA client authentication. The Netrek Server will work fine
without it.
RSA is only really required on the Internet, where you cannot track down and
***************
*** 31,40 ****
You don't need the crypt key for the RSA package if you are setting up a Netrek
server within your organisation that will not be used by players outside your
organisation.
-
-
-
-
Instructions for Building and Setting up the Server (24-Jul-1996)
--- 30,35 ----
Index: Server/keycomp/defs.h
diff -c Server/keycomp/defs.h:1.1 Server/keycomp/defs.h:1.2
*** Server/keycomp/defs.h:1.1 Wed Oct 15 18:17:21 1997
--- Server/keycomp/defs.h Tue Oct 28 00:39:55 1997
***************
*** 91,97 ****
#define CLOAK_PHASES 7 /* number of drawing phases in a cloak engage/disengage */
#define NUMRANKS 9
! #define SURREND 4
#ifdef SURRENDER_SHORT /* Length of surrender timer in minutes */
#define SURRLENGTH 20 /* Short timer */
--- 94,100 ----
#define CLOAK_PHASES 7 /* number of drawing phases in a cloak engage/disengage */
#define NUMRANKS 9
! #define SURREND 5
#ifdef SURRENDER_SHORT /* Length of surrender timer in minutes */
#define SURRLENGTH 20 /* Short timer */
Index: Server/ntserv/gencmds.c
diff -c Server/ntserv/gencmds.c:1.1 Server/ntserv/gencmds.c:1.2
*** Server/ntserv/gencmds.c:1.1 Wed Oct 15 17:51:28 1997
--- Server/ntserv/gencmds.c Tue Oct 28 00:40:02 1997
***************
*** 292,298 ****
/* The Votes Passes */
if ( (vcount >= votes[num].minpass)
&& ( ((pcount < (2*vcount)) && (votes[num].tag & C_VC_ALL))
! || ((votes[num].tag & C_VC_TEAM) && (pcount-1 <= vcount)) ))
{
pmessage(sendto, mflag, addr_mess(sendto,mflag),
"The motion %s passes", comm);
--- 292,298 ----
/* The Votes Passes */
if ( (vcount >= votes[num].minpass)
&& ( ((pcount < (2*vcount)) && (votes[num].tag & C_VC_ALL))
! || ((votes[num].tag & C_VC_TEAM) && (pcount/2 + 1 <= vcount)) ))
{
pmessage(sendto, mflag, addr_mess(sendto,mflag),
"The motion %s passes", comm);
***************
*** 310,318 ****
}
else
{
if (votes[num].tag & C_VC_TEAM)
i = pcount - vcount - 1;
! else
i = pcount/2 + 1 - vcount;
if (i < (votes[num].minpass - vcount))
--- 310,319 ----
}
else
{
+ /*
if (votes[num].tag & C_VC_TEAM)
i = pcount - vcount - 1;
! else */
i = pcount/2 + 1 - vcount;
if (i < (votes[num].minpass - vcount))
Index: Server/ntserv/socket.c
diff -c Server/ntserv/socket.c:1.1 Server/ntserv/socket.c:1.3
*** Server/ntserv/socket.c:1.1 Wed Oct 15 17:51:31 1997
--- Server/ntserv/socket.c Wed Oct 15 19:23:46 1997
***************
*** 496,502 ****
}
remoteaddr=addr.sin_addr.s_addr;
! if (connect(ns, &addr, sizeof(addr)) < 0) {
ERROR(3,("I cannot connect through port %d\n", port));
close(ns);
return(0);
--- 500,506 ----
}
remoteaddr=addr.sin_addr.s_addr;
! if (connect(ns, (struct sockadd*)&addr, sizeof(addr)) < 0) {
ERROR(3,("I cannot connect through port %d\n", port));
close(ns);
return(0);
Index: Server/sequencer/sequencer.c
diff -c Server/sequencer/sequencer.c:1.1 Server/sequencer/sequencer.c:1.2
*** Server/sequencer/sequencer.c:1.1 Wed Oct 15 17:51:36 1997
--- Server/sequencer/sequencer.c Tue Oct 28 00:42:30 1997
***************
*** 309,315 ****
--- 309,317 ----
/* commands which _do_ require the game to be up */
COMMAND ( "say", do_say );
COMMAND ( "nuke", do_nuke );
+ #if defined (TRIPLE_PLANET_MAYHEM)
COMMAND ( "balance", do_balance ); /* see commands.c */
+ #endif
COMMAND ( "reset", do_reset );
COMMAND ( "pause", do_pause );
COMMAND ( "continue", do_continue );
References: