mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-29 19:00:57 +02:00
Code Releases Activity

Merge of 21954, 22042, and 22050.

Browse source
This commit is contained in:
Paul Ackersviller 2007-10-15 01:47:26 +00:00
parent dea45542ea
commit 35cf28d63f
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -26,7 +26,7 @@ dnl support, updates, enhancements, or modifications.
dnl dnl
AC_INIT(Src/zsh.h) AC_INIT(Src/zsh.h)
AC_PREREQ(2.50) AC_PREREQ(2.53b)
AC_CONFIG_HEADER(config.h) AC_CONFIG_HEADER(config.h)
dnl What version of zsh are we building ? dnl What version of zsh are we building ?
@ -489,6 +489,7 @@ AC_PROG_MAKE_SET dnl Does make define $MAKE
AC_PROG_INSTALL dnl Check for BSD compatible `install' AC_PROG_INSTALL dnl Check for BSD compatible `install'
AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk. AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk.
AC_PROG_LN dnl Check for working ln, for "make install" AC_PROG_LN dnl Check for working ln, for "make install"
AC_PROG_EGREP dnl sets $EGREP to grep -E or egrep
AC_CHECK_PROGS([YODL], [yodl], [: yodl]) AC_CHECK_PROGS([YODL], [yodl], [: yodl])
AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex]) AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex])
AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr]) AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr])
@ -1292,7 +1293,7 @@ do
dnl Try to make sure it doesn't get confused by files that don't dnl Try to make sure it doesn't get confused by files that don't
dnl have real error definitions in. Count definitions to make sure. dnl have real error definitions in. Count definitions to make sure.
nerrs=`test -f $ERRNO_H && \ nerrs=`test -f $ERRNO_H && \
grep '#[ ]*define[ ][ ]*E[0-9A-Z]*[ ]*[0-9][0-9]*' $ERRNO_H | \ $EGREP '#[ ]*define[ ][ ]*E[0-9A-Z]*[ ]*(_HURD_ERRNO \()?[0-9]+\)?' $ERRNO_H | \
wc -l | sed 's/[ ]//g'` wc -l | sed 's/[ ]//g'`
test "x$nerrs" != x && test "$nerrs" -ge 7 && break test "x$nerrs" != x && test "$nerrs" -ge 7 && break
done done
@ -1575,11 +1576,16 @@ AC_DEFINE_UNQUOTED(DEFAULT_PATH, "$zsh_cv_cs_path",
dnl ---------------------------- dnl ----------------------------
dnl CHECK FOR /dev/fd FILESYSTEM dnl CHECK FOR /dev/fd FILESYSTEM
dnl ---------------------------- dnl ----------------------------
dnl FreeBSD 5 only supports /dev/fd/0 to /dev/fd/2 without mounting
dnl a special file system. As zsh needs arbitrary /dev/fd (typically
dnl >10) for its own use, we need to make sure higher fd's are available.
dnl Since we're using the shell, we're restricted to 0 to 9 but 3 should
dnl be good enough.
AH_TEMPLATE([PATH_DEV_FD], AH_TEMPLATE([PATH_DEV_FD],
[Define to the path of the /dev/fd filesystem.]) [Define to the path of the /dev/fd filesystem.])
AC_CACHE_CHECK(for /dev/fd filesystem, zsh_cv_sys_path_dev_fd, AC_CACHE_CHECK(for /dev/fd filesystem, zsh_cv_sys_path_dev_fd,
[for zsh_cv_sys_path_dev_fd in /proc/self/fd /dev/fd no; do [for zsh_cv_sys_path_dev_fd in /proc/self/fd /dev/fd no; do
test x`echo ok|cat $zsh_cv_sys_path_dev_fd/0 2>/dev/null` = xok && break test x`echo ok|(exec 3<&0; cat $zsh_cv_sys_path_dev_fd/3 2>/dev/null;)` = xok && break
done]) done])
if test $zsh_cv_sys_path_dev_fd != no; then if test $zsh_cv_sys_path_dev_fd != no; then
AC_DEFINE_UNQUOTED(PATH_DEV_FD, "$zsh_cv_sys_path_dev_fd") AC_DEFINE_UNQUOTED(PATH_DEV_FD, "$zsh_cv_sys_path_dev_fd")
@ -2202,7 +2208,7 @@ char *argv[];
esac esac
fi fi
case "$host_os" in case "$host_os" in
freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;; *freebsd*|linux*|irix*|osf*|gnu*|dragonfly*) DLLDFLAGS="${DLLDFLAGS=-shared}" ;;
sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;; sunos*) DLLDFLAGS="${DLLDFLAGS=-assert nodefinitions}" ;;
sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;; sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G $ldflags}" ;;
netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;; netbsd*) DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
@ -2226,7 +2232,7 @@ char *argv[];
esac esac
case "$host" in case "$host" in
*-hpux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;; *-hpux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
*-freebsd[3-9]*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;; *-freebsd[3-9]*|*-kfreebsd*|*-linux*|gnu*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
*openbsd*) *openbsd*)
if test $zsh_cv_sys_elf = yes; then if test $zsh_cv_sys_elf = yes; then
EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"