From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Fri, 3 Aug 2018 11:10:55 +0000 (+0000)
Subject: - New fix for #4136: This one ignores lex without without
X-Git-Tag: release-1.8.0rc1~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87bdb489f9015876346fb63b9dcfa956d45b2476;p=thirdparty%2Funbound.git

- New fix for #4136: This one ignores lex without without
  yylex_destroy.


git-svn-id: file:///svn/unbound/trunk@4827 be551aaa-1e26-0410-a405-d3ace91eadb9
---

diff --git a/configure b/configure
index 8ef5da87b..2b8a8c1b6 100755
--- a/configure
+++ b/configure
@@ -6446,8 +6446,12 @@ $as_echo "#define LEX_HAS_YYLEX_DESTROY 1" >>confdefs.h
 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 	else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }; fi
+$as_echo "no" >&6; };
+		LEX=":"
+	fi
 
+fi
+if test "$LEX" != "" -a "$LEX" != ":"; then
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for lex %option" >&5
 $as_echo_n "checking for lex %option... " >&6; }
diff --git a/configure.ac b/configure.ac
index 5888a05b9..966f2f736 100644
--- a/configure.ac
+++ b/configure.ac
@@ -324,7 +324,9 @@ AC_DEFUN([ACX_YYLEX_DESTROY], [
 	if echo %% | $LEX -t 2>&1 | grep yylex_destroy >/dev/null 2>&1; then
 		AC_DEFINE(LEX_HAS_YYLEX_DESTROY, 1, [if lex has yylex_destroy])
 		AC_MSG_RESULT(yes)
-	else AC_MSG_RESULT(no); fi
+	else AC_MSG_RESULT(no);
+		LEX=":"
+	fi
 ])
 
 AC_DEFUN([ACX_YYLEX_OPTION], [
@@ -342,6 +344,8 @@ EOF
 AC_PROG_LEX
 if test "$LEX" != "" -a "$LEX" != ":"; then
 ACX_YYLEX_DESTROY
+fi
+if test "$LEX" != "" -a "$LEX" != ":"; then
 ACX_YYLEX_OPTION
 fi
 AC_PROG_YACC
diff --git a/doc/Changelog b/doc/Changelog
index 793c99f86..73f034fc5 100644
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,6 +1,8 @@
 3 August 2018: Wouter
 	- Revert previous change for #4136: because it introduces build
 	  problems.
+	- New fix for #4136: This one ignores lex without without
+	  yylex_destroy.
 
 1 August 2018: Wouter
 	- Fix to remove systemd sockaddr function check, that is not