albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make configure[.ng] compatible with autoconf 1.10 again 

The incompatibility has been introduced by commit d0c9f4a6,
"configure: search for iconv_open as well as libiconv_open".
This commit is contained in:
Alexander Barton 2013-03-18 12:45:32 +01:00
parent 0131e1e00b
commit a14eb495b7
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure.ng
View File

@ -527,14 +527,15 @@ if test "$x_ircplus_on" = "yes"; then
LDFLAGS="-L$withval/lib $LDFLAGS" LDFLAGS="-L$withval/lib $LDFLAGS"
fi fi
AC_CHECK_LIB(iconv, iconv_open) AC_CHECK_LIB(iconv, iconv_open)
AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes, AC_CHECK_FUNCS(iconv_open, x_iconv_on=yes)
if test "$x_iconv_on" != "yes"; then
AC_CHECK_LIB(iconv, libiconv_open) AC_CHECK_LIB(iconv, libiconv_open)
AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes, AC_CHECK_FUNCS(libiconv_open, x_iconv_on=yes)
AC_MSG_ERROR([Can't enable libiconv support!]) fi
) if test "$x_iconv_on" != "yes"; then
) AC_MSG_ERROR([Can't enable libiconv support!])
fi fi
] fi ]
) )
if test "$x_iconv_on" = "yes"; then if test "$x_iconv_on" = "yes"; then
AC_DEFINE(ICONV, 1) AC_DEFINE(ICONV, 1)