diff options
| author | Lennart Poettering <lennart@poettering.net> | 2004-11-23 13:00:53 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2004-11-23 13:00:53 +0000 |
| commit | 29ec9d343b3163c03d491170a2182366e26b3408 (patch) | |
| tree | a30f0530416f5e12895a471bda902fdec9dc4a2b | |
| parent | c827fca3b9ad589c970c08d792d62e283a8a7852 (diff) | |
* some fixes for MacOS X by Conrad Parker
* Minor build fixes
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@312 fefdeb5f-60dc-0310-8127-8f9354f1896f
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 | ||||
| -rw-r--r-- | polyp/Makefile.am | 2 | ||||
| -rw-r--r-- | polyp/mcalign-test.c | 2 | ||||
| -rw-r--r-- | polyp/pid.c | 1 |
5 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 47f965e0..4db6b5b9 100644 --- a/configure.ac +++ b/configure.ac @@ -168,7 +168,7 @@ if test x$lynx = xyes ; then AC_CHECK_PROG(have_lynx, lynx, yes, no) if test x$have_lynx = xno ; then - AC_MSG_ERROR([*** Sorry, you have to install lynx or use --disable-lynx ***]) + AC_MSG_WARN([*** lynx not found, plain text README will not be built ***]) fi fi diff --git a/doc/Makefile.am b/doc/Makefile.am index f67598f1..fff06551 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -19,7 +19,7 @@ noinst_DATA = README.html cli.html modules.html daemon.html README EXTRA_DIST = $(noinst_DATA) style.css README.html.in cli.html.in modules.html.in daemon.html.in todo FAQ.html.in -MAINTAINERCLEANFILES = README README.html cli.html modules.html daemon.html FAQ.html +MAINTAINERCLEANFILES = README.html cli.html modules.html daemon.html FAQ.html CLEANFILES = if USE_LYNX diff --git a/polyp/Makefile.am b/polyp/Makefile.am index 8c91ae4b..db508d7a 100644 --- a/polyp/Makefile.am +++ b/polyp/Makefile.am @@ -729,7 +729,7 @@ daemon.conf: daemon.conf.in Makefile -e 's,@DEFAULT_CONFIG_FILE\@,$(polypconfdir)/daemon.conf,g' < $< > $@ install-exec-hook: - chown root $(DESTDIR)$(bindir)/polypaudio + chown root $(DESTDIR)$(bindir)/polypaudio ; true chmod u+s $(DESTDIR)$(bindir)/polypaudio ln -s pacat $(DESTDIR)$(bindir)/parec diff --git a/polyp/mcalign-test.c b/polyp/mcalign-test.c index f8af4f9f..e4a6a239 100644 --- a/polyp/mcalign-test.c +++ b/polyp/mcalign-test.c @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) { break; pa_loop_write(STDOUT_FILENO, (uint8_t*) t.memblock->data + t.index, t.length); - fprintf(stderr, "Wrote %u bytes.\n", t.length); + fprintf(stderr, "Wrote %lu bytes.\n", (unsigned long) t.length); pa_memblock_unref(t.memblock); } diff --git a/polyp/pid.c b/polyp/pid.c index 232de216..32365136 100644 --- a/polyp/pid.c +++ b/polyp/pid.c @@ -27,6 +27,7 @@ #include <unistd.h> #include <errno.h> #include <sys/types.h> +#include <sys/stat.h> #include <string.h> #include <stdio.h> #include <assert.h> |