[Freeswitch-svn] [commit] r6287 - in freeswitch/trunk: . libs/apr libs/apr/build

[Freeswitch SVN]

Author: mikej
Date: Thu Nov 15 15:07:34 2007
New Revision: 6287

Added:
   freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4
Modified:
   freeswitch/trunk/configure.in
   freeswitch/trunk/libs/apr/configure.in

Log:
start adding solaris suncc 64 bit support native in the build system

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Thu Nov 15 15:07:34 2007
@@ -138,7 +138,6 @@
     APR_ADDTO(SWITCH_AM_LDFLAGS, -R${prefix}/lib)
     if test "${enable_64}" = "yes"; then
         APR_ADDTO(SWITCH_AM_CFLAGS, -m64)
-        APR_ADDTO(SWITCH_AM_LDFLAGS, -L/opt/csw/lib/amd64)
     fi
 elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
     APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC)

Added: freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4
==============================================================================
--- (empty file)
+++ freeswitch/trunk/libs/apr/build/ax_compiler_vendor.m4	Thu Nov 15 15:07:34 2007
@@ -0,0 +1,15 @@
+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
+ ])
+])

Modified: freeswitch/trunk/libs/apr/configure.in
==============================================================================
--- freeswitch/trunk/libs/apr/configure.in	(original)
+++ freeswitch/trunk/libs/apr/configure.in	Thu Nov 15 15:07:34 2007
@@ -116,6 +116,9 @@
 dnl preload section from invoking the macro to get compiler info.
 AC_PROG_CC
 
+#Check for compiler vendor
+AX_COMPILER_VENDOR
+
 dnl Preload
 APR_PRELOAD
 
@@ -254,6 +257,18 @@
    fi
 ])dnl
 
+#  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"])
+# tweak compiler specific flags
+if test "x${ax_cv_c_compiler_vendor}"  =  "xsun" ; then
+    if test "${enable_64}" = "yes"; then
+        APR_ADDTO(CFLAGS, -m64)
+    fi
+fi
+
+
+
 AC_ARG_ENABLE(maintainer-mode,[  --enable-maintainer-mode  Turn on debugging and compile time warnings],
   [APR_ADDTO(CFLAGS,-g)
    if test "$GCC" = "yes"; then