| @@ -1,125 +1,134 @@ | | | @@ -1,125 +1,134 @@ |
| 1 | $NetBSD: patch-configure.ac,v 1.4 2015/01/27 04:04:50 dbj Exp $ | | 1 | $NetBSD: patch-configure.ac,v 1.5 2015/02/25 23:40:35 ryoon Exp $ |
| 2 | | | 2 | |
| 3 | * Don't assume sys/capability.h is guaranteed present on Linux. | | 3 | * Don't assume sys/capability.h is guaranteed present on Linux. |
| 4 | * Fix NetBSD detection for libatomics_ops check. | | 4 | * Fix NetBSD detection for libatomics_ops check. |
| 5 | * Fix unportable test(1) construct. | | 5 | * Fix unportable test(1) construct. |
| 6 | * Adapt /var-paths for pkgsrc defaults. | | 6 | * Adapt /var-paths for pkgsrc defaults. |
| 7 | * Install default config files in example directory; pkgsrc config | | 7 | * Install default config files in example directory; pkgsrc config |
| 8 | file framework will install them in the right place. | | 8 | file framework will install them in the right place. |
| 9 | * Avoid hardcoded SDK paths on Darwin. | | 9 | * Avoid hardcoded SDK paths on Darwin. |
| 10 | | | 10 | |
| 11 | --- configure.ac.orig 2014-02-15 08:33:32.000000000 +0000 | | 11 | --- configure.ac.orig 2015-02-12 14:10:35.000000000 +0000 |
| 12 | +++ configure.ac | | 12 | +++ configure.ac |
| 13 | @@ -130,7 +130,6 @@ AC_MSG_CHECKING([host operating system]) | | 13 | @@ -21,7 +21,7 @@ |
| | | 14 | |
| | | 15 | AC_PREREQ(2.63) |
| | | 16 | |
| | | 17 | -AC_INIT([pulseaudio],[m4_esyscmd(./git-version-gen .tarball-version)],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) |
| | | 18 | +AC_INIT([pulseaudio],[6.0],[pulseaudio-discuss (at) lists (dot) freedesktop (dot) org],[pulseaudio],[http://pulseaudio.org/]) |
| | | 19 | AC_CONFIG_SRCDIR([src/daemon/main.c]) |
| | | 20 | AC_CONFIG_MACRO_DIR([m4]) |
| | | 21 | AC_CONFIG_HEADERS([config.h]) |
| | | 22 | @@ -133,7 +133,6 @@ AC_MSG_CHECKING([host operating system]) |
| 14 | case "$host_os" in | | 23 | case "$host_os" in |
| 15 | linux*) | | 24 | linux*) |
| 16 | AC_MSG_RESULT([linux]) | | 25 | AC_MSG_RESULT([linux]) |
| 17 | - host_has_caps=1 | | 26 | - host_has_caps=1 |
| 18 | os_is_linux=1 | | 27 | os_is_linux=1 |
| 19 | ;; | | 28 | ;; |
| 20 | freebsd*) | | 29 | freebsd*) |
| 21 | @@ -251,6 +250,11 @@ else | | 30 | @@ -260,6 +259,11 @@ else |
| 22 | # HW specific atomic ops stuff | | 31 | # HW specific atomic ops stuff |
| 23 | AC_MSG_CHECKING([architecture for native atomic operations]) | | 32 | AC_MSG_CHECKING([architecture for native atomic operations]) |
| 24 | case $host in | | 33 | case $host in |
| 25 | + *-netbsd*) | | 34 | + *-netbsd*) |
| 26 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 | | 35 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 |
| 27 | +$as_echo "yes" >&6; } | | 36 | +$as_echo "yes" >&6; } |
| 28 | + need_libatomic_ops=no | | 37 | + need_libatomic_ops=no |
| 29 | + ;; | | 38 | + ;; |
| 30 | arm*) | | 39 | arm*) |
| 31 | AC_MSG_RESULT([arm]) | | 40 | AC_MSG_RESULT([arm]) |
| 32 | AC_MSG_CHECKING([whether we can use Linux kernel helpers]) | | 41 | AC_MSG_CHECKING([whether we can use Linux kernel helpers]) |
| 33 | @@ -286,10 +290,6 @@ else | | 42 | @@ -295,10 +299,6 @@ else |
| 34 | ]) | | 43 | ]) |
| 35 | fi | | 44 | fi |
| 36 | ;; | | 45 | ;; |
| 37 | - *-netbsdelf5*) | | 46 | - *-netbsdelf5*) |
| 38 | - AC_MSG_RESULT([yes]) | | 47 | - AC_MSG_RESULT([yes]) |
| 39 | - need_libatomic_ops=no | | 48 | - need_libatomic_ops=no |
| 40 | - ;; | | 49 | - ;; |
| 41 | *-freebsd*) | | 50 | *-freebsd*) |
| 42 | AC_MSG_RESULT([yes]) | | 51 | AC_MSG_RESULT([yes]) |
| 43 | need_libatomic_ops=no | | 52 | need_libatomic_ops=no |
| 44 | @@ -478,14 +478,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye | | 53 | @@ -488,14 +488,14 @@ AS_IF([test "$pulseaudio_cv__Bool" = "ye |
| 45 | #### Thread support #### | | 54 | #### Thread support #### |
| 46 | | | 55 | |
| 47 | AX_TLS | | 56 | AX_TLS |
| 48 | -AS_IF([test "$ac_cv_tls" == "__thread"], | | 57 | -AS_IF([test "$ac_cv_tls" == "__thread"], |
| 49 | +AS_IF([test "$ac_cv_tls" = "__thread"], | | 58 | +AS_IF([test "$ac_cv_tls" = "__thread"], |
| 50 | AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports __thread for Thread-Local Storage])) | | 59 | AC_DEFINE([SUPPORT_TLS___THREAD], 1, [Define this if the compiler supports __thread for Thread-Local Storage])) |
| 51 | | | 60 | |
| 52 | # Win32 build breaks with win32 pthread installed | | 61 | # Win32 build breaks with win32 pthread installed |
| 53 | AS_IF([test "x$os_is_win32" != "x1"], | | 62 | AS_IF([test "x$os_is_win32" != "x1"], |
| 54 | [AX_PTHREAD]) | | 63 | [AX_PTHREAD]) |
| 55 | | | 64 | |
| 56 | -AS_IF([test "x$ax_pthread_ok" == "xyes"], | | 65 | -AS_IF([test "x$ax_pthread_ok" == "xyes"], |
| 57 | +AS_IF([test "x$ax_pthread_ok" = "xyes"], | | 66 | +AS_IF([test "x$ax_pthread_ok" = "xyes"], |
| 58 | AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris])) | | 67 | AC_DEFINE([_POSIX_PTHREAD_SEMANTICS], 1, [Needed on Solaris])) |
| 59 | | | 68 | |
| 60 | | | 69 | |
| 61 | @@ -512,15 +512,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub | | 70 | @@ -522,15 +522,9 @@ AC_SEARCH_LIBS([backtrace], [execinfo ub |
| 62 | if test "x$os_is_darwin" = "x1" ; then | | 71 | if test "x$os_is_darwin" = "x1" ; then |
| 63 | AC_MSG_CHECKING([looking for Apple CoreService Framework]) | | 72 | AC_MSG_CHECKING([looking for Apple CoreService Framework]) |
| 64 | # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope | | 73 | # How do I check a framework "library" - AC_CHECK_LIB prob. won't work??, just assign LIBS & hope |
| 65 | - AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h], | | 74 | - AC_CHECK_HEADER([/Developer/Headers/FlatCarbon/CoreServices.h], |
| 66 | + AC_CHECK_HEADER([CoreServices/CoreServices.h], | | 75 | + AC_CHECK_HEADER([CoreServices/CoreServices.h], |
| 67 | [LIBS="$LIBS -framework CoreServices"], | | 76 | [LIBS="$LIBS -framework CoreServices"], |
| 68 | - [AC_CHECK_HEADERS([/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h], | | 77 | - [AC_CHECK_HEADERS([/System/Library/Frameworks/CoreServices.framework/Headers/CoreServices.h], |
| 69 | - [LIBS="$LIBS -framework CoreServices"], | | 78 | - [LIBS="$LIBS -framework CoreServices"], |
| 70 | - [AC_MSG_ERROR([CoreServices.h header file not found])] | | 79 | - [AC_MSG_ERROR([CoreServices.h header file not found])] |
| 71 | - )] | | 80 | - )] |
| 72 | - ) | | 81 | - ) |
| 73 | - | | 82 | - |
| 74 | - AC_MSG_RESULT([ok]) | | 83 | - AC_MSG_RESULT([ok]) |
| 75 | + [AC_MSG_ERROR([CoreServices.h header file not found])]) | | 84 | + [AC_MSG_ERROR([CoreServices.h header file not found])]) |
| 76 | AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement]) | | 85 | AC_DEFINE([HAVE_CLOCK_GETTIME], 1, [Using clock_gettime() replacement]) |
| 77 | HAVE_BONJOUR=1 | | 86 | HAVE_BONJOUR=1 |
| 78 | fi | | 87 | fi |
| 79 | @@ -988,7 +982,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE | | 88 | @@ -1001,7 +995,7 @@ AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DE |
| 80 | | | 89 | |
| 81 | PA_MACHINE_ID="${sysconfdir}/machine-id" | | 90 | PA_MACHINE_ID="${sysconfdir}/machine-id" |
| 82 | AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file]) | | 91 | AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file]) |
| 83 | -PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id" | | 92 | -PA_MACHINE_ID_FALLBACK="${localstatedir}/lib/dbus/machine-id" |
| 84 | +PA_MACHINE_ID_FALLBACK="${localstatedir}/db/dbus/machine-id" | | 93 | +PA_MACHINE_ID_FALLBACK="${localstatedir}/db/dbus/machine-id" |
| 85 | AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK, | | 94 | AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK, |
| 86 | [Fallback machine-id file]) | | 95 | [Fallback machine-id file]) |
| 87 | | | 96 | |
| 88 | @@ -1234,9 +1228,9 @@ fi | | 97 | @@ -1309,9 +1303,9 @@ fi |
| 89 | | | 98 | |
| 90 | PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse" | | 99 | PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse" |
| 91 | AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir]) | | 100 | AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir]) |
| 92 | -PA_SYSTEM_CONFIG_PATH="${localstatedir}/lib/pulse" | | 101 | -PA_SYSTEM_CONFIG_PATH="${localstatedir}/lib/pulse" |
| 93 | +PA_SYSTEM_CONFIG_PATH="${localstatedir}/db/pulse" | | 102 | +PA_SYSTEM_CONFIG_PATH="${localstatedir}/db/pulse" |
| 94 | AX_DEFINE_DIR(PA_SYSTEM_CONFIG_PATH, PA_SYSTEM_CONFIG_PATH, [System config dir]) | | 103 | AX_DEFINE_DIR(PA_SYSTEM_CONFIG_PATH, PA_SYSTEM_CONFIG_PATH, [System config dir]) |
| 95 | -PA_SYSTEM_STATE_PATH="${localstatedir}/lib/pulse" | | 104 | -PA_SYSTEM_STATE_PATH="${localstatedir}/lib/pulse" |
| 96 | +PA_SYSTEM_STATE_PATH="${localstatedir}/db/pulse" | | 105 | +PA_SYSTEM_STATE_PATH="${localstatedir}/db/pulse" |
| 97 | AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir]) | | 106 | AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir]) |
| 98 | | | 107 | |
| 99 | PA_BINARY=${bindir}/pulseaudio${EXEEXT} | | 108 | PA_BINARY=${bindir}/pulseaudio${EXEEXT} |
| 100 | @@ -1248,8 +1242,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY | | 109 | @@ -1323,8 +1317,9 @@ AX_DEFINE_DIR(PACTL_BINARY, PACTL_BINARY |
| 101 | AC_SUBST(PA_SOEXT, [.so]) | | 110 | AC_SUBST(PA_SOEXT, [.so]) |
| 102 | AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension]) | | 111 | AC_DEFINE(PA_SOEXT, [".so"], [Shared object extension]) |
| 103 | | | 112 | |
| 104 | -AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"]) | | 113 | -AC_SUBST(pulseconfdir, ["${sysconfdir}/pulse"]) |
| 105 | -AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files]) | | 114 | -AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdir, [Location of configuration files]) |
| 106 | +AC_SUBST(pulseconfdirreal, ["${sysconfdir}/pulse"]) | | 115 | +AC_SUBST(pulseconfdirreal, ["${sysconfdir}/pulse"]) |
| 107 | +AC_SUBST(pulseconfdir, ["${EGDIR}"]) | | 116 | +AC_SUBST(pulseconfdir, ["${EGDIR}"]) |
| 108 | +AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdirreal, [Location of configuration files]) | | 117 | +AX_DEFINE_DIR(PA_DEFAULT_CONFIG_DIR, pulseconfdirreal, [Location of configuration files]) |
| 109 | | | 118 | |
| 110 | #### Mac OSX specific stuff ##### | | 119 | #### Mac OSX specific stuff ##### |
| 111 | | | 120 | |
| 112 | @@ -1265,17 +1260,6 @@ AC_ARG_WITH(mac-sysroot, | | 121 | @@ -1340,17 +1335,6 @@ AC_ARG_WITH(mac-sysroot, |
| 113 | AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]), | | 122 | AS_HELP_STRING([--with-mac-sysroot=<path>], [SDK basedir to use as the logical root directory for headers and libraries.]), |
| 114 | mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk") | | 123 | mac_sysroot=$withval, mac_sysroot="/Developer/SDKs/MacOSX10.5.sdk") |
| 115 | | | 124 | |
| 116 | -if test "x$os_is_darwin" = "x1" ; then | | 125 | -if test "x$os_is_darwin" = "x1" ; then |
| 117 | - LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" | | 126 | - LDFLAGS="$LDFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" |
| 118 | - CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" | | 127 | - CFLAGS="$CFLAGS -isysroot $mac_sysroot -mmacosx-version-min=$mac_version_min" |
| 119 | - | | 128 | - |
| 120 | - if test "x$enable_mac_universal" = "xyes" ; then | | 129 | - if test "x$enable_mac_universal" = "xyes" ; then |
| 121 | - mac_arches="-arch i386 -arch x86_64" | | 130 | - mac_arches="-arch i386 -arch x86_64" |
| 122 | - LDFLAGS="$LDFLAGS $mac_arches" | | 131 | - LDFLAGS="$LDFLAGS $mac_arches" |
| 123 | - CFLAGS="$CFLAGS $mac_arches" | | 132 | - CFLAGS="$CFLAGS $mac_arches" |
| 124 | - fi | | 133 | - fi |
| 125 | -fi | | 134 | -fi |