- 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 8ef5da87bb3c5498d85903d4189e9aeddf724796..2b8a8c1b61d3a647957339acebd9c7b2c921ff39 100755 (executable)
--- 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 5888a05b9e692f0d584f72a246c6cdbb8643162e..966f2f73616254f5ce866d3adfa10db2c10222c6 100644 (file)
--- 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 793c99f86acf26526373074f15f283ffa620d188..73f034fc5224f816f2b2f1fbf5b6597edd5a3c82 100644 (file)
--- 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