diff options
author | Peter Stephenson <pws@users.sourceforge.net> | 2005-02-01 10:52:50 +0000 |
---|---|---|
committer | Peter Stephenson <pws@users.sourceforge.net> | 2005-02-01 10:52:50 +0000 |
commit | d1d67428480b8fb1b38d3408fad6ca53e14823cc (patch) | |
tree | e910011f4598d169c1fe760061c0411269699316 /configure.ac | |
parent | 8b53cc45bd7f1e1f1b2aa5db09903ca8b40f6d70 (diff) | |
download | zsh-d1d67428480b8fb1b38d3408fad6ca53e14823cc.tar.gz zsh-d1d67428480b8fb1b38d3408fad6ca53e14823cc.tar.xz zsh-d1d67428480b8fb1b38d3408fad6ca53e14823cc.zip |
20759, 20760, 20765: Improve Cygwin configuration
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 1b87dadaf..321cf56fb 100644 --- a/configure.ac +++ b/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 \ 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 \ - sys/stropts.h) + sys/stropts.h iconv.h) if test $dynamic = yes; then AC_CHECK_HEADERS(dlfcn.h) AC_CHECK_HEADERS(dl.h) @@ -729,9 +729,15 @@ AC_CHECK_LIB(socket, socket) 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 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 dnl --------------------- |