提交 d4138959 authored 作者: Stefan Knoblich's avatar Stefan Knoblich

freetdm: use m4_ifdef() to check for pkg-config macros and print a warning if…

freetdm: use m4_ifdef() to check for pkg-config macros and print a warning if they are not available

...instead of failing at runtime
Signed-off-by: 's avatarStefan Knoblich <s.knoblich@axsentis.de>
上级 ad7c7f13
...@@ -24,7 +24,12 @@ AC_PROG_MAKE_SET ...@@ -24,7 +24,12 @@ AC_PROG_MAKE_SET
AM_PROG_CC_C_O AM_PROG_CC_C_O
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
AC_PROG_INSTALL AC_PROG_INSTALL
PKG_PROG_PKG_CONFIG
# NOTE: pkg-config is used to detect libisdn
m4_ifdef([PKG_PROG_PKG_CONFIG],
[PKG_PROG_PKG_CONFIG],
[AC_MSG_WARN([pkg-config missing (required for libisdn detection)])]
)
AX_COMPILER_VENDOR AX_COMPILER_VENDOR
...@@ -305,41 +310,44 @@ AC_ARG_WITH([libisdn], ...@@ -305,41 +310,44 @@ AC_ARG_WITH([libisdn],
if test "${with_libisdn}" != "no" if test "${with_libisdn}" != "no"
then then
AC_MSG_RESULT([${as_nl}<<>> ftmod_isdn (libisdn stack)]) AC_MSG_RESULT([${as_nl}<<>> ftmod_isdn (libisdn stack)])
PKG_CHECK_MODULES([libisdn], m4_ifdef([PKG_CHECK_MODULES],
[libisdn >= 0.0.1], [PKG_CHECK_MODULES([libisdn],
[AC_MSG_CHECKING([libisdn version]) [libisdn >= 0.0.1],
LIBISDN_VERSION="`${PKG_CONFIG} --modversion libisdn`" [AC_MSG_CHECKING([libisdn version])
if test -z "${LIBISDN_VERSION}"; then LIBISDN_VERSION="`${PKG_CONFIG} --modversion libisdn`"
AC_MSG_ERROR([Failed to retrieve libisdn version]) if test -z "${LIBISDN_VERSION}"; then
fi AC_MSG_ERROR([Failed to retrieve libisdn version])
AC_MSG_RESULT([${LIBISDN_VERSION}]) fi
AC_MSG_RESULT([${LIBISDN_VERSION}])
# check features
AC_MSG_CHECKING([for new experimental API]) # check features
AC_COMPILE_IFELSE( AC_MSG_CHECKING([for new experimental API])
[AC_LANG_PROGRAM( AC_COMPILE_IFELSE(
[#include <libisdn/version.h> [AC_LANG_PROGRAM(
#if !LIBISDN_FEATURE(API2) [#include <libisdn/version.h>
#error "libisdn API v2 not available" #if !LIBISDN_FEATURE(API2)
#endif #error "libisdn API v2 not available"
], #endif
[;] ],
)], [;]
[AC_MSG_RESULT([yes])], )],
[AC_MSG_RESULT([no])] [AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])]
)
HAVE_LIBISDN="yes"
AC_DEFINE([HAVE_LIBISDN], [1], [libisdn support])
AC_SUBST([LIBISDN_CFLAGS], [${libisdn_CFLAGS}])
AC_SUBST([LIBISDN_CPPFLAGS],[${libisdn_CPPFLAGS}])
AC_SUBST([LIBISDN_LDFLAGS], [${libisdn_LDFLAGS}])
AC_SUBST([LIBISDN_LIBS], [${libisdn_LIBS}])
AC_SUBST([LIBISDN_VERSION])
],
[AC_MSG_ERROR([Need libisdn-0.0.1 or higher])]
) )
AX_LIB_PCAP],
HAVE_LIBISDN="yes" [AC_MSG_WARN([pkg-config missing (required for libisdn detection)])]
AC_DEFINE([HAVE_LIBISDN], [1], [libisdn support])
AC_SUBST([LIBISDN_CFLAGS], [${libisdn_CFLAGS}])
AC_SUBST([LIBISDN_CPPFLAGS],[${libisdn_CPPFLAGS}])
AC_SUBST([LIBISDN_LDFLAGS], [${libisdn_LDFLAGS}])
AC_SUBST([LIBISDN_LIBS], [${libisdn_LIBS}])
AC_SUBST([LIBISDN_VERSION])
],
[AC_MSG_ERROR([Need libisdn-0.0.1 or higher])]
) )
AX_LIB_PCAP
fi fi
AM_CONDITIONAL([HAVE_LIBISDN], [test "${HAVE_LIBISDN}" = "yes"]) AM_CONDITIONAL([HAVE_LIBISDN], [test "${HAVE_LIBISDN}" = "yes"])
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论