diff options
| author | Adrian Thurston <thurston@colm.net> | 2019-09-10 16:29:52 -0600 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2019-09-10 16:29:52 -0600 |
| commit | cf4bfd8cc0958798610d51035e029d52621ca035 (patch) | |
| tree | 0623948b0377212e4a2d8f5a5b7eb10693cf6985 /configure.ac | |
| parent | 0eadae82699035bb9eda0cf979b33116aa8c84cc (diff) | |
| download | colm-cf4bfd8cc0958798610d51035e029d52621ca035.tar.gz | |
don't depend on crack being installed
if --with-crack is not given, attempt to locate it
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 5590f114..d1c060d2 100644 --- a/configure.ac +++ b/configure.ac @@ -115,22 +115,14 @@ AM_CONDITIONAL([LINKER_NO_UNDEFINED], [test "x$host_os" = "xlinux-gnu"]) # COLM='$(top_srcdir)/colm/colm' COLM_LD='$(top_srcdir)/colm/libcolm.la' -COLM_LIBDEP=$COLM_LD -COLM_BINDEP=$COLM +COLM_LIBDEP="${COLM_LD}" +COLM_BINDEP="${COLM}" AC_SUBST(COLM) AC_SUBST(COLM_LD) AC_SUBST(COLM_LIBDEP) AC_SUBST(COLM_BINDEP) -AC_ARG_WITH(crack, - [AC_HELP_STRING([--with-crack], [location of crack install])], - [CRACK_BIN="$withval/bin/crack"], - [AC_ERROR(["require --with-crack"])] -) - -AC_SUBST(CRACK_BIN) - dnl dnl Which installed target to test. Without this option supplied testing is dnl done against what's in the source tree. @@ -197,8 +189,18 @@ AC_SUBST(RAGEL_BIN) AC_SUBST(RAGEL_CPPFLAGS) AC_SUBST(RAGEL_LDFLAGS) AC_SUBST(RAGEL_LM) + +AC_ARG_WITH(crack, + [AC_HELP_STRING([--with-crack], [location of crack install])], + [CRACK_BIN="$withval/bin/crack"], + [AC_PATH_PROG([CRACK_BIN], [crack])] +) + +AC_SUBST(CRACK_BIN) SED_SUBST=["\ + -e 's|@CXX@|${CXX}|g' \ + -e 's|@CC@|${CC}|g' \ -e 's|@COLM@|${COLM}|g' \ -e 's|@COLM_LD@|${COLM_LD}|g' \ -e 's|@COLM_LIBDEP@|${COLM_LIBDEP}|g' \ @@ -222,8 +224,6 @@ SED_SUBST=["\ -e 's|@RAGEL_CRACK_BIN@|${RAGEL_CRACK_BIN}|g' \ -e 's|@RAGEL_JULIA_BIN@|${RAGEL_JULIA_BIN}|g' \ -e 's|@CRACK_BIN@|${CRACK_BIN}|g' \ - -e 's|@CXX@|${CXX}|g' \ - -e 's|@CC@|${CC}|g' \ "] AC_SUBST(SED_SUBST) |