4 files changed, 24 insertions, 4 deletions
diff --git a/Src/Modules/termcap.c b/Src/Modules/termcap.c
index 8f5f650f9..9c72bf27f 100644
--- a/Src/Modules/termcap.c
+++ b/Src/Modules/termcap.c
@@ -33,7 +33,7 @@
 /* echotc: output a termcap */
 
 /**/
-int
+static int
 bin_echotc(char *name, char **argv, char *ops, int func)
 {
     char *s, buf[2048], *t, *u;
diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd
index 5f88a9662..89f939ff8 100644
--- a/Src/Modules/termcap.mdd
+++ b/Src/Modules/termcap.mdd
@@ -1,5 +1,15 @@
 name=zsh/termcap
-link=either
+
+link='if test "x$ac_cv_func_tgetent" = xyes; then
+          if test "x$zsh_cv_shared_tgetent" = xyes; then
+	      echo either
+	  else
+	      echo static
+	  fi
+      else
+          echo no;
+      fi
+'
 load=yes
 
 autobins="echotc"
diff --git a/Src/Modules/terminfo.c b/Src/Modules/terminfo.c
index 512f4b474..7eb47bdb3 100644
--- a/Src/Modules/terminfo.c
+++ b/Src/Modules/terminfo.c
@@ -36,7 +36,7 @@ static Param terminfo_pm;
 /* echoti: output a terminfo capability */
 
 /**/
-int
+static int
 bin_echoti(char *name, char **argv, char *ops, int func)
 {
     char *s, *t;
diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd
index 251281742..dd01bed3a 100644
--- a/Src/Modules/terminfo.mdd
+++ b/Src/Modules/terminfo.mdd
@@ -1,5 +1,15 @@
 name=zsh/terminfo
-link='if test "x$ac_cv_func_tigetstr" = xyes; then echo either; else echo no; fi'
+
+link='if test "x$ac_cv_func_tigetstr" = xyes; then
+          if test "x$zsh_cv_shared_tigetstr" = xyes; then
+	      echo either
+	  else
+	      echo static
+	  fi
+      else
+          echo no;
+      fi
+'
 load=yes
 
 autobins="echoti"