diff options
author | Adrian Thurston <thurston@colm.net> | 2019-12-22 21:17:37 +0200 |
---|---|---|
committer | Adrian Thurston <thurston@colm.net> | 2019-12-22 21:17:37 +0200 |
commit | cdaa1ab24a06ccbf71987b1516a96028a9c61b67 (patch) | |
tree | ae78c9b7dc60c69e6c7a0cf9d5e67dc446a78301 | |
parent | ca2fc51203d0539934dcf49d2d9c7592cebb96d7 (diff) | |
download | colm-cdaa1ab24a06ccbf71987b1516a96028a9c61b67.tar.gz |
with-colm build: need to make tar dir, added a check for the colm bin
-rw-r--r-- | colm/Makefile.am | 2 | ||||
-rw-r--r-- | configure.ac | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/colm/Makefile.am b/colm/Makefile.am index 3586ab7e..583aae43 100644 --- a/colm/Makefile.am +++ b/colm/Makefile.am @@ -162,7 +162,7 @@ bootstrap2_LDADD = libprog.a libcolm.la endif tar/bootstrap3.tar: $(BUILD_PARSE_3_WITH) prog.lm colm.lm - mkdir -p gen + mkdir -p tar gen $(BUILD_PARSE_3_WITH) -c -o tar/parse3.c -e tar/if3.h -x tar/if3.cc prog.lm tar -C tar -cf tar/bootstrap3.tar parse3.c if3.h if3.cc diff --git a/configure.ac b/configure.ac index 88d8493c..5e1b9ee4 100644 --- a/configure.ac +++ b/configure.ac @@ -334,10 +334,15 @@ SED_SUBST="$SED_SUBST -e 's|@CRACK_BIN@|${CRACK_BIN}|g'" AC_SUBST(CRACK_BIN) -dnl Generic dependency specification. +dnl Skip bootstrap and build using an existing version of colm. Allows us to +dnl break colm without breaking the build of colm. AC_ARG_WITH(colm, - [AC_HELP_STRING([--with-colm], [colm install to build bootstrap programs])], - [EXTERNAL_COLM="$withval"], + [AC_HELP_STRING([--with-colm], [prefix of colm install to build with, instead of bootstrapping])], + [ + EXTERNAL_COLM="$withval" + AC_CHECK_FILES(["$EXTERNAL_COLM/bin/colm"], [], + [AC_ERROR(["could not find $EXTERNAL_COLM/bin/colm"])]) + ], [] ) |