diff options
| author | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-04-12 01:12:06 +0000 |
|---|---|---|
| committer | Paul Ackersviller <packersv@users.sourceforge.net> | 2007-04-12 01:12:06 +0000 |
| commit | 21f83e46b28ad9f21c8e194f545b3b3220e10e73 (patch) | |
| tree | 2ff6e1fff113bc67640ddb652833917f84e65339 /configure.ac | |
| parent | a2712dcef7c1410781029bfd8607974e1d35366c (diff) | |
| download | zsh-21f83e46b28ad9f21c8e194f545b3b3220e10e73.tar.gz zsh-21f83e46b28ad9f21c8e194f545b3b3220e10e73.tar.xz zsh-21f83e46b28ad9f21c8e194f545b3b3220e10e73.zip | |
Merge from trunk of workers/21107.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index b209c76da..4d31822bf 100644 --- a/configure.ac +++ b/configure.ac @@ -490,6 +490,7 @@ AC_PROG_INSTALL dnl Check for BSD compatible `install' AC_PROG_AWK dnl Check for mawk,gawk,nawk, then awk. AC_PROG_LN dnl Check for working ln, for "make install" AC_CHECK_PROGS([YODL], [yodl], [: yodl]) +AC_CHECK_PROGS([PDFETEX], [pdfetex], [: pdfetex]) AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr]) if test x"$ansi2knr" = xyes && test x"$ANSI2KNR" = x": ansi2knr"; then @@ -742,6 +743,11 @@ if test "x$ac_cv_header_iconv_h" = "xyes"; then if test "x$ac_found_iconv" != "xno"; then LIBS="-liconv $LIBS" fi + else + dnl Handle case where there is a native iconv but iconv.h is from libiconv + AC_CHECK_DECL(_libiconv_version, + [ AC_CHECK_LIB(iconv, libiconv, LIBS="-liconv $LIBS") ],, + [ #include <iconv.h> ]) fi fi if test "x$ac_found_iconv" = xyes; then |