*** ./lib/stdlib.in.h.ORIG	Mon Apr  1 22:35:09 2013
--- ./lib/stdlib.in.h	Mon Apr  1 22:37:37 2013
***************
*** 164,172 ****
--- 164,174 ----
  #if @GNULIB_CALLOC_POSIX@
  # if @REPLACE_CALLOC@
  #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+ #ifndef _AIX
  #   undef calloc
  #   define calloc rpl_calloc
  #  endif
+ #endif
  _GL_FUNCDECL_RPL (calloc, void *, (size_t nmemb, size_t size));
  _GL_CXXALIAS_RPL (calloc, void *, (size_t nmemb, size_t size));
  # else
***************
*** 276,284 ****
--- 278,288 ----
  # if @REPLACE_MALLOC@
  #  if !((defined __cplusplus && defined GNULIB_NAMESPACE) \
          || _GL_USE_STDLIB_ALLOC)
+ #ifndef _AIX
  #   undef malloc
  #   define malloc rpl_malloc
  #  endif
+ #endif
  _GL_FUNCDECL_RPL (malloc, void *, (size_t size));
  _GL_CXXALIAS_RPL (malloc, void *, (size_t size));
  # else
*** ./Makefile.in.ORIG	Mon Apr  1 22:33:16 2013
--- ./Makefile.in	Mon Apr  1 22:33:26 2013
***************
*** 1266,1272 ****
  barcode_SOURCES = main.c cmdline.c
  barcode_LDADD = libbarcode.la lib/libgnu.la
  sample_SOURCES = sample.c
! sample_LDADD = libbarcode.la
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive
  
--- 1266,1272 ----
  barcode_SOURCES = main.c cmdline.c
  barcode_LDADD = libbarcode.la lib/libgnu.la
  sample_SOURCES = sample.c
! sample_LDADD = libbarcode.la -lintl
  all: config.h
  	$(MAKE) $(AM_MAKEFLAGS) all-recursive