48 lines
3.0 KiB
Plaintext
48 lines
3.0 KiB
Plaintext
$OpenBSD: patch-configure_ac,v 1.5 2012/05/14 17:45:16 ajacoutot Exp $
|
|
|
|
- Fix path to soundcard.h
|
|
- Fix path to DBus machine-id
|
|
- Use /var/db instead of /var/lib
|
|
|
|
--- configure.ac.orig Fri May 11 13:43:03 2012
|
|
+++ configure.ac Mon May 14 16:18:28 2012
|
|
@@ -161,7 +161,7 @@ esac
|
|
#### Compiler flags ####
|
|
|
|
AX_APPEND_COMPILE_FLAGS(
|
|
- [-Wall -W -Wextra -pipe -Wno-long-long -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option],
|
|
+ [-Wall -W -Wextra -pipe -Wno-long-long -Wvla -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -ffast-math -Wp,-D_FORTIFY_SOURCE=2 -fno-common -fdiagnostics-show-option],
|
|
[], [-pedantic -Werror])
|
|
|
|
# Only enable fastpath asserts when doing a debug build, e.g. from bootstrap.sh.
|
|
@@ -687,7 +687,7 @@ AC_ARG_ENABLE([oss-wrapper],
|
|
AS_HELP_STRING([--disable-oss-wrapper],[Disable optional OSS wrapper support]))
|
|
|
|
AS_IF([test "x$enable_oss_output" != "xno" -o "x$enable_oss_wrapper" != "xno"],
|
|
- [AC_CHECK_HEADERS([sys/soundcard.h], HAVE_OSS=1, HAVE_OSS=0)],
|
|
+ [AC_CHECK_HEADERS([soundcard.h], HAVE_OSS=1, HAVE_OSS=0)],
|
|
HAVE_OSS=0)
|
|
|
|
AS_IF([test "x$enable_oss_output" = "xyes" -o "x$enable_oss_wrapper" = "xyes" && test "x$HAVE_OSS" = "x0"],
|
|
@@ -945,7 +945,7 @@ AC_SUBST(HAVE_DBUS)
|
|
AM_CONDITIONAL([HAVE_DBUS], [test "x$HAVE_DBUS" = x1])
|
|
AS_IF([test "x$HAVE_DBUS" = "x1"], AC_DEFINE([HAVE_DBUS], 1, [Have D-Bus.]))
|
|
|
|
-PA_MACHINE_ID="${localstatedir}/lib/dbus/machine-id"
|
|
+PA_MACHINE_ID="${localstatedir}/db/dbus/machine-id"
|
|
AX_DEFINE_DIR(PA_MACHINE_ID, PA_MACHINE_ID, [D-Bus machine-id file])
|
|
PA_MACHINE_ID_FALLBACK="${sysconfdir}/machine-id"
|
|
AX_DEFINE_DIR(PA_MACHINE_ID_FALLBACK, PA_MACHINE_ID_FALLBACK,
|
|
@@ -1174,9 +1174,9 @@ fi
|
|
|
|
PA_SYSTEM_RUNTIME_PATH="${localstatedir}/run/pulse"
|
|
AX_DEFINE_DIR(PA_SYSTEM_RUNTIME_PATH, PA_SYSTEM_RUNTIME_PATH, [System runtime dir])
|
|
-PA_SYSTEM_CONFIG_PATH="${localstatedir}/lib/pulse"
|
|
+PA_SYSTEM_CONFIG_PATH="${localstatedir}/db/pulse"
|
|
AX_DEFINE_DIR(PA_SYSTEM_CONFIG_PATH, PA_SYSTEM_CONFIG_PATH, [System config dir])
|
|
-PA_SYSTEM_STATE_PATH="${localstatedir}/lib/pulse"
|
|
+PA_SYSTEM_STATE_PATH="${localstatedir}/db/pulse"
|
|
AX_DEFINE_DIR(PA_SYSTEM_STATE_PATH, PA_SYSTEM_STATE_PATH, [System state dir])
|
|
|
|
PA_BINARY=${bindir}/pulseaudio${EXEEXT}
|