update

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@142 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/libs/iax/Makefile.in b/libs/iax/Makefile.in
index d7e36a24a0b86266b8c1ca362b427d727922dc18..9de131738e79e42a3f7c532eec446c08d2ec10c2 100644 (file)
--- a/libs/iax/Makefile.in
+++ b/libs/iax/Makefile.in
@@ -109,6 +109,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ISMAC_FALSE = @ISMAC_FALSE@
+ISMAC_TRUE = @ISMAC_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@

diff --git a/libs/iax/configure b/libs/iax/configure
index 3b325c362571f75abe8d03880fe618cda2d21b22..69f2021235a3a09c57e7868e89405a53cfacdc16 100755 (executable)
--- a/libs/iax/configure
+++ b/libs/iax/configure
@@ -463,7 +463,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL IAX_VERSION LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ISMAC_TRUE ISMAC_FALSE IAX_VERSION LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -19832,6 +19832,17 @@ fi
 
 
 
+
+
+if test `uname -s` = Darwin; then
+  ISMAC_TRUE=
+  ISMAC_FALSE='#'
+else
+  ISMAC_TRUE='#'
+  ISMAC_FALSE=
+fi
+
+
 # Check whether --enable-snomhack or --disable-snomhack was given.
 if test "${enable_snomhack+set}" = set; then
   enableval="$enable_snomhack"
@@ -20012,6 +20023,13 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${ISMAC_TRUE}" && test -z "${ISMAC_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"ISMAC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"ISMAC\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -20606,6 +20624,8 @@ s,@F77@,$F77,;t t
 s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
+s,@ISMAC_TRUE@,$ISMAC_TRUE,;t t
+s,@ISMAC_FALSE@,$ISMAC_FALSE,;t t
 s,@IAX_VERSION@,$IAX_VERSION,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t

diff --git a/libs/iax/configure.in b/libs/iax/configure.in
index 54bbc8515070431e95f2b2cb0b6fe8c0651247d8..0895242b4f398265f9dc9b5d63b0711f696170c8 100644 (file)
--- a/libs/iax/configure.in
+++ b/libs/iax/configure.in
@@ -17,6 +17,8 @@ AC_HEADER_STDC
 
 AC_SUBST(LIBS)
 
+AM_CONDITIONAL(ISMAC, [test `uname -s` = Darwin])
+
 AC_ARG_ENABLE(snomhack,     [  --enable-snomhack       Use slower memset for SNOM phoneem ],,enable_snomhack=no)
 AC_ARG_ENABLE(extreme_debug,     [  --enable-extreme-debug  Compile with extreme debugging code enabled ],,enable_extreme_debug=no)
 AC_ARG_ENABLE(newjb,     [  --enable-newjb       Use new jitter buffer  ], [CFLAGS="$CFLAGS -DNEWJB"])

diff --git a/libs/iax/src/Makefile.am b/libs/iax/src/Makefile.am
index 1e8c872a5d9f2318e31128c61dcf0ccbb508b3ac..315cffa170d19268742858f6b1302ccadb9b53e0 100644 (file)
--- a/libs/iax/src/Makefile.am
+++ b/libs/iax/src/Makefile.am
@@ -4,7 +4,9 @@ AM_CFLAGS += -DDEBUG_SUPPORT -DLIBIAX
 AM_CFLAGS += -fsigned-char
 # -DDEBUG_DEFAULT 
 AM_CFLAGS += $(UCFLAGS)
-
+if ISMAC
+AM_CFLAGS += -DMACOSX
+endif
 
 pkgdir = $(libdir)
 pkg_LTLIBRARIES=libiax.la

diff --git a/libs/iax/src/Makefile.in b/libs/iax/src/Makefile.in
index 1028cdc2ca1fdb9e7eee965a8c62d08a2ef6bbb0..029682c1124af57030d603a89ea1c1a3ced176f9 100644 (file)
--- a/libs/iax/src/Makefile.in
+++ b/libs/iax/src/Makefile.in
@@ -36,6 +36,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
+@ISMAC_TRUE@am__append_1 = -DMACOSX
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -106,6 +107,8 @@ INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+ISMAC_FALSE = @ISMAC_FALSE@
+ISMAC_TRUE = @ISMAC_TRUE@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
@@ -171,7 +174,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 # -DDEBUG_DEFAULT 
 AM_CFLAGS = -Wall -O2 -g -Wall -Wstrict-prototypes -I . \
-       -DDEBUG_SUPPORT -DLIBIAX -fsigned-char $(UCFLAGS)
+       -DDEBUG_SUPPORT -DLIBIAX -fsigned-char $(UCFLAGS) \
+       $(am__append_1)
 pkgdir = $(libdir)
 pkg_LTLIBRARIES = libiax.la
 libiax_la_SOURCES = iax2-parser.c iax.c md5.c jitterbuf.c