Skip to content
Snippets Groups Projects
Commit 88651489 authored by Houtan Bastani's avatar Houtan Bastani
Browse files

build system: replace hard-coded flex include dir with that found by autoconf, #575

parent dd2aa846
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
configure.ac
+ 4
− 1
View file @ 88651489
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl Copyright (C) 2009-2013 Dynare Team dnl Copyright (C) 2009-2014 Dynare Team
dnl dnl
dnl This file is part of Dynare. dnl This file is part of Dynare.
dnl dnl
...@@ -62,6 +62,9 @@ AX_PROG_LN_S ...@@ -62,6 +62,9 @@ AX_PROG_LN_S
AC_PROG_MKDIR_P AC_PROG_MKDIR_P
AM_PROG_LEX AM_PROG_LEX
# Hack to get lex include dir, ticket #575
AC_PATH_PROG([LEXPATH], [$LEX])
AC_SUBST([LEXINC], [`eval "echo $LEXPATH | sed 's|$LEX$|../include|'"`])
AC_CHECK_PROG([YACC], [bison], [bison]) AC_CHECK_PROG([YACC], [bison], [bison])
if test "x$YACC" = "x"; then if test "x$YACC" = "x"; then
......
preprocessor/Makefile.am
+ 1
− 1
View file @ 88651489
...@@ -61,7 +61,7 @@ dynare_m_LDADD = macro/libmacro.a ...@@ -61,7 +61,7 @@ dynare_m_LDADD = macro/libmacro.a
DynareFlex.cc FlexLexer.h: DynareFlex.ll DynareFlex.cc FlexLexer.h: DynareFlex.ll
$(LEX) -oDynareFlex.cc DynareFlex.ll $(LEX) -oDynareFlex.cc DynareFlex.ll
cp /usr/include/FlexLexer.h . cp $(LEXINC)/FlexLexer.h .
DynareBison.cc DynareBison.hh location.hh stack.hh position.hh: DynareBison.yy DynareBison.cc DynareBison.hh location.hh stack.hh position.hh: DynareBison.yy
$(YACC) -o DynareBison.cc DynareBison.yy $(YACC) -o DynareBison.cc DynareBison.yy
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment