|
@@ -1,9 +1,20 @@
|
|
|
---- weechat-0.4.2.orig/configure.ac 2013-10-06 08:58:14.000000000 +0200
|
|
|
-+++ weechat-0.4.2/configure.ac 2013-11-07 10:07:42.000000000 +0100
|
|
|
-@@ -241,28 +241,6 @@ if test "x$ac_found_iconv_header" = "xye
|
|
|
- ICONV_LFLAGS="-liconv"
|
|
|
- LIBS="$LIBS $ICONV_LFLAGS"
|
|
|
- fi
|
|
|
+--- weechat-0.4.3.orig/configure.ac 2014-02-09 09:52:53.000000000 +0100
|
|
|
++++ weechat-0.4.3/configure.ac 2014-06-24 08:07:06.000000000 +0200
|
|
|
+@@ -232,33 +232,7 @@ fi
|
|
|
+
|
|
|
+ ICONV_LFLAGS=""
|
|
|
+
|
|
|
+-iconv_found="no"
|
|
|
+-AC_CHECK_HEADER(iconv.h,ac_found_iconv_header="yes",ac_found_iconv_header="no")
|
|
|
+-if test "x$ac_found_iconv_header" = "xyes" ; then
|
|
|
+- AC_CHECK_LIB(iconv,iconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
|
|
|
+- if test "x$ac_found_iconv_lib" = "xno" ; then
|
|
|
+- AC_CHECK_LIB(iconv,libiconv_open,ac_found_iconv_lib="yes",ac_found_iconv_lib="no")
|
|
|
+- fi
|
|
|
+- if test "x$ac_found_iconv_lib" = "xyes" ; then
|
|
|
+- ICONV_LFLAGS="-liconv"
|
|
|
+- LIBS="$LIBS $ICONV_LFLAGS"
|
|
|
+- fi
|
|
|
- AC_MSG_CHECKING(for iconv usability in programs)
|
|
|
- AC_TRY_RUN([
|
|
|
- #include <iconv.h>
|
|
@@ -20,12 +31,7 @@
|
|
|
- AC_MSG_RESULT(yes)
|
|
|
- fi
|
|
|
-fi
|
|
|
--
|
|
|
--if test "x$iconv_found" = "xno" ; then
|
|
|
-- AC_MSG_ERROR([
|
|
|
--*** Iconv headers and/or libraries couldn't be found on your system.
|
|
|
--*** Try to install them with your software package manager.
|
|
|
--*** WeeChat can't be built without Iconv support.])
|
|
|
- fi
|
|
|
++iconv_found="yes"
|
|
|
|
|
|
- # ------------------------------------------------------------------------------
|
|
|
+ if test "x$iconv_found" = "xno" ; then
|
|
|
+ AC_MSG_ERROR([
|