From cbd3156f728ca54bb4d1964c0581201f4dce6f0f Mon Sep 17 00:00:00 2001 From: kpfleming Date: Wed, 7 Jun 2006 19:05:35 +0000 Subject: move autoconfig.h to the include/asterisk directory so it will get installed install asterisk.h include the system's default include directory git-svn-id: http://svn.digium.com/svn/asterisk/trunk@32860 f38db490-d61c-443f-a65b-d21fe96a405b --- Makefile | 1 + acl.c | 1 - configure | 6 +- configure.ac | 2 +- include/asterisk.h | 2 +- include/asterisk/autoconfig.h.in | 577 +++++++++++++++++++++++++++++++++++++++ include/autoconfig.h.in | 577 --------------------------------------- pbx.c | 1 - utils/ael_main.c | 2 +- utils/astman.c | 2 +- utils/smsq.c | 2 +- 11 files changed, 586 insertions(+), 587 deletions(-) create mode 100644 include/asterisk/autoconfig.h.in delete mode 100644 include/autoconfig.h.in diff --git a/Makefile b/Makefile index ac59244d1..12ba2565a 100644 --- a/Makefile +++ b/Makefile @@ -635,6 +635,7 @@ bininstall: all chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\ fi $(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR) + $(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir) $(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR) if [ -n "$(OLDHEADERS)" ]; then \ rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\ diff --git a/acl.c b/acl.c index 7b5850d03..b3ca90362 100644 --- a/acl.c +++ b/acl.c @@ -69,7 +69,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/utils.h" #include "asterisk/lock.h" #include "asterisk/srv.h" -#include "asterisk/compat.h" struct ast_ha { /* Host access rule */ diff --git a/configure b/configure index a8b4e2c23..d606e6b66 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Revision: 30458 . +# From configure.ac Revision: 32846 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59e. # @@ -2015,7 +2015,7 @@ test -n "$target_alias" && # specify output header file -ac_config_headers="$ac_config_headers include/autoconfig.h" +ac_config_headers="$ac_config_headers include/asterisk/autoconfig.h" @@ -26855,7 +26855,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do case $ac_config_target in - "include/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/autoconfig.h" ;; + "include/asterisk/autoconfig.h") CONFIG_HEADERS="$CONFIG_HEADERS include/asterisk/autoconfig.h" ;; "build_tools/menuselect-deps") CONFIG_FILES="$CONFIG_FILES build_tools/menuselect-deps" ;; "makeopts") CONFIG_FILES="$CONFIG_FILES makeopts" ;; diff --git a/configure.ac b/configure.ac index fc2b7ef5f..92bc87ac6 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_CANONICAL_TARGET AC_CONFIG_SRCDIR([asterisk.c]) # specify output header file -AC_CONFIG_HEADER(include/autoconfig.h) +AC_CONFIG_HEADER(include/asterisk/autoconfig.h) AC_COPYRIGHT("Asterisk") AC_REVISION($Revision$) diff --git a/include/asterisk.h b/include/asterisk.h index f6a5f1f50..2b979e488 100644 --- a/include/asterisk.h +++ b/include/asterisk.h @@ -18,7 +18,7 @@ #ifndef _ASTERISK_H #define _ASTERISK_H -#include "autoconfig.h" +#include "asterisk/autoconfig.h" #include "asterisk/compat.h" diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in new file mode 100644 index 000000000..604922ac1 --- /dev/null +++ b/include/asterisk/autoconfig.h.in @@ -0,0 +1,577 @@ +/* include/asterisk/autoconfig.h.in. Generated from configure.ac by autoheader. */ + +#ifndef ASTERISK_AUTOCONFIG_H +#define ASTERISK_AUTOCONFIG_H + +#ifndef MENUSELECT +#include "asterisk/buildopts.h" +#endif + +#ifndef _REENTRANT +#define _REENTRANT +#endif + + +/* Define to 1 if the `closedir' function returns void instead of `int'. */ +#undef CLOSEDIR_VOID + +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END + +/* Define to 1 if using `alloca.c'. */ +#undef C_ALLOCA + +/* Define according to your operating system type. */ +#undef Darwin + +/* Define according to your operating system type. */ +#undef FreeBSD + +/* Define to 1 if you have the `alarm' function. */ +#undef HAVE_ALARM + +/* Define to 1 if you have `alloca', as a function or macro. */ +#undef HAVE_ALLOCA + +/* Define to 1 if you have and it should be used (not on Ultrix). + */ +#undef HAVE_ALLOCA_H + +/* Define to indicate the Advanced Linux Sound Architecture library */ +#undef HAVE_ALSA + +/* Define to 1 if you have the 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 + +/* Define to 1 if you have the `bzero' function. */ +#undef HAVE_BZERO + +/* Define to 1 if your system has a working `chown' function. */ +#undef HAVE_CHOWN + +/* Define if your system has the curl libraries. */ +#undef HAVE_CURL + +/* Define to indicate the curses library */ +#undef HAVE_CURSES + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_DIRENT_H + +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT + +/* Define to 1 if you have the `dup2' function. */ +#undef HAVE_DUP2 + +/* Define to 1 if you have the `endpwent' function. */ +#undef HAVE_ENDPWENT + +/* Define to 1 if you have the header file. */ +#undef HAVE_FCNTL_H + +/* Define to 1 if you have the `floor' function. */ +#undef HAVE_FLOOR + +/* 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 fseeko (and presumably ftello) exists and is declared. */ +#undef HAVE_FSEEKO + +/* Define to 1 if you have the `ftruncate' function. */ +#undef HAVE_FTRUNCATE + +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD + +/* Define to 1 if you have the `gethostbyname' function. */ +#undef HAVE_GETHOSTBYNAME + +/* Define to 1 if you have the `gethostname' function. */ +#undef HAVE_GETHOSTNAME + +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE + +/* Define to 1 if you have the `gettimeofday' function. */ +#undef HAVE_GETTIMEOFDAY + +/* Define to indicate the GSM library */ +#undef HAVE_GSM + +/* Define if your system has the GTK libraries. */ +#undef HAVE_GTK + +/* Define to indicate the Iksemel Jabber Library library */ +#undef HAVE_IKSEMEL + +/* Define to 1 if you have the `inet_ntoa' function. */ +#undef HAVE_INET_NTOA + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the `isascii' function. */ +#undef HAVE_ISASCII + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIBINTL_H + +/* Define if your system has the KDE library */ +#undef HAVE_LIBKDE + +/* Define to indicate the ISDN PRI library */ +#undef HAVE_LIBPRI + +/* Define if your system has the pwlib libraries. */ +#undef HAVE_LIBPWLIB + +/* Define if your system has the Qt library */ +#undef HAVE_LIBQT + +/* Define if your system has the VoiceTronix (vpb) libraries. */ +#undef HAVE_LIBVPB + +/* Define to 1 if you have the header file. */ +#undef HAVE_LIMITS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_LOCALE_H + +/* Define to 1 if you have the `localtime_r' function. */ +#undef HAVE_LOCALTIME_R + +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ +#undef HAVE_MALLOC + +/* Define to 1 if you have the header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the `memchr' function. */ +#undef HAVE_MEMCHR + +/* Define to 1 if you have the `memmove' function. */ +#undef HAVE_MEMMOVE + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `memset' function. */ +#undef HAVE_MEMSET + +/* Define to 1 if you have the `mkdir' function. */ +#undef HAVE_MKDIR + +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* 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 indicate the ncurses library */ +#undef HAVE_NCURSES + +/* Define to 1 if you have the header file, and it defines `DIR'. */ +#undef HAVE_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_NETDB_H + +/* Define to 1 if you have the 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 + +/* Define to 1 if you have the `putenv' function. */ +#undef HAVE_PUTENV + +/* Define to indicate the Radius Client library */ +#undef HAVE_RADIUSCLIENT + +/* Define to 1 if your system has a GNU libc compatible `realloc' function, + and to 0 otherwise. */ +#undef HAVE_REALLOC + +/* Define to 1 if you have the `regcomp' function. */ +#undef HAVE_REGCOMP + +/* Define to 1 if you have the `re_comp' function. */ +#undef HAVE_RE_COMP + +/* Define to 1 if you have the `rint' function. */ +#undef HAVE_RINT + +/* Define to 1 if you have the `select' function. */ +#undef HAVE_SELECT + +/* Define to 1 if you have the `setenv' function. */ +#undef HAVE_SETENV + +/* 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 + +/* Define to 1 if `stat' has the bug that it succeeds when given the + zero-length file name argument. */ +#undef HAVE_STAT_EMPTY_STRING_BUG + +/* Define to 1 if stdbool.h conforms to C99. */ +#undef HAVE_STDBOOL_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDDEF_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* 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 + +/* Define to 1 if you have the `strcoll' function and it is properly defined. + */ +#undef HAVE_STRCOLL + +/* Define to 1 if you have the `strcspn' function. */ +#undef HAVE_STRCSPN + +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + +/* Define to 1 if you have the `strerror' function. */ +#undef HAVE_STRERROR + +/* Define to 1 if you have the `strftime' function. */ +#undef HAVE_STRFTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strndup' function. */ +#undef HAVE_STRNDUP + +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + +/* Define to 1 if you have the `strsep' function. */ +#undef HAVE_STRSEP + +/* Define to 1 if you have the `strspn' function. */ +#undef HAVE_STRSPN + +/* Define to 1 if you have the `strstr' function. */ +#undef HAVE_STRSTR + +/* 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 + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYSLOG_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_DIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_FILE_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_IOCTL_H + +/* Define to 1 if you have the header file, and it defines `DIR'. + */ +#undef HAVE_SYS_NDIR_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_PARAM_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SELECT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_SOCKET_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TIME_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have that is POSIX.1 compatible. */ +#undef HAVE_SYS_WAIT_H + +/* Define to indicate the Termcap library */ +#undef HAVE_TERMCAP + +/* Define to 1 if you have the header file. */ +#undef HAVE_TERMIOS_H + +/* Define to indicate the Term Info library */ +#undef HAVE_TINFO + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* Define to indicate the unixODBC library */ +#undef HAVE_UNIXODBC + +/* Define to 1 if you have the `unsetenv' function. */ +#undef HAVE_UNSETENV + +/* Define to 1 if you have the `utime' function. */ +#undef HAVE_UTIME + +/* Define to 1 if you have the header file. */ +#undef HAVE_UTIME_H + +/* 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 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 + +/* Define to 1 if `fork' works. */ +#undef HAVE_WORKING_FORK + +/* 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 + +/* Define to 1 if `lstat' dereferences a symlink specified with a trailing + slash. */ +#undef LSTAT_FOLLOWS_SLASHED_SYMLINK + +/* Define according to your operating system type. */ +#undef Linux + +/* Define according to your operating system type. */ +#undef NetBSD + +/* Define according to your operating system type. */ +#undef OpenBSD + +/* 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 this to be the name of the CPU of your system. */ +#undef PBX_CPU + +/* Define this to be the name of the OS of your system. */ +#undef PBX_OS + +/* Define this to be the canonical name (cpu-vendor-os) of your system. */ +#undef PBX_PLATFORM + +/* Define this to be the name of the vendor of your system. */ +#undef PBX_VENDOR + +/* Define to 1 if the C compiler supports function prototypes. */ +#undef PROTOTYPES + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* Define to the type of arg 1 for `select'. */ +#undef SELECT_TYPE_ARG1 + +/* Define to the type of args 2, 3 and 4 for `select'. */ +#undef SELECT_TYPE_ARG234 + +/* Define to the type of arg 5 for `select'. */ +#undef SELECT_TYPE_ARG5 + +/* Define to 1 if the `setvbuf' function takes the buffering type as its + second argument and the buffer pointer as the third, as on System V before + release 3. */ +#undef SETVBUF_REVERSED + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at runtime. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define according to your operating system type. */ +#undef SunOS + +/* Define to 1 if you can safely include both and . */ +#undef TIME_WITH_SYS_TIME + +/* Define to 1 if your declares `struct tm'. */ +#undef TM_IN_SYS_TIME + +/* Define according to your operating system type. */ +#undef Unix + +/* Define according to your operating system type. */ +#undef Win32 + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS + +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# undef _GNU_SOURCE +#endif + +/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ +#undef _LARGEFILE_SOURCE + +/* Define for large files, on AIX-style hosts. */ +#undef _LARGE_FILES + +/* Define like PROTOTYPES; this can be used by system headers. */ +#undef __PROTOTYPES + +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const + +/* Define to `int' if doesn't define. */ +#undef gid_t + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +#undef inline +#endif + +/* Define to rpl_malloc if the replacement function should be used. */ +#undef malloc + +/* Define to `int' if does not define. */ +#undef mode_t + +/* Define to `long int' if does not define. */ +#undef off_t + +/* Define to `int' if does not define. */ +#undef pid_t + +/* Define to rpl_realloc if the replacement function should be used. */ +#undef realloc + +/* Define to `unsigned int' if does not define. */ +#undef size_t + +/* Define to `int' if doesn't define. */ +#undef uid_t + +/* Define as `fork' if `vfork' does not work. */ +#undef vfork + +/* Define to empty if the keyword `volatile' does not work. Warning: valid + code using `volatile' can become incorrect without. Disable with care. */ +#undef volatile + +#endif + diff --git a/include/autoconfig.h.in b/include/autoconfig.h.in deleted file mode 100644 index a5c34af51..000000000 --- a/include/autoconfig.h.in +++ /dev/null @@ -1,577 +0,0 @@ -/* include/autoconfig.h.in. Generated from configure.ac by autoheader. */ - -#ifndef ASTERISK_AUTOCONFIG_H -#define ASTERISK_AUTOCONFIG_H - -#ifndef MENUSELECT -#include "asterisk/buildopts.h" -#endif - -#ifndef _REENTRANT -#define _REENTRANT -#endif - - -/* Define to 1 if the `closedir' function returns void instead of `int'. */ -#undef CLOSEDIR_VOID - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ -#undef C_ALLOCA - -/* Define according to your operating system type. */ -#undef Darwin - -/* Define according to your operating system type. */ -#undef FreeBSD - -/* Define to 1 if you have the `alarm' function. */ -#undef HAVE_ALARM - -/* Define to 1 if you have `alloca', as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#undef HAVE_ALLOCA_H - -/* Define to indicate the Advanced Linux Sound Architecture library */ -#undef HAVE_ALSA - -/* Define to 1 if you have the 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 - -/* Define to 1 if you have the `bzero' function. */ -#undef HAVE_BZERO - -/* Define to 1 if your system has a working `chown' function. */ -#undef HAVE_CHOWN - -/* Define if your system has the curl libraries. */ -#undef HAVE_CURL - -/* Define to indicate the curses library */ -#undef HAVE_CURSES - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_DIRENT_H - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - -/* Define to 1 if you have the `dup2' function. */ -#undef HAVE_DUP2 - -/* Define to 1 if you have the `endpwent' function. */ -#undef HAVE_ENDPWENT - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the `floor' function. */ -#undef HAVE_FLOOR - -/* 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 fseeko (and presumably ftello) exists and is declared. */ -#undef HAVE_FSEEKO - -/* Define to 1 if you have the `ftruncate' function. */ -#undef HAVE_FTRUNCATE - -/* Define to 1 if you have the `getcwd' function. */ -#undef HAVE_GETCWD - -/* Define to 1 if you have the `gethostbyname' function. */ -#undef HAVE_GETHOSTBYNAME - -/* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME - -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - -/* Define to 1 if you have the `gettimeofday' function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define to indicate the GSM library */ -#undef HAVE_GSM - -/* Define if your system has the GTK libraries. */ -#undef HAVE_GTK - -/* Define to indicate the Iksemel Jabber Library library */ -#undef HAVE_IKSEMEL - -/* Define to 1 if you have the `inet_ntoa' function. */ -#undef HAVE_INET_NTOA - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `isascii' function. */ -#undef HAVE_ISASCII - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBINTL_H - -/* Define if your system has the KDE library */ -#undef HAVE_LIBKDE - -/* Define to indicate the ISDN PRI library */ -#undef HAVE_LIBPRI - -/* Define if your system has the pwlib libraries. */ -#undef HAVE_LIBPWLIB - -/* Define if your system has the Qt library */ -#undef HAVE_LIBQT - -/* Define if your system has the VoiceTronix (vpb) libraries. */ -#undef HAVE_LIBVPB - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the `localtime_r' function. */ -#undef HAVE_LOCALTIME_R - -/* Define to 1 if your system has a GNU libc compatible `malloc' function, and - to 0 otherwise. */ -#undef HAVE_MALLOC - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define to 1 if you have the `memchr' function. */ -#undef HAVE_MEMCHR - -/* Define to 1 if you have the `memmove' function. */ -#undef HAVE_MEMMOVE - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `memset' function. */ -#undef HAVE_MEMSET - -/* Define to 1 if you have the `mkdir' function. */ -#undef HAVE_MKDIR - -/* Define to 1 if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* 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 indicate the ncurses library */ -#undef HAVE_NCURSES - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NETDB_H - -/* Define to 1 if you have the 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 - -/* Define to 1 if you have the `putenv' function. */ -#undef HAVE_PUTENV - -/* Define to indicate the Radius Client library */ -#undef HAVE_RADIUSCLIENT - -/* Define to 1 if your system has a GNU libc compatible `realloc' function, - and to 0 otherwise. */ -#undef HAVE_REALLOC - -/* Define to 1 if you have the `regcomp' function. */ -#undef HAVE_REGCOMP - -/* Define to 1 if you have the `re_comp' function. */ -#undef HAVE_RE_COMP - -/* Define to 1 if you have the `rint' function. */ -#undef HAVE_RINT - -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - -/* Define to 1 if you have the `setenv' function. */ -#undef HAVE_SETENV - -/* 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 - -/* Define to 1 if `stat' has the bug that it succeeds when given the - zero-length file name argument. */ -#undef HAVE_STAT_EMPTY_STRING_BUG - -/* Define to 1 if stdbool.h conforms to C99. */ -#undef HAVE_STDBOOL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* 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 - -/* Define to 1 if you have the `strcoll' function and it is properly defined. - */ -#undef HAVE_STRCOLL - -/* Define to 1 if you have the `strcspn' function. */ -#undef HAVE_STRCSPN - -/* Define to 1 if you have the `strdup' function. */ -#undef HAVE_STRDUP - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strncasecmp' function. */ -#undef HAVE_STRNCASECMP - -/* Define to 1 if you have the `strndup' function. */ -#undef HAVE_STRNDUP - -/* Define to 1 if you have the `strrchr' function. */ -#undef HAVE_STRRCHR - -/* Define to 1 if you have the `strsep' function. */ -#undef HAVE_STRSEP - -/* Define to 1 if you have the `strspn' function. */ -#undef HAVE_STRSPN - -/* Define to 1 if you have the `strstr' function. */ -#undef HAVE_STRSTR - -/* 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 - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYSLOG_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_DIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_FILE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -#undef HAVE_SYS_NDIR_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define to indicate the Termcap library */ -#undef HAVE_TERMCAP - -/* Define to 1 if you have the header file. */ -#undef HAVE_TERMIOS_H - -/* Define to indicate the Term Info library */ -#undef HAVE_TINFO - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to indicate the unixODBC library */ -#undef HAVE_UNIXODBC - -/* Define to 1 if you have the `unsetenv' function. */ -#undef HAVE_UNSETENV - -/* Define to 1 if you have the `utime' function. */ -#undef HAVE_UTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_UTIME_H - -/* 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 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 - -/* Define to 1 if `fork' works. */ -#undef HAVE_WORKING_FORK - -/* 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 - -/* Define to 1 if `lstat' dereferences a symlink specified with a trailing - slash. */ -#undef LSTAT_FOLLOWS_SLASHED_SYMLINK - -/* Define according to your operating system type. */ -#undef Linux - -/* Define according to your operating system type. */ -#undef NetBSD - -/* Define according to your operating system type. */ -#undef OpenBSD - -/* 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 this to be the name of the CPU of your system. */ -#undef PBX_CPU - -/* Define this to be the name of the OS of your system. */ -#undef PBX_OS - -/* Define this to be the canonical name (cpu-vendor-os) of your system. */ -#undef PBX_PLATFORM - -/* Define this to be the name of the vendor of your system. */ -#undef PBX_VENDOR - -/* Define to 1 if the C compiler supports function prototypes. */ -#undef PROTOTYPES - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Define to the type of arg 1 for `select'. */ -#undef SELECT_TYPE_ARG1 - -/* Define to the type of args 2, 3 and 4 for `select'. */ -#undef SELECT_TYPE_ARG234 - -/* Define to the type of arg 5 for `select'. */ -#undef SELECT_TYPE_ARG5 - -/* Define to 1 if the `setvbuf' function takes the buffering type as its - second argument and the buffer pointer as the third, as on System V before - release 3. */ -#undef SETVBUF_REVERSED - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at runtime. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define according to your operating system type. */ -#undef SunOS - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Define to 1 if your declares `struct tm'. */ -#undef TM_IN_SYS_TIME - -/* Define according to your operating system type. */ -#undef Unix - -/* Define according to your operating system type. */ -#undef Win32 - -/* Number of bits in a file offset, on hosts where this is settable. */ -#undef _FILE_OFFSET_BITS - -/* Enable GNU extensions on systems that have them. */ -#ifndef _GNU_SOURCE -# undef _GNU_SOURCE -#endif - -/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ -#undef _LARGEFILE_SOURCE - -/* Define for large files, on AIX-style hosts. */ -#undef _LARGE_FILES - -/* Define like PROTOTYPES; this can be used by system headers. */ -#undef __PROTOTYPES - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const - -/* Define to `int' if doesn't define. */ -#undef gid_t - -/* Define to `__inline__' or `__inline' if that's what the C compiler - calls it, or to nothing if 'inline' is not supported under any name. */ -#ifndef __cplusplus -#undef inline -#endif - -/* Define to rpl_malloc if the replacement function should be used. */ -#undef malloc - -/* Define to `int' if does not define. */ -#undef mode_t - -/* Define to `long int' if does not define. */ -#undef off_t - -/* Define to `int' if does not define. */ -#undef pid_t - -/* Define to rpl_realloc if the replacement function should be used. */ -#undef realloc - -/* Define to `unsigned int' if does not define. */ -#undef size_t - -/* Define to `int' if doesn't define. */ -#undef uid_t - -/* Define as `fork' if `vfork' does not work. */ -#undef vfork - -/* Define to empty if the keyword `volatile' does not work. Warning: valid - code using `volatile' can become incorrect without. Disable with care. */ -#undef volatile - -#endif - diff --git a/pbx.c b/pbx.c index c0095787b..40ec7752e 100644 --- a/pbx.c +++ b/pbx.c @@ -58,7 +58,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/musiconhold.h" #include "asterisk/app.h" #include "asterisk/devicestate.h" -#include "asterisk/compat.h" #include "asterisk/stringfields.h" /*! diff --git a/utils/ael_main.c b/utils/ael_main.c index 69be09f06..5ac403007 100644 --- a/utils/ael_main.c +++ b/utils/ael_main.c @@ -1,4 +1,4 @@ -#include "autoconfig.h" +#include "asterisk/autoconfig.h" #include #include diff --git a/utils/astman.c b/utils/astman.c index b6dd9ec57..733f377b3 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -22,7 +22,7 @@ * */ -#include "autoconfig.h" +#include "asterisk/autoconfig.h" #include #include diff --git a/utils/smsq.c b/utils/smsq.c index 20b6d376e..4954e118b 100644 --- a/utils/smsq.c +++ b/utils/smsq.c @@ -17,7 +17,7 @@ * at the top of the source tree. */ -#include "autoconfig.h" +#include "asterisk/autoconfig.h" #include #include -- cgit v1.2.3