diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-19 12:05:47 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2012-11-19 12:06:49 +0000 |
| commit | 19316aa9e8d3d9523c600269c03896042a26b732 (patch) | |
| tree | 78f620e25eb7cd5c50d5fc40b49aff672fa82dea /main/znc/libiconv.patch | |
| parent | a35c83d0624a0383545f6bd26fceaecff16e8d1e (diff) | |
| download | aports-19316aa9e8d3d9523c600269c03896042a26b732.tar.bz2 aports-19316aa9e8d3d9523c600269c03896042a26b732.tar.xz | |
main/znc: upgrade to 1.0
fixes #1468
Diffstat (limited to 'main/znc/libiconv.patch')
| -rw-r--r-- | main/znc/libiconv.patch | 33 |
1 files changed, 16 insertions, 17 deletions
diff --git a/main/znc/libiconv.patch b/main/znc/libiconv.patch index 276fbcfd8c..1fd5838c21 100644 --- a/main/znc/libiconv.patch +++ b/main/znc/libiconv.patch @@ -1,18 +1,17 @@ -diff --git a/configure.ac b/configure.ac -index 9131a01..47a2e37 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -458,7 +458,12 @@ fi - if test x"$EXTRA" = "xyes" +--- ./configure.ac.orig ++++ ./configure.ac +@@ -504,7 +504,13 @@ + fi + + AC_CHECK_FUNC( iconv, CHARSET=1 ) +-AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) ++dnl On some systems iconv is in a separate library, and may actually ++dnl be named libiconv. ++AC_CHECK_LIB( iconv, libiconv_open, LIBICONV=-liconv ; CHARSET=1 ) ++if test $ac_cv_lib_iconv_libiconv = no; then ++ AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) ++fi ++ + if test "x$CHARSET" = "x1" then - AC_CHECK_FUNC( iconv, CHARSET=1 ) -- AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+ dnl On some systems iconv is in a separate library, and may actually -+ dnl be named libiconv. -+ AC_CHECK_LIB( iconv, libiconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+ if test $ac_cv_lib_iconv_libiconv = no; then -+ AC_CHECK_LIB( iconv, iconv_open, LIBICONV=-liconv ; CHARSET=1 ) -+ fi - if test "x$CHARSET" = "x1" - then - AC_MSG_CHECKING([whether iconv expects a const second argument]) + AC_MSG_CHECKING([whether iconv expects a const second argument]) |