*** x11/Makefile.aix.in.ORIG	Tue Jun  3 00:35:29 2008
--- x11/Makefile.aix.in	Tue Jun  3 00:36:17 2008
***************
*** 60,67 ****
  
  
  $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) curses.exp
! 	ld -bnoentry -bM:SRE -bE:curses.exp $(MH_LIBS) $(MH_EXTRA_LIBS) \
! $(LIBOBJS) $(PDCOBJS) -o $@
  
  $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
  $(PDCOBJS) : $(PDCURSES_X11_H)
--- 60,72 ----
  
  
  $(LIBCURSES) : $(LIBOBJS) $(PDCOBJS) curses.exp
! 	${AR} -rv $@ $(LIBOBJS) $(PDCOBJS)
! 	CreateExportList -X32 x32bit.exp $@
! 	CreateExportList -X64 x64bit.exp $@
! 	cat x32bit.exp x64bit.exp > libXCurses.exp
! 	${CC} -qmkshrobj $@ -o shr.o -bE:libXCurses.exp -lXmu -lXaw -lXt -lXext -lXpm -lX11
! 	rm -f libXCurses.exp $@
! 	${AR} -rv $@ shr.o
  
  $(LIBOBJS) $(PDCOBJS) : $(PDCURSES_HEADERS)
  $(PDCOBJS) : $(PDCURSES_X11_H)
*** configure.ORIG	Tue Jun  3 00:37:47 2008
--- configure	Tue Jun  3 00:24:51 2008
***************
*** 4773,4779 ****
  MH_X11R6_LIBS="SM ICE Xext"
  mh_x11r6=no
  
! mh_lib_dirs="$x_libraries `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g`"
  
  for ac_dir in $mh_lib_dirs ; do
  	for mh_xsm in libSM.a libSM.so libSM.sl libSM.dylib; do
--- 4773,4779 ----
  MH_X11R6_LIBS="SM ICE Xext"
  mh_x11r6=no
  
! mh_lib_dirs="`echo $x_libraries o $ac_x_includes $ac_x_header_dirs | sed 's/include/lib/g'`"
  
  for ac_dir in $mh_lib_dirs ; do
  	for mh_xsm in libSM.a libSM.so libSM.sl libSM.dylib; do