Author: lukedashjr Date: Mon May 26 13:10:53 2008 New Revision: 8665 Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in Log: fix problems introduced by merge Modified: freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in ============================================================================== --- freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in (original) +++ freeswitch/branches/lukedashjr/syslibs/freeswitch/configure.in Mon May 26 13:10:53 2008 @@ -16,7 +16,6 @@ AM_INIT_AUTOMAKE(libfreeswitch,0.1) AC_CONFIG_SRCDIR([src/switch.c]) AC_CONFIG_HEADER([src/include/switch_private.h]) -AC_CONFIG_HEADER([libs/xmlrpc-c/xmlrpc_amconfig.h]) AC_PREFIX_DEFAULT(/usr/local/freeswitch) # AC_PREFIX_DEFAULT does not get expanded until too late so we need to do this to use prefix in this script @@ -331,14 +330,6 @@ AC_HEADER_STDC AC_CHECK_HEADERS([sys/types.h sys/resource.h sched.h wchar.h sys/filio.h sys/ioctl.h]) -# for xmlrpc-c config.h -if test x"$ac_cv_header_wchar_h" = xyes; then - HAVE_WCHAR_H_DEFINE=1 -else - HAVE_WCHAR_H_DEFINE=0 -fi -AC_SUBST(HAVE_WCHAR_H_DEFINE) - # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST AC_C_INLINE @@ -410,45 +401,6 @@ AC_DEFINE([USE_SCHED_SETSCHEDULER],[1],[Enable round-robin scheduler using sched_setscheduler]) fi -# -# xmlrpc-c checks -# - - -HAVE_LIBWWW_SSL_DEFINE=0 -AC_SUBST(HAVE_LIBWWW_SSL_DEFINE) - -DIRECTORY_SEPARATOR="/" -AC_SUBST(DIRECTORY_SEPARATOR) - -va_list_is_array=no -AC_MSG_CHECKING(whether va_list is an array) -AC_TRY_COMPILE([ -#include <stdarg.h> -], [va_list list1, list2; list1 = list2;], , -va_list_is_array=yes) -AC_MSG_RESULT($va_list_is_array) -if test x"$va_list_is_array" = xyes; then - VA_LIST_IS_ARRAY_DEFINE=1 -else - VA_LIST_IS_ARRAY_DEFINE=0 -fi -AC_SUBST(VA_LIST_IS_ARRAY_DEFINE) - -AC_MSG_CHECKING(whether compiler has __attribute__) -AC_TRY_COMPILE(, [int x __attribute__((__unused__));], -compiler_has_attribute=yes, -compiler_has_attribute=no) -AC_MSG_RESULT($compiler_has_attribute) -if test x"$compiler_has_attribute" = xyes; then - ATTR_UNUSED="__attribute__((__unused__))" -else - ATTR_UNUSED= -fi -AC_SUBST(ATTR_UNUSED) - - - AC_C_BIGENDIAN(AC_DEFINE([SWITCH_BYTE_ORDER],__BIG_ENDIAN,[Big Endian]),AC_DEFINE([SWITCH_BYTE_ORDER],__LITTLE_ENDIAN,[Little Endian])) @@ -748,8 +700,6 @@ build/getsounds.sh build/getlib.sh build/modmake.rules - libs/xmlrpc-c/include/xmlrpc-c/config.h - libs/xmlrpc-c/xmlrpc_config.h scripts/gentls_cert]) AM_CONDITIONAL(ISLINUX, [test `uname -s` = Linux])