3 files changed, 4 insertions, 12 deletions
diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd
index 9a6ddd08e..17d07aa03 100644
--- a/Src/Modules/termcap.mdd
+++ b/Src/Modules/termcap.mdd
@@ -10,12 +10,7 @@ link='if test "x$ac_cv_func_tgetent" = xyes; then
           echo either;
       fi
 '
-load='if test "x$ac_cv_func_tgetent" = xyes; then
-          echo yes;
-      else
-          echo no;
-      fi
-'
+load=yes
 
 autobins="echotc"
 
diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c
index 0cac6e530..fd21a3de3 100644
--- a/Src/Modules/terminfo.c
+++ b/Src/Modules/terminfo.c
@@ -215,6 +215,8 @@ boot_(Module m)
 
     if (!createtihash())
     	return 1;
+#else
+    unsetparam(terminfo_nam);
 #endif
     return  !addbuiltins(m->nam, bintab, sizeof(bintab)/sizeof(*bintab));
 }
diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd
index 580aa2893..da79e9768 100644
--- a/Src/Modules/terminfo.mdd
+++ b/Src/Modules/terminfo.mdd
@@ -10,12 +10,7 @@ link='if test "x$ac_cv_func_tigetstr" = xyes; then
           echo either;
       fi
 '
-load='if test "x$ac_cv_func_tigetstr" = xyes; then
-          echo yes;
-      else
-          echo no;
-      fi
-'
+load=yes
 
 autobins="echoti"
 autoparams="terminfo"