From d20d8b69d128eae3a0865bef08a1952ba26b6419 Mon Sep 17 00:00:00 2001
From: lebel <lebel@openbsd.org>
Date: Fri, 7 Sep 2001 02:11:47 +0000
Subject: [PATCH] new patches to zshconfig_ac to build modules under ELF archs.
 thanks brad@

---
 shells/zsh/stable/Makefile                   |  4 +-
 shells/zsh/stable/patches/patch-zshconfig_ac | 50 ++++++++++++++++++++
 2 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 shells/zsh/stable/patches/patch-zshconfig_ac

diff --git a/shells/zsh/stable/Makefile b/shells/zsh/stable/Makefile
index 9270f639798..02402a443c5 100644
--- a/shells/zsh/stable/Makefile
+++ b/shells/zsh/stable/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2001/07/01 15:43:40 lebel Exp $
+# $OpenBSD: Makefile,v 1.6 2001/09/07 02:11:47 lebel Exp $
 
 COMMENT=	"the Z shell, Bourne shell-compatible, release flavor"
 COMMENT-zftp=	"the Z shell embedded ftp client"
@@ -29,7 +29,7 @@ PERMIT_DISTFILES_FTP=	Yes
 FLAVORS=	static
 FLAVOR?=
 
-CONFIGURE_STYLE= gnu
+CONFIGURE_STYLE= autoconf
 CONFIGURE_ARGS=	--enable-zsh-mem --enable-zsh-secure-free
 
 .if ${FLAVOR:L} == "static"
diff --git a/shells/zsh/stable/patches/patch-zshconfig_ac b/shells/zsh/stable/patches/patch-zshconfig_ac
new file mode 100644
index 00000000000..36ca6e32edb
--- /dev/null
+++ b/shells/zsh/stable/patches/patch-zshconfig_ac
@@ -0,0 +1,50 @@
+$OpenBSD: patch-zshconfig_ac,v 1.1 2001/09/07 02:11:47 lebel Exp $
+--- zshconfig.ac.orig	Tue Jun 26 06:08:54 2001
++++ zshconfig.ac	Thu Sep  6 13:24:37 2001
+@@ -1602,7 +1602,14 @@ char *argv[];
+   else
+     case "$host" in
+       *openbsd*)
+-	DLLD="${DLLD=$CC}"
++	case "$host_os" in
++	  openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	    DLLD="${DLLD=ld}"
++	  ;;
++	  *)
++	    DLLD="${DLLD=$CC}"
++	  ;;
++	esac
+ 	DLLDARG="${LDARG}"
+       ;;
+       * )
+@@ -1630,11 +1637,29 @@ char *argv[];
+     netbsd*)      DLLDFLAGS="${DLLDFLAGS=${DLLDARG}-x -shared --whole-archive}" ;;
+     aix*)         DLLDFLAGS="${DLLDFLAGS=-G -bexpall -lc}" ;;
+     solaris*|sysv4*|esix*) DLLDFLAGS="${DLLDFLAGS=-G}" ;;
+-    openbsd*)     DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}" ;;
++    openbsd*)
++      if test $zsh_cv_sys_elf = yes; then
++	DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
++      else
++	case "$host_os" in
++	  openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
++	   DLLDFLAGS="${DLLDFLAGS=-Bshareable}"
++	  ;;
++	  *)
++	    DLLDFLAGS="${DLLDFLAGS=-shared -fPIC}"
++	  ;;
++	esac
++      fi
++    ;;
+   esac
+   case "$host" in
+     *-hpux*)  EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}" ;;
+     *-freebsd[3-9]*|*-linux*) EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-rdynamic}" ;;
++    *openbsd*)
++       if test $zsh_cv_sys_elf = yes; then
++	 EXTRA_LDFLAGS="${EXTRA_LDFLAGS=-Wl,-E}"
++       fi
++    ;;
+     mips-sni-sysv4)
+       #
+       # unfortunately, we have different compilers