summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Thurston <thurston@complang.org>2013-05-11 16:00:12 +0000
committerAdrian Thurston <thurston@complang.org>2013-05-11 16:00:12 +0000
commit946e6c6c43b9b0f0949a3751b12c34ff28b2149b (patch)
tree014a769b5b5a4a942cffdad9d3ed9c75ad9028cd
parent31d181031a350c732f65c6fae201897081c1ded6 (diff)
downloadcolm-946e6c6c43b9b0f0949a3751b12c34ff28b2149b.tar.gz
don't need to check for ragel or kelbt
-rw-r--r--configure.in64
1 files changed, 3 insertions, 61 deletions
diff --git a/configure.in b/configure.in
index c3f51d88..c741a647 100644
--- a/configure.in
+++ b/configure.in
@@ -26,16 +26,11 @@ AM_INIT_AUTOMAKE([foreign])
AC_SUBST(PUBDATE)
AC_CONFIG_HEADER([colm/config.h colm/defs.h])
-dnl Choose defaults for the build_parsers and build_manual vars. If the dist
-dnl file is present in the root then default to no, otherwise go for it.
+dnl Choose a default for the build_manual var. If the dist file is present in
+dnl the root then default to no, otherwise go for it.
AC_CHECK_FILES( [$srcdir/DIST],
[. $srcdir/DIST;],
- [build_parsers=yes; build_manual=yes; ] )
-
-dnl Set to true if the build system should generate parsers from ragel and kelbt
-dnl sources. Set to false if generated files are included and not to be built
-dnl (production).
-AM_CONDITIONAL(BUILD_PARSERS, [test "x$build_parsers" = "xyes"])
+ [build_manual=yes; ] )
dnl Set to true if the manual should be built.
AM_CONDITIONAL(BUILD_MANUAL, [test "x$build_manual" = "xyes"])
@@ -72,59 +67,6 @@ AC_ARG_ENABLE(debug,
AC_HELP_STRING([--enable-debug], [enable debug statements]),
AC_DEFINE([DEBUG], [1], [enable debug statements]))
-if test "x$build_parsers" = "xyes"; then
-
-dnl Check for Ragel
-AC_ARG_WITH(ragel,
- [AC_HELP_STRING([--with-ragel], [location of ragel install])],
- [
- # with value specified
- RAGEL="$withval/bin/ragel"
- AC_CHECK_FILES(
- [$RAGEL],
- [],
- [AC_ERROR([ragel is required to build this package])]
- )
- ],
- [
- AC_CHECK_PROG(RAGEL, ragel, ragel)
- if test -z "$RAGEL"; then
- echo
- echo "error: ragel is required to build the parsers"
- echo
- exit 1
- fi
- ]
-)
-
-dnl Check for Kelbt
-AC_ARG_WITH(kelbt,
- [AC_HELP_STRING([--with-kelbt], [location of kelbt install])],
- [
- # with value specified
- KELBT="$withval/bin/kelbt"
- AC_CHECK_FILES(
- [$RAGEL],
- [],
- [AC_ERROR([kelbt is required to build this package])]
- )
- ],
- [
- AC_CHECK_PROG(KELBT, kelbt, kelbt)
- if test -z "$KELBT"; then
- echo
- echo "error: kelbt is required to build the parsers"
- echo
- exit 1
- fi
- ]
-)
-
-AC_SUBST(RAGEL)
-AC_SUBST(KELBT)
-
-fi # build_parsers
-
dnl write output files
AC_OUTPUT(Makefile colm/Makefile aapl/Makefile test/Makefile)