diff options
| author | Adrian Thurston <thurston@colm.net> | 2021-01-18 13:32:46 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 13:32:46 -0800 |
| commit | 627b71cf04f294872ad0458d4021553d844a2f51 (patch) | |
| tree | 5ddda847084488acfa8f2ccc8c8125a98d27f5d6 | |
| parent | 2c520d84df2463d69a28dba9fff5648a841bad74 (diff) | |
| parent | 25f93dbfae301d25372c91bd00e6cce836b0886f (diff) | |
| download | colm-627b71cf04f294872ad0458d4021553d844a2f51.tar.gz | |
Merge pull request #124 from Grommish/pr
Correct for cross-compiling
| -rw-r--r-- | configure.ac | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 612cc698..30e37b76 100644 --- a/configure.ac +++ b/configure.ac @@ -85,9 +85,13 @@ AM_CONDITIONAL([BUILD_MANUAL], [test "x$ASCIIDOC" != x && test "x$PYGMENTIZE" != 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. +if test "$cross_compiling" != "yes"; then AC_CHECK_FILES( [$srcdir/DIST], [. $srcdir/DIST;], [build_manual=yes; ] ) +else +AS_IF([test -a "$srcdir/DIST"], [build_manual="yes"], []) +fi dnl dnl Enable arg to explicitly control the building of the manual @@ -390,8 +394,13 @@ AC_ARG_WITH(colm, EXTERNAL_COLM="$withval" EXTERNAL_INC="-I$withval/include" EXTERNAL_LIBS="-L$withval/lib" + if test "$cross_compiling" != "yes"; then AC_CHECK_FILES(["$EXTERNAL_COLM/bin/colm"], [], [AC_ERROR(["could not find $EXTERNAL_COLM/bin/colm"])]) + else + AS_IF([test -a "$EXTERNAL_COLM/bin/colm"], [], + AC_ERROR(["could not find $EXTERNAL_COLM/bin/colm"])) + fi ], [] ) |