X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/24a138b38b11dcfc5f7c360d601244af14c5488a..55e350dc7050d5384f8d33a1583d6c8d8da4e1c3:/configure.ac diff --git a/configure.ac b/configure.ac index eed1a19..90440e3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,14 @@ -dnl Copyright © 2011-2013, 2020 Nick Bowler +dnl Copyright © 2011-2013, 2020-2021 Nick Bowler dnl dnl License WTFPL2: Do What The Fuck You Want To Public License, version 2. dnl This is free software: you are free to do what the fuck you want to. dnl There is NO WARRANTY, to the extent permitted by law. AC_PREREQ([2.68]) -AC_INIT([cdecl99], [0.1], [nbowler@draconx.ca]) -AC_CONFIG_HEADER([config.h]) +AC_INIT([cdecl99], [1], [nbowler@draconx.ca]) +AC_CONFIG_HEADERS([config.h]) -AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects]) +AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz]) AM_SILENT_RULES([yes]) DX_AUTOMAKE_COMPAT @@ -48,15 +48,22 @@ m4_traceoff([AM_GNU_GETTEXT]) AM_GNU_GETTEXT([external]) DX_LINGUAS -AC_ARG_VAR([FLEX], [Command to invoke flex. Defaults to flex.]) -AC_ARG_VAR([FLEXFLAGS], [Additional options to pass to flex.]) -AC_CHECK_PROGS([FLEX], [flex], [flex]) +DX_PROG_FLEX([], [have_flex=yes], [have_flex=no]) +AM_CONDITIONAL([HAVE_FLEX], [test x"$have_flex" = x"yes"]) -AC_ARG_VAR([BISON], [Command to invoke GNU Bison. Defaults to bison.]) -AC_ARG_VAR([BISONFLAGS], [Additional options to pass to Bison.]) -AC_CHECK_PROGS([BISON], [bison], [bison]) +DX_PROG_BISON([], [have_bison=yes], [have_bison=no]) +AM_CONDITIONAL([HAVE_BISON], [test x"$have_bison" = x"yes"]) + +DX_BISON_COMPAT BISON_I18N +BISON_COMPAT= +AS_IF([test x"$dx_cv_bison_api_header_include" = x"yes"], + [BISON_COMPAT="'--define=api.header.include={\"\$(*F).h\"}'"]) +AS_IF([test x"$dx_cv_bison_warn_no_deprecated" = x"yes"], + [AS_VAR_APPEND([BISON_COMPAT], ["${BISON_COMPAT:+ }-Wno-deprecated"])]) +AC_SUBST([BISON_COMPAT]) + AH_TOP([#include ]) AH_BOTTOM([#include ]) @@ -71,7 +78,7 @@ AS_CASE([$with_gsl], [DX_CHECK_GSL([1.0], [have_gsl=yes], [have_gsl=no])]) AM_CONDITIONAL([HAVE_GSL], [test x"$have_gsl" = x"yes"]) -AC_CONFIG_TESTDIR([.]) +AC_CONFIG_TESTDIR([.], [test:.]) DX_PROG_AUTOTEST AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"])