#
#
# patch "Makefile.am"
#  from [d6a41351a82bc9d3deb246d48be2ac81fb17c10a]
#    to [dfaa00d12056b5dc7a53ea779ba605d890669470]
# 
# patch "configure.ac"
#  from [aca13afbe2bd515baa1facffd450a83ec1b0353c]
#    to [629652d97ca179fdd82f20455dd7d959bea7a527]
#
============================================================
--- Makefile.am	d6a41351a82bc9d3deb246d48be2ac81fb17c10a
+++ Makefile.am	dfaa00d12056b5dc7a53ea779ba605d890669470
@@ -291,14 +291,14 @@ UNIX_PLATFORM_SOURCES =							\
 	unix/process.cc unix/terminal.cc unix/inodeprint.cc		\
 	unix/fs.cc unix/make_io_binary.cc unix/os_strerror.cc           \
 	unix/cputime.cc unix/ssh_agent_platform.cc			\
-	unix/ssh_agent_platform.hh unix/tester-plaf.cc
+	unix/ssh_agent_platform.hh
 
 WIN32_PLATFORM_SOURCES =						\
 	win32/read_password.cc win32/get_system_flavour.cc		\
 	win32/process.cc win32/terminal.cc win32/inodeprint.cc		\
 	win32/fs.cc win32/make_io_binary.cc win32/os_strerror.cc	\
 	win32/cputime.cc win32/ssh_agent_platform.cc			\
-	win32/ssh_agent_platform.hh win32/tester-plaf.cc
+	win32/ssh_agent_platform.hh
 
 # these files contain unit tests
 UNIT_TEST_SOURCES =							\
@@ -450,9 +450,11 @@ if WIN32_PLATFORM
   unit_tester_LDADD += -lshfolder -lws2_32 -lintl -liconv -liphlpapi
   lib3rdparty_a_CPPFLAGS += -DWIN32 -DBOTAN_EXT_ENTROPY_SRC_CAPI -DBOTAN_EXT_ENTROPY_SRC_WIN32
   lib3rdparty_a_SOURCES += botan/es_capi.cpp botan/es_win32.cpp
+  tester_SOURCES += win32/tester-plaf.cc
 else
   libplatform_a_SOURCES += $(UNIX_PLATFORM_SOURCES)
   mtn_SOURCES += unix/main.cc
+  tester_SOURCES += unix/tester-plaf.cc
 endif
 
 if MISSING_INET_PTON
============================================================
--- configure.ac	aca13afbe2bd515baa1facffd450a83ec1b0353c
+++ configure.ac	629652d97ca179fdd82f20455dd7d959bea7a527
@@ -45,6 +45,22 @@ fi
    AC_DEFINE(os_err_t, int, [OS-specific error type])
 fi
 
+AC_CACHE_CHECK([whether this is AIX],
+       ac_aix, [
+       AC_TRY_COMPILE([#ifndef _AIX
+                       #error "This is not AIX"
+                       #endif],
+                      [int i;],
+                      ac_aix=yes,
+                      ac_aix=no)
+])
+if test "$ac_aix" = "yes"; then
+   AM_CONDITIONAL(AIX_PLATFORM, true)
+   LDFLAGS="$LDFLAGS -Wl,-bexpfull"
+else
+   AM_CONDITIONAL(AIX_PLATFORM, false)
+fi
+
 # Checks for header files.
 AC_HEADER_STDC
 dnl Explicitly specifying AC_INCLUDES_DEFAULT gets autoconf not to do all