mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-10-13 23:31:08 +02:00
Cygwin configuration updates from Peter A. Castro.
This commit is contained in:
parent
912826aeb6
commit
0524dd6d27
3 changed files with 703 additions and 207 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2005-02-01 Peter Stephenson <pws@csr.com>
|
||||||
|
|
||||||
|
* Peter A. Castro: 20759 updated as 20760 and 20765: configure.ac,
|
||||||
|
Src/utils.c: Improve configuration of libiconv and pcre on Cygwin.
|
||||||
|
|
||||||
2005-01-27 Peter Stephenson <pws@csr.com>
|
2005-01-27 Peter Stephenson <pws@csr.com>
|
||||||
|
|
||||||
* users/8433: configure.ac: Latest Cygwin hangs on FIFO test,
|
* users/8433: configure.ac: Latest Cygwin hangs on FIFO test,
|
||||||
|
|
839
Src/utils.c
839
Src/utils.c
File diff suppressed because it is too large
Load diff
10
configure.ac
10
configure.ac
|
@ -529,7 +529,7 @@ AC_CHECK_HEADERS(sys/time.h sys/times.h sys/select.h termcap.h termio.h \
|
||||||
locale.h errno.h stdio.h stdlib.h unistd.h sys/capability.h \
|
locale.h errno.h stdio.h stdlib.h unistd.h sys/capability.h \
|
||||||
utmp.h utmpx.h sys/types.h pwd.h grp.h poll.h sys/mman.h \
|
utmp.h utmpx.h sys/types.h pwd.h grp.h poll.h sys/mman.h \
|
||||||
netinet/in_systm.h pcre.h langinfo.h wchar.h stddef.h \
|
netinet/in_systm.h pcre.h langinfo.h wchar.h stddef.h \
|
||||||
sys/stropts.h)
|
sys/stropts.h iconv.h)
|
||||||
if test $dynamic = yes; then
|
if test $dynamic = yes; then
|
||||||
AC_CHECK_HEADERS(dlfcn.h)
|
AC_CHECK_HEADERS(dlfcn.h)
|
||||||
AC_CHECK_HEADERS(dl.h)
|
AC_CHECK_HEADERS(dl.h)
|
||||||
|
@ -729,9 +729,15 @@ AC_CHECK_LIB(socket, socket)
|
||||||
|
|
||||||
AC_CHECK_LIB(iconv, iconv)
|
AC_CHECK_LIB(iconv, iconv)
|
||||||
|
|
||||||
|
if test "$host_os" = cygwin; then
|
||||||
|
dnl cygwin iconv() is really libiconv()
|
||||||
|
AC_CHECK_LIB(iconv, libiconv)
|
||||||
|
fi
|
||||||
|
|
||||||
if test x$enable_pcre = xyes; then
|
if test x$enable_pcre = xyes; then
|
||||||
dnl pcre-config should probably be employed here
|
dnl pcre-config should probably be employed here
|
||||||
AC_SEARCH_LIBS(pcre_compile, pcre)
|
dnl AC_SEARCH_LIBS(pcre_compile, pcre)
|
||||||
|
LIBS="`pcre-config --libs` $LIBS"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl ---------------------
|
dnl ---------------------
|
||||||
|
|
Loading…
Reference in a new issue