Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

PATCH: revert Clint's build patches

>
> On Apr 23, 10:00pm, Andrej Borsenkow wrote:
> } Subject: Re: What about this? (was: RE: Zsh broken after the latest build
> }
> } I actually meant, that I cannot just use cvs update currently because it
> } will reapply the patches again.
>
> That's not true.  If you've modified your files and then do a "cvs update",
> it should leave any changes that you made alone, and simply merge in any
> new changes since the previous time you did "cvs update".
>

Ehem ... really. O.K., so here is diff against current CVS that reverts
Clint's patches (sorry). I commit it when I have article number.

-andrej

Index: acconfig.h
===================================================================
RCS file: /cvsroot/zsh/zsh/acconfig.h,v
retrieving revision 1.7
diff -u -r1.7 acconfig.h
--- acconfig.h	2001/04/19 14:45:41	1.7
+++ acconfig.h	2001/04/23 19:41:20
@@ -317,9 +317,3 @@
 
 /* Define if you have the terminfo strnames symbol.  */
 #undef HAVE_STRNAMES
-
-/* Define if you have the cap library.  */
-#undef HAVE_LIBCAP
-
-/* Define if you have the socket library.  */
-#undef HAVE_LIBSOCKET
Index: aczsh.m4
===================================================================
RCS file: /cvsroot/zsh/zsh/aczsh.m4,v
retrieving revision 1.9
diff -u -r1.9 aczsh.m4
--- aczsh.m4	2001/04/19 14:45:41	1.9
+++ aczsh.m4	2001/04/23 19:41:21
@@ -683,27 +683,3 @@
 	then LIBS="$4"
 	else LIBS="$enable_libs"
 	fi)])
-
-dnl zsh_SEARCH_LIBS(FUNCTION, SEARCH-LIBS [, ACTION-IF-FOUND
-dnl            [, ACTION-IF-NOT-FOUND [, OTHER-LIBRARIES]]])
-dnl Search for a library defining FUNC, if it's not already available.
-
-AC_DEFUN(zsh_SEARCH_LIBS,
-[AC_PREREQ([2.13])
-AC_CACHE_CHECK([for library containing $1], [ac_cv_search_$1],
-[ac_func_search_save_LIBS="$LIBS"
-ac_cv_search_$1="no"
-AC_TRY_LINK_FUNC([$1], [ac_cv_search_$1="none required"])
-test "$ac_cv_search_$1" = "no" && for i in $2; do
-LIBS="-l$i $5 $ac_func_search_save_LIBS"
-AC_TRY_LINK_FUNC([$1],
-[ac_cv_search_$1="-l$i"
-break])
-done
-LIBS="$ac_func_search_save_LIBS"])
-if test "$ac_cv_search_$1" != "no"; then
-  test "$ac_cv_search_$1" = "none required" || ZS_LIBS="$ac_cv_search_$1"
-  $3
-else :
-  $4
-fi])
Index: configure.in
===================================================================
RCS file: /cvsroot/zsh/zsh/configure.in,v
retrieving revision 1.47
diff -u -r1.47 configure.in
--- configure.in	2001/04/19 18:35:31	1.47
+++ configure.in	2001/04/23 19:41:21
@@ -504,7 +504,7 @@
 dnl may happen.
 AC_CHECK_LIB(c, printf, [LIBS="$LIBS -lc"])
 
-AC_CHECK_LIB(m, pow, [LIBS_M="-lm"])
+AC_CHECK_LIB(m, pow)
 
 dnl Prefer BSD termcap library to SysV curses library, except on certain
 dnl SYSV-derived systems.
@@ -514,12 +514,7 @@
   *)             termcap_curses_order="termcap curses ncurses" ;;
 esac
 
