*** configure.ORIG	Thu Mar 12 11:41:49 2009
--- configure	Thu Mar 12 11:42:22 2009
***************
*** 4588,4594 ****
  
  
  cat >>confdefs.h <<\_ACEOF
! #define malloc rpl_malloc
  _ACEOF
  
  fi
--- 4588,4594 ----
  
  
  cat >>confdefs.h <<\_ACEOF
! /* #define malloc rpl_malloc */
  _ACEOF
  
  fi
*** src/Makefile.in.ORIG	Thu Mar 12 11:47:41 2009
--- src/Makefile.in	Thu Mar 12 11:47:58 2009
***************
*** 54,60 ****
  	path.$(OBJEXT) unicode.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) \
  	word.$(OBJEXT)
  unrtf_OBJECTS = $(am_unrtf_OBJECTS)
! unrtf_LDADD = $(LDADD)
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles
--- 54,60 ----
  	path.$(OBJEXT) unicode.$(OBJEXT) user.$(OBJEXT) util.$(OBJEXT) \
  	word.$(OBJEXT)
  unrtf_OBJECTS = $(am_unrtf_OBJECTS)
! unrtf_LDADD = $(LDADD) -liconv
  DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/config/depcomp
  am__depfiles_maybe = depfiles