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 | |
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
-rw-r--r-- | acinclude.m4 | 10 | ||||
-rw-r--r-- | configure.ac | 115 |
2 files changed, 71 insertions, 54 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] ) diff --git a/configure.ac b/configure.ac index bc3fd3ea8..0dd06da4f 100644 --- a/configure.ac +++ b/configure.ac @@ -175,27 +175,26 @@ AST_EXT_LIB([vorbis], [vorbis_info_init], [vorbis/codec.h], [VORBIS], [Vorbis], AST_EXT_LIB([z], [compress], [zlib.h], [ZLIB], [zlib]) PBX_LIBossaudio=0 -if test "x${PBX_OSTYPE}" = "xLinux" ; then - AC_CHECK_HEADER([linux/soundcard.h], - [PBX_LIBossaudio=1 - AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library]) - ]) -elif test "x${PBX_OSTYPE}" = "xFreeBSD" ; then +AC_CHECK_HEADER([linux/soundcard.h], + [ + PBX_LIBossaudio=1 + AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library]) + ]) +if test "$PBX_LIBossaudio" = "0"; then AC_CHECK_HEADER([sys/soundcard.h], - [PBX_LIBossaudio=1 - AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library]) - ]) -elif test "x${PBX_OSTYPE}" = "xOpenBSD" ; then - AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System]) -elif test "x${PBX_OSTYPE}" = "xNetBSD" ; then + [ + PBX_LIBossaudio=1 + AC_DEFINE_UNQUOTED([HAVE_OSS], 1, [Define to indicate the Open Sound System library]) + ]) +fi +if test "$PBX_LIBossaudio" = "0"; then AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [soundcard.h], [OSS], [Open Sound System]) fi AC_SUBST([PBX_LIBossaudio]) -if test "x${PBX_OSTYPE}" = "xLinux" ; then - AST_EXT_LIB([tonezone], [tone_zone_find], [linux/zaptel.h], [ZAPTEL], [Zaptel]) -else +AST_EXT_LIB([tonezone], [tone_zone_find], [linux/zaptel.h], [ZAPTEL], [Zaptel]) +if test "$PBX_LIBtonezone" = "0"; then AST_EXT_LIB([tonezone], [tone_zone_find], [zaptel.h], [ZAPTEL], [Zaptel], [-lm]) fi @@ -222,12 +221,16 @@ PBX_LIBgsm=0 if test "${USE_GSM}" != "no"; then if test "${GSM_SYSTEM}" = "yes"; then + libdir="" + if test "x${GSM_DIR}" != "x"; then + libdir="-L${GSM_DIR}/lib" + fi AC_CHECK_LIB([gsm], [gsm_create], AC_DEFINE_UNQUOTED([HAVE_GSM], 1, - [Define to indicate the GSM library]), [], -L${GSM_DIR}/lib) + [Define to indicate the GSM library]), [], ${libdir}) if test "${ac_cv_lib_gsm_gsm_create}" = "yes"; then gsm_LIB="-lgsm" if test "x${GSM_DIR}" != "x"; then - gsm_LIB="-L${GSM_DIR}/lib ${gsm_LIB}" + gsm_LIB="${libdir} ${gsm_LIB}" gsm_INCLUDE="-I${GSM_DIR}/include" fi PBX_LIBgsm=1 @@ -339,7 +342,7 @@ if test "${USE_VPB}" != "no"; then echo -n "checking for vpb_open in -lvpb..." saved_libs="${LIBS}" saved_cppflags="${CPPFLAGS}" - if test "x${VPB_DIR}" != "x" ; then + if test "x${VPB_DIR}" != "x"; then LIBS="${LIBS} -L${VPB_DIR}/lib" CPPFLAGS="${CPPFLAGS} -I${VPB_DIR}/include" fi @@ -399,50 +402,63 @@ esac PBX_QT=0 if test "${USE_QT}" != "no"; then echo -n "checking for QDate in -lqt..." - saved_ldflags="${LDFLAGS}" - LDFLAGS="${LDFLAGS} -L${QT_DIR}/lib -lqt" + saved_libs="${LIBS}" + saved_cppflags="${CPPFLAGS}" + if test "x${QT_DIR}" != "x"; then + LIBS="${LIBS} -L${QT_DIR}/lib" + CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include" + fi + LIBS="${LIBS} -lqt" qtlib="qt" - AC_LINK_IFELSE( + AC_LINK_IFELSE( [ AC_LANG_PROGRAM( - [#include "${QT_DIR}include/qdatetime.h"], + [#include <qt3/qdatetime.h>], [QDate date();]) ], [ac_cv_lib_qt_qt_date="yes"], [ac_cv_lib_qt_qt_date="no"]) - - if test "${ac_cv_lib_qt_qt_date}" = "no"; then - qtlib="qt-mt" - LDFLAGS="${saved_ldflags} -L${QT_DIR}/lib -lqt-mt" - AC_LINK_IFELSE( + LIBS="${saved_libs}" + CPPFLAGS="${saved_cppflags}" + + if test "${ac_cv_lib_qt_qt_date}" = "no"; then + saved_libs="${LIBS}" + saved_cppflags="${CPPFLAGS}" + if test "x${QT_DIR}" != "x"; then + LIBS="${LIBS} -L${QT_DIR}/lib" + CPPFLAGS="${CPPFLAGS} -I${QT_DIR}/include" + fi + LIBS="${LIBS} -lqt-mt" + qtlib="qt-mt" + AC_LINK_IFELSE( [ AC_LANG_PROGRAM( - [#include "${QT_DIR}include/qdatetime.h"], + [#include <qt3/qdatetime.h>], [QDate date();]) ], [ac_cv_lib_qt_qt_date="yes"], [ac_cv_lib_qt_qt_date="no"]) - fi - - LDFLAGS="${saved_ldflags}" - - if test "${ac_cv_lib_qt_qt_date}" = "yes"; then - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - fi + LIBS="${saved_libs}" + CPPFLAGS="${saved_cppflags}" + fi + + if test "${ac_cv_lib_qt_qt_date}" = "yes"; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi - if test "${ac_cv_lib_qt_qt_date}" = "yes"; then - QT_LIB="-l${qtlib}" - if test "${QT_DIR}" != ""; then - QT_LIB="-L${QT_DIR}/lib ${QT_LIB}" - QT_INCLUDE="-I${QT_DIR}/include" - AC_SUBST([QT_INCLUDE]) - fi - AC_SUBST([QT_LIB]) - PBX_QT=1 - AC_DEFINE([HAVE_LIBQT], 1, [Define if your system has the Qt library]) - AC_PATH_TOOL(QTMOC, moc, No) + if test "${ac_cv_lib_qt_qt_date}" = "yes"; then + QT_LIB="-l${qtlib}" + if test "${QT_DIR}" != ""; then + QT_LIB="-L${QT_DIR}/lib ${QT_LIB}" + QT_INCLUDE="-I${QT_DIR}/include" + AC_SUBST([QT_INCLUDE]) + fi + AC_SUBST([QT_LIB]) + PBX_QT=1 + AC_DEFINE([HAVE_LIBQT], 1, [Define if your system has the Qt library]) + AC_PATH_TOOL(QTMOC, moc, No) elif test ! -z "${QT_MANDATORY}"; then echo "***" @@ -454,9 +470,6 @@ if test "${USE_QT}" != "no"; then fi AC_SUBST([PBX_QT]) - - - AC_ARG_WITH([kde], AC_HELP_STRING([--with-kde=PATH],[use KDE files in PATH]),[ case ${withval} in n|no) |