Ok, I'v testing it on a few more machines.
It looks like the quotes were needed. I have zaptel showing up in the
opbx cli.
Mike
Mike Fedyk wrote:
Has anyone tested this patch? I'm waiting for some kind of response...
Mike Fedyk wrote:
Mike Fedyk wrote:
It turns out that configure should be checking for struct
zt_radio_stat, and ${ZAPTEL_V12_OR_HIGHER} should be set to "yes"
instead of "1" because the test (two lines below) uses that value.
With this patch I can use zaptel in the latest 1.2 svn (it works with
1.2.12 also).
There was one more problem. The tests were working properly for
zaptel.h, zaptel/zaptel.h and linux/zaptel.h, but the results of the
tests wasn't being used. This patch uses the results of the tests for
the include and takes out the forced quoting within the variable since
all uses of that variable are quoted and quotes weren't working very
well within the brackets.
Give this a try. It should work with all of the test cases that are
there now. With this patch, zaptel works with openpbx without making
any symlinks anywhere else in the system. That's why it was working on
my laptop. I had a symlink from /usr/include/zaptel.h ->
/usr/include/linux/zaptel.h.
Mike
------------------------------------------------------------------------
Index: configure.ac
===================================================================
--- configure.ac (revision 2490)
+++ configure.ac (working copy)
@@ -1053,24 +1053,24 @@
[AC_HELP_STRING([--enable-zaptel],[Enable support for Zaptel
(default=yes)])],,[enable_zaptel="yes"])
if test "${enable_zaptel}" = "yes"; then
- AC_CHECK_HEADERS([zaptel/zaptel.h], [ZAPTEL_H="\"zaptel/zaptel.h\""])
+ AC_CHECK_HEADERS([zaptel/zaptel.h], [ZAPTEL_H="zaptel/zaptel.h"])
if test -z "${ZAPTEL_H}"; then
- AC_CHECK_HEADERS([zaptel.h], [ZAPTEL_H="\"zaptel.h\""])
+ AC_CHECK_HEADERS([zaptel.h], [ZAPTEL_H="zaptel.h"])
fi
if test -z "${ZAPTEL_H}"; then
- AC_CHECK_HEADERS([linux/zaptel.h], [ZAPTEL_H="\"linux/zaptel.h\""])
+ AC_CHECK_HEADERS([linux/zaptel.h], [ZAPTEL_H="linux/zaptel.h"])
fi
- AC_CHECK_HEADERS([zaptel/tonezone.h], [TONEZONE_H="\"zaptel/tonezone.h\""])
+ AC_CHECK_HEADERS([zaptel/tonezone.h], [TONEZONE_H="zaptel/tonezone.h"])
if test -z "${TONEZONE_H}"; then
- AC_CHECK_HEADERS([tonezone.h], [TONEZONE_H="\"tonezone.h\""])
+ AC_CHECK_HEADERS([tonezone.h], [TONEZONE_H="tonezone.h"])
fi
AC_DEFINE_UNQUOTED([ZAPTEL_H], [${ZAPTEL_H}], [Location of zaptel.h header file])
AC_DEFINE_UNQUOTED([TONEZONE_H], [${TONEZONE_H}], [Location of tonezone.h
header file])
if test -n "${ZAPTEL_H}"; then
- AC_CHECK_TYPES(zt_radio_stat,[ZAPTEL_V12_OR_HIGHER=1],,[#include
<zaptel.h>])
+ AC_CHECK_TYPES(struct zt_radio_stat,[ZAPTEL_V12_OR_HIGHER="yes"],,[#include
<${ZAPTEL_H}>])
if test "${ZAPTEL_V12_OR_HIGHER}" = "yes"; then
AC_MSG_NOTICE([Zaptel appears to be version 1.2 or higher -- ok.])
------------------------------------------------------------------------
_______________________________________________
Openpbx-dev mailing list
[email protected]
http://lists.openpbx.org/mailman/listinfo/openpbx-dev
_______________________________________________
Openpbx-dev mailing list
[email protected]
http://lists.openpbx.org/mailman/listinfo/openpbx-dev
Index: configure.ac
===================================================================
--- configure.ac (revision 2490)
+++ configure.ac (working copy)
@@ -1070,9 +1070,9 @@
AC_DEFINE_UNQUOTED([TONEZONE_H], [${TONEZONE_H}], [Location of tonezone.h header file])
if test -n "${ZAPTEL_H}"; then
- AC_CHECK_TYPES(zt_radio_stat,[ZAPTEL_V12_OR_HIGHER=1],,[#include <zaptel.h>])
+ AC_CHECK_TYPES(struct zt_radio_stat,[ZAPTEL_V12_OR_HIGHER=1],,[#include ${ZAPTEL_H}])
- if test "${ZAPTEL_V12_OR_HIGHER}" = "yes"; then
+ if test "${ZAPTEL_V12_OR_HIGHER}" = "1"; then
AC_MSG_NOTICE([Zaptel appears to be version 1.2 or higher -- ok.])
AC_CHECK_LIB([tonezone], [main], [HAVE_LIBTONEZONE=1])
AC_CHECK_LIB([pri], [main], [HAVE_LIBPRI=1])
_______________________________________________
Openpbx-dev mailing list
[email protected]
http://lists.openpbx.org/mailman/listinfo/openpbx-dev
