[asterisk-commits] branch group/autoconf_and_menuselect r18484 - in
/team/group/autoconf_and_men...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Sat Apr 8 10:31:38 MST 2006
Author: kpfleming
Date: Sat Apr 8 12:31:37 2006
New Revision: 18484
URL: http://svn.digium.com/view/asterisk?rev=18484&view=rev
Log:
start the long and complex process of eliminating the old Makefile logic and using the new autoconf-supplied results
Modified:
team/group/autoconf_and_menuselect/acinclude.m4
team/group/autoconf_and_menuselect/ast_expr2.c
team/group/autoconf_and_menuselect/ast_expr2.fl
team/group/autoconf_and_menuselect/configure.ac
team/group/autoconf_and_menuselect/include/asterisk.h
team/group/autoconf_and_menuselect/include/asterisk/compat.h
team/group/autoconf_and_menuselect/include/autoconfig.h.in
team/group/autoconf_and_menuselect/res/Makefile
team/group/autoconf_and_menuselect/res/res_musiconhold.c
Modified: team/group/autoconf_and_menuselect/acinclude.m4
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/acinclude.m4?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/acinclude.m4 (original)
+++ team/group/autoconf_and_menuselect/acinclude.m4 Sat Apr 8 12:31:37 2006
@@ -1,8 +1,8 @@
-# AST_EXT_LIB([NAME], [FUNCTION], [package name], [additional LIB data])
+# AST_EXT_LIB([NAME], [FUNCTION], [package symbol name], [package friendly name], [additional LIB data])
AC_DEFUN([AST_EXT_LIB],
[
-AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $3 files in PATH]),[
+AC_ARG_WITH([$1], AC_HELP_STRING([--with-$1=PATH],[use $4 files in PATH]),[
case ${withval} in
n|no)
USE_$1=no
@@ -20,11 +20,11 @@
PBX_LIB$1=0
if test "${USE_$1}" != "no"; then
- AC_CHECK_LIB([$1], [$2], AC_DEFINE_UNQUOTED(AS_TR_CPP([HAVE_LIB$1]), 1,
- [Define to indicate the $3 library]), [], -L${$1_DIR}/lib $4)
+ AC_CHECK_LIB([$1], [$2], AC_DEFINE_UNQUOTED([HAVE_$3], 1,
+ [Define to indicate the $4 library]), [], -L${$1_DIR}/lib $5)
if test "${ac_cv_lib_$1_$2}" = "yes"; then
- $1_LIB="-l$1 $4"
+ $1_LIB="-l$1 $5"
if test "x${$1_DIR}" != "x"; then
$1_LIB="-L${$1_DIR}/lib ${$1_LIB}"
$1_INCLUDE="-I${$1_DIR}/include"
@@ -35,7 +35,7 @@
elif test ! -z "${$1_MANDATORY}";
then
echo "***"
- echo "*** The $3 installation on this system appears to be broken."
+ echo "*** The $4 installation on this system appears to be broken."
echo "*** Either correct the installation, or run configure"
echo "*** including --without-$1"
exit 1
Modified: team/group/autoconf_and_menuselect/ast_expr2.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/ast_expr2.c?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/ast_expr2.c (original)
+++ team/group/autoconf_and_menuselect/ast_expr2.c Sat Apr 8 12:31:37 2006
@@ -143,8 +143,11 @@
#include <errno.h>
#include <regex.h>
#include <limits.h>
-#include <asterisk/ast_expr.h>
-#include <asterisk/logger.h>
+
+#include "asterisk.h"
+#include "asterisk/ast_expr.h"
+#include "asterisk/logger.h"
+#include "asterisk/strings.h"
#if defined(LONG_LONG_MIN) && !defined(QUAD_MIN)
#define QUAD_MIN LONG_LONG_MIN
Modified: team/group/autoconf_and_menuselect/ast_expr2.fl
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/ast_expr2.fl?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/ast_expr2.fl (original)
+++ team/group/autoconf_and_menuselect/ast_expr2.fl Sat Apr 8 12:31:37 2006
@@ -36,9 +36,11 @@
#include <errno.h>
#include <regex.h>
#include <limits.h>
-#include <asterisk/ast_expr.h>
-#include <asterisk/logger.h>
-#include <asterisk/strings.h>
+
+#include "asterisk.h"
+#include "asterisk/ast_expr.h"
+#include "asterisk/logger.h"
+#include "asterisk/strings.h"
enum valtype {
AST_EXPR_integer, AST_EXPR_numeric_string, AST_EXPR_string
Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Sat Apr 8 12:31:37 2006
@@ -139,24 +139,24 @@
*) AC_MSG_ERROR(bad value ${enableval} for --enable-developer-mode) ;;
esac])
-AST_EXT_LIB([ogg], [ogg_sync_init], [OGG] )
-AST_EXT_LIB([vorbis], [vorbis_info_init], [Vorbis])
-AST_EXT_LIB([asound], [snd_spcm_init], [ALSA])
-AST_EXT_LIB([nbs], [nbs_setup], [NBS])
-AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS])
-AST_EXT_LIB([speex], [speex_encode], [Speex])
-AST_EXT_LIB([tonezone], [tone_zone_find], [Zaptel])
-AST_EXT_LIB([pri], [pri_call], [ISDN PRI])
-AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [MFCR2])
-AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [OSP Toolkit])
-AST_EXT_LIB([odbc], [SQLConnect], [unixODBC])
-AST_EXT_LIB([pq], [PQexec], [PostgresQL])
-AST_EXT_LIB([sqlite], [sqlite_exec], [SQLite])
-AST_EXT_LIB([tds], [tds_version], [FreeTDS])
-AST_EXT_LIB([popt], [poptStrerror], [popt])
-AST_EXT_LIB([newt], [newtBell], [newt])
-AST_EXT_LIB([ssl], [ssl2_connect], [OpenSSL], [-lcrypto])
-AST_EXT_LIB([z], [compress], [zlib])
+AST_EXT_LIB([ogg], [ogg_sync_init], [OGG], [OGG])
+AST_EXT_LIB([vorbis], [vorbis_info_init], [VORBIS], [Vorbis])
+AST_EXT_LIB([asound], [snd_spcm_init], [ALSA], [Advanced Linux Sound Architecture])
+AST_EXT_LIB([nbs], [nbs_setup], [NBS], [Network Broadcast Sound])
+AST_EXT_LIB([ossaudio], [oss_ioctl_mixer], [OSS], [Open Sound System])
+AST_EXT_LIB([speex], [speex_encode], [SPEEX], [Speex])
+AST_EXT_LIB([tonezone], [tone_zone_find], [ZAPTEL], [Zaptel])
+AST_EXT_LIB([pri], [pri_call], [LIBPRI], [ISDN PRI])
+AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [MFCR2], [MFCR2])
+AST_EXT_LIB([osptk], [OSPPCryptoDecrypt], [OSPTK], [OSP Toolkit])
+AST_EXT_LIB([odbc], [SQLConnect], [UNIXODBC], [unixODBC])
+AST_EXT_LIB([pq], [PQexec], [PQ], [PostgreSQL])
+AST_EXT_LIB([sqlite], [sqlite_exec], [SQLITE], [SQLite])
+AST_EXT_LIB([tds], [tds_version], [FREETDS], [FreeTDS])
+AST_EXT_LIB([popt], [poptStrerror], [POPT], [popt])
+AST_EXT_LIB([newt], [newtBell], [NEWT], [newt])
+AST_EXT_LIB([ssl], [ssl2_connect], [OPENSSL], [OpenSSL], [-lcrypto])
+AST_EXT_LIB([z], [compress], [ZLIB], [zlib])
PBX_H323=0
AC_CHECK_HEADER([h323.h], [PBX_H323=1], [])
@@ -382,7 +382,7 @@
AC_FUNC_STRNLEN
AC_FUNC_UTIME_NULL
AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strndup strrchr strspn strstr strtol utime])
+AC_CHECK_FUNCS([atexit bzero dup2 endpwent floor ftruncate getcwd gethostbyname gethostname gettimeofday inet_ntoa isascii localtime_r memchr memmove memset mkdir munmap pow putenv re_comp regcomp rint select setenv socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strndup strrchr strspn strstr strtol utime strtoq strcasestr asprintf vasprintf])
AC_CONFIG_FILES([build_tools/menuselect-deps makeopts])
AC_OUTPUT
Modified: team/group/autoconf_and_menuselect/include/asterisk.h
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/include/asterisk.h?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/include/asterisk.h (original)
+++ team/group/autoconf_and_menuselect/include/asterisk.h Sat Apr 8 12:31:37 2006
@@ -3,7 +3,7 @@
*
* General Definitions for Asterisk top level program
*
- * Copyright (C) 1999-2005, Mark Spencer
+ * Copyright (C) 1999-2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -17,6 +17,8 @@
#ifndef _ASTERISK_H
#define _ASTERISK_H
+
+#include "autoconfig.h"
#define DEFAULT_LANGUAGE "en"
Modified: team/group/autoconf_and_menuselect/include/asterisk/compat.h
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/include/asterisk/compat.h?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/include/asterisk/compat.h (original)
+++ team/group/autoconf_and_menuselect/include/asterisk/compat.h Sat Apr 8 12:31:37 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- A telephony toolkit for Linux.
*
- * Copyright (C) 1999-2005, Mark Spencer
+ * Copyright (C) 1999-2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -71,30 +71,11 @@
#endif
#endif /* __CYGWIN__ */
-#define HAVE_VASPRINTF
-#define HAVE_STRTOQ
-
-#ifdef _BSD_SOURCE
-#define HAVE_GETLOADAVG
-#endif
-
-#ifdef __linux__
-#define HAVE_STRCASESTR
-#define HAVE_STRNDUP
-#define HAVE_STRNLEN
-#endif
-
#ifdef __FreeBSD__
#include <sys/types.h>
#endif
-#ifdef SOLARIS
-#undef HAVE_VASPRINTF
-#undef HAVE_STRTOQ
-#endif
-
#ifdef __CYGWIN__
-#undef HAVE_STRTOQ
typedef unsigned long long uint64_t;
#endif
Modified: team/group/autoconf_and_menuselect/include/autoconfig.h.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/include/autoconfig.h.in?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/include/autoconfig.h.in (original)
+++ team/group/autoconf_and_menuselect/include/autoconfig.h.in Sat Apr 8 12:31:37 2006
@@ -24,8 +24,14 @@
*/
#undef HAVE_ALLOCA_H
+/* Define to indicate the Advanced Linux Sound Architecture library */
+#undef HAVE_ALSA
+
/* Define to 1 if you have the <arpa/inet.h> header file. */
#undef HAVE_ARPA_INET_H
+
+/* Define to 1 if you have the `asprintf' function. */
+#undef HAVE_ASPRINTF
/* Define to 1 if you have the `atexit' function. */
#undef HAVE_ATEXIT
@@ -61,6 +67,9 @@
/* Define to 1 if you have the `fork' function. */
#undef HAVE_FORK
+/* Define to indicate the FreeTDS library */
+#undef HAVE_FREETDS
+
/* Define to 1 if you have the `ftruncate' function. */
#undef HAVE_FTRUNCATE
@@ -94,65 +103,14 @@
/* Define if your system has the KDE libraries. */
#undef HAVE_KDE
-/* Define to indicate the ALSA library */
-#undef HAVE_LIBASOUND
-
-/* Define to indicate the MFCR2 library */
-#undef HAVE_LIBMFCR2
-
-/* Define to indicate the NBS library */
-#undef HAVE_LIBNBS
-
-/* Define to indicate the newt library */
-#undef HAVE_LIBNEWT
-
-/* Define to indicate the unixODBC library */
-#undef HAVE_LIBODBC
-
-/* Define to indicate the OGG library */
-#undef HAVE_LIBOGG
-
-/* Define to indicate the OSP Toolkit library */
-#undef HAVE_LIBOSPTK
-
-/* Define to indicate the OSS library */
-#undef HAVE_LIBOSSAUDIO
-
-/* Define to indicate the popt library */
-#undef HAVE_LIBPOPT
-
-/* Define to indicate the PostgresQL library */
-#undef HAVE_LIBPQ
-
/* Define to indicate the ISDN PRI library */
#undef HAVE_LIBPRI
/* Define if your system has the pwlib libraries. */
#undef HAVE_LIBPWLIB
-/* Define to indicate the Speex library */
-#undef HAVE_LIBSPEEX
-
-/* Define to indicate the SQLite library */
-#undef HAVE_LIBSQLITE
-
-/* Define to indicate the OpenSSL library */
-#undef HAVE_LIBSSL
-
-/* Define to indicate the FreeTDS library */
-#undef HAVE_LIBTDS
-
-/* Define to indicate the Zaptel library */
-#undef HAVE_LIBTONEZONE
-
-/* Define to indicate the Vorbis library */
-#undef HAVE_LIBVORBIS
-
/* Define if your system has the VoiceTronix (vpb) libraries. */
#undef HAVE_LIBVPB
-
-/* Define to indicate the zlib library */
-#undef HAVE_LIBZ
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -182,6 +140,9 @@
/* Define to 1 if you have the `memset' function. */
#undef HAVE_MEMSET
+/* Define to indicate the MFCR2 library */
+#undef HAVE_MFCR2
+
/* Define to 1 if you have the `mkdir' function. */
#undef HAVE_MKDIR
@@ -191,6 +152,9 @@
/* Define to 1 if you have the `munmap' function. */
#undef HAVE_MUNMAP
+/* Define to indicate the Network Broadcast Sound library */
+#undef HAVE_NBS
+
/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
#undef HAVE_NDIR_H
@@ -200,8 +164,29 @@
/* Define to 1 if you have the <netinet/in.h> header file. */
#undef HAVE_NETINET_IN_H
+/* Define to indicate the newt library */
+#undef HAVE_NEWT
+
+/* Define to indicate the OGG library */
+#undef HAVE_OGG
+
+/* Define to indicate the OpenSSL library */
+#undef HAVE_OPENSSL
+
+/* Define to indicate the OSP Toolkit library */
+#undef HAVE_OSPTK
+
+/* Define to indicate the Open Sound System library */
+#undef HAVE_OSS
+
+/* Define to indicate the popt library */
+#undef HAVE_POPT
+
/* Define to 1 if you have the `pow' function. */
#undef HAVE_POW
+
+/* Define to indicate the PostgreSQL library */
+#undef HAVE_PQ
/* Define to 1 if the system has the type `ptrdiff_t'. */
#undef HAVE_PTRDIFF_T
@@ -234,6 +219,12 @@
/* Define to 1 if you have the `socket' function. */
#undef HAVE_SOCKET
+/* Define to indicate the Speex library */
+#undef HAVE_SPEEX
+
+/* Define to indicate the SQLite library */
+#undef HAVE_SQLITE
+
/* Define to 1 if you have the `sqrt' function. */
#undef HAVE_SQRT
@@ -256,6 +247,9 @@
/* Define to 1 if you have the `strcasecmp' function. */
#undef HAVE_STRCASECMP
+/* Define to 1 if you have the `strcasestr' function. */
+#undef HAVE_STRCASESTR
+
/* Define to 1 if you have the `strchr' function. */
#undef HAVE_STRCHR
@@ -299,6 +293,9 @@
/* Define to 1 if you have the `strtol' function. */
#undef HAVE_STRTOL
+/* Define to 1 if you have the `strtoq' function. */
+#undef HAVE_STRTOQ
+
/* Define to 1 if `st_blksize' is member of `struct stat'. */
#undef HAVE_STRUCT_STAT_ST_BLKSIZE
@@ -346,6 +343,9 @@
/* Define to 1 if you have the <unistd.h> header file. */
#undef HAVE_UNISTD_H
+/* Define to indicate the unixODBC library */
+#undef HAVE_UNIXODBC
+
/* Define to 1 if you have the `utime' function. */
#undef HAVE_UTIME
@@ -355,12 +355,18 @@
/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */
#undef HAVE_UTIME_NULL
+/* Define to 1 if you have the `vasprintf' function. */
+#undef HAVE_VASPRINTF
+
/* Define to 1 if you have the `vfork' function. */
#undef HAVE_VFORK
/* Define to 1 if you have the <vfork.h> header file. */
#undef HAVE_VFORK_H
+/* Define to indicate the Vorbis library */
+#undef HAVE_VORBIS
+
/* Define to 1 if you have the `vprintf' function. */
#undef HAVE_VPRINTF
@@ -369,6 +375,12 @@
/* Define to 1 if `vfork' works. */
#undef HAVE_WORKING_VFORK
+
+/* Define to indicate the Zaptel library */
+#undef HAVE_ZAPTEL
+
+/* Define to indicate the zlib library */
+#undef HAVE_ZLIB
/* Define to 1 if the system has the type `_Bool'. */
#undef HAVE__BOOL
Modified: team/group/autoconf_and_menuselect/res/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/Makefile?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/Makefile (original)
+++ team/group/autoconf_and_menuselect/res/Makefile Sat Apr 8 12:31:37 2006
@@ -13,12 +13,9 @@
MODS:=$(filter-out $(MENUSELECT_RES),$(patsubst %.c,%.so,$(wildcard res_*.c)))
-ifeq (${OSARCH},FreeBSD)
+ifeq ($(OSARCH),FreeBSD)
MODS:=$(filter-out $(shell if test ${BSDVERSION} -lt 500000 ; then echo "res_config_odbc.so"; fi),$(MODS))
endif
-
-# XXX To be removed once this is set by autoconf
-OSPLIB:=$(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libosptk.a $(CROSS_COMPILE_TARGET)/usr/local/lib/libosptk.a)
# NETsnmp has some difficulties on some platforms (conflict with unload_module)
# Until we figure out if the collission is version-specific or what to do
@@ -37,23 +34,17 @@
SNMP_LDLIBS+=$(shell net-snmp-config --agent-libs)
endif
-ifeq (${OSARCH},CYGWIN)
+ifeq ($(OSARCH),CYGWIN)
CYGSOLINK=-Wl,--out-implib=lib$@.a -Wl,--export-all-symbols
CYGSOLIB=-L.. -L. -lasterisk.dll
CYG_RES_CONFIG_ODBC_LIB=-lres_odbc.so
CYG_RES_FEATURES_LIB=-lres_adsi.so -lres_monitor.so
endif
-ifndef WITHOUT_ZAPTEL
-ifeq ($(ZAPTEL),1)
- CFLAGS+=-DZAPATA_MOH
-endif
-endif # WITHOUT_ZAPTEL
-
#
# Work around buggy RedHat 9.0
#
-ifeq (${OSARCH},CYGWIN)
+ifeq ($(OSARCH),CYGWIN)
CFLAGS+=-DOPENSSL_NO_KRB5
else
CFLAGS+=-DOPENSSL_NO_KRB5 -fPIC
@@ -81,7 +72,7 @@
uninstall:
res_crypto.so: res_crypto.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CRYPTO_LIBS)
+ $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CRYPTO_LIBS)
clean-depend:
rm -f .depend
@@ -90,25 +81,25 @@
rm -f *.so *.o
res_odbc.so: res_odbc.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lodbc
+ $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) -lodbc
res_osp.so: res_osp.o $(OSPLIB)
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(OSPLIB) $(CRYPTO_LIBS)
+ $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(OSPLIB) $(CRYPTO_LIBS)
%.so : %.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB}
+ $(CC) -o $@ $(SOLINK) $(CYGSOLINK) $< $(CYGSOLIB)
res_features.so: res_features.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${CYG_RES_FEATURES_LIB}
+ $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CYG_RES_FEATURES_LIB)
res_config_odbc.so: res_config_odbc.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} ${CYG_RES_CONFIG_ODBC_LIB}
+ $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) $(CYG_RES_CONFIG_ODBC_LIB)
res_snmp.so: res_snmp.o snmp/agent.o
- $(CC) $(SOLINK) ${SNMP_LDFLAGS} -o $@ ${CYGSOLINK} res_snmp.o snmp/agent.o ${CYGSOLIB} ${SNMP_LDLIBS}
+ $(CC) $(SOLINK) $(SNMP_LDFLAGS) -o $@ $(CYGSOLINK) res_snmp.o snmp/agent.o $(CYGSOLIB) $(SNMP_LDLIBS)
res_config_pgsql.so: res_config_pgsql.o
- $(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -lpq -lz $(MLFLAGS)
+ $(CC) $(SOLINK) -o $@ $(CYGSOLINK) $< $(CYGSOLIB) -lpq -lz $(MLFLAGS)
ifneq ($(wildcard .depend),)
include .depend
Modified: team/group/autoconf_and_menuselect/res/res_musiconhold.c
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/res/res_musiconhold.c?rev=18484&r1=18483&r2=18484&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/res/res_musiconhold.c (original)
+++ team/group/autoconf_and_menuselect/res/res_musiconhold.c Sat Apr 8 12:31:37 2006
@@ -1,7 +1,7 @@
/*
* Asterisk -- An open source telephony toolkit.
*
- * Copyright (C) 1999 - 2005, Digium, Inc.
+ * Copyright (C) 1999 - 2006, Digium, Inc.
*
* Mark Spencer <markster at digium.com>
*
@@ -37,7 +37,7 @@
#include <netinet/in.h>
#include <sys/stat.h>
#include <dirent.h>
-#ifdef ZAPATA_MOH
+#ifdef HAVE_ZAPTEL
#ifdef __linux__
#include <linux/zaptel.h>
#else
@@ -790,7 +790,7 @@
static int moh_register(struct mohclass *moh, int reload)
{
-#ifdef ZAPATA_MOH
+#ifdef HAVE_ZAPTEL
int x;
#endif
ast_mutex_lock(&moh_lock);
@@ -828,7 +828,7 @@
ast_set_flag(moh, MOH_QUIET);
moh->srcfd = -1;
-#ifdef ZAPATA_MOH
+#ifdef HAVE_ZAPTEL
/* Open /dev/zap/pseudo for timing... Is
there a better, yet reliable way to do this? */
moh->pseudofd = open("/dev/zap/pseudo", O_RDONLY);
More information about the asterisk-commits
mailing list