[patch] files/proftpd-1.3.4a-iconv.patch

proftpd-1.3.4a-iconv.patch (text/plain), 1.51 KB, created by Naohiro Aota on 2011-12-12 06:35:24 UTC

Index: configure.in
===================================================================
RCS file: /cvsroot/proftp/proftpd/configure.in,v
retrieving revision 1.361
diff -u -r1.361 configure.in
--- configure.in	18 Nov 2011 05:06:54 -0000	1.361
+++ configure.in	9 Dec 2011 17:19:02 -0000
@@ -715,18 +715,26 @@
       )
 
       dnl Similarly, the libiconv library is only needed on some non-GNU
-      dnl systems.
+      dnl systems.  Note that some systems redefine the iconv_open function
+      dnl to something else (Bug#3682), e.g. libiconv_open.
       AC_CHECK_LIB(iconv, iconv_open,
         [LIBS="$LIBS -liconv"
          AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
          AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
          ENABLE_NLS="1"
         ],
-        [AC_CHECK_LIB(c, iconv_open,
-          [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
+        [AC_CHECK_LIB(iconv, libiconv_open,
+          [LIBS="$LIBS -liconv"
+           AC_DEFINE(HAVE_LIBICONV, 1, [Define if libiconv is present.])
+           AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
            ENABLE_NLS="1"
           ],
-          [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
+          [AC_CHECK_LIB(c, iconv_open,
+            [AC_DEFINE(PR_USE_NLS, 1, [Define if using NLS support.])
+             ENABLE_NLS="1"
+            ],
+            [AC_MSG_ERROR([libiconv support, required for NLS, not present -- aborting])]
+          ])
         ])
       )
     fi