replace Carbon with CoreFoundation and CoreServices

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c5f7486bb567a5b04f08737b03bf77130b1b26a..122fe932f8a9e435a50c028a84be012f8001c0a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,11 +264,12 @@ ELSE()
       FIND_LIBRARY(COREAUDIO_LIBRARY CoreAudio REQUIRED)
       FIND_LIBRARY(AUDIOTOOLBOX_LIBRARY AudioToolbox REQUIRED)
       FIND_LIBRARY(AUDIOUNIT_LIBRARY AudioUnit REQUIRED)
-      FIND_LIBRARY(CARBON_LIBRARY Carbon REQUIRED)
-      MARK_AS_ADVANCED(COREAUDIO_LIBRARY AUDIOTOOLBOX_LIBRARY AUDIOUNIT_LIBRARY CARBON_LIBRARY)
-      SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${COREAUDIO_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${AUDIOUNIT_LIBRARY} ${CARBON_LIBRARY})
+      FIND_LIBRARY(COREFOUNDATION_LIBRARY CoreFoundation REQUIRED)
+      FIND_LIBRARY(CORESERVICES_LIBRARY CoreServices REQUIRED)
+      MARK_AS_ADVANCED(COREAUDIO_LIBRARY AUDIOTOOLBOX_LIBRARY AUDIOUNIT_LIBRARY COREFOUNDATION_LIBRARY CORESERVICES_LIBRARY)
+      SET(PA_LIBRARY_DEPENDENCIES ${PA_LIBRARY_DEPENDENCIES} ${COREAUDIO_LIBRARY} ${AUDIOTOOLBOX_LIBRARY} ${AUDIOUNIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${CORESERVICES_LIBRARY})
       SET(PA_PRIVATE_COMPILE_DEFINITIONS ${PA_PRIVATE_COMPILE_DEFINITIONS} PA_USE_COREAUDIO)
-      SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon")
+      SET(PA_PKGCONFIG_LDFLAGS "${PA_PKGCONFIG_LDFLAGS} -framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreFoundation -framework CoreServices")
     ENDIF()
 
   ELSEIF(UNIX)

diff --git a/configure b/configure
index c95c18b412a5db3eedd22f75beb15eca895af584..42d22a02fc63476e5c34f013cc70cbad2667c288 100755 (executable)
Binary files a/configure and b/configure differ

diff --git a/configure.in b/configure.in
index a22602922a34d9b2f0bf12d7e735b2542e2ea49b..1727df76cfe8f4f889d2d957f21ebbd87a46ae34 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -205,7 +205,7 @@ case "${host_os}" in
         AC_DEFINE(PA_USE_COREAUDIO,1)
 
         CFLAGS="$CFLAGS -I\$(top_srcdir)/src/os/unix -Wno-deprecated -Werror"
-        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework Carbon"
+        LIBS="-framework CoreAudio -framework AudioToolbox -framework AudioUnit -framework CoreFoundation -framework CoreServices"
 
         if test "x$enable_mac_universal" = "xyes" ; then
            case `xcodebuild -version | sed -n 's/Xcode \(.*\)/\1/p'` in

diff --git a/doc/src/tutorial/compile_mac_coreaudio.dox b/doc/src/tutorial/compile_mac_coreaudio.dox
index e16ce33dbd0ca682d50085c63d36c1d88618cbc0..068391e28523e999e2a1f385ecc6d8324c2c0ae2 100644 (file)
--- a/doc/src/tutorial/compile_mac_coreaudio.dox
+++ b/doc/src/tutorial/compile_mac_coreaudio.dox
@@ -99,7 +99,7 @@ You will need to add the following frameworks to your XCode project:
  - AudioToolbox.framework
  - AudioUnit.framework
  - CoreServices.framework
- - Carbon.framework
+ - CoreFoundation.framework
 
 @section comp_mac_ca_5 Using the Library in Other Projects