diff options
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | include/asterisk/autoconfig.h.in | 46 |
2 files changed, 28 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac index e37b34e62..1c8fded08 100644 --- a/configure.ac +++ b/configure.ac @@ -17,20 +17,26 @@ AC_CANONICAL_HOST # check existence of the package AC_CONFIG_SRCDIR([main/asterisk.c]) -# specify output header file -AC_CONFIG_HEADER(include/asterisk/autoconfig.h) - AC_COPYRIGHT("Asterisk") AC_REVISION($Revision$) -AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD - # preserve any CFLAGS or LDFLAGS that may be set +# NOTE: This must be done before calling any macros that end up +# calling AC_PROG_CC or the like, since they will set a default +# set of CFLAGS ("-g -O2") if the user did not supply any, and +# we don't want those default flags to be carried over into the +# rest of the build system since we have other means of controlling +# debugging symbol generation and optimization. CONFIG_CFLAGS="${CFLAGS}" CONFIG_LDFLAGS="${LDFLAGS}" AC_SUBST(CONFIG_CFLAGS) AC_SUBST(CONFIG_LDFLAGS) +# specify output header file +AC_CONFIG_HEADER(include/asterisk/autoconfig.h) + +AC_USE_SYSTEM_EXTENSIONS # note- does not work on FreeBSD + case "${host_os}" in freebsd*) ac_default_prefix=/usr/local diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in index 78f01cfcb..faf3a0e7d 100644 --- a/include/asterisk/autoconfig.h.in +++ b/include/asterisk/autoconfig.h.in @@ -1068,9 +1068,6 @@ /* Define to the version of this package. */ #undef PACKAGE_VERSION -/* Define to 1 if the C compiler supports function prototypes. */ -#undef PROTOTYPES - /* Define to necessary symbol if this constant uses a non-standard name on your system. */ #undef PTHREAD_CREATE_JOINABLE @@ -1087,11 +1084,6 @@ /* 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 - /* The size of `int', as computed by sizeof. */ #undef SIZEOF_INT @@ -1112,20 +1104,30 @@ /* Define to 1 if your <sys/time.h> declares `struct tm'. */ #undef TM_IN_SYS_TIME -/* Define to 1 if on AIX 3. - System headers sometimes define this. - We just want to avoid a redefinition error message. */ +/* Enable extensions on AIX 3, Interix. */ #ifndef _ALL_SOURCE # undef _ALL_SOURCE #endif - -/* 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 +/* 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 + + +/* Number of bits in a file offset, on hosts where this is settable. */ +#undef _FILE_OFFSET_BITS /* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */ #undef _LARGEFILE_SOURCE @@ -1143,20 +1145,6 @@ /* Define to 1 if you need to in order for `stat' and other things to work. */ #undef _POSIX_SOURCE -/* Enable extensions on Solaris. */ -#ifndef __EXTENSIONS__ -# undef __EXTENSIONS__ -#endif -#ifndef _POSIX_PTHREAD_SEMANTICS -# undef _POSIX_PTHREAD_SEMANTICS -#endif -#ifndef _TANDEM_SOURCE -# undef _TANDEM_SOURCE -#endif - -/* 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 |