Changeset 698 for pjproject/trunk/aconfigure.ac

Timestamp:

Sep 10, 2006 8:53:59 AM (18 years ago)

Author:

bennylp

Message:

Fixed autoconf on MacOS X

File:

• pjproject/trunk/aconfigure.ac (modified) (22 diffs)

pjproject/trunk/aconfigure.ac

@@ -22 +22 @@
 AC_DEFINE_UNQUOTED(PJ_M_NAME,["$target_cpu"])
 
-# Endianness detection
-AC_C_BIGENDIAN([AC_SUBST(ac_bigendian,1)
-                AC_DEFINE(PJ_IS_LITTLE_ENDIAN,0)
-                AC_DEFINE(PJ_IS_BIG_ENDIAN,1)
-               ],
-               [AC_SUBST(ac_bigendian,0)
-                AC_DEFINE(PJ_IS_LITTLE_ENDIAN,1)
-                AC_DEFINE(PJ_IS_BIG_ENDIAN,0)
-               ])
-
-# --disable-floating-point option
+dnl # Endianness detection
+AC_C_BIGENDIAN
+
+dnl # --disable-floating-point option
 AC_ARG_ENABLE(floating-point,
               AC_HELP_STRING([--disable-floating-point],
@@ -91 +84 @@
 AC_DEFINE(PJ_ATOMIC_VALUE_TYPE,long)
 
-# Determine if inet_aton() is available
+dnl # Determine if inet_aton() is available
 AC_MSG_CHECKING([if inet_aton is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>
-                                    #include <netinet/in.h>
-                                    #include <arpa/inet.h>]],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <arpa/inet.h>]],
                                   [inet_aton(0, 0);])],
                   [AC_DEFINE(PJ_SOCK_HAS_INET_ATON,1)
@@ -101 +92 @@
                   [AC_MSG_RESULT(no)])
 
-# Determine if sockaddr_in has sin_len member
+dnl # Determine if sockaddr_in has sin_len member
 AC_MSG_CHECKING([if sockaddr_in has sin_len member])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>
-                                    #include <netinet/in.h>
-                                    #include <arpa/inet.h>]],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+                                     #include <sys/socket.h>
+                                     #include <netinet/in.h>
+                                     #include <arpa/inet.h>]],
                                   [struct sockaddr_in a; a.sin_len=0;])],
                   [AC_DEFINE(PJ_SOCKADDR_HAS_LEN,1)
@@ -111 +103 @@
                   AC_MSG_RESULT(no))
 
-# Determine if socklen_t is available
+dnl # Determine if socklen_t is available
 AC_MSG_CHECKING([if socklen_t is available])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <unistd.h>]],
@@ -119 +111 @@
                   AC_MSG_RESULT(no))
 
-# Determine if SO_ERROR is available
+dnl # Determine if SO_ERROR is available
 AC_MSG_CHECKING([if SO_ERROR is available])
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/socket.h>
-                                    #include <netinet/in.h>
-                                    #include <arpa/inet.h>]],
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
+                                     #include <sys/socket.h>
+                                     #include <netinet/in.h>
+                                     #include <arpa/inet.h>]],
                                   [int i=SO_ERROR;])],
                   [AC_DEFINE(PJ_HAS_SO_ERROR,1)
@@ -129 +122 @@
                   AC_MSG_RESULT(no))
 
-# Determine if RW-mutex is available
+dnl # Determine if RW-mutex is available
 AC_MSG_CHECKING([if pthread_rwlock_t is available])
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>],
@@ -139 +132 @@
 
 
-##########################################
-#
-# PJMEDIA
-#
-
-# Sound device backend selection
+dnl ##########################################
+dnl #
+dnl # PJMEDIA
+dnl #
+
+dnl # Sound device backend selection
 AC_SUBST(ac_pjmedia_snd)
 case $target in
-  *cygwin* | *win* | *mingw*)
+  *darwin*)
+        ac_pjmedia_snd=pa_darwinos
+        AC_MSG_RESULT([Checking sound device backend... coreaudio])
+        LIBS="$LIBS -framework CoreAudio"
+        ;;
+  *cygwin* | *mingw*)
         ac_pjmedia_snd=pa_win32
         AC_MSG_RESULT([Checking sound device backend... win32 sound])
@@ -154 +152 @@
         ac_pjmedia_snd=null
         AC_MSG_RESULT([Checking sound device backend... null sound])
-        ;;
-  *darwin*)
-        ac_pjmedia_snd=pa_darwin_os
-        AC_MSG_RESULT([Checking sound device backend... coreaudio])
         ;;
   *)
@@ -170 +164 @@
 esac
 
