diff options
| author | Adrian Thurston <thurston@colm.net> | 2019-12-18 16:49:34 +0200 |
|---|---|---|
| committer | Adrian Thurston <thurston@colm.net> | 2019-12-18 16:49:34 +0200 |
| commit | cebe9ff64f5d4b2da3331483a22d73712014df51 (patch) | |
| tree | bc06d988c08ad9dbd15941a6c5d524ff4e2ea345 | |
| parent | fdc9ccb6f104b720a1966ebfe1003f9c8f7939e8 (diff) | |
| download | colm-cebe9ff64f5d4b2da3331483a22d73712014df51.tar.gz | |
don't run objective-c tests if gnustep config is not available
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | test/ragel.d/gentests.sh | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2f6cc116..4e144a79 100644 --- a/configure.ac +++ b/configure.ac @@ -260,6 +260,7 @@ AC_PATH_PROG([GO_BIN], [go]) AC_PATH_PROG([OCAML_BIN], [ocaml]) AC_PATH_PROG([RUST_BIN], [rustc]) AC_PATH_PROG([JULIA_BIN], [julia]) +AC_PATH_PROG([GNUSTEP_CONFIG], [gnustep-config]) echo -n "checking if julia is able to run programs ... " @@ -283,6 +284,7 @@ SED_SUBST="$SED_SUBST -e 's|@GO_BIN@|${GO_BIN}|g'" SED_SUBST="$SED_SUBST -e 's|@OCAML_BIN@|${OCAML_BIN}|g'" SED_SUBST="$SED_SUBST -e 's|@RUST_BIN@|${RUST_BIN}|g'" SED_SUBST="$SED_SUBST -e 's|@JULIA_BIN@|${JULIA_BIN}|g'" +SED_SUBST="$SED_SUBST -e 's|@GNUSTEP_CONFIG@|${GNUSTEP_CONFIG}|g'" AC_ARG_WITH(crack, [AC_HELP_STRING([--with-crack], [location of crack install])], diff --git a/test/ragel.d/gentests.sh b/test/ragel.d/gentests.sh index 57c54a91..941ef448 100644 --- a/test/ragel.d/gentests.sh +++ b/test/ragel.d/gentests.sh @@ -107,6 +107,11 @@ ocaml_compiler="@OCAML_BIN@" rust_compiler="@RUST_BIN@" crack_interpreter="@CRACK_BIN@" julia_interpreter="@JULIA_BIN@" +gnustep_config="@GNUSTEP_CONFIG@" + +if [ -z "$gnustep_config" ]; then + objc_compiler="" +fi function test_error { @@ -183,7 +188,11 @@ function lang_opts() interpreted=false compiler=$objc_compiler host_ragel=$RAGEL_BIN - flags="`gnustep-config --objc-flags`" + if [ -z "$gnustep_config" ]; then + flags="" + else + flags="`$gnustep_config --objc-flags`" + fi libs="-lobjc -lgnustep-base" prohibit_flags="" ;; |