[asterisk-commits] mmichelson: trunk r92422 - in /trunk: ./ channels/ include/asterisk/

[SVN commits to the Asterisk project]

Author: mmichelson
Date: Tue Dec 11 16:10:43 2007
New Revision: 92422

URL: http://svn.digium.com/view/asterisk?view=rev&rev=92422
Log:
Trunk build would fail due to the nonexistence of zaptel hwgain
structures missing. Patched configure to check for this stuff and
put a #ifdef around the offending code in chan_zap. Thanks to file
for overseeing this.


Modified:
    trunk/channels/chan_zap.c
    trunk/configure
    trunk/configure.ac
    trunk/include/asterisk/autoconfig.h.in

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=92422&r1=92421&r2=92422
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Tue Dec 11 16:10:43 2007
@@ -11683,6 +11683,7 @@
 	return CLI_SUCCESS;
 }
 
+#ifdef HAVE_ZAPTEL_HWGAIN
 static char *zap_set_hwgain(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
 	int channel;
@@ -11753,6 +11754,7 @@
 	return CLI_FAILURE;
 
 }
+#endif
 
 static char *zap_set_swgain(struct ast_cli_entry *e, int cmd, struct ast_cli_args *a)
 {
@@ -11836,7 +11838,9 @@
 	AST_CLI_DEFINE(zap_restart_cmd, "Fully restart zaptel channels"),
 	AST_CLI_DEFINE(zap_show_status, "Show all Zaptel cards status"),
 	AST_CLI_DEFINE(zap_show_version, "Show the Zaptel version in use"),
+#ifdef HAVE_ZAPTEL_HWGAIN
 	AST_CLI_DEFINE(zap_set_hwgain, "Set hardware gains at the port driver"),
+#endif
 	AST_CLI_DEFINE(zap_set_swgain, "Set software gain table values"),
 };
 

Modified: trunk/configure
URL: http://svn.digium.com/view/asterisk/trunk/configure?view=diff&rev=92422&r1=92421&r2=92422
==============================================================================
--- trunk/configure (original)
+++ trunk/configure Tue Dec 11 16:10:43 2007
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.ac Revision: 89506 .
+# From configure.ac Revision: 89615 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61.
 #
@@ -43640,6 +43640,77 @@
     fi
 
 
+# Check for Zaptel hwgain support
+
+    if test "x${PBX_ZAPTEL_HWGAIN}" != "x1" -a "${USE_ZAPTEL_HWGAIN}" != "no"; then
+	{ echo "$as_me:$LINENO: checking for ZT_SET_HWGAIN in zaptel/zaptel.h" >&5
+echo $ECHO_N "checking for ZT_SET_HWGAIN in zaptel/zaptel.h... $ECHO_C" >&6; }
+	saved_cppflags="${CPPFLAGS}"
+	if test "x${ZAPTEL_HWGAIN_DIR}" != "x"; then
+	    ZAPTEL_HWGAIN_INCLUDE="-I${ZAPTEL_HWGAIN_DIR}/include"
+	fi
+	CPPFLAGS="${CPPFLAGS} ${ZAPTEL_HWGAIN_INCLUDE}"
+
+	cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <zaptel/zaptel.h>
+int
+main ()
+{
+int foo = ZT_SET_HWGAIN;
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+     { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+		PBX_ZAPTEL_HWGAIN=1
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZAPTEL_HWGAIN 1
+_ACEOF
+
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_ZAPTEL_HWGAIN_VERSION
+_ACEOF
+
+
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	       { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+	CPPFLAGS="${saved_cppflags}"
+    fi
+
+
 # On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf
 case "${host_os}" in
     freebsd*)

Modified: trunk/configure.ac
URL: http://svn.digium.com/view/asterisk/trunk/configure.ac?view=diff&rev=92422&r1=92421&r2=92422
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Dec 11 16:10:43 2007
@@ -1140,6 +1140,9 @@
 # Check for transcode support
 AST_C_DEFINE_CHECK([ZAPTEL_TRANSCODE], [ZT_TCOP_ALLOCATE], [zaptel/zaptel.h])
 
+# Check for Zaptel hwgain support
+AST_C_DEFINE_CHECK([ZAPTEL_HWGAIN], [ZT_SET_HWGAIN], [zaptel/zaptel.h])
+
 # On FreeBSD, try old zaptel (0.80 or so) and pretend we have vldtmf
 case "${host_os}" in
     freebsd*)

Modified: trunk/include/asterisk/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/autoconfig.h.in?view=diff&rev=92422&r1=92421&r2=92422
==============================================================================
--- trunk/include/asterisk/autoconfig.h.in (original)
+++ trunk/include/asterisk/autoconfig.h.in Tue Dec 11 16:10:43 2007
@@ -996,6 +996,12 @@
 
 /* Define this to indicate the ${ZAPTEL_DESCRIP} library */
 #undef HAVE_ZAPTEL
+
+/* Define if your system has the ZAPTEL_HWGAIN headers. */
+#undef HAVE_ZAPTEL_HWGAIN
+
+/* Define ZAPTEL_HWGAIN headers version */
+#undef HAVE_ZAPTEL_HWGAIN_VERSION
 
 /* Define if your system has the ZAPTEL_TRANSCODE headers. */
 #undef HAVE_ZAPTEL_TRANSCODE