diff options
Diffstat (limited to 'editors/xmlcopyeditor/files/patch-aclocal.m4.diff')
-rw-r--r-- | editors/xmlcopyeditor/files/patch-aclocal.m4.diff | 83 |
1 files changed, 0 insertions, 83 deletions
diff --git a/editors/xmlcopyeditor/files/patch-aclocal.m4.diff b/editors/xmlcopyeditor/files/patch-aclocal.m4.diff deleted file mode 100644 index 050d19fb31f8..000000000000 --- a/editors/xmlcopyeditor/files/patch-aclocal.m4.diff +++ /dev/null @@ -1,83 +0,0 @@ ---- aclocal.m4.orig Thu Dec 20 19:29:53 2007 -+++ aclocal.m4 Thu Dec 20 19:30:48 2007 -@@ -7243,3 +7243,80 @@ - ]) # _AM_PROG_TAR - - -+# --------------------------------------------------------------------------- -+# test for availability of iconv() -+# --------------------------------------------------------------------------- -+ -+# From Bruno Haible. -+ -+AC_DEFUN([AM_ICONV], -+[ -+ # Some systems have iconv in libc, some have it in libiconv (OSF/1 and -+ # those with the standalone portable GNU libiconv installed). -+ -+ AC_ARG_WITH([libiconv-prefix], -+[ --with-libiconv-prefix=DIR search for libiconv in DIR/include and DIR/lib], [ -+ for dir in `echo "$withval" | tr : ' '`; do -+ if test -d $dir/include; then CPPFLAGS="$CPPFLAGS -I$dir/include"; fi -+ if test -d $dir/lib; then LDFLAGS="$LDFLAGS -L$dir/lib"; fi -+ done -+ ]) -+ -+ AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ -+ am_cv_func_iconv="no, consider installing GNU libiconv" -+ am_cv_lib_iconv=no -+ AC_TRY_LINK([#include <stdlib.h> -+#include <iconv.h>], -+ [iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd);], -+ am_cv_func_iconv=yes) -+ if test "$am_cv_func_iconv" != yes; then -+ am_save_LIBS="$LIBS" -+ LIBS="$LIBS -liconv" -+ AC_TRY_LINK([#include <stdlib.h> -+#include <iconv.h>], -+ [iconv_t cd = iconv_open("",""); -+ iconv(cd,NULL,NULL,NULL,NULL); -+ iconv_close(cd);], -+ am_cv_lib_iconv=yes -+ am_cv_func_iconv=yes) -+ LIBS="$am_save_LIBS" -+ fi -+ ]) -+ if test "$am_cv_func_iconv" = yes; then -+ AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) -+ AC_CACHE_CHECK([if iconv needs const], wx_cv_func_iconv_const, -+ AC_TRY_COMPILE([ -+#include <stdlib.h> -+#include <iconv.h> -+extern -+#ifdef __cplusplus -+"C" -+#endif -+#if defined(__STDC__) || defined(__cplusplus) -+size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -+#else -+size_t iconv(); -+#endif -+ ], -+ [], -+ wx_cv_func_iconv_const="no", -+ wx_cv_func_iconv_const="yes" -+ ) -+ ) -+ -+ iconv_const= -+ if test "x$wx_cv_func_iconv_const" = "xyes"; then -+ iconv_const="const" -+ fi -+ -+ AC_DEFINE_UNQUOTED(ICONV_CONST, $iconv_const, -+ [Define as const if the declaration of iconv() needs const.]) -+ fi -+ LIBICONV= -+ if test "$am_cv_lib_iconv" = yes; then -+ LIBICONV="-liconv" -+ fi -+ AC_SUBST(LIBICONV) -+]) |