diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-01 10:34:20 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-05-01 10:34:20 +0000 |
commit | 152144cce7376dcc1e512ffd095e7d7287706422 (patch) | |
tree | 2d67e705d9c17d2a3bd1523ac4718765a2b381f8 /acinclude.m4 | |
parent | 027ba007a974156a14f427e43a800252bc9c6c72 (diff) |
don't put bogus paths like -L/lib into link commands
do the QT check properly
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@23897 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'acinclude.m4')
-rw-r--r-- | acinclude.m4 | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 584f5e971..cceb7bc70 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -19,14 +19,18 @@ esac PBX_LIB$1=0 -if test "${USE_$1}" != "no"; then - AC_CHECK_LIB([$1], [$2], [:], [], -L${$1_DIR}/lib $6) +if test "${USE_$1}" != "no"; then + libdir="" + if test "x${$1_DIR}" != "x"; then + libdir="-L${$1_DIR}/lib" + fi + AC_CHECK_LIB([$1], [$2], [:], [], ${libdir} $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="-L${$1_DIR}/lib ${$1_LIB}" + $1_LIB="${libdir} ${$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] ) |