-zsh_SEARCH_LIBS(tgetent, [$termcap_curses_order])
-LIBS_TERMCAP=$ZS_LIBS
-
-zsh_SEARCH_LIBS(tigetstr, [$termcap_curses_order])
-LIBS_TERMINFO=$ZS_LIBS
-
+AC_SEARCH_LIBS(tgetent, [$termcap_curses_order])
 AC_MSG_CHECKING(if boolcodes is available)
 AC_TRY_COMPILE([#include <curses.h>
 #include <term.h>], [char **test = boolcodes;],
@@ -554,8 +549,7 @@
 dnl Some systems (Solaris 2.x, Linux Redhat 5.x) require
 dnl libnsl (Network Services Library) to find yp_all
 
-zsh_SEARCH_LIBS(yp_all, nsl)
-LIBS_YP=$ZS_LIBS
+AC_SEARCH_LIBS(yp_all, nsl)
 
 dnl I am told that told that unicos reqire these for nis_list
 if test `echo $host_os | sed 's/^\(unicos\).*/\1/'` = unicos; then
@@ -566,11 +560,9 @@
   AC_CHECK_LIB(dl, dlopen)
 fi
 
-AC_CHECK_LIB(cap, cap_get_proc, [LIBS_CAP="-lcap"
-AC_DEFINE(HAVE_LIBCAP)])
+AC_CHECK_LIB(cap, cap_get_proc)
 
-AC_CHECK_LIB(socket, socket, [LIBS_SOCKET="-lsocket"
-AC_DEFINE(HAVE_LIBSOCKET)])
+AC_CHECK_LIB(socket, socket)
 
 dnl ---------------------
 dnl CHECK TERMCAP LIBRARY
@@ -839,9 +831,6 @@
 dnl need to integrate this function
 dnl AC_FUNC_STRFTIME
 
-SAVELIBS=$LIBS
-LIBS="$LIBS_CAP $LIBS_YP $LIBS_M $LIBS_TERMCAP $LIBS_TERMINFO $LIBS"
-
 AC_CHECK_FUNCS(strftime difftime gettimeofday \
 	       select poll \
 	       readlink lstat lchown faccessx fchdir ftruncate \
@@ -898,9 +887,6 @@
   AC_DEFINE(TGETENT_ACCEPTS_NULL)
 fi
 
-MAINLIBS="$LIBS_CAP $LIBS_SOCKET $LIBS_M $LIBS_TERMCAP $LIBS_TERMINFO $LIBS_YP $SAVELIBS"
-LIBS=$SAVELIBS
-
 AC_FUNC_MMAP
 if test x$ac_cv_func_mmap_fixed_mapped = xyes; then
   AC_CHECK_FUNCS(munmap msync)
@@ -1689,16 +1675,10 @@
   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"
     zsh_SHARED_FUNCTION([tgetent])
-    LIBS=$SAVELIBS
   fi
   if test "$ac_cv_func_tigetstr" = yes; then
-    SAVELIBS=$LIBS
-    LIBS="$LIBS_TERMINFO $LIBS"
     zsh_SHARED_FUNCTION([tigetstr])
-    LIBS=$SAVELIBS
   fi
 fi
 
@@ -1772,13 +1752,6 @@
 AC_SUBST(MOD_IMPORT_VARIABLE)dnl
 AC_SUBST(MOD_IMPORT_FUNCTION)dnl
 AC_SUBST(EXTRAZSHOBJS)dnl
-AC_SUBST(MAINLIBS)dnl
-AC_SUBST(LIBS_M)dnl
-AC_SUBST(LIBS_CAP)dnl
-AC_SUBST(LIBS_SOCKET)dnl
-AC_SUBST(LIBS_TERMCAP)dnl
-AC_SUBST(LIBS_TERMINFO)dnl
-AC_SUBST(LIBS_YP)dnl
 
 # Generate config.modules.  We look for *.mdd files in first and second
 # level subdirectories.  Any existing line not containing 'auto=y' will be
@@ -1929,8 +1902,7 @@
 module linker flags       : ${LDFLAGS} ${LIBLDFLAGS} ${DLLDFLAGS}"
 fi
 echo "\
-main library flags        : ${MAINLIBS}
-base library flags        : ${LIBS}
+library flags             : ${LIBS}
 installation basename     : ${tzsh_name}
 binary install path       : ${zshbin2}
 man page install path     : ${zshman}
Index: Config/defs.mk.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Config/defs.mk.in,v
retrieving revision 1.6
diff -u -r1.6 defs.mk.in
--- Config/defs.mk.in	2001/04/19 17:55:02	1.6
+++ Config/defs.mk.in	2001/04/23 19:41:21
@@ -63,15 +63,6 @@
 EXPOPT          = @EXPOPT@
 IMPOPT          = @IMPOPT@
 
-# extra libraries
-MAINLIBS        = @MAINLIBS@
-LIBS_M          = @LIBS_M@
-LIBS_CAP        = @LIBS_CAP@
-LIBS_SOCKET     = @LIBS_SOCKET@
-LIBS_TERMCAP    = @LIBS_TERMCAP@
-LIBS_TERMINFO   = @LIBS_TERMINFO@
-LIBS_YP         = @LIBS_YP@
-
 # utilities
 AWK             = @AWK@
 YODL            = @YODL@
Index: Src/Makefile.in
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Makefile.in,v
retrieving revision 1.9
diff -u -r1.9 Makefile.in
--- Src/Makefile.in	2001/04/19 17:55:02	1.9
+++ Src/Makefile.in	2001/04/23 19:41:22
@@ -82,11 +82,11 @@
 
 zsh$(EXEEXT): $(@L@IBZSH) $(@L@STMP) $(MAIN_OBJS) zsh.export $(EXTRAZSHOBJS)
 	rm -f $@
-	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(MAINLIBS)
+	$(@L@DRUNPATH) $(LINK) $(MAIN_OBJS) $(EXTRAZSHOBJS) $(@L@LIST) $(ZSH_@E@XPORT) $(@L@IBZSH) $(LIBS)
 
 $(LIBZSH): $(LIBOBJS) $(NSTMP)
 	rm -f $@
-	$(DLLINK) $(LIBOBJS) $(NLIST) $(MAINLIBS)
+	$(DLLINK) $(LIBOBJS) $(NLIST) $(LIBS)
 
 zsh.res.o: $(sdir)/zsh.rc $(sdir)/zsh.ico
 	windres -O coff --include-dir $(sdir) -i $(sdir)/zsh.rc -o zsh.res.o
Index: Src/mkmakemod.sh
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/mkmakemod.sh,v
retrieving revision 1.9
diff -u -r1.9 mkmakemod.sh
--- Src/mkmakemod.sh	2001/04/19 14:45:41	1.9
+++ Src/mkmakemod.sh	2001/04/23 19:41:22
@@ -27,7 +27,6 @@
 #   autoprefixconds like autoinfixconds, but for prefix condition codes
 #   autoparams      parameters defined by the module, for autoloading
 #   automathfuncs   math functions defined by the module, for autoloading
-#   extralibs       libraries specific to this module (default none)
 #   objects         .o files making up this module (*must* be defined)
 #   proto           .syms files for this module (default generated from $objects)
 #   headers         extra headers for this module (default none)
@@ -191,8 +190,7 @@
 
 	unset name moddeps nozshdep alwayslink hasexport
 	unset autobins autoinfixconds autoprefixconds autoparams automathfuncs
-	unset extralibs objects proto headers hdrdeps otherincs
-	unset EXTRALIBS
+	unset objects proto headers hdrdeps otherincs
 	. $top_srcdir/$the_subdir/${mddname}.mdd
 	q_name=`echo $name | sed 's,Q,Qq,g;s,_,Qu,g;s,/,Qs,g'`
 	test -n "${moddeps+set}" || moddeps=
@@ -201,24 +199,6 @@
 	    proto=`echo $objects '' | sed 's,\.o ,.syms ,g'`
 
 	dobjects=`echo $objects '' | sed 's,\.o ,..o ,g'`
-
-	for lib in $extralibs; do
-	case $lib in
-	m) EXTRALIBS="$EXTRALIBS \$(LIBS_M)"
-	;;
-	cap) EXTRALIBS="$EXTRALIBS \$(LIBS_CAP)"
-	;;
-	socket) EXTRALIBS="$EXTRALIBS \$(LIBS_SOCKET)"
-	;;
-	termcap) EXTRALIBS="$EXTRALIBS \$(LIBS_TERMCAP)"
-	;;
-	terminfo) EXTRALIBS="$EXTRALIBS \$(LIBS_TERMINFO)"
-	;;
-	yp) EXTRALIBS="$EXTRALIBS \$(LIBS_YP)"
-	;;
-	esac
-	done
-
 	modhdeps=
 	mododeps=
 	exportdeps=
