Subject: patch for wv configure.in
From: Alec Wolman (wolman@cs.washington.edu)
Date: Thu Jul 12 2001 - 16:35:05 CDT
The following patch to the wv version of configure.in adds
a --with-peer-iconv option to configure which allows the wv
directory to build properly as part of the abiword build
process on systems that do not have iconv as part of libc.
Please review this patch and either provide feedback
or commit it...
Alec
--- ../../wv/configure.in.orig Tue May 1 14:36:02 2001
+++ ../../wv/configure.in Sun Jun 24 20:35:35 2001
@@ -314,13 +314,32 @@
fi
fi
-if test "$have_iconv" = "no"; then
- AC_CHECK_FUNC(iconv,[
- AC_DEFINE(USE_ICONV)
- have_iconv=yes],[
- ICONVOBJS="\$(RICONVOBJS)"
- ICONV="ICONV"
- AC_MSG_WARN(*** Get Iconv ***)])
+# use --with-peer-iconv to get libiconv from the peer directory
+AC_ARG_WITH(peer-iconv,
+[ --with-peer-iconv use libiconv from peer directory ],[
+ if test "$withval" = "yes"; then
+ use_peer_iconv=yes
+ elif test "$withval" = "no"; then
+ use_peer_iconv=no
+ else
+ use_peer_iconv=no
+ fi
+],use_peer_iconv=no)
+
+if test "$use_peer_iconv" = "yes"; then
+ basepath="../libiconv"
+ ICONV_LIBS="${basepath}/lib/.libs/libiconv.a"
+ ICONV_CFLAGS="-I${basepath}/include"
+ AC_MSG_RESULT(using supplied iconv library)
+else
+ if test "$have_iconv" = "no"; then
+ AC_CHECK_FUNC(iconv,[
+ AC_DEFINE(USE_ICONV)
+ have_iconv=yes],[
+ ICONVOBJS="\$(RICONVOBJS)"
+ ICONV="ICONV"
+ AC_MSG_WARN(*** Get Iconv ***)])
+ fi
fi
AC_DEFUN(AC_SYS_ICONV_WIN_CP_SUPPORT,
This archive was generated by hypermail 2b25 : Thu Jul 12 2001 - 16:35:12 CDT