mirror of
git://git.code.sf.net/p/zsh/code
synced 2024-11-19 05:24:23 +01:00
unposted: Remove patch from 12686 that was accidentally commited
This commit is contained in:
Andrey Borzenkov
parent
fe992fe5a9
commit
27be824ed0
@ -13,6 +13,9 @@
|
||||
use `@:` instead. In line, use `{}` for tex, this looks better
|
||||
in printed output.
|
||||
|
||||
* unposted: aczsh.m4, conifgure.in: Remove patch from 12686
|
||||
that was accidentally commited
|
||||
|
||||
2000-09-05 Bart Schaefer <schaefer@zsh.org>
|
||||
|
||||
* 12745: Doc/Zsh/contrib.yo: Add a cross-reference; include some
|
||||
|
||||
30
aczsh.m4
30
aczsh.m4
@ -646,33 +646,3 @@ AC_DEFUN(zsh_COMPILE_FLAGS,
|
||||
then LIBS="$4"
|
||||
else LIBS="$enable_libs"
|
||||
fi)])
|
||||
|
||||
# zsh_SEARCH_LIBS(FUNCTION, SEARCH-LIBS,
|
||||
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
|
||||
# This is derived from autoconf 2.49a AC_SEARCH_LIBS
|
||||
# with the following differences:
|
||||
# - no extra libs argument
|
||||
# - SEARCH-LIBS are taken literally - use -lfoo not foo. That
|
||||
# makes it possible to pass several libs, e.g. "-lsocket -lnsl"
|
||||
# --------------------------------------------------------
|
||||
# Search for a library defining FUNC, if it's not already available.
|
||||
AC_DEFUN([zsh_SEARCH_LIBS],
|
||||
[AC_CACHE_CHECK([for library containing $1], [zsh_cv_search_$1],
|
||||
[zsh_func_search_save_LIBS="$LIBS"
|
||||
zsh_cv_search_$1=no
|
||||
AC_TRY_LINK_FUNC([$1], [zsh_cv_search_$1="none required"])
|
||||
test "$zsh_cv_search_$1" = no && for zsh_lib in $2; do
|
||||
LIBS="$zsh_lib $zsh_func_search_save_LIBS"
|
||||
AC_TRY_LINK_FUNC([$1],
|
||||
[zsh_cv_search_$1="$zsh_lib"
|
||||
break])
|
||||
done
|
||||
LIBS="$zsh_func_search_save_LIBS"])
|
||||
if test "$zsh_cv_search_$1" = no; then
|
||||
ifelse([$4], , :, [$4])
|
||||
else
|
||||
test "$zsh_cv_search_$1" = "none required" || LIBS="$zsh_cv_search_$1 $LIBS"
|
||||
ifelse([$3], , , [$3])
|
||||
fi
|
||||
])
|
||||
|
||||
|
||||
51
configure.in
51
configure.in
@ -512,9 +512,7 @@ dnl -------------------
|
||||
dnl On some systems, modules need to be linked against libc explicitly,
|
||||
dnl in case they require objects that exist only in the static version
|
||||
dnl and might not be compiled into the zsh executable.
|
||||
dnl Also, on SINIX -lc MUST BE after -lsocket, so this test
|
||||
dnl adds -lc as the last library
|
||||
AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
|
||||
AC_CHECK_LIB(c, printf)
|
||||
|
||||
AC_CHECK_LIB(m, pow)
|
||||
|
||||
@ -530,43 +528,12 @@ for lib in $termcap_curses_order; do
|
||||
AC_CHECK_LIB(${lib}, tgetent, [LIBS="-l$lib $LIBS"; break])
|
||||
done
|
||||
|
||||
dnl Check for network libraries.
|
||||
dnl This is really sad and messy story
|
||||
dnl Zsh needs three groups of functions:
|
||||
dnl NIS (a.k.a. Yellow Pages)
|
||||
dnl socket
|
||||
dnl resolver
|
||||
dnl Depending on particlular OS (or even on particular OS version)
|
||||
dnl these function may be found in -lc, -lnsl, -lresolv, -lsocket.
|
||||
dnl Sometimes libraries depend on other (notorious -lnsl that is needed
|
||||
dnl on SVR4-derived systems to get any network functionality at all)
|
||||
dnl or must follow particular order (SINIX, that has two incompatible
|
||||
dnl versions of gethostbyname() in -lsocket and -lresolv).
|
||||
dnl So, this test tries to find minimal set of needed libraries;
|
||||
dnl it tries to preserve user settings (if needed libs were explcitly
|
||||
dnl specified) and -lresolv after -lsocket order.
|
||||
|
||||
#
|
||||
# First check for -lnsl. Good chances, that if it exists, it
|
||||
# will be neeeded anyway.
|
||||
#
|
||||
zsh_SEARCH_LIBS(yp_all, -lnsl)
|
||||
|
||||
#
|
||||
# Check for resolver functions to make sure, that
|
||||
# -lresolv will be after -lsocket on SINIX
|
||||
#
|
||||
|
||||
zsh_SEARCH_LIBS(inet_aton, -lnsl -lresolv "-lresolv -lnsl")
|
||||
zsh_SEARCH_LIBS(inet_pton, -lnsl -lresolv "-lresolv -lnsl")
|
||||
zsh_SEARCH_LIBS(inet_ntop, -lnsl -lresolv "-lresolv -lnsl")
|
||||
zsh_SEARCH_LIBS(gethostbyname2, -lnsl -lresolv "-lresolv -lnsl")
|
||||
|
||||
#
|
||||
# ... and check for socket support
|
||||
#
|
||||
|
||||
zsh_SEARCH_LIBS(socket, -lnsl -lsocket "-lsocket -lnsl")
|
||||
dnl Some systems (Solaris 2.x, Linux Redhat 5.x) require
|
||||
dnl libnsl (Network Services Library) to find yp_all
|
||||
AC_CHECK_FUNCS(yp_all)
|
||||
if test $ac_cv_func_yp_all = no; then
|
||||
AC_CHECK_LIB(nsl, yp_all)
|
||||
fi
|
||||
|
||||
dnl I am told that told that unicos reqire these for nis_list
|
||||
if test `echo $host_os | sed 's/^\(unicos\).*/\1/'` = unicos; then
|
||||
@ -579,6 +546,8 @@ fi
|
||||
|
||||
AC_CHECK_LIB(cap, cap_get_proc)
|
||||
|
||||
AC_CHECK_LIB(socket, socket)
|
||||
|
||||
dnl ---------------------
|
||||
dnl CHECK TERMCAP LIBRARY
|
||||
dnl ---------------------
|
||||
@ -888,7 +857,7 @@ AC_CHECK_FUNCS(strftime difftime gettimeofday \
|
||||
gethostname gethostbyname2 getipnodebyname \
|
||||
inet_aton inet_pton inet_ntop \
|
||||
getlogin getpwent getpwnam getpwuid getgrgid getgrnam \
|
||||
initgroups yp_all nis_list \
|
||||
initgroups nis_list \
|
||||
setuid seteuid setreuid setresuid setsid \
|
||||
memcpy memmove strstr strerror \
|
||||
cap_get_proc \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user