@@ -322,7 +302,6 @@
 	echo "NXPIMP_${mddname} ="
 	echo "LINKMODS_${mddname} = $mododeps"
 	echo "NOLINKMODS_${mddname} = "
-	echo "EXTRALIBS_${mddname} = $EXTRALIBS"
 	echo
 	echo "proto.${mddname}: \$(EPRO_${mddname})"
 	echo "\$(SYMS_${mddname}): \$(PROTODEPS)"
@@ -349,7 +328,7 @@
 	    echo
 	    echo "${mddname}.\$(DL_EXT): \$(MODDOBJS_${mddname}) ${mddname}.export $exportdeps \$(@LINKMODS@_${mddname})"
 	    echo '	rm -f $@'
-	    echo "	\$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(MODDOBJS_${mddname}) \$(@LINKMODS@_${mddname}) $EXTRALIBS \$(LIBS)"
+	    echo "	\$(DLLINK) \$(@E@XPIMP_$mddname) \$(@E@NTRYOPT) \$(MODDOBJS_${mddname}) \$(@LINKMODS@_${mddname}) \$(LIBS) "
 	    echo
 	fi
 	echo "${mddname}.mdhi: ${mddname}.mdhs \$(INCS_${mddname})"
Index: Src/zsh.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/zsh.mdd,v
retrieving revision 1.9
diff -u -r1.9 zsh.mdd
--- Src/zsh.mdd	2001/04/19 17:00:53	1.9
+++ Src/zsh.mdd	2001/04/23 19:41:22
@@ -17,8 +17,6 @@
 headers="../config.h system.h zsh.h sigcount.h signals.h \
 prototypes.h hashtable.h ztype.h"
 
