about summary refs log tree commit diff
path: root/zshconfig.ac
diff options
context:
space:
mode:
authorGeoff Wing <gcw@users.sourceforge.net>2001-12-21 00:06:48 +0000
committerGeoff Wing <gcw@users.sourceforge.net>2001-12-21 00:06:48 +0000
commita498485d0da464c564da934cc5c73353d09e9e8a (patch)
treeacce05538925128c61cd8308bdc9b3b34dedaa7c /zshconfig.ac
parentf0c5812f1ed3c87f89ab84a69a67f0e4eae58d5c (diff)
downloadzsh-a498485d0da464c564da934cc5c73353d09e9e8a.tar.gz
zsh-a498485d0da464c564da934cc5c73353d09e9e8a.tar.xz
zsh-a498485d0da464c564da934cc5c73353d09e9e8a.zip
16332: pullup from trunk. Stop distributing ansi2knr.c and adjust
configure mechanism
Diffstat (limited to 'zshconfig.ac')
-rw-r--r--zshconfig.ac13
1 files changed, 12 insertions, 1 deletions
diff --git a/zshconfig.ac b/zshconfig.ac
index 4dc5c823f..27df2695f 100644
--- a/zshconfig.ac
+++ b/zshconfig.ac
@@ -289,7 +289,7 @@ fi
 dnl if the user hasn't specified CFLAGS, then
 dnl   if compiler is gcc, then use -O2 and some warning flags
 dnl   else use -O
-if test -n "$auto_cflags"; then
+if test -n "$auto_cflags" && test ."$ansi2knr" != .yes; then
   if test "${enable_zsh_debug}" = yes; then
     if test -n "$GCC"; then
       CFLAGS="$CFLAGS -Wall -Wno-implicit -Wmissing-prototypes -ggdb"
@@ -462,6 +462,17 @@ AC_PROG_INSTALL             dnl Check for BSD compatible `install'
 AC_PROG_AWK                 dnl Check for mawk,gawk,nawk, then awk.
 AC_PROG_LN                  dnl Check for working ln, for "make install"
 AC_CHECK_PROGS([YODL], [yodl], [: yodl])
+AC_CHECK_PROGS([ANSI2KNR], [ansi2knr], [: ansi2knr])
+
+if test x"$ansi2knr" = xyes && test x"$ANSI2KNR" = x": ansi2knr"; then
+    echo "----------"
+    echo "configure fatal error:"
+    echo "ansi2knr was specified (--enable-ansi2knr) but the program could not be found."
+    echo "Either remove the configure option if it is not required or build the ansi2knr"
+    echo "program before reconfiguring Zsh.  The source code for ansi2knr is also"
+    echo "available in the GPL directory on Zsh distribution sites."
+    exit 1
+fi
 
 dnl ------------------
 dnl CHECK HEADER FILES