-# Include resampling small filter
+dnl # Include resampling small filter
 AC_SUBST(ac_no_small_filter)
 AC_ARG_ENABLE(small-filter,
@@ -181 +175 @@
               AC_MSG_RESULT([Checking if small filter is disabled... no]))
 
-# Include resampling large filter
+dnl # Include resampling large filter
 AC_SUBST(ac_no_large_filter)
 AC_ARG_ENABLE(large-filter,
@@ -192 +186 @@
               AC_MSG_RESULT([Checking if large filter is disabled... no]))
 
-# Include G.711 Annex A PLC
+dnl # Include G.711 Annex A PLC
 AC_SUBST(ac_no_g711_plc)
 AC_ARG_ENABLE(g711-plc,
@@ -203 +197 @@
               AC_MSG_RESULT([Checking if G.711 Annex A PLC is disabled...no]))
 
-# Include Speex AEC
+dnl # Include Speex AEC
 AC_SUBST(ac_no_speex_aec)
 AC_ARG_ENABLE(speex-aec,
@@ -214 +208 @@
               AC_MSG_RESULT([Checking if Speex AEC is disabled...no]))
 
-# Include G711 codec
+dnl # Include G711 codec
 AC_SUBST(ac_no_g711_codec)
 AC_ARG_ENABLE(g711-codec,
@@ -226 +220 @@
 
 
-# Include L16 codec
+dnl # Include L16 codec
 AC_SUBST(ac_no_l16_codec)
 AC_ARG_ENABLE(l16-codec,
@@ -238 +232 @@
 
 
-# Include GSM codec
+dnl # Include GSM codec
 AC_SUBST(ac_no_gsm_codec)
 AC_ARG_ENABLE(gsm-codec,
@@ -249 +243 @@
               AC_MSG_RESULT([Checking if GSM codec is disabled...no]))
 
-# Include Speex codec
+dnl # Include Speex codec
 AC_SUBST(ac_no_speex_codec)
 AC_ARG_ENABLE(speex-codec,
@@ -260 +254 @@
               AC_MSG_RESULT([Checking if Speex codec is disabled...no]))
 
-# Include iLBC codec
+dnl # Include iLBC codec
 AC_SUBST(ac_no_ilbc_codec)
 AC_ARG_ENABLE(ilbc-codec,
@@ -273 +267 @@
 
 
-##########################################
-#
-# MANUAL CONFIG
-#
-
-
-# Determine if select() requires nfds to be filled up with
-# correct value (max_fd+1). If zero, nfds will be filled up with
-# PJ_FD_SETSIZE
+dnl ##########################################
+dnl #
+dnl # MANUAL CONFIG
+dnl #
+
+
+dnl # Determine if select() requires nfds to be filled up with
+dnl # correct value (max_fd+1). If zero, nfds will be filled up with
+dnl # PJ_FD_SETSIZE
 AC_MSG_CHECKING([if select() needs correct nfds])
 case $target in
@@ -293 +287 @@
 esac
 
-# Determine if pj_thread_create() should enforce thread stack size when
-# creating thread. Default is zero, to allow OS to allocate appropriate
-# thread's stack size.
+dnl # Determine if pj_thread_create() should enforce thread stack size when
+dnl # creating thread. Default is zero, to allow OS to allocate appropriate
+dnl # thread's stack size.
 AC_MSG_CHECKING([if pj_thread_create() should enforce stack size])
 case $target in
@@ -306 +300 @@
 esac
 
-# Determine if pj_thread_create() should allocate thread's stack from
-# the pool. Default is zero, to let OS allocate thread's stack.
+dnl # Determine if pj_thread_create() should allocate thread's stack from
+dnl # the pool. Default is zero, to let OS allocate thread's stack.
 AC_MSG_CHECKING([if pj_thread_create() should allocate stack])
 case $target in
@@ -318 +312 @@
 esac
 
-# This value specifies the value set in errno by the OS when a non-blocking
-# socket recv() can not return immediate data.
+dnl # This value specifies the value set in errno by the OS when a non-blocking
+dnl # socket recv() can not return immediate data.
 case $target in
   *) AC_DEFINE(PJ_BLOCKING_ERROR_VAL,EAGAIN)
@@ -326 +320 @@
 esac
 
-# This value specifies the value set in errno by the OS when a non-blocking
-# socket connect() can not get connected immediately.
+dnl # This value specifies the value set in errno by the OS when a non-blocking
+dnl # socket connect() can not get connected immediately.
 case $target in
   *) AC_DEFINE(PJ_BLOCKING_CONNECT_ERROR_VAL,EINPROGRESS)