diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2018-01-09 05:38:15 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2018-01-09 05:38:15 -0600 |
| commit | 29d96b46f03a974ff0c5ea786ca36c90cbe95429 (patch) | |
| tree | 5d368e96716dc2d3e6a171b129584d5f55f38a37 | |
| parent | 7cc614d22363398747bd2c1aa81d3422cf2d07c5 (diff) | |
| parent | 440fb4d02b0c22643256ff9b9b1a94af4d367b1b (diff) | |
Merge "BuildSystem: Find ptlib-config on Debian/Ubuntu." into 13
| -rw-r--r-- | autoconf/ast_check_pwlib.m4 | 4 | ||||
| -rwxr-xr-x | configure | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/autoconf/ast_check_pwlib.m4 b/autoconf/ast_check_pwlib.m4 index 510881f3c..beaf8db74 100644 --- a/autoconf/ast_check_pwlib.m4 +++ b/autoconf/ast_check_pwlib.m4 @@ -103,7 +103,7 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then else AC_CHECK_HEADER(/usr/local/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make) + AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make) PWLIB_INCDIR="/usr/local/include" PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null` if test "${PWLIB_LIBDIR:-unset}" = "unset"; then @@ -121,7 +121,7 @@ if test "${HAS_PWLIB:-unset}" = "unset" ; then else AC_CHECK_HEADER(/usr/include/ptlib.h, HAS_PWLIB=1, ) if test "${HAS_PWLIB:-unset}" != "unset" ; then - AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make) + AC_PATH_PROG(PTLIB_CONFIG, ptlib-config, , /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make) PWLIB_INCDIR="/usr/include" PWLIB_LIBDIR=`${PTLIB_CONFIG} --pwlibdir 2>/dev/null` if test "${PWLIB_LIBDIR:-unset}" = "unset"; then @@ -28858,7 +28858,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/pwlib/make +for as_dir in /usr/local/bin$PATH_SEPARATOR/usr/local/share/ptlib/make$PATH_SEPARATOR/usr/local/share/pwlib/make do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. @@ -28920,7 +28920,7 @@ else ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/pwlib/make +for as_dir in /usr/bin$PATH_SEPARATOR/usr/share/ptlib/make$PATH_SEPARATOR/usr/share/pwlib/make do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. |