[dahdi-commits] dahdi/tools.git branch "master" updated.
SVN commits to the DAHDI project
dahdi-commits at lists.digium.com
Mon Feb 15 01:22:38 CST 2016
branch "master" has been updated
via e1da7b528467a8f8f82058993b2e01333677ee39 (commit)
via f105a09eda3a3b832078194e7ece902271a8d7b7 (commit)
from 212b247e689f84a431c67f80144384c5d2a27c50 (commit)
Summary of changes:
Makefile.am | 7 ++++---
configure.ac | 21 +++++++++++++++++++--
patgen.c | 2 --
pattest.c | 2 --
xpp/astribank_allow.c | 2 --
xpp/hexfile.c | 2 --
6 files changed, 23 insertions(+), 13 deletions(-)
- Log -----------------------------------------------------------------
commit e1da7b528467a8f8f82058993b2e01333677ee39
Author: Oron Peled <oron.peled at xorcom.com>
Date: Mon Dec 28 19:34:39 2015 +0200
link libtonezone directly to libm
* Now we properly '-lm' to libtonezone itself.
Tools that link with libtonezone get it automatically without having
to individually link it.
- dahdi_cfg historically needed -lm, but no longer does.
* Also use "autoscan" to refresh "configure.ac":
- Added missing tests
- Move AC_CHECK_HEADERS() to their correct location (before testing
libraries).
* Fixes the following (on Ubuntu-14.04):
CCLD dahdi_cfg
./.libs/libtonezone.so: undefined reference to `sin'
./.libs/libtonezone.so: undefined reference to `cos'
./.libs/libtonezone.so: undefined reference to `pow'
collect2: error: ld returned 1 exit status
make[2]: *** [dahdi_cfg] Error 1
Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
diff --git a/Makefile.am b/Makefile.am
index cfd561b..d43ce91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -74,14 +74,15 @@ libtonezone_la_SOURCES = \
dahdiinclude_HEADERS = tonezone.h
libtonezone_la_CFLAGS = $(CFLAGS) -I$(srcdir) -DBUILDING_TONEZONE
libtonezone_la_LDFLAGS = -version-info "$(LTZ_CURRENT):$(LTZ_REVISION):$(LTZ_AGE)"
+libtonezone_la_LIBADD = -lm
if PBX_PCAP
noinst_PROGRAMS += dahdi_pcap
dahdi_pcap_LDADD = -lpcap
endif
-patlooptest_LDADD = libtonezone.la -lm
-fxstest_LDADD = libtonezone.la -lm
+patlooptest_LDADD = libtonezone.la
+fxstest_LDADD = libtonezone.la
fxotune_LDADD = -lm
dahdi_speed_CFLAGS = -O2
@@ -93,7 +94,7 @@ dahdi_tool_CFLAGS = $(CFLAGS) $(NEWT_INCLUDE)
dahdi_tool_LDADD = $(NEWT_LIB)
endif
-dahdi_cfg_LDFLAGS = -lm -lpthread
+dahdi_cfg_LDFLAGS = -lpthread
dahdi_cfg_LDADD = libtonezone.la
udevrulesdir = @udevrulesdir@
diff --git a/configure.ac b/configure.ac
index ee06287..826a7ec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,8 +68,6 @@ AC_CONFIG_HEADER(autoconfig.h)
# This needs to be before any macros that use the C compiler
AC_GNU_SOURCE
-AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
-
AC_CHECK_TOOL([LD], [ld])
# Checks for programs.
@@ -160,6 +158,22 @@ else
fi
AC_SUBST(DAHDI_DECLARATION_AFTER_STATEMENT)
+# Checks for header files.
+AC_CHECK_HEADERS([sys/soundcard.h linux/soundcard.h])
+AC_CHECK_HEADERS([arpa/inet.h fcntl.h limits.h netinet/in.h stdint.h stdlib.h string.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_INLINE
+AC_TYPE_SIZE_T
+AC_TYPE_SSIZE_T
+AC_TYPE_UINT16_T
+AC_TYPE_UINT32_T
+AC_TYPE_UINT8_T
+
+# Checks for libraries.
+AC_CHECK_LIB([m], [cos])
+AC_CHECK_LIB([pthread], [pthread_create])
+
AST_EXT_LIB_SETUP([DAHDI], [DAHDI], [dahdi])
AST_EXT_LIB_SETUP([NEWT], [newt], [newt])
AST_EXT_LIB_SETUP([USB], [usb], [usb])
@@ -181,6 +195,9 @@ AM_CONDITIONAL([PBX_NEWT], [test "$PBX_NEWT" = "1"])
AM_CONDITIONAL([PBX_PCAP], [test "$PBX_PCAP" = "1" -a "$DAHDI_TXMIRROR" = "1"])
AC_CHECK_FUNCS([semtimedop])
+AC_CHECK_FUNCS([alarm bzero gettimeofday memset pow regcomp select socket strcasecmp strchr strdup strerror strrchr strstr strtol strtoul])
+AC_FUNC_ERROR_AT_LINE
+AC_FUNC_MALLOC
# What the user asked for? libusb/libusbx
AC_ARG_WITH([libusbx],
commit f105a09eda3a3b832078194e7ece902271a8d7b7
Author: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
Date: Tue Jan 26 15:12:30 2016 +0200
Remove rcsid: Unused since move to Git
* While technically Git can support $ID keywords, in practice they are not
used.
* GCC now give a warning about ''rcsid' defined but not used' for some
of those.
Let's just remove the unused rcsid.
diff --git a/patgen.c b/patgen.c
index 2b619d3..5086c32 100644
--- a/patgen.c
+++ b/patgen.c
@@ -45,7 +45,6 @@
#define BLOCK_SIZE 2041
#define DEVICE "/dev/dahdi/channel"
-static const char rcsid[] = "$Id$";
char *prog_name;
static void usage(void)
@@ -53,7 +52,6 @@ static void usage(void)
fprintf(stderr, "Usage: %s <dahdi_chan>\n", prog_name);
fprintf(stderr, " e.g.: %s /dev/dahdi/55\n", prog_name);
fprintf(stderr, " %s 455\n", prog_name);
- fprintf(stderr, "%s version %s\n", prog_name, rcsid);
exit(1);
}
diff --git a/pattest.c b/pattest.c
index 09b0c8e..91d10ee 100644
--- a/pattest.c
+++ b/pattest.c
@@ -44,7 +44,6 @@
#define BLOCK_SIZE 2039
#define DEVICE "/dev/dahdi/channel"
-static const char rcsid[] = "$Id$";
char *prog_name;
static void usage(void)
@@ -52,7 +51,6 @@ static void usage(void)
fprintf(stderr, "Usage: %s <dahdi_chan>\n", prog_name);
fprintf(stderr, " e.g.: %s /dev/dahdi/55\n", prog_name);
fprintf(stderr, " %s 455\n", prog_name);
- fprintf(stderr, "%s version %s\n", prog_name, rcsid);
exit(1);
}
diff --git a/xpp/astribank_allow.c b/xpp/astribank_allow.c
index dd8d9d3..bc97c92 100644
--- a/xpp/astribank_allow.c
+++ b/xpp/astribank_allow.c
@@ -36,8 +36,6 @@
#include "astribank.h"
#include "astribank_license.h"
-static const char rcsid[] = "$Id$";
-
#define DBG_MASK 0x80
static char *progname;
diff --git a/xpp/hexfile.c b/xpp/hexfile.c
index 1227b26..2a54fd5 100644
--- a/xpp/hexfile.c
+++ b/xpp/hexfile.c
@@ -28,8 +28,6 @@
#include <ctype.h>
#include "hexfile.h"
-static const char rcsid[] = "$Id$";
-
static parse_hexfile_report_func_t report_func = NULL;
parse_hexfile_report_func_t parse_hexfile_set_reporting(parse_hexfile_report_func_t rf)
-----------------------------------------------------------------------
--
dahdi/tools.git
More information about the dahdi-commits
mailing list