Author: mikej Date: Thu Nov 15 16:02:53 2007 New Revision: 6288 Modified: freeswitch/trunk/libs/libresample/configure.in freeswitch/trunk/libs/pcre/configure.ac freeswitch/trunk/libs/sqlite/configure.ac freeswitch/trunk/libs/srtp/configure.in Log: --enable-64 for 64bit suncc build Modified: freeswitch/trunk/libs/libresample/configure.in ============================================================================== --- freeswitch/trunk/libs/libresample/configure.in (original) +++ freeswitch/trunk/libs/libresample/configure.in Thu Nov 15 16:02:53 2007 @@ -94,6 +94,17 @@ 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/pcre/configure.ac ============================================================================== --- freeswitch/trunk/libs/pcre/configure.ac (original) +++ freeswitch/trunk/libs/pcre/configure.ac Thu Nov 15 16:02:53 2007 @@ -1,3 +1,4 @@ + dnl Process this file with autoconf to produce a configure script. dnl This configure.in file has been hacked around quite a lot as a result of @@ -86,6 +87,35 @@ BUILD_EXEEXT=${BUILD_EXEEXT:-'$(EXEEXT)'} BUILD_OBJEXT=${BUILD_OBJEXT:-'$(OBJEXT)'} +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 + dnl Checks for header files. AC_HEADER_STDC Modified: freeswitch/trunk/libs/sqlite/configure.ac ============================================================================== --- freeswitch/trunk/libs/sqlite/configure.ac (original) +++ freeswitch/trunk/libs/sqlite/configure.ac Thu Nov 15 16:02:53 2007 @@ -180,6 +180,24 @@ . $hints fi +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 + ######### # Locate a compiler for the build machine. This compiler should # generate command-line programs that run on the build machine. @@ -213,6 +231,11 @@ AC_SUBST(BUILD_CFLAGS) AC_SUBST(BUILD_LIBS) + +# 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"]) + ########## # Locate a compiler that converts C code into *.o files that run on # the target machine. @@ -230,6 +253,11 @@ else TARGET_CFLAGS=$BUILD_CFLAGS fi +if test "x${ax_cv_c_compiler_vendor}" = "xsun" ; then + if test "${enable_64}" = "yes"; then + TARGET_CFLAGS="$TARGET_CFLAGS -m64" + fi +fi AC_MSG_RESULT($TARGET_CFLAGS) AC_MSG_CHECKING([target linker]) if test "$config_TARGET_LINK" = ""; then Modified: freeswitch/trunk/libs/srtp/configure.in ============================================================================== --- freeswitch/trunk/libs/srtp/configure.in (original) +++ freeswitch/trunk/libs/srtp/configure.in Thu Nov 15 16:02:53 2007 @@ -31,6 +31,7 @@ AX_CFLAGS_WARN_ALL_ANSI fi + AM_CONDITIONAL([WANT_DEBUG],[test "${enable_debug}" = "yes"]) @@ -85,6 +86,17 @@ 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)