[Freeswitch-svn] [commit] r6294 - in freeswitch/trunk/libs: codec/g726 codec/g7xx codec/gsm codec/ilbc codec/lpc10 speex

[Freeswitch SVN]

Author: mikej
Date: Thu Nov 15 20:45:29 2007
New Revision: 6294

Modified:
   freeswitch/trunk/libs/codec/g726/configure.in
   freeswitch/trunk/libs/codec/g7xx/configure.in
   freeswitch/trunk/libs/codec/gsm/configure.in
   freeswitch/trunk/libs/codec/ilbc/configure.in
   freeswitch/trunk/libs/codec/lpc10/configure.ac
   freeswitch/trunk/libs/speex/configure.ac
   freeswitch/trunk/libs/speex/configure.gnu

Log:
add --enable-64 configure flag to build 64 bit with suncc

Modified: freeswitch/trunk/libs/codec/g726/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/g726/configure.in	(original)
+++ freeswitch/trunk/libs/codec/g726/configure.in	Thu Nov 15 20:45:29 2007
@@ -85,6 +85,15 @@
                         DYNAMIC_LIB_EXTEN="so"
                 ;;
 esac
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        new_AM_CFLAGS="$new_AM_CFLAGS -m64"
+    fi
+fi
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)

Modified: freeswitch/trunk/libs/codec/g7xx/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/g7xx/configure.in	(original)
+++ freeswitch/trunk/libs/codec/g7xx/configure.in	Thu Nov 15 20:45:29 2007
@@ -88,6 +88,17 @@
                         IN_LINE=inline
                 ;;
 esac
+
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        new_AM_CFLAGS="$new_AM_CFLAGS -m64"
+    fi
+fi
+
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)

Modified: freeswitch/trunk/libs/codec/gsm/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/gsm/configure.in	(original)
+++ freeswitch/trunk/libs/codec/gsm/configure.in	Thu Nov 15 20:45:29 2007
@@ -12,6 +12,35 @@
 AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 
+AC_DEFUN([AX_COMPILER_VENDOR],
+[
+AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+ [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+#if !($vencpp)
+      thisisanerror;
+#endif
+])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
+  done
+ ])
+])
+
+AX_COMPILER_VENDOR
+
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        CFLAGS="$CFLAGS -m64"
+        CXXFLAGS="$CXXFLAGS -m64"
+    fi
+fi
+
 # Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC

Modified: freeswitch/trunk/libs/codec/ilbc/configure.in
==============================================================================
--- freeswitch/trunk/libs/codec/ilbc/configure.in	(original)
+++ freeswitch/trunk/libs/codec/ilbc/configure.in	Thu Nov 15 20:45:29 2007
@@ -91,6 +91,15 @@
                         IN_LINE=inline
                 ;;
 esac
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        new_AM_CFLAGS="$new_AM_CFLAGS -m64"
+    fi
+fi
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)

Modified: freeswitch/trunk/libs/codec/lpc10/configure.ac
==============================================================================
--- freeswitch/trunk/libs/codec/lpc10/configure.ac	(original)
+++ freeswitch/trunk/libs/codec/lpc10/configure.ac	Thu Nov 15 20:45:29 2007
@@ -83,6 +83,15 @@
                         DYNAMIC_LIB_EXTEN="so"
                 ;;
 esac
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        new_AM_CFLAGS="$new_AM_CFLAGS -m64"
+    fi
+fi
 AC_SUBST(new_AM_CFLAGS)
 AC_SUBST(new_AM_LDFLAGS)
 AC_SUBST(SOLINK)

Modified: freeswitch/trunk/libs/speex/configure.ac
==============================================================================
--- freeswitch/trunk/libs/speex/configure.ac	(original)
+++ freeswitch/trunk/libs/speex/configure.ac	Thu Nov 15 20:45:29 2007
@@ -185,6 +185,36 @@
 AC_SUBST(SIZE16)
 AC_SUBST(SIZE32)
 
+
+AC_DEFUN([AX_COMPILER_VENDOR],
+[
+AC_CACHE_CHECK([for _AC_LANG compiler vendor], ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor,
+ [ax_cv_[]_AC_LANG_ABBREV[]_compiler_vendor=unknown
+  # note: don't check for gcc first since some other compilers define __GNUC__
+  for ventest in intel:__ICC,__ECC,__INTEL_COMPILER ibm:__xlc__,__xlC__,__IBMC__,__IBMCPP__ gnu:__GNUC__ sun:__SUNPRO_C,__SUNPRO_CC hp:__HP_cc,__HP_aCC dec:__DECC,__DECCXX,__DECC_VER,__DECCXX_VER borland:__BORLANDC__,__TURBOC__ comeau:__COMO__ cray:_CRAYC kai:__KCC lcc:__LCC__ metrowerks:__MWERKS__ sgi:__sgi,sgi microsoft:_MSC_VER watcom:__WATCOMC__ portland:__PGI; do
+    vencpp="defined("`echo $ventest | cut -d: -f2 | sed 's/,/) || defined(/g'`")"
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,[
+#if !($vencpp)
+      thisisanerror;
+#endif
+])], [ax_cv_]_AC_LANG_ABBREV[_compiler_vendor=`echo $ventest | cut -d: -f1`; break])
+  done
+ ])
+])
+
+AX_COMPILER_VENDOR
+
+#  Enable 64 bit build
+AC_ARG_ENABLE(64,
+[AC_HELP_STRING([--enable-64],[build with 64 bit support])],[enable_64="$enable_64"],[enable_64="no"])
+
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        CFLAGS="$CFLAGS -m64"
+        CXXFLAGS="$CXXFLAGS -m64"
+    fi
+fi
+
 AC_OUTPUT([Makefile libspeex/Makefile src/Makefile doc/Makefile Speex.spec
            include/Makefile include/speex/Makefile speex.pc
            win32/Makefile win32/libspeex/Makefile win32/speexenc/Makefile

Modified: freeswitch/trunk/libs/speex/configure.gnu
==============================================================================
--- freeswitch/trunk/libs/speex/configure.gnu	(original)
+++ freeswitch/trunk/libs/speex/configure.gnu	Thu Nov 15 20:45:29 2007
@@ -1,2 +1,2 @@
 #! /bin/sh
-./configure "$@" --disable-shared --with-pic
+./configure "$@" --disable-shared --with-pic --disable-oggtest