[Opalvoip-svn] SF.net SVN: opalvoip:[20715] ptlib/trunk

[<ms3...@us...>]

Revision: 20715
          http://opalvoip.svn.sourceforge.net/opalvoip/?rev=20715&view=rev
Author:   ms30002000
Date:     2008-08-21 18:17:37 +0000 (Thu, 21 Aug 2008)

Log Message:
-----------
Move FDSIZE check of solaris to arch-dependent section.

Modified Paths:
--------------
    ptlib/trunk/configure
    ptlib/trunk/configure.ac
    ptlib/trunk/ptlib.m4

Modified: ptlib/trunk/configure
===================================================================
--- ptlib/trunk/configure	2008-08-21 17:53:25 UTC (rev 20714)
+++ ptlib/trunk/configure	2008-08-21 18:17:37 UTC (rev 20715)
@@ -3318,6 +3318,10 @@
 
 
 
+
+
+
+
 PTLIBDIR=`pwd`
 
 
@@ -3982,6 +3986,26 @@
 fi
 
 
+
+          ptlib_fdsize_file=/etc/system
+          ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -c1`
+
+          if test "x${ptlib_fdsize}" = "x#"; then
+            ptlib_fdsize=4098
+          else
+            ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -f2 -d'='`
+            if test "x${ptlib_fdsize}" = "x"; then
+              ptlib_fdsize=4098
+            fi
+          fi
+
+          if test "x${ptlib_fdsize}" != "x4098"; then
+            STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=${ptlib_fdsize}"
+          fi
+
+          { echo "$as_me:$LINENO: result: ${ptlib_fdsize}" >&5
+echo "${ECHO_T}${ptlib_fdsize}" >&6; }
+
 		   ;;
 
   darwin* )	   OSTYPE=Darwin ;
@@ -7071,30 +7095,6 @@
 
 
 
-
-if test "${OSTYPE:-unknown}" = "solaris"; then
-  { echo "$as_me:$LINENO: checking checking for FD_SETSIZE" >&5
-echo $ECHO_N "checking checking for FD_SETSIZE... $ECHO_C" >&6; }
-  _FD_SYSTEM_FILE=/etc/system
-  _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -c1`
-  if test "$_FD_SETSIZE" = "#"; then
-    _FD_SETSIZE=4098
-  else
-    _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -f2 -d'='`
-    if test "x$_FD_SETSIZE" = "x"; then
-      _FD_SETSIZE=4098
-    else
-      STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=$_FD_SETSIZE"
-    fi
-  fi
-  { echo "$as_me:$LINENO: result: $_FD_SETSIZE" >&5
-echo "${ECHO_T}$_FD_SETSIZE" >&6; }
-fi
-
-
-
-
-
 if test ${OSTYPE} != Darwin ; then
   cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */

Modified: ptlib/trunk/configure.ac
===================================================================
--- ptlib/trunk/configure.ac	2008-08-21 17:53:25 UTC (rev 20714)
+++ ptlib/trunk/configure.ac	2008-08-21 18:17:37 UTC (rev 20715)
@@ -122,6 +122,7 @@
                    dnl According to Andre Schulze <as...@rn...>
                    dnl Solaris swab should not be used
                    PTLIB_CHECK_UPAD128( [AC_DEFINE(P_HAS_UPAD128_T)] )
+                   PTLIB_CHECK_FDSIZE()
 		   ;;
 
   darwin* )	   OSTYPE=Darwin ;
@@ -715,31 +716,7 @@
 AC_DEFINE_UNQUOTED(P_HAS_ATOMIC_INT, ${P_HAS_ATOMIC_INT})
 AC_DEFINE_UNQUOTED(P_NEEDS_GNU_CXX_NAMESPACE, ${P_NEEDS_GNU_CXX_NAMESPACE})
 
-
 dnl ########################################################################
-dnl check for select_large_fdset (Solaris)
-
-if test "${OSTYPE:-unknown}" = "solaris"; then
-  AC_MSG_CHECKING(checking for FD_SETSIZE)
-  _FD_SYSTEM_FILE=/etc/system
-  _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -c1`
-  if test "$_FD_SETSIZE" = "#"; then
-    _FD_SETSIZE=4098
-  else
-    _FD_SETSIZE=`cat $_FD_SYSTEM_FILE | grep rlim_fd_max | cut -f2 -d'='`
-    if test "x$_FD_SETSIZE" = "x"; then
-      _FD_SETSIZE=4098
-    else
-      STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=$_FD_SETSIZE"
-    fi
-  fi
-  AC_MSG_RESULT($_FD_SETSIZE)
-fi
-
-
-
-
-dnl ########################################################################
 dnl check for Unix semaphores
 
 dnl posix unnamed semaphore support in darwin/macosx is broken

Modified: ptlib/trunk/ptlib.m4
===================================================================
--- ptlib/trunk/ptlib.m4	2008-08-21 17:53:25 UTC (rev 20714)
+++ ptlib/trunk/ptlib.m4	2008-08-21 18:17:37 UTC (rev 20715)
@@ -287,3 +287,45 @@
          ])
 
 
+dnl PTLIB_OPENSSL_AES
+dnl Check for directX
+dnl Arguments:
+dnl Return:    $1 action if-found
+dnl            $2 action if-not-found
+AC_DEFUN([PTLIB_OPENSSL_AES],
+         [
+          ptlib_openssl_aes=no
+          old_CFLAGS="$CFLAGS"
+          CFLAGS="$CFLAGS $OPENSSL_CFLAGS"
+          AC_LANG(C)
+          AC_CHECK_HEADERS([openssl/aes.h], [ptlib_openssl_aes=yes])
+          AC_LANG(C++)
+          CFLAGS="${old_CFLAGS}"
+          AS_IF([test AS_VAR_GET([ptlib_openssl_aes]) = yes], [$1], [$2])[]
+         ])
+
+dnl PTLIB_CHECK_FDSIZE
+dnl check for select_large_fdset (Solaris)
+dnl Arguments: $STDCCFLAGS
+dnl Return:    $STDCCFLAGS
+AC_DEFUN([PTLIB_CHECK_FDSIZE],
+         [
+          ptlib_fdsize_file=/etc/system
+          ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -c1`
+
+          if test "x${ptlib_fdsize}" = "x#"; then
+            ptlib_fdsize=4098
+          else
+            ptlib_fdsize=`cat ${ptlib_fdsize_file} | grep rlim_fd_max | cut -f2 -d'='`
+            if test "x${ptlib_fdsize}" = "x"; then
+              ptlib_fdsize=4098
+            fi
+          fi
+
+          if test "x${ptlib_fdsize}" != "x4098"; then
+            STDCCFLAGS="$STDCCFLAGS -DFD_SETSIZE=${ptlib_fdsize}"
+          fi
+
+          AC_MSG_RESULT(${ptlib_fdsize})
+         ])
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.