--- OpenIPMI-2.0.16/cmdlang/Makefile.am.link	2007-10-02 16:34:22.000000000 +0200
+++ OpenIPMI-2.0.16/cmdlang/Makefile.am	2011-04-22 04:53:24.000000000 +0200
@@ -18,16 +18,17 @@
 
 libOpenIPMIcmdlang_la_SOURCES = cmdlang.c cmd_domain.c cmd_entity.c cmd_mc.c \
 	cmd_pet.c cmd_sensor.c cmd_control.c cmd_sel.c cmd_lanparm.c \
-	cmd_pef.c cmd_conn.c cmd_fru.c out_fru.c cmd_solparm.c
+	cmd_pef.c cmd_conn.c cmd_fru.c out_fru.c cmd_solparm.c ipmish.c
 libOpenIPMIcmdlang_la_LIBADD = -lm \
 	$(top_builddir)/utils/libOpenIPMIutils.la \
+	$(top_builddir)/unix/libOpenIPMIposix.la \
 	$(top_builddir)/lib/libOpenIPMI.la
 libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
 	-Wl,-Map -Wl,libOpenIPMIcmdlang.map
 
 bin_PROGRAMS = openipmish
 
-openipmish_SOURCES = ipmish.c os_debug.c
+openipmish_SOURCES = os_debug.c
 openipmish_LDADD =  libOpenIPMIcmdlang.la \
 		$(top_builddir)/utils/libOpenIPMIutils.la \
 		$(top_builddir)/lib/libOpenIPMI.la \
--- OpenIPMI-2.0.16/configure.in.link	2009-03-17 01:56:22.000000000 +0100
+++ OpenIPMI-2.0.16/configure.in	2011-04-22 04:52:35.000000000 +0200
@@ -852,9 +852,10 @@
    *-sun-*) AC_DEFINE([_SUNOS], [], [Solaris's term.h does horrid things.]);;
 esac
 
-AC_CHECK_LIB(curses, tgetent,,
+AC_CHECK_LIB(tinfo, tgetent,,
+[AC_CHECK_LIB(curses, tgetent,,
    [AC_CHECK_LIB(ncurses, tgetent,,
-      [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
+      [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )])
 
 # Checks for header files.
 AC_FUNC_ALLOCA
--- OpenIPMI-2.0.16/ui/Makefile.am.link	2007-10-02 16:34:41.000000000 +0200
+++ OpenIPMI-2.0.16/ui/Makefile.am	2011-04-22 04:52:35.000000000 +0200
@@ -22,7 +22,7 @@
 lib_LTLIBRARIES = libOpenIPMIui.la
 
 libOpenIPMIui_la_SOURCES = ui.c ui_os.c ui_keypad.c ui_command.c 
-libOpenIPMIui_la_LIBADD =
+libOpenIPMIui_la_LIBADD = $(top_builddir)/lib/libOpenIPMI.la $(top_builddir)/unix/libOpenIPMIposix.la -lncurses
 libOpenIPMIui_la_LDFLAGS = -version-info $(LD_VERSION) \
 	-Wl,-Map -Wl,libOpenIPMIui.map
 
--- OpenIPMI-2.0.16/unix/Makefile.am.link	2007-10-02 16:34:44.000000000 +0200
+++ OpenIPMI-2.0.16/unix/Makefile.am	2011-04-22 04:52:35.000000000 +0200
@@ -16,7 +16,7 @@
 
 libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c
 libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \
-	$(top_builddir)/utils/libOpenIPMIutils.la
+	$(top_builddir)/utils/libOpenIPMIutils.la $(top_builddir)/lib/libOpenIPMI.la
 libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \
 	-Wl,-Map -Wl,libOpenIPMIpthread.map