diff options
| author | Lukas Larsson <[email protected]> | 2016-05-09 20:18:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-05-09 20:18:53 +0200 |
| commit | 929039adce30e62592cec1e8334dab99c4581b83 (patch) | |
| tree | e4362b3c7db9e9fb8f4e81086116e1daf1f72467 /lib | |
| parent | 2c3faa179d8c32f99d3a7365b808cbb746b36f38 (diff) | |
| parent | 98b8650d22e94a5ff839170833f691294f6276d0 (diff) | |
| download | otp-929039adce30e62592cec1e8334dab99c4581b83.tar.gz otp-929039adce30e62592cec1e8334dab99c4581b83.tar.bz2 otp-929039adce30e62592cec1e8334dab99c4581b83.zip | |
Merge branch 'binarin/fix-build-tool-paths/PR-1023/OTP-13562'
* binarin/fix-build-tool-paths/PR-1023/OTP-13562:
Fix program paths used in build process
Conflicts:
erts/configure.in
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/odbc/configure.in | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/odbc/configure.in b/lib/odbc/configure.in index 2871d91a1c..cb2b23d534 100644 --- a/lib/odbc/configure.in +++ b/lib/odbc/configure.in @@ -73,6 +73,16 @@ AC_CHECK_TOOL(LD, ld, '$(CC)') AC_SUBST(LD) +_search_path=/bin:/usr/bin:/usr/local/bin:$PATH + +AC_PATH_PROG(RM, rm, false, $_search_path) +if test "$ac_cv_path_RM" = false; then + AC_MSG_ERROR([No 'rm' command found]) +fi + +_search_path= + + # Sockets #-------------------------------------------------------------------- # Check for the existence of the -lsocket and -lnsl libraries. @@ -128,7 +138,7 @@ dnl Checks for library functions. AC_CHECK_FUNCS([memset socket]) # ODBC -/bin/rm -f "$ERL_TOP/lib/odbc/SKIP" +$RM -f "$ERL_TOP/lib/odbc/SKIP" LM_CHECK_THR_LIB AC_SUBST(THR_DEFS) |