[dahdi-commits] seanbright: tools/trunk r7137 - /tools/trunk/

Tue Sep 15 14:55:33 CDT 2009

Author: seanbright
Date: Tue Sep 15 14:55:29 2009
New Revision: 7137

URL: http://svn.asterisk.org/svn-view/dahdi?view=rev&rev=7137
Log:
Use configure to determine the location of header files instead of relying on
the platform.  Still need to copy bootstrap.sh from asterisk and tonezone.c
still needs to be updated appropriately.

Added:
    tools/trunk/autoconfig.h.in   (with props)
Modified:
    tools/trunk/   (props changed)
    tools/trunk/configure
    tools/trunk/configure.ac
    tools/trunk/dahdi_monitor.c

Propchange: tools/trunk/
------------------------------------------------------------------------------

--- svn:ignore (original)
+++ svn:ignore Tue Sep 15 14:55:29 2009
@@ -3,6 +3,7 @@
 README.html
 README.Astribank.html
 aclocal.m4
+autoconfig.h
 autom4te.cache
 config.log
 config.status

Added: tools/trunk/autoconfig.h.in
URL: http://svn.asterisk.org/svn-view/dahdi/tools/trunk/autoconfig.h.in?view=auto&rev=7137
==============================================================================
--- tools/trunk/autoconfig.h.in (added)
+++ tools/trunk/autoconfig.h.in Tue Sep 15 14:55:29 2009
@@ -1,0 +1,102 @@
+/* autoconfig.h.in.  Generated from configure.ac by autoheader.  */
+
+/* Define if your system has the DAHDI headers. */
+#undef HAVE_DAHDI
+
+/* Define DAHDI headers version */
+#undef HAVE_DAHDI_VERSION
+
+/* Define to 1 if you have the <inttypes.h> header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the <linux/soundcard.h> header file. */
+#undef HAVE_LINUX_SOUNDCARD_H
+
+/* Define to 1 if you have the <memory.h> header file. */
+#undef HAVE_MEMORY_H
+
+/* Define this to indicate the ${NEWT_DESCRIP} library */
+#undef HAVE_NEWT
+
+/* Define to indicate the ${NEWT_DESCRIP} library version */
+#undef HAVE_NEWT_VERSION
+
+/* Define to 1 if you have the <stdint.h> header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the <stdlib.h> header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the <strings.h> header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the <string.h> header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the <sys/soundcard.h> header file. */
+#undef HAVE_SYS_SOUNDCARD_H
+
+/* Define to 1 if you have the <sys/stat.h> header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the <sys/types.h> header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the <unistd.h> header file. */
+#undef HAVE_UNISTD_H
+
+/* Define this to indicate the ${USB_DESCRIP} library */
+#undef HAVE_USB
+
+/* Define to indicate the ${USB_DESCRIP} library version */
+#undef HAVE_USB_VERSION
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix.  */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them.  */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris.  */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop.  */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris.  */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+   this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE

Propchange: tools/trunk/autoconfig.h.in
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: tools/trunk/autoconfig.h.in
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: tools/trunk/autoconfig.h.in
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: tools/trunk/configure.ac
URL: http://svn.asterisk.org/svn-view/dahdi/tools/trunk/configure.ac?view=diff&rev=7137&r1=7136&r2=7137
==============================================================================
--- tools/trunk/configure.ac (original)
+++ tools/trunk/configure.ac Tue Sep 15 14:55:29 2009
@@ -26,8 +26,13 @@
      localstatedir=/var
 fi
 
+# specify output header file
+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])
 
 # Checks for programs.
 AC_PROG_CC

Modified: tools/trunk/dahdi_monitor.c
URL: http://svn.asterisk.org/svn-view/dahdi/tools/trunk/dahdi_monitor.c?view=diff&rev=7137&r1=7136&r2=7137
==============================================================================
--- tools/trunk/dahdi_monitor.c (original)
+++ tools/trunk/dahdi_monitor.c Tue Sep 15 14:55:29 2009
@@ -41,11 +41,16 @@
 #include <dahdi/user.h>
 #include "dahdi_tools_version.h"
 #include "wavformat.h"
-
-#if defined(__FreeBSD__)
-#include <sys/soundcard.h>
+#include "autoconfig.h"
+
+#ifdef HAVE_SYS_SOUNDCARD_H
+# include <sys/soundcard.h>
 #else
-#include <linux/soundcard.h>
+# ifdef HAVE_LINUX_SOUNDCARD_H
+#  include <linux/soundcard.h>
+# else
+#  error "Your installation appears to be missing soundcard.h which is needed to continue."
+# endif
 #endif
 
 /*


