X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/a5bd3ad316db03f0e4de775908a920a3833f2a26..ae2e55ea361bf632ba771264e07ec674123b0446:/configure.ac diff --git a/configure.ac b/configure.ac index 5fd17d6..4c906c0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,17 +1,26 @@ -dnl Copyright © 2011-2013, 2020-2021 Nick Bowler +dnl Copyright © 2011-2013, 2020-2022 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], [1a], [nbowler@draconx.ca]) +AC_INIT([cdecl99], [1.2], [nbowler@draconx.ca]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign subdir-objects dist-xz]) AM_SILENT_RULES([yes]) DX_AUTOMAKE_COMPAT +AC_ARG_WITH([readline], + [AS_HELP_STRING([--with-readline], + [use GNU readline for line-editing functionality (default: auto)])], + [], [with_readline=auto]) +AS_CASE([$with_readline], + [no], [gl_cv_lib_readline=no], + [yes|auto], [:], + [*], [AC_MSG_ERROR([invalid option --with-readline=$with_readline])]) + AC_PROG_CC_C99 AM_PROG_CC_C_O gl_EARLY @@ -19,6 +28,10 @@ gl_EARLY LT_INIT gl_INIT +AS_IF([test x"$gl_cv_lib_readline" = x"no"], + [AS_IF([test x"$with_readline" = x"yes"], + [AC_MSG_FAILURE([--with-readline requested but readline was not found])], + [dx_cv_rl_add_history=no])]) AC_CACHE_CHECK([if readline supports add_history], [dx_cv_rl_add_history], [dnl dx_cv_rl_add_history=no dx_save_libs=$LIBS @@ -35,11 +48,13 @@ LIBS=$dx_save_libs ]) AS_IF([test x"$dx_cv_rl_add_history" = x"yes"], - [AC_DEFINE([HAVE_RL_ADD_HISTORY], [1], - [Define to 1 if readline supports add_history.])]) + [AC_DEFINE([HAVE_RL_ADD_HISTORY], [1], + [Define to 1 if readline supports add_history.])]) m4_include([lib/gnulib.mk]) -DX_GLSYM_PREFIX([cdecl__]) +DX_GLSYM_PREFIX([cdecl__gl_]) +DX_GNULIB_SYMFILES([lib/symfiles], [s]) +AM_CONDITIONAL([BUILD_STATIC], [test x"$enable_static" = x"yes"]) dnl We provide our own makefile rules for gettext. Disable tracing of dnl AM_GNU_GETTEXT to prevent autoreconf from running autopoint, and to @@ -48,6 +63,8 @@ m4_traceoff([AM_GNU_GETTEXT]) AM_GNU_GETTEXT([external]) DX_LINGUAS +AM_CONDITIONAL([USE_NLS], [test x"$USE_NLS" = x"yes"]) + DX_PROG_FLEX([], [have_flex=yes], [have_flex=no]) AM_CONDITIONAL([HAVE_FLEX], [test x"$have_flex" = x"yes"]) @@ -67,20 +84,10 @@ AC_SUBST([BISON_COMPAT]) AH_TOP([#include ]) AH_BOTTOM([#include ]) -AC_ARG_WITH([gsl], - [AS_HELP_STRING([--with-gsl], - [specify whether to build test programs requiring the GNU Scientific Library. [default=auto]] - )], [with_gsl=$withval], [with_gsl=auto]) - -AS_CASE([$with_gsl], - [no], [have_gsl=no], - [yes], [DX_CHECK_GSL([1.0], [have_gsl=yes])], - [DX_CHECK_GSL([1.0], [have_gsl=yes], [have_gsl=no])]) -AM_CONDITIONAL([HAVE_GSL], [test x"$have_gsl" = x"yes"]) - AC_CONFIG_TESTDIR([.], [test:.]) DX_PROG_AUTOTEST AM_CONDITIONAL([HAVE_AUTOTEST], [test x"$dx_cv_autotest_works" = x"yes"]) +AC_CHECK_FUNCS_ONCE([strtoull __strtoull]) AC_CONFIG_FILES([ Makefile