X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/f78c5d06a8775b33890071166d56be82d9233c8b..e92ef179a31b2357ec1dcec634767d7d1eed97e3:/configure.ac

diff --git a/configure.ac b/configure.ac
index a0bf6b1..0784644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,13 +5,22 @@ 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.1a], [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
 
+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,8 +48,8 @@ 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__])
@@ -48,8 +61,12 @@ m4_traceoff([AM_GNU_GETTEXT])
 AM_GNU_GETTEXT([external])
 DX_LINGUAS
 
-DX_PROG_FLEX([], [], [FLEX=false])
-DX_PROG_BISON([], [], [BISON=false])
+DX_PROG_FLEX([], [have_flex=yes], [have_flex=no])
+AM_CONDITIONAL([HAVE_FLEX], [test x"$have_flex" = x"yes"])
+
+DX_PROG_BISON([], [have_bison=yes], [have_bison=no])
+AM_CONDITIONAL([HAVE_BISON], [test x"$have_bison" = x"yes"])
+
 DX_BISON_COMPAT
 BISON_I18N