diff options
author | Russell Bryant <russell@russellbryant.com> | 2006-05-19 18:54:21 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2006-05-19 18:54:21 +0000 |
commit | 9993d14f8689b272542c435848e7e7d2aa398d5f (patch) | |
tree | 452ffd36be0539c3e303afc121c739eed16e76c5 /acinclude.m4 | |
parent | d0c36296d29df95c68f219cc21baee6b5fa90e73 (diff) |
add support for more refined ability to set install paths using the standard
options to configure such as --libdir, --sbindir, etc. All of the default paths
are still the same. (issue #7057, jcollie)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@28747 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index cceb7bc70..7ab203300 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -20,17 +20,17 @@ esac PBX_LIB$1=0 if test "${USE_$1}" != "no"; then - libdir="" + pbxlibdir="" if test "x${$1_DIR}" != "x"; then - libdir="-L${$1_DIR}/lib" + pbxlibdir="-L${$1_DIR}/lib" fi - AC_CHECK_LIB([$1], [$2], [:], [], ${libdir} $6) + AC_CHECK_LIB([$1], [$2], [:], [], ${pbxlibdir} $6) if test "${ac_cv_lib_$1_$2}" = "yes"; then $1_LIB="-l$1 $6" $4_HEADER_FOUND="1" if test "x${$1_DIR}" != "x"; then - $1_LIB="${libdir} ${$1_LIB}" + $1_LIB="${pbxlibdir} ${$1_LIB}" $1_INCLUDE="-I${$1_DIR}/include" if test "x$3" != "x" ; then AC_CHECK_HEADER([${$1_DIR}/include/$3], [$4_HEADER_FOUND=1], [$4_HEADER_FOUND=0] ) |