Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .github/scripts/configure.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/sh

set -eu #Needed so CI fails when anything is wrong
set -x

#Any arguments are passed to configure

cd src
./autogen.sh
./configure "$@" --disable-check-runtime-deps --enable-werror
7 changes: 5 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,13 @@ jobs:
- name: Install dependencies
run: |
set -x
sudo apt-get -q update
.github/scripts/install-deps.sh
sudo apt-get --yes install shellcheck
- name: Configure
run: |
set -x
.github/scripts/configure.sh
- name: Shellcheck
continue-on-error: true
run: |
set -x
scripts/shellcheck.sh
Expand Down
4 changes: 2 additions & 2 deletions src/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ if test "xyes" = "x$RUN_IN_PLACE"; then
EMC2_PO_DIR=$EMC2_HOME/share/locale
EMC2_HELP_DIR=$EMC2_HOME/docs/help
EMC2_RTLIB_DIR=$EMC2_HOME/rtlib
LINUXCNC_CONFIG_PATH="~/linuxcnc/configs:$EMC2_HOME/configs"
LINUXCNC_CONFIG_PATH="\$HOME/linuxcnc/configs:$EMC2_HOME/configs"
LINUXCNC_CONFIG_PATH_TCL="$::env(HOME)/linuxcnc/configs:$EMC2_HOME/configs"
EMC2_NCFILES_DIR=$EMC2_HOME/nc_files
REALTIME=$EMC2_HOME/scripts/realtime
Expand All @@ -743,7 +743,7 @@ else
*/linuxcnc*) EMC2_RTLIB_DIR=$MODULE_DIR ;;
*) EMC2_RTLIB_DIR=$MODULE_DIR/linuxcnc
esac
LINUXCNC_CONFIG_PATH="~/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
LINUXCNC_CONFIG_PATH="\$HOME/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
LINUXCNC_CONFIG_PATH_TCL="$::env(HOME)/linuxcnc/configs:/usr/local/etc/linuxcnc/configs:"$(eval echo $EMC2_HELP_DIR)"/examples/sample-configs"
EMC2_NCFILES_DIR=${prefix}/share/linuxcnc/ncfiles
REALTIME=${prefix}/lib/linuxcnc/realtime
Expand Down
Loading