mirror of
git://git.sv.gnu.org/autoconf
synced 2025-03-19 14:40:24 +08:00
various bug fixes
This commit is contained in:
David MacKenzie
parent
d2af471598
commit
77caa43c94
14
Makefile.in
14
Makefile.in
@ -169,24 +169,26 @@ Makefile: Makefile.in config.status
|
||||
config.status: configure
|
||||
./config.status --recheck
|
||||
|
||||
clean mostlyclean distclean realclean::
|
||||
maintainer-clean::
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "rebuilding the deleted files requires makeinfo."
|
||||
rm -f TAGS *.info* INSTALL
|
||||
|
||||
clean mostlyclean distclean maintainer-clean::
|
||||
for dir in $(SUBDIRS); do \
|
||||
echo making $@ in $$dir ; \
|
||||
(cd $$dir; $(MAKE) $@) ; \
|
||||
done
|
||||
|
||||
clean mostlyclean distclean realclean::
|
||||
clean mostlyclean distclean maintainer-clean::
|
||||
rm -f $(SCRIPTS) *.tmp
|
||||
rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
|
||||
rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
|
||||
rm -f *.ev *.evs *.ov *.ovs *.cv *.cvs *.ma *.mas
|
||||
|
||||
distclean realclean::
|
||||
distclean maintainer-clean::
|
||||
rm -f Makefile config.status config.cache config.log
|
||||
|
||||
realclean::
|
||||
rm -f TAGS *.info* INSTALL
|
||||
|
||||
TAGS:
|
||||
etags ${srcdir}/*.m4 ${srcdir}/*.sh ${srcdir}/[a-z]*.in ${srcdir}/*.texi
|
||||
|
||||
|
||||
108
TODO
108
TODO
@ -89,8 +89,10 @@ in a dnl comment. (Seems to be hard.)
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
* Look at user contributed macros: prototypes, IEEE double precision math,
|
||||
shared libraries, various other things.
|
||||
* Look at user contributed macros:
|
||||
prototypes
|
||||
IEEE double precision math
|
||||
shared libraries
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
@ -100,17 +102,6 @@ warnings. (Roland McGrath)
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
It would be very useful if autoconf allowed checking for multiple libraries
|
||||
that are required together. For example:
|
||||
|
||||
AC_HAVE_LIBRARY([-lsocket -lnsl], [LIBS="$LIBS -lsocket -lnsl"])
|
||||
|
||||
I have been informed that SVR4 requires both -lnsl to be used with -lsocket,
|
||||
so a test just for -lsocket fails, as that will not compile.
|
||||
From: markd@grizzly.COM (Mark Diekhans)
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
In config.status comment, put the host/target/build types, if used.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
@ -120,17 +111,12 @@ substitutions done on them.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Have AC_CANONICAL_HOST cache the host/build/target types.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
AC_OUTPUT(Makefile.out:Makefile.in)
|
||||
generates
|
||||
trap 'rm -f Makefile.out:Makefile.in; exit 1' 1 2 15
|
||||
Have AC_CANONICAL_* cache the host/build/target types.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Look at contributions:
|
||||
ifnames rewrite using nawk (Paul Eggert)
|
||||
ac_include (Karl Berry)
|
||||
tool_prefix (Roland McGrath)
|
||||
aclocal.h tom@basil.icce.rug.NL (Tom R.Hageman)
|
||||
@ -187,19 +173,6 @@ disabling the m4 "comment" feature when processing user-supplied strings.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
- I would like the default behavior of the library command to change
|
||||
so that the newly tested library is tried in front of $LIBS instead of
|
||||
after it. This makes it possible to test for more complicated sets of
|
||||
dependencies. For instance: on some SVR4 systems (e.g. Sequent),
|
||||
-lsocket requires -linet and -lnsl. The link order must be
|
||||
"-lsocket -linet -lnsl". On some other SVR4 systems either -linet or
|
||||
-lnsl does not exist. Now if I test for -lnsl first, the test for
|
||||
-linet fails because it tries "-lnsl -linet"; but if I test for
|
||||
-linet it fails because it only works if -lnsl is also specified.
|
||||
--Guido van Rossum, CWI, Amsterdam <mailto:Guido.van.Rossum@cwi.nl>
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
on hal.gnu.ai.mit.edu, configure is getting the wrong answer for
|
||||
AC_CHECK_FUNCS(select).
|
||||
|
||||
@ -218,7 +191,7 @@ From: kwzh@gnu.ai.mit.edu (Karl Heuer)
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
put all the config.* stuff somewhere like config/?
|
||||
All these extrainious file sure clutter up a toplevel directory.
|
||||
All these extraneous files sure clutter up a toplevel directory.
|
||||
From: "Randall S. Winchester" <rsw@eng.umd.edu>
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
@ -230,9 +203,70 @@ From: "Randall S. Winchester" <rsw@eng.umd.edu>
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
define([AC_DEFUN],
|
||||
[define($1, [AC_PRO([$1])[$2][]AC_EPI()])])
|
||||
to fix a quoting bug (Noah Friedman).
|
||||
Handle trailing slashes in PATH elements in AC_CHECK_PROG,
|
||||
AC_PATH_PROG, AC_PROG_INSTALL.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
In libc and make in aclocal.m4 I have AC_CHECK_SYMBOL, which checks for
|
||||
sys_siglist et al. Using AC_CHECK_FUNC doesn't work on some system that
|
||||
winds up caring that you reference it as a function and it is really a
|
||||
variable. My version always declares the symbol as a char *[]; if that
|
||||
ends up a bad idea, we can have it take an arg with the C decl, but that is
|
||||
a bit verbose to write if it's actually superfluous.
|
||||
From Roland McGrath.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
In /gd4/gnu/hurd/aclocal.m4 I wrote AC_CHECK_TOOL, which is a boon when
|
||||
doing a lot of cross compilation, and I think a good thing to use
|
||||
generically (AC_PROG_{CC,RANLIB} should use it). I want this merged so I
|
||||
can convert mach4's configure.in to stop using local hack macros, and
|
||||
finally get a configure.in up for hurd (and then rewrite its makefiles
|
||||
again).
|
||||
From Roland McGrath.
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
ls -lt configure configure.in | sort
|
||||
doesn't work right if configure.in is from a symlink farm, where the
|
||||
symlink has either a timestamp of it's own, or under BSD 4.4, it has
|
||||
the timestamp of the current directory, neither of which
|
||||
helps. Changing it to
|
||||
ls -Llt configure configure.in | sort
|
||||
works for me, though I don't know how portable that is
|
||||
_Mark_ <eichin@cygnus.com>
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
Here is the thing I would like the most;
|
||||
AC_PKG_WITH(PACKAGE, HELP_STRING, PACKAGE-ROOT, PACKAGE-LIBS, PACKAGE-DEFS,
|
||||
PACKAGE-CCPFLAGS)
|
||||
like
|
||||
|
||||
AC_PKG_WITH(kerberos,,/usr/local/athena,-lkrb -ldes,[KERBEROS KRB4
|
||||
CRYPT],include)
|
||||
AC_PKG_WITH(hesiod,
|
||||
[if hesiod is not in kerberos-root add --with-hesiod-root=somewhere]
|
||||
,,-lhesiod,HESIOD,,)
|
||||
AC_PKG_WITH(glue,,,-lglue,GLUE,,)
|
||||
AC_PKG_WITH(bind,,/usr/local/bind, [lib/resolv.a lib/lib44bsd.a], ,include)
|
||||
After the apropriate checks, the existance of the paths, and libs and such
|
||||
LIBS=$LIBS $PKG-LIBS
|
||||
DEFS=$DEFS $PKG-DEFS
|
||||
CPPFLAGS=$PKG-CPPFLAGS $CPPFLAGS
|
||||
$PKG-ROOT=$PKG-ROOT
|
||||
The cppflags should reverse the order so that you can have;
|
||||
-I/usr/local/bind/include -I/usr/local/athena/include
|
||||
and
|
||||
-L/usr/local/athena/lib -lkrb -ldes /usr/local/bind/lib/libresolv.a
|
||||
as order matters.
|
||||
|
||||
also an AC_PKG_CHK_HEADER
|
||||
and an AC_PKG_CHK_FUNCTION
|
||||
so one can give alternate paths to check for stuff ($PKG-ROOT/lib for
|
||||
example)
|
||||
From: Randall Winchester
|
||||
|
||||
------------------------------------------------------------------------------
|
||||
|
||||
|
||||
17
acgeneral.m4
17
acgeneral.m4
@ -51,7 +51,7 @@ dnl
|
||||
divert(-1)dnl Throw away output until AC_INIT is called.
|
||||
changequote([, ])
|
||||
|
||||
define(AC_ACVERSION, 2.1)
|
||||
define(AC_ACVERSION, 2.1.1)
|
||||
|
||||
dnl Some old m4's don't support m4exit. But they provide
|
||||
dnl equivalent functionality by core dumping because of the
|
||||
@ -1009,8 +1009,8 @@ AC_DEFUN(AC_LANG_C,
|
||||
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} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
])
|
||||
|
||||
dnl AC_LANG_CPLUSPLUS()
|
||||
@ -1164,6 +1164,7 @@ AC_DEFUN(AC_PREFIX_PROGRAM,
|
||||
changequote(<<, >>)dnl
|
||||
define(<<AC_VAR_NAME>>, translit($1, [a-z], [A-Z]))dnl
|
||||
changequote([, ])dnl
|
||||
AC_MSG_CHECKING([for prefix by ])
|
||||
AC_PATH_PROG(AC_VAR_NAME, $1)
|
||||
changequote(<<, >>)dnl
|
||||
if test -n "$ac_cv_path_<<>>AC_VAR_NAME"; then
|
||||
@ -1184,7 +1185,7 @@ AC_DEFUN(AC_CHECK_LIB,
|
||||
[AC_MSG_CHECKING([for -l$1])
|
||||
AC_CACHE_VAL(ac_cv_lib_$1,
|
||||
[ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -l$1 $5"
|
||||
LIBS="-l$1 $LIBS $5"
|
||||
AC_TRY_LINK(, [$2()], eval "ac_cv_lib_$1=yes", eval "ac_cv_lib_$1=no")dnl
|
||||
LIBS="$ac_save_LIBS"
|
||||
])dnl
|
||||
@ -1195,7 +1196,7 @@ if eval "test \"`echo '$ac_cv_lib_'$1`\" = yes"; then
|
||||
ac_tr_lib=HAVE_LIB`echo $1 | tr '[a-z]' '[A-Z]'`
|
||||
changequote([, ])dnl
|
||||
AC_DEFINE_UNQUOTED($ac_tr_lib)
|
||||
LIBS="$LIBS -l$1"
|
||||
LIBS="-l$1 $LIBS"
|
||||
], [$3])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
@ -1216,7 +1217,7 @@ changequote([, ])dnl
|
||||
AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
|
||||
AC_CACHE_VAL(AC_CV_NAME,
|
||||
[ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -l[]AC_LIB_NAME[] $4"
|
||||
LIBS="-l[]AC_LIB_NAME[] $LIBS $4"
|
||||
AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl
|
||||
LIBS="$ac_save_LIBS"
|
||||
])dnl
|
||||
@ -1224,7 +1225,7 @@ AC_MSG_RESULT($AC_CV_NAME)
|
||||
if test "$AC_CV_NAME" = yes; then
|
||||
ifelse([$2], ,
|
||||
[AC_DEFINE([HAVE_LIB]translit(AC_LIB_NAME, [a-z], [A-Z]))
|
||||
LIBS="$LIBS -l[]AC_LIB_NAME[]"
|
||||
LIBS="-l[]AC_LIB_NAME[] $LIBS"
|
||||
], [$2])
|
||||
ifelse([$3], , , [else
|
||||
$3
|
||||
@ -1621,7 +1622,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
|
||||
])dnl
|
||||
|
||||
ifdef([AC_LIST_HEADER],
|
||||
[trap 'rm -fr $1 AC_LIST_HEADER conftest*; exit 1' 1 2 15],
|
||||
[trap 'rm -fr `echo $1 AC_LIST_HEADER | tr : " "` conftest*; exit 1' 1 2 15],
|
||||
[trap 'rm -f $1; exit 1' 1 2 15])
|
||||
|
||||
AC_OUTPUT_FILES($1)
|
||||
|
||||
@ -313,7 +313,7 @@ then
|
||||
flex*) ac_lib=fl ;;
|
||||
*) ac_lib=l ;;
|
||||
esac
|
||||
AC_CHECK_LIB($ac_lib, main, LEXLIB="-l$ac_lib")
|
||||
AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-l$ac_lib")
|
||||
fi
|
||||
AC_SUBST(LEXLIB)])
|
||||
|
||||
@ -517,9 +517,9 @@ AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
|
||||
[ac_header_dirent=$ac_hdr; break])
|
||||
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
||||
if test $ac_header_dirent = dirent.h; then
|
||||
AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir")
|
||||
AC_CHECK_LIB(dir, opendir, LIBS="-ldir $LIBS")
|
||||
else
|
||||
AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx")
|
||||
AC_CHECK_LIB(x, opendir, LIBS="-lx $LIBS")
|
||||
fi
|
||||
])
|
||||
|
||||
@ -730,7 +730,10 @@ AC_CACHE_VAL(ac_cv_type_signal,
|
||||
#ifdef signal
|
||||
#undef signal
|
||||
#endif
|
||||
extern void (*signal ()) ();],
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
void (*signal ()) ();],
|
||||
[int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])dnl
|
||||
AC_MSG_RESULT($ac_cv_type_signal)
|
||||
AC_DEFINE_UNQUOTED(RETSIGTYPE, $ac_cv_type_signal)
|
||||
@ -985,7 +988,7 @@ main() {
|
||||
case -1: _exit(0); /* What can we do? */
|
||||
default: /* Parent. */
|
||||
wait3(&i, 0, &r);
|
||||
sleep(1); /* Avoid "text file busy" from rm on fast HP-UX machines. */
|
||||
sleep(2); /* Avoid "text file busy" from rm on fast HP-UX machines. */
|
||||
exit(r.ru_nvcsw == 0 && r.ru_majflt == 0 && r.ru_minflt == 0
|
||||
&& r.ru_stime.tv_sec == 0 && r.ru_stime.tv_usec == 0);
|
||||
}
|
||||
@ -1084,24 +1087,19 @@ AC_SUBST(ALLOCA)dnl
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_FUNC_GETLOADAVG,
|
||||
[# Some definitions of getloadavg require that the program be installed setgid.
|
||||
NEED_SETGID=false
|
||||
AC_SUBST(NEED_SETGID)dnl
|
||||
ac_have_func=no
|
||||
[ac_have_func=no
|
||||
|
||||
# Some systems with -lutil have (and need) -lkvm as well, some do not.
|
||||
# If it is needed, it will be needed to detect getloadavg in -lutil.
|
||||
ac_LIBS_before_kvm="$LIBS"
|
||||
AC_CHECK_LIB(kvm, kvm_open, ac_LIBS_kvm=-lkvm, ac_LIBS_kvm=)
|
||||
AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
|
||||
# Check for the 4.4BSD definition of getloadavg.
|
||||
AC_CHECK_LIB(util, getloadavg, [
|
||||
LIBS="$ac_LIBS_before_kvm -lutil $ac_LIBS_kvm" ac_have_func=yes])
|
||||
AC_CHECK_LIB(util, getloadavg,
|
||||
[LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
|
||||
|
||||
if test $ac_have_func = no; then
|
||||
# There is a commonly available library for RS/6000 AIX.
|
||||
# Since it is not a standard part of AIX, it might be installed locally.
|
||||
ac_save_LIBS="$LIBS" LIBS="-L/usr/local/lib $LIBS"
|
||||
AC_CHECK_LIB(getloadavg, getloadavg, LIBS="$LIBS -lgetloadavg", LIBS="$ac_save_LIBS")
|
||||
AC_CHECK_LIB(getloadavg, getloadavg, LIBS="-lgetloadavg $LIBS", LIBS="$ac_save_LIBS")
|
||||
fi
|
||||
|
||||
# Make sure it is really in the library, if we think we found it.
|
||||
@ -1112,24 +1110,24 @@ if test $ac_cv_func_getloadavg = yes; then
|
||||
else
|
||||
ac_have_func=no
|
||||
AC_CHECK_HEADER(sys/dg_sys_info.h,
|
||||
[ac_have_func=yes AC_DEFINE(DGUX)
|
||||
[ac_have_func=yes; AC_DEFINE(DGUX)
|
||||
AC_CHECK_LIB(dgc, dg_sys_info)])
|
||||
if test $ac_have_func = no; then
|
||||
# We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
|
||||
# uses stabs), but it is still SVR4. We cannot check for <elf.h> because
|
||||
# Irix 4.0.5F has the header but not the library.
|
||||
AC_CHECK_LIB(elf, elf_begin,
|
||||
[LIBS="$LIBS -lelf" ac_have_func=yes AC_DEFINE(SVR4)
|
||||
AC_CHECK_LIB(kvm, kvm_open, LIBS="$LIBS -lkvm")])
|
||||
[LIBS="-lelf $LIBS" ac_have_func=yes; AC_DEFINE(SVR4)
|
||||
AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")])
|
||||
fi
|
||||
if test $ac_have_func = no; then
|
||||
AC_CHECK_HEADER(inq_stats/cpustats.h,
|
||||
[ac_have_func=yes AC_DEFINE(UMAX)
|
||||
[ac_have_func=yes; AC_DEFINE(UMAX)
|
||||
AC_DEFINE(UMAX4_3)])
|
||||
fi
|
||||
if test $ac_have_func = no; then
|
||||
AC_CHECK_HEADER(sys/cpustats.h,
|
||||
[ac_have_func=yes AC_DEFINE(UMAX)])
|
||||
[ac_have_func=yes; AC_DEFINE(UMAX)])
|
||||
fi
|
||||
if test $ac_have_func = no; then
|
||||
AC_CHECK_HEADERS(mach/mach.h)
|
||||
@ -1148,9 +1146,10 @@ if test $ac_cv_struct_nlist_n_un = yes; then
|
||||
fi
|
||||
])dnl
|
||||
|
||||
dnl FIXME two bugs here:
|
||||
dnl Hardwiring the path of getloadavg.c in the top-level directory,
|
||||
dnl and not checking whether a getloadavg from a library needs privileges.
|
||||
fi # Do not have getloadavg in system libraries.
|
||||
|
||||
# Some definitions of getloadavg require that the program be installed setgid.
|
||||
dnl FIXME Don't hardwire the path of getloadavg.c in the top-level directory.
|
||||
AC_MSG_CHECKING(whether getloadavg requires setgid)
|
||||
AC_CACHE_VAL(ac_cv_func_getloadavg_setgid,
|
||||
[AC_EGREP_CPP([Yowza Am I SETGID yet],
|
||||
@ -1161,12 +1160,13 @@ Yowza Am I SETGID yet
|
||||
ac_cv_func_getloadavg_setgid=yes, ac_cv_func_getloadavg_setgid=no)])dnl
|
||||
AC_MSG_RESULT($ac_cv_func_getloadavg_setgid)
|
||||
if test $ac_cv_func_getloadavg_setgid = yes; then
|
||||
NEED_SETGID=true AC_DEFINE(GETLOADAVG_PRIVILEGED)
|
||||
NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED)
|
||||
else
|
||||
NEED_SETGID=false
|
||||
fi
|
||||
AC_SUBST(NEED_SETGID)dnl
|
||||
|
||||
fi # Do not have getloadavg in system libraries.
|
||||
|
||||
if test "$NEED_SETGID" = true; then
|
||||
if test $ac_cv_func_getloadavg_setgid = yes; then
|
||||
AC_MSG_CHECKING(group of /dev/kmem)
|
||||
AC_CACHE_VAL(ac_cv_group_kmem,
|
||||
[changequote(, )dnl
|
||||
@ -1246,13 +1246,13 @@ fi
|
||||
|
||||
AC_DEFUN(AC_FUNC_GETMNTENT,
|
||||
[# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX.
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="$LIBS -lsun",
|
||||
[AC_CHECK_LIB(seq, getmntent, LIBS="$LIBS -lseq")])
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS",
|
||||
[AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")])
|
||||
AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])])
|
||||
|
||||
AC_DEFUN(AC_FUNC_STRFTIME,
|
||||
[# strftime is in -lintl on SCO UNIX.
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="$LIBS -lintl")
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
|
||||
AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)])])
|
||||
|
||||
AC_DEFUN(AC_FUNC_MEMCMP,
|
||||
@ -1681,13 +1681,14 @@ EOF
|
||||
then
|
||||
ac_im_usrlibdir=$ac_im_libdir
|
||||
fi
|
||||
# Screen out bogus values from the imake configuration.
|
||||
case "$ac_im_incroot" in
|
||||
/usr/include) ;;
|
||||
*) ac_x_includes="$ac_im_incroot" ;;
|
||||
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
|
||||
esac
|
||||
case "$ac_im_usrlibdir" in
|
||||
/usr/lib | /lib) ;;
|
||||
*) ac_x_libraries="$ac_im_usrlibdir" ;;
|
||||
*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
|
||||
esac
|
||||
fi
|
||||
cd ..
|
||||
@ -1750,7 +1751,7 @@ AC_TRY_CPP([#include <$x_direct_test_include>],
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -l$x_direct_test_library"
|
||||
LIBS="-l$x_direct_test_library $LIBS"
|
||||
AC_TRY_LINK(, [${x_direct_test_function}()],
|
||||
[LIBS="$ac_save_LIBS" no_x= ac_x_libraries=],
|
||||
[LIBS="$ac_save_LIBS"
|
||||
@ -1834,34 +1835,34 @@ else
|
||||
# libraries we check for below, so use a different variable.
|
||||
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
|
||||
AC_CHECK_LIB(ICE, IceConnectionNumber,
|
||||
[X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"])
|
||||
[X_PRE_LIBS="-lSM -lICE $X_PRE_LIBS"])
|
||||
LDFLAGS="$ac_save_LDFLAGS"
|
||||
|
||||
# Check for system-dependent libraries X programs must link with.
|
||||
|
||||
if test "$ISC" = yes; then
|
||||
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
|
||||
X_EXTRA_LIBS="-lnsl_s -linet $X_EXTRA_LIBS"
|
||||
else
|
||||
# Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
|
||||
# libraries were built with DECnet support. And karl@cs.umb.edu says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
|
||||
AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="-ldnet $X_EXTRA_LIBS"])
|
||||
if test $ac_cv_lib_dnet = no; then
|
||||
AC_CHECK_LIB(dnet_stub, dnet_ntoa,
|
||||
[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
|
||||
[X_EXTRA_LIBS="-ldnet_stub $X_EXTRA_LIBS"])
|
||||
fi
|
||||
|
||||
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
|
||||
# to get the SysV transport functions.
|
||||
# Not sure which flavor of 386 UNIX this is, but it seems harmless to
|
||||
# check for it.
|
||||
AC_CHECK_LIB(nsl, t_accept, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
|
||||
AC_CHECK_LIB(nsl, t_accept, [X_EXTRA_LIBS="-lnsl $X_EXTRA_LIBS"])
|
||||
|
||||
# lieder@skyler.mavd.honeywell.com says without -lsocket,
|
||||
# socket/setsockopt and other routines are undefined under SCO ODT 2.0.
|
||||
# But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch.
|
||||
if test "`(uname) 2>/dev/null`" != IRIX; then
|
||||
AC_CHECK_LIB(socket, socket, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket"])
|
||||
AC_CHECK_LIB(socket, socket, [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -1874,6 +1875,7 @@ AC_SUBST(X_EXTRA_LIBS)dnl
|
||||
|
||||
dnl ### Checks for UNIX variants
|
||||
dnl These are kludges which should be replaced by a single POSIX check.
|
||||
dnl They aren't cached, to discourage their use.
|
||||
|
||||
|
||||
AC_DEFUN(AC_AIX,
|
||||
@ -1901,7 +1903,7 @@ fi
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_ISC_POSIX,
|
||||
[AC_BEFORE([$0], [AC_TRY_LINK])dnl
|
||||
[AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
|
||||
AC_BEFORE([$0], [AC_TRY_LINK])dnl
|
||||
AC_BEFORE([$0], [AC_TRY_RUN])dnl
|
||||
AC_MSG_CHECKING(for POSIXized ISC)
|
||||
@ -1933,22 +1935,22 @@ AC_EGREP_CPP(yes,
|
||||
], [AC_MSG_RESULT(yes); XENIX=yes], [AC_MSG_RESULT(no); XENIX=])
|
||||
if test "$XENIX" = yes; then
|
||||
# Make sure -ldir precedes -lx.
|
||||
test $ac_header_dirent = dirent.h && LIBS="$LIBS -ldir"
|
||||
LIBS="$LIBS -lx"
|
||||
test $ac_header_dirent = dirent.h && LIBS="-ldir $LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_DYNIX_SEQ,
|
||||
[AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT])dnl
|
||||
AC_CHECK_LIB(seq, getmntent, LIBS="$LIBS -lseq")
|
||||
AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_IRIX_SUN,
|
||||
[AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT or AC_CHECK_LIB(sun, getpwnam)])dnl
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="$LIBS -lsun")
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS")
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_SCO_INTL,
|
||||
[AC_OBSOLETE([$0], [; instead use AC_FUNC_STRFTIME])dnl
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="$LIBS -lintl")
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
|
||||
])
|
||||
|
||||
@ -39,7 +39,8 @@ case "${M4}" in
|
||||
test -f "${M4}" || M4=m4 ;;
|
||||
esac
|
||||
|
||||
tmpout=/tmp/acout.$$
|
||||
: ${TMPDIR=/tmp}
|
||||
tmpout=${TMPDIR}/acout.$$
|
||||
localdir=
|
||||
show_version=no
|
||||
|
||||
@ -91,7 +92,7 @@ esac
|
||||
|
||||
trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
|
||||
|
||||
tmpin=/tmp/acin.$$ # Always set this, to avoid bogus errors from some rm's.
|
||||
tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
|
||||
if test z$infile = z-; then
|
||||
infile=$tmpin
|
||||
cat > $infile
|
||||
|
||||
@ -39,7 +39,8 @@ case "${M4}" in
|
||||
test -f "${M4}" || M4=m4 ;;
|
||||
esac
|
||||
|
||||
tmpout=/tmp/acout.$$
|
||||
: ${TMPDIR=/tmp}
|
||||
tmpout=${TMPDIR}/acout.$$
|
||||
localdir=
|
||||
show_version=no
|
||||
|
||||
@ -91,7 +92,7 @@ esac
|
||||
|
||||
trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
|
||||
|
||||
tmpin=/tmp/acin.$$ # Always set this, to avoid bogus errors from some rm's.
|
||||
tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
|
||||
if test z$infile = z-; then
|
||||
infile=$tmpin
|
||||
cat > $infile
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
@c @setchapternewpage odd
|
||||
@c %**end of header
|
||||
|
||||
@set EDITION 2.1
|
||||
@set VERSION 2.1
|
||||
@set UPDATED November 1994
|
||||
@set EDITION 2.1.1
|
||||
@set VERSION 2.1.1
|
||||
@set UPDATED February 1995
|
||||
|
||||
@iftex
|
||||
@finalout
|
||||
@ -1577,7 +1577,15 @@ to @samp{byacc}. Otherwise set @code{YACC} to @samp{yacc}.
|
||||
These macros are used to find programs not covered by the particular
|
||||
test macros. If you need to check the behavior of a program as well as
|
||||
find out whether it is present, you have to write your own test for
|
||||
it (@pxref{Writing Tests}).
|
||||
it (@pxref{Writing Tests}). If you need to check for a program that
|
||||
might not be in the user's @code{PATH}, you can temporarily add to it:
|
||||
|
||||
@example
|
||||
ac_save_path="$PATH"
|
||||
PATH=/usr/libexec:/usr/sbin:/usr/etc:/etc
|
||||
AC_PATH_PROG(INETD, inetd, /usr/libexec/inetd)
|
||||
PATH="$ac_save_path"
|
||||
@end example
|
||||
|
||||
@defmac AC_CHECK_PROG (@var{variable}, @var{prog-to-check-for}, @var{value-if-found} @r{[}, @var{value-if-not-found}@r{]})
|
||||
@maindex CHECK_PROG
|
||||
|
||||
@ -217,9 +217,10 @@ if test -n "$libs"; then
|
||||
done
|
||||
fi
|
||||
|
||||
# The echo and cat are in case @BOTTOM@ is the first line of acconfig.h.
|
||||
test -r $localdir/acconfig.h &&
|
||||
grep @BOTTOM@ $localdir/acconfig.h >/dev/null &&
|
||||
sed '1,/@BOTTOM@/d' $localdir/acconfig.h
|
||||
(echo; cat $localdir/acconfig.h | sed '1,/@BOTTOM@/d')
|
||||
test -f ${config_h}.bot && cat ${config_h}.bot
|
||||
|
||||
status=0
|
||||
|
||||
@ -217,9 +217,10 @@ if test -n "$libs"; then
|
||||
done
|
||||
fi
|
||||
|
||||
# The echo and cat are in case @BOTTOM@ is the first line of acconfig.h.
|
||||
test -r $localdir/acconfig.h &&
|
||||
grep @BOTTOM@ $localdir/acconfig.h >/dev/null &&
|
||||
sed '1,/@BOTTOM@/d' $localdir/acconfig.h
|
||||
(echo; cat $localdir/acconfig.h | sed '1,/@BOTTOM@/d')
|
||||
test -f ${config_h}.bot && cat ${config_h}.bot
|
||||
|
||||
status=0
|
||||
|
||||
@ -39,7 +39,8 @@ case "${M4}" in
|
||||
test -f "${M4}" || M4=m4 ;;
|
||||
esac
|
||||
|
||||
tmpout=/tmp/acout.$$
|
||||
: ${TMPDIR=/tmp}
|
||||
tmpout=${TMPDIR}/acout.$$
|
||||
localdir=
|
||||
show_version=no
|
||||
|
||||
@ -91,7 +92,7 @@ esac
|
||||
|
||||
trap 'rm -f $tmpin $tmpout; exit 1' 1 2 15
|
||||
|
||||
tmpin=/tmp/acin.$$ # Always set this, to avoid bogus errors from some rm's.
|
||||
tmpin=${TMPDIR}/acin.$$ # Always set this, to avoid bogus errors from some rm's.
|
||||
if test z$infile = z-; then
|
||||
infile=$tmpin
|
||||
cat > $infile
|
||||
|
||||
@ -217,9 +217,10 @@ if test -n "$libs"; then
|
||||
done
|
||||
fi
|
||||
|
||||
# The echo and cat are in case @BOTTOM@ is the first line of acconfig.h.
|
||||
test -r $localdir/acconfig.h &&
|
||||
grep @BOTTOM@ $localdir/acconfig.h >/dev/null &&
|
||||
sed '1,/@BOTTOM@/d' $localdir/acconfig.h
|
||||
(echo; cat $localdir/acconfig.h | sed '1,/@BOTTOM@/d')
|
||||
test -f ${config_h}.bot && cat ${config_h}.bot
|
||||
|
||||
status=0
|
||||
|
||||
@ -169,24 +169,26 @@ Makefile: Makefile.in config.status
|
||||
config.status: configure
|
||||
./config.status --recheck
|
||||
|
||||
clean mostlyclean distclean realclean::
|
||||
maintainer-clean::
|
||||
@echo "This command is intended for maintainers to use;"
|
||||
@echo "rebuilding the deleted files requires makeinfo."
|
||||
rm -f TAGS *.info* INSTALL
|
||||
|
||||
clean mostlyclean distclean maintainer-clean::
|
||||
for dir in $(SUBDIRS); do \
|
||||
echo making $@ in $$dir ; \
|
||||
(cd $$dir; $(MAKE) $@) ; \
|
||||
done
|
||||
|
||||
clean mostlyclean distclean realclean::
|
||||
clean mostlyclean distclean maintainer-clean::
|
||||
rm -f $(SCRIPTS) *.tmp
|
||||
rm -f *.aux *.cp *.cps *.dvi *.fn *.fns *.ky *.kys *.log
|
||||
rm -f *.pg *.pgs *.toc *.tp *.tps *.vr *.vrs
|
||||
rm -f *.ev *.evs *.ov *.ovs *.cv *.cvs *.ma *.mas
|
||||
|
||||
distclean realclean::
|
||||
distclean maintainer-clean::
|
||||
rm -f Makefile config.status config.cache config.log
|
||||
|
||||
realclean::
|
||||
rm -f TAGS *.info* INSTALL
|
||||
|
||||
TAGS:
|
||||
etags ${srcdir}/*.m4 ${srcdir}/*.sh ${srcdir}/[a-z]*.in ${srcdir}/*.texi
|
||||
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
@c @setchapternewpage odd
|
||||
@c %**end of header
|
||||
|
||||
@set EDITION 2.1
|
||||
@set VERSION 2.1
|
||||
@set UPDATED November 1994
|
||||
@set EDITION 2.1.1
|
||||
@set VERSION 2.1.1
|
||||
@set UPDATED February 1995
|
||||
|
||||
@iftex
|
||||
@finalout
|
||||
@ -1577,7 +1577,15 @@ to @samp{byacc}. Otherwise set @code{YACC} to @samp{yacc}.
|
||||
These macros are used to find programs not covered by the particular
|
||||
test macros. If you need to check the behavior of a program as well as
|
||||
find out whether it is present, you have to write your own test for
|
||||
it (@pxref{Writing Tests}).
|
||||
it (@pxref{Writing Tests}). If you need to check for a program that
|
||||
might not be in the user's @code{PATH}, you can temporarily add to it:
|
||||
|
||||
@example
|
||||
ac_save_path="$PATH"
|
||||
PATH=/usr/libexec:/usr/sbin:/usr/etc:/etc
|
||||
AC_PATH_PROG(INETD, inetd, /usr/libexec/inetd)
|
||||
PATH="$ac_save_path"
|
||||
@end example
|
||||
|
||||
@defmac AC_CHECK_PROG (@var{variable}, @var{prog-to-check-for}, @var{value-if-found} @r{[}, @var{value-if-not-found}@r{]})
|
||||
@maindex CHECK_PROG
|
||||
|
||||
@ -59,7 +59,7 @@ You can remove the program binaries and object files from the source code
|
||||
directory by typing @samp{make clean}. To also remove the files that
|
||||
@code{configure} created (so you can compile the package for a different
|
||||
kind of computer), type @samp{make distclean}. There is also a
|
||||
@samp{make realclean} target, but that is intended mainly for the
|
||||
@samp{make maintainer-clean} target, but that is intended mainly for the
|
||||
package's developers. If you use it, you may have to get all sorts of
|
||||
other programs in order to regenerate files that came with the distribution.
|
||||
@end enumerate
|
||||
|
||||
@ -59,7 +59,7 @@ You can remove the program binaries and object files from the source code
|
||||
directory by typing @samp{make clean}. To also remove the files that
|
||||
@code{configure} created (so you can compile the package for a different
|
||||
kind of computer), type @samp{make distclean}. There is also a
|
||||
@samp{make realclean} target, but that is intended mainly for the
|
||||
@samp{make maintainer-clean} target, but that is intended mainly for the
|
||||
package's developers. If you use it, you may have to get all sorts of
|
||||
other programs in order to regenerate files that came with the distribution.
|
||||
@end enumerate
|
||||
|
||||
@ -51,7 +51,7 @@ dnl
|
||||
divert(-1)dnl Throw away output until AC_INIT is called.
|
||||
changequote([, ])
|
||||
|
||||
define(AC_ACVERSION, 2.1)
|
||||
define(AC_ACVERSION, 2.1.1)
|
||||
|
||||
dnl Some old m4's don't support m4exit. But they provide
|
||||
dnl equivalent functionality by core dumping because of the
|
||||
@ -1009,8 +1009,8 @@ AC_DEFUN(AC_LANG_C,
|
||||
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} $CFLAGS $CPPFLAGS conftest.$ac_ext -c 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
ac_link='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
ac_compile='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS -c 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
ac_link='${CC-cc} conftest.$ac_ext $CFLAGS $CPPFLAGS $LDFLAGS -o conftest $LIBS 1>&AC_FD_CC 2>&AC_FD_CC'
|
||||
])
|
||||
|
||||
dnl AC_LANG_CPLUSPLUS()
|
||||
@ -1164,6 +1164,7 @@ AC_DEFUN(AC_PREFIX_PROGRAM,
|
||||
changequote(<<, >>)dnl
|
||||
define(<<AC_VAR_NAME>>, translit($1, [a-z], [A-Z]))dnl
|
||||
changequote([, ])dnl
|
||||
AC_MSG_CHECKING([for prefix by ])
|
||||
AC_PATH_PROG(AC_VAR_NAME, $1)
|
||||
changequote(<<, >>)dnl
|
||||
if test -n "$ac_cv_path_<<>>AC_VAR_NAME"; then
|
||||
@ -1184,7 +1185,7 @@ AC_DEFUN(AC_CHECK_LIB,
|
||||
[AC_MSG_CHECKING([for -l$1])
|
||||
AC_CACHE_VAL(ac_cv_lib_$1,
|
||||
[ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -l$1 $5"
|
||||
LIBS="-l$1 $LIBS $5"
|
||||
AC_TRY_LINK(, [$2()], eval "ac_cv_lib_$1=yes", eval "ac_cv_lib_$1=no")dnl
|
||||
LIBS="$ac_save_LIBS"
|
||||
])dnl
|
||||
@ -1195,7 +1196,7 @@ if eval "test \"`echo '$ac_cv_lib_'$1`\" = yes"; then
|
||||
ac_tr_lib=HAVE_LIB`echo $1 | tr '[a-z]' '[A-Z]'`
|
||||
changequote([, ])dnl
|
||||
AC_DEFINE_UNQUOTED($ac_tr_lib)
|
||||
LIBS="$LIBS -l$1"
|
||||
LIBS="-l$1 $LIBS"
|
||||
], [$3])
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
@ -1216,7 +1217,7 @@ changequote([, ])dnl
|
||||
AC_MSG_CHECKING([for -l[]AC_LIB_NAME])
|
||||
AC_CACHE_VAL(AC_CV_NAME,
|
||||
[ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -l[]AC_LIB_NAME[] $4"
|
||||
LIBS="-l[]AC_LIB_NAME[] $LIBS $4"
|
||||
AC_TRY_LINK( , [main()], AC_CV_NAME=yes, AC_CV_NAME=no)dnl
|
||||
LIBS="$ac_save_LIBS"
|
||||
])dnl
|
||||
@ -1224,7 +1225,7 @@ AC_MSG_RESULT($AC_CV_NAME)
|
||||
if test "$AC_CV_NAME" = yes; then
|
||||
ifelse([$2], ,
|
||||
[AC_DEFINE([HAVE_LIB]translit(AC_LIB_NAME, [a-z], [A-Z]))
|
||||
LIBS="$LIBS -l[]AC_LIB_NAME[]"
|
||||
LIBS="-l[]AC_LIB_NAME[] $LIBS"
|
||||
], [$2])
|
||||
ifelse([$3], , , [else
|
||||
$3
|
||||
@ -1621,7 +1622,7 @@ ifdef([AC_PROVIDE_AC_PROG_INSTALL], [ac_given_INSTALL="$INSTALL"
|
||||
])dnl
|
||||
|
||||
ifdef([AC_LIST_HEADER],
|
||||
[trap 'rm -fr $1 AC_LIST_HEADER conftest*; exit 1' 1 2 15],
|
||||
[trap 'rm -fr `echo $1 AC_LIST_HEADER | tr : " "` conftest*; exit 1' 1 2 15],
|
||||
[trap 'rm -f $1; exit 1' 1 2 15])
|
||||
|
||||
AC_OUTPUT_FILES($1)
|
||||
|
||||
@ -313,7 +313,7 @@ then
|
||||
flex*) ac_lib=fl ;;
|
||||
*) ac_lib=l ;;
|
||||
esac
|
||||
AC_CHECK_LIB($ac_lib, main, LEXLIB="-l$ac_lib")
|
||||
AC_CHECK_LIB($ac_lib, yywrap, LEXLIB="-l$ac_lib")
|
||||
fi
|
||||
AC_SUBST(LEXLIB)])
|
||||
|
||||
@ -517,9 +517,9 @@ AC_CHECK_HEADERS_DIRENT(dirent.h sys/ndir.h sys/dir.h ndir.h,
|
||||
[ac_header_dirent=$ac_hdr; break])
|
||||
# Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
|
||||
if test $ac_header_dirent = dirent.h; then
|
||||
AC_CHECK_LIB(dir, opendir, LIBS="$LIBS -ldir")
|
||||
AC_CHECK_LIB(dir, opendir, LIBS="-ldir $LIBS")
|
||||
else
|
||||
AC_CHECK_LIB(x, opendir, LIBS="$LIBS -lx")
|
||||
AC_CHECK_LIB(x, opendir, LIBS="-lx $LIBS")
|
||||
fi
|
||||
])
|
||||
|
||||
@ -730,7 +730,10 @@ AC_CACHE_VAL(ac_cv_type_signal,
|
||||
#ifdef signal
|
||||
#undef signal
|
||||
#endif
|
||||
extern void (*signal ()) ();],
|
||||
#ifdef __cplusplus
|
||||
extern "C"
|
||||
#endif
|
||||
void (*signal ()) ();],
|
||||
[int i;], ac_cv_type_signal=void, ac_cv_type_signal=int)])dnl
|
||||
AC_MSG_RESULT($ac_cv_type_signal)
|
||||
AC_DEFINE_UNQUOTED(RETSIGTYPE, $ac_cv_type_signal)
|
||||
@ -985,7 +988,7 @@ main() {
|
||||
case -1: _exit(0); /* What can we do? */
|
||||
default: /* Parent. */
|
||||
wait3(&i, 0, &r);
|
||||
sleep(1); /* Avoid "text file busy" from rm on fast HP-UX machines. */
|
||||
sleep(2); /* Avoid "text file busy" from rm on fast HP-UX machines. */
|
||||
exit(r.ru_nvcsw == 0 && r.ru_majflt == 0 && r.ru_minflt == 0
|
||||
&& r.ru_stime.tv_sec == 0 && r.ru_stime.tv_usec == 0);
|
||||
}
|
||||
@ -1084,24 +1087,19 @@ AC_SUBST(ALLOCA)dnl
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_FUNC_GETLOADAVG,
|
||||
[# Some definitions of getloadavg require that the program be installed setgid.
|
||||
NEED_SETGID=false
|
||||
AC_SUBST(NEED_SETGID)dnl
|
||||
ac_have_func=no
|
||||
[ac_have_func=no
|
||||
|
||||
# Some systems with -lutil have (and need) -lkvm as well, some do not.
|
||||
# If it is needed, it will be needed to detect getloadavg in -lutil.
|
||||
ac_LIBS_before_kvm="$LIBS"
|
||||
AC_CHECK_LIB(kvm, kvm_open, ac_LIBS_kvm=-lkvm, ac_LIBS_kvm=)
|
||||
AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")
|
||||
# Check for the 4.4BSD definition of getloadavg.
|
||||
AC_CHECK_LIB(util, getloadavg, [
|
||||
LIBS="$ac_LIBS_before_kvm -lutil $ac_LIBS_kvm" ac_have_func=yes])
|
||||
AC_CHECK_LIB(util, getloadavg,
|
||||
[LIBS="-lutil $LIBS" ac_have_func=yes ac_cv_func_getloadavg_setgid=yes])
|
||||
|
||||
if test $ac_have_func = no; then
|
||||
# There is a commonly available library for RS/6000 AIX.
|
||||
# Since it is not a standard part of AIX, it might be installed locally.
|
||||
ac_save_LIBS="$LIBS" LIBS="-L/usr/local/lib $LIBS"
|
||||
AC_CHECK_LIB(getloadavg, getloadavg, LIBS="$LIBS -lgetloadavg", LIBS="$ac_save_LIBS")
|
||||
AC_CHECK_LIB(getloadavg, getloadavg, LIBS="-lgetloadavg $LIBS", LIBS="$ac_save_LIBS")
|
||||
fi
|
||||
|
||||
# Make sure it is really in the library, if we think we found it.
|
||||
@ -1112,24 +1110,24 @@ if test $ac_cv_func_getloadavg = yes; then
|
||||
else
|
||||
ac_have_func=no
|
||||
AC_CHECK_HEADER(sys/dg_sys_info.h,
|
||||
[ac_have_func=yes AC_DEFINE(DGUX)
|
||||
[ac_have_func=yes; AC_DEFINE(DGUX)
|
||||
AC_CHECK_LIB(dgc, dg_sys_info)])
|
||||
if test $ac_have_func = no; then
|
||||
# We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it
|
||||
# uses stabs), but it is still SVR4. We cannot check for <elf.h> because
|
||||
# Irix 4.0.5F has the header but not the library.
|
||||
AC_CHECK_LIB(elf, elf_begin,
|
||||
[LIBS="$LIBS -lelf" ac_have_func=yes AC_DEFINE(SVR4)
|
||||
AC_CHECK_LIB(kvm, kvm_open, LIBS="$LIBS -lkvm")])
|
||||
[LIBS="-lelf $LIBS" ac_have_func=yes; AC_DEFINE(SVR4)
|
||||
AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS")])
|
||||
fi
|
||||
if test $ac_have_func = no; then
|
||||
AC_CHECK_HEADER(inq_stats/cpustats.h,
|
||||
[ac_have_func=yes AC_DEFINE(UMAX)
|
||||
[ac_have_func=yes; AC_DEFINE(UMAX)
|
||||
AC_DEFINE(UMAX4_3)])
|
||||
fi
|
||||
if test $ac_have_func = no; then
|
||||
AC_CHECK_HEADER(sys/cpustats.h,
|
||||
[ac_have_func=yes AC_DEFINE(UMAX)])
|
||||
[ac_have_func=yes; AC_DEFINE(UMAX)])
|
||||
fi
|
||||
if test $ac_have_func = no; then
|
||||
AC_CHECK_HEADERS(mach/mach.h)
|
||||
@ -1148,9 +1146,10 @@ if test $ac_cv_struct_nlist_n_un = yes; then
|
||||
fi
|
||||
])dnl
|
||||
|
||||
dnl FIXME two bugs here:
|
||||
dnl Hardwiring the path of getloadavg.c in the top-level directory,
|
||||
dnl and not checking whether a getloadavg from a library needs privileges.
|
||||
fi # Do not have getloadavg in system libraries.
|
||||
|
||||
# Some definitions of getloadavg require that the program be installed setgid.
|
||||
dnl FIXME Don't hardwire the path of getloadavg.c in the top-level directory.
|
||||
AC_MSG_CHECKING(whether getloadavg requires setgid)
|
||||
AC_CACHE_VAL(ac_cv_func_getloadavg_setgid,
|
||||
[AC_EGREP_CPP([Yowza Am I SETGID yet],
|
||||
@ -1161,12 +1160,13 @@ Yowza Am I SETGID yet
|
||||
ac_cv_func_getloadavg_setgid=yes, ac_cv_func_getloadavg_setgid=no)])dnl
|
||||
AC_MSG_RESULT($ac_cv_func_getloadavg_setgid)
|
||||
if test $ac_cv_func_getloadavg_setgid = yes; then
|
||||
NEED_SETGID=true AC_DEFINE(GETLOADAVG_PRIVILEGED)
|
||||
NEED_SETGID=true; AC_DEFINE(GETLOADAVG_PRIVILEGED)
|
||||
else
|
||||
NEED_SETGID=false
|
||||
fi
|
||||
AC_SUBST(NEED_SETGID)dnl
|
||||
|
||||
fi # Do not have getloadavg in system libraries.
|
||||
|
||||
if test "$NEED_SETGID" = true; then
|
||||
if test $ac_cv_func_getloadavg_setgid = yes; then
|
||||
AC_MSG_CHECKING(group of /dev/kmem)
|
||||
AC_CACHE_VAL(ac_cv_group_kmem,
|
||||
[changequote(, )dnl
|
||||
@ -1246,13 +1246,13 @@ fi
|
||||
|
||||
AC_DEFUN(AC_FUNC_GETMNTENT,
|
||||
[# getmntent is in -lsun on Irix 4, -lseq on Dynix/PTX.
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="$LIBS -lsun",
|
||||
[AC_CHECK_LIB(seq, getmntent, LIBS="$LIBS -lseq")])
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS",
|
||||
[AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")])
|
||||
AC_CHECK_FUNC(getmntent, [AC_DEFINE(HAVE_GETMNTENT)])])
|
||||
|
||||
AC_DEFUN(AC_FUNC_STRFTIME,
|
||||
[# strftime is in -lintl on SCO UNIX.
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="$LIBS -lintl")
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
|
||||
AC_CHECK_FUNC(strftime, [AC_DEFINE(HAVE_STRFTIME)])])
|
||||
|
||||
AC_DEFUN(AC_FUNC_MEMCMP,
|
||||
@ -1681,13 +1681,14 @@ EOF
|
||||
then
|
||||
ac_im_usrlibdir=$ac_im_libdir
|
||||
fi
|
||||
# Screen out bogus values from the imake configuration.
|
||||
case "$ac_im_incroot" in
|
||||
/usr/include) ;;
|
||||
*) ac_x_includes="$ac_im_incroot" ;;
|
||||
*) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes="$ac_im_incroot" ;;
|
||||
esac
|
||||
case "$ac_im_usrlibdir" in
|
||||
/usr/lib | /lib) ;;
|
||||
*) ac_x_libraries="$ac_im_usrlibdir" ;;
|
||||
*) test -d "$ac_im_usrlibdir" && ac_x_libraries="$ac_im_usrlibdir" ;;
|
||||
esac
|
||||
fi
|
||||
cd ..
|
||||
@ -1750,7 +1751,7 @@ AC_TRY_CPP([#include <$x_direct_test_include>],
|
||||
# See if we find them without any special options.
|
||||
# Don't add to $LIBS permanently.
|
||||
ac_save_LIBS="$LIBS"
|
||||
LIBS="$LIBS -l$x_direct_test_library"
|
||||
LIBS="-l$x_direct_test_library $LIBS"
|
||||
AC_TRY_LINK(, [${x_direct_test_function}()],
|
||||
[LIBS="$ac_save_LIBS" no_x= ac_x_libraries=],
|
||||
[LIBS="$ac_save_LIBS"
|
||||
@ -1834,34 +1835,34 @@ else
|
||||
# libraries we check for below, so use a different variable.
|
||||
# --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
|
||||
AC_CHECK_LIB(ICE, IceConnectionNumber,
|
||||
[X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"])
|
||||
[X_PRE_LIBS="-lSM -lICE $X_PRE_LIBS"])
|
||||
LDFLAGS="$ac_save_LDFLAGS"
|
||||
|
||||
# Check for system-dependent libraries X programs must link with.
|
||||
|
||||
if test "$ISC" = yes; then
|
||||
X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet"
|
||||
X_EXTRA_LIBS="-lnsl_s -linet $X_EXTRA_LIBS"
|
||||
else
|
||||
# Martyn.Johnson@cl.cam.ac.uk says this is needed for Ultrix, if the X
|
||||
# libraries were built with DECnet support. And karl@cs.umb.edu says
|
||||
# the Alpha needs dnet_stub (dnet does not exist).
|
||||
AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"])
|
||||
AC_CHECK_LIB(dnet, dnet_ntoa, [X_EXTRA_LIBS="-ldnet $X_EXTRA_LIBS"])
|
||||
if test $ac_cv_lib_dnet = no; then
|
||||
AC_CHECK_LIB(dnet_stub, dnet_ntoa,
|
||||
[X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"])
|
||||
[X_EXTRA_LIBS="-ldnet_stub $X_EXTRA_LIBS"])
|
||||
fi
|
||||
|
||||
# msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT,
|
||||
# to get the SysV transport functions.
|
||||
# Not sure which flavor of 386 UNIX this is, but it seems harmless to
|
||||
# check for it.
|
||||
AC_CHECK_LIB(nsl, t_accept, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"])
|
||||
AC_CHECK_LIB(nsl, t_accept, [X_EXTRA_LIBS="-lnsl $X_EXTRA_LIBS"])
|
||||
|
||||
# lieder@skyler.mavd.honeywell.com says without -lsocket,
|
||||
# socket/setsockopt and other routines are undefined under SCO ODT 2.0.
|
||||
# But -lsocket is broken on IRIX, according to simon@lia.di.epfl.ch.
|
||||
if test "`(uname) 2>/dev/null`" != IRIX; then
|
||||
AC_CHECK_LIB(socket, socket, [X_EXTRA_LIBS="$X_EXTRA_LIBS -lsocket"])
|
||||
AC_CHECK_LIB(socket, socket, [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"])
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -1874,6 +1875,7 @@ AC_SUBST(X_EXTRA_LIBS)dnl
|
||||
|
||||
dnl ### Checks for UNIX variants
|
||||
dnl These are kludges which should be replaced by a single POSIX check.
|
||||
dnl They aren't cached, to discourage their use.
|
||||
|
||||
|
||||
AC_DEFUN(AC_AIX,
|
||||
@ -1901,7 +1903,7 @@ fi
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_ISC_POSIX,
|
||||
[AC_BEFORE([$0], [AC_TRY_LINK])dnl
|
||||
[AC_BEFORE([$0], [AC_TRY_COMPILE])dnl
|
||||
AC_BEFORE([$0], [AC_TRY_LINK])dnl
|
||||
AC_BEFORE([$0], [AC_TRY_RUN])dnl
|
||||
AC_MSG_CHECKING(for POSIXized ISC)
|
||||
@ -1933,22 +1935,22 @@ AC_EGREP_CPP(yes,
|
||||
], [AC_MSG_RESULT(yes); XENIX=yes], [AC_MSG_RESULT(no); XENIX=])
|
||||
if test "$XENIX" = yes; then
|
||||
# Make sure -ldir precedes -lx.
|
||||
test $ac_header_dirent = dirent.h && LIBS="$LIBS -ldir"
|
||||
LIBS="$LIBS -lx"
|
||||
test $ac_header_dirent = dirent.h && LIBS="-ldir $LIBS"
|
||||
LIBS="-lx $LIBS"
|
||||
fi
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_DYNIX_SEQ,
|
||||
[AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT])dnl
|
||||
AC_CHECK_LIB(seq, getmntent, LIBS="$LIBS -lseq")
|
||||
AC_CHECK_LIB(seq, getmntent, LIBS="-lseq $LIBS")
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_IRIX_SUN,
|
||||
[AC_OBSOLETE([$0], [; instead use AC_FUNC_GETMNTENT or AC_CHECK_LIB(sun, getpwnam)])dnl
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="$LIBS -lsun")
|
||||
AC_CHECK_LIB(sun, getmntent, LIBS="-lsun $LIBS")
|
||||
])
|
||||
|
||||
AC_DEFUN(AC_SCO_INTL,
|
||||
[AC_OBSOLETE([$0], [; instead use AC_FUNC_STRFTIME])dnl
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="$LIBS -lintl")
|
||||
AC_CHECK_LIB(intl, strftime, LIBS="-lintl $LIBS")
|
||||
])
|
||||
|
||||
@ -69,10 +69,10 @@ uninstall:
|
||||
Makefile: Makefile.in ../config.status
|
||||
cd ..; ./config.status
|
||||
|
||||
clean mostlyclean distclean realclean::
|
||||
clean mostlyclean distclean maintainer-clean::
|
||||
rm -f autoconf.log autoconf.sum site.exp site.bak AC* confdummy*
|
||||
|
||||
distclean realclean::
|
||||
distclean maintainer-clean::
|
||||
rm -f Makefile config.status config.cache config.log
|
||||
|
||||
TAGS:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user