diff options
| author | Maarten Bosmans <mkbosmans@gmail.com> | 2011-06-29 15:16:10 +0200 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2011-06-30 11:54:03 +0100 |
| commit | 107106afd4e6f93d495f75c224cde6817319d662 (patch) | |
| tree | e2e787206c132af0fd0098c26305abe05e47825c /configure.ac | |
| parent | 3722dbbcb3bbe889ca9e5ae061aa01f2e9cb29a0 (diff) | |
| download | pulseaudio-panda-107106afd4e6f93d495f75c224cde6817319d662.tar.gz pulseaudio-panda-107106afd4e6f93d495f75c224cde6817319d662.tar.bz2 pulseaudio-panda-107106afd4e6f93d495f75c224cde6817319d662.zip | |
build-sys: Process configuration files with m4
This allows for build-time conditionals to be processed,
eliminating the need for a separate default.pa.win32.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 06cce8f0..8b4dbef8 100644 --- a/configure.ac +++ b/configure.ac @@ -131,6 +131,7 @@ esac AM_CONDITIONAL(OS_IS_DARWIN, test "x$os_is_darwin" = "x1") AM_CONDITIONAL(OS_IS_WIN32, test "x$os_is_win32" = "x1") +AC_SUBST([OS_IS_WIN32], [$os_is_win32]) # Platform specific hacks case "$host_os" in @@ -1234,10 +1235,12 @@ AC_CONFIG_FILES([src/esdcompat:src/daemon/esdcompat.in], [chmod +x src/esdcompat AC_CONFIG_FILES([src/start-pulseaudio-x11:src/daemon/start-pulseaudio-x11.in], [chmod +x src/start-pulseaudio-x11]) AC_CONFIG_FILES([src/start-pulseaudio-kde:src/daemon/start-pulseaudio-kde.in], [chmod +x src/start-pulseaudio-kde]) AC_CONFIG_FILES([src/client.conf:src/pulse/client.conf.in]) -AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in]) -AS_IF([test "x$os_is_win32" = "x1"], [config_source_ext=win32], [config_source_ext=in]) -AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.$config_source_ext]) -AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.$config_source_ext]) +AC_CONFIG_FILES([src/daemon.conf:src/daemon/daemon.conf.in], + [m4 src/daemon.conf > src/daemon.conf.gen && mv src/daemon.conf.gen src/daemon.conf]) +AC_CONFIG_FILES([src/default.pa:src/daemon/default.pa.in], + [m4 src/default.pa > src/default.pa.gen && mv src/default.pa.gen src/default.pa]) +AC_CONFIG_FILES([src/system.pa:src/daemon/system.pa.in], + [m4 src/system.pa > src/system.pa.gen && mv src/system.pa.gen src/system.pa]) AC_OUTPUT |