From 28fe9e602780df7d023ce526d1ae3d00fb8583b5 Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@users.sourceforge.net>
Date: Thu, 19 Apr 2001 17:00:52 +0000
Subject: 14039: simulate old linking behavior

---
 ChangeLog                |  5 +++++
 Src/Modules/cap.mdd      |  2 +-
 Src/Modules/termcap.mdd  |  2 +-
 Src/Modules/terminfo.mdd |  2 +-
 Src/Modules/zftp.mdd     |  2 ++
 Src/zsh.mdd              |  2 +-
 configure.in             | 14 +++++++-------
 7 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index effe65d7b..ac73b2132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2001-04-19  Clint Adams  <schizo@debian.org>
 
+	* 14039: configure.in, Config/defs.mk.in, Src/zsh.mdd,
+	Src/Modules/cap.mdd, Src/Modules/termcap.mdd,
+	Src/Modules/terminfo.mdd, Src/Modules/zftp.mdd:
+	simulate old linking behavior.
+
 	* 14033: acconfig.h, aczsh.m4, configure.in, Config/defs.mk.in,
 	Src/Makefile.in, Src/mkmakemod.sh, Src/zsh.mdd,
 	Src/Modules/cap.mdd, Src/Modules/termcap.mdd,
diff --git a/Src/Modules/cap.mdd b/Src/Modules/cap.mdd
index 0393f7f38..df4a52c4c 100644
--- a/Src/Modules/cap.mdd
+++ b/Src/Modules/cap.mdd
@@ -6,4 +6,4 @@ autobins="cap getcap setcap"
 
 objects="cap.o"
 
-extralibs="cap"
+#extralibs="cap"
diff --git a/Src/Modules/termcap.mdd b/Src/Modules/termcap.mdd
index 4c33f5690..f50fb59a1 100644
--- a/Src/Modules/termcap.mdd
+++ b/Src/Modules/termcap.mdd
@@ -16,4 +16,4 @@ autobins="echotc"
 
 objects="termcap.o"
 
-extralibs="termcap"
+#extralibs="termcap"
diff --git a/Src/Modules/terminfo.mdd b/Src/Modules/terminfo.mdd
index 0eca9ddfb..2525eda57 100644
--- a/Src/Modules/terminfo.mdd
+++ b/Src/Modules/terminfo.mdd
@@ -17,4 +17,4 @@ autoparams="terminfo"
 
 objects="terminfo.o"
 
-extralibs="terminfo"
+#extralibs="terminfo"
diff --git a/Src/Modules/zftp.mdd b/Src/Modules/zftp.mdd
index d9619b549..504984ed2 100644
--- a/Src/Modules/zftp.mdd
+++ b/Src/Modules/zftp.mdd
@@ -6,3 +6,5 @@ functions='Functions/Zftp/*'
 autobins="zftp"
 
 objects="zftp.o"
+
+#extralibs="socket"
diff --git a/Src/zsh.mdd b/Src/zsh.mdd
index 2accfda10..7ec492330 100644
--- a/Src/zsh.mdd
+++ b/Src/zsh.mdd
@@ -17,7 +17,7 @@ signames.o string.o subst.o text.o utils.o watch.o"
 headers="../config.h system.h zsh.h sigcount.h signals.h \
 prototypes.h hashtable.h ztype.h"
 
-extralibs="m termcap yp"
+#extralibs="m termcap yp"
 
 :<<\Make
 @CONFIG_MK@
diff --git a/configure.in b/configure.in
index f751b8834..006a45e93 100644
--- a/configure.in
+++ b/configure.in
@@ -898,7 +898,7 @@ if test $zsh_cv_func_tgetent_accepts_null = yes; then
   AC_DEFINE(TGETENT_ACCEPTS_NULL)
 fi
 
-LIBS=$SAVELIBS
+LIBS="$LIBS_CAP $LIBS_SOCKET $LIBS_M $LIBS_TERMCAP $LIBS_TERMINFO $LIBS_YP $SAVELIBS"
 
 AC_FUNC_MMAP
 if test x$ac_cv_func_mmap_fixed_mapped = xyes; then
@@ -1688,16 +1688,16 @@ if test "x$dynamic" = xyes; then
   test "$zsh_cv_shared_environ" = yes || dynamic=no
 dnl  test "$zsh_cv_sys_dynamic_broken" = no || dynamic=no
   if test "$ac_cv_func_tgetent" = yes; then
-    SAVELIBS=$LIBS
-    LIBS="$LIBS_TERMCAP $LIBS"
+#    SAVELIBS=$LIBS
+#    LIBS="$LIBS_TERMCAP $LIBS"
     zsh_SHARED_FUNCTION([tgetent])
-    LIBS=$SAVELIBS
+#    LIBS=$SAVELIBS
   fi
   if test "$ac_cv_func_tigetstr" = yes; then
-    SAVELIBS=$LIBS
-    LIBS="$LIBS_TERMINFO $LIBS"
+#    SAVELIBS=$LIBS
+#    LIBS="$LIBS_TERMINFO $LIBS"
     zsh_SHARED_FUNCTION([tigetstr])
-    LIBS=$SAVELIBS
+#    LIBS=$SAVELIBS
   fi
 fi
 
-- 
cgit 1.4.1