-#extralibs="m termcap yp"
-
 :<<\Make
 @CONFIG_MK@
 
Index: Src/Modules/cap.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/cap.mdd,v
retrieving revision 1.5
diff -u -r1.5 cap.mdd
--- Src/Modules/cap.mdd	2001/04/19 17:55:02	1.5
+++ Src/Modules/cap.mdd	2001/04/23 19:41:22
@@ -5,5 +5,3 @@
 autobins="cap getcap setcap"
 
 objects="cap.o"
-
-extralibs="cap"
Index: Src/Modules/termcap.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/termcap.mdd,v
retrieving revision 1.8
diff -u -r1.8 termcap.mdd
--- Src/Modules/termcap.mdd	2001/04/20 13:31:26	1.8
+++ Src/Modules/termcap.mdd	2001/04/23 19:41:22
@@ -16,5 +16,3 @@
 autoparams="termcap"
 
 objects="termcap.o"
-
-extralibs="termcap"
Index: Src/Modules/terminfo.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/terminfo.mdd,v
retrieving revision 1.9
diff -u -r1.9 terminfo.mdd
--- Src/Modules/terminfo.mdd	2001/04/19 17:55:02	1.9
+++ Src/Modules/terminfo.mdd	2001/04/23 19:41:22
@@ -16,5 +16,3 @@
 autoparams="terminfo"
 
 objects="terminfo.o"
-
-extralibs="terminfo"
Index: Src/Modules/zftp.mdd
===================================================================
RCS file: /cvsroot/zsh/zsh/Src/Modules/zftp.mdd,v
retrieving revision 1.5
diff -u -r1.5 zftp.mdd
--- Src/Modules/zftp.mdd	2001/04/19 17:55:02	1.5
+++ Src/Modules/zftp.mdd	2001/04/23 19:41:22
@@ -6,5 +6,3 @@
 autobins="zftp"
 
 objects="zftp.o"
-
-extralibs="socket"
Messages sorted by: Reverse Date, Date, Thread, Author