Commit 86e4a7dd authored by Philipp Schafft's avatar Philipp Schafft 🦁
Browse files

Merge branch 'chouquette/icecast-libshout-videolan_patches_upstream'

* Don't include strings.h unconditionally
* Allow examples not to be built
parents 82c55067 2924b949
......@@ -3,7 +3,10 @@
AUTOMAKE_OPTIONS = 1.6 foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS = include src examples doc win32
SUBDIRS = include src doc win32
if HAVE_EXAMPLES
SUBDIRS += examples
endif
EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
......
......@@ -89,6 +89,11 @@ AC_SEARCH_LIBS([nanosleep], [rt],
[AC_DEFINE([HAVE_NANOSLEEP], [1],
[Define if you have the nanosleep function])])
dnl Allow examples not to be build
AC_ARG_ENABLE([examples],
AC_HELP_STRING([--disable-examples],[Do not build example code]))
AM_CONDITIONAL([HAVE_EXAMPLES],[test "${enable_examples}" != "no"])
dnl Module checks
XIPH_NET
......
......@@ -28,7 +28,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <shout/shout.h>
#include "shout_private.h"
......
......@@ -29,7 +29,9 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
#include <errno.h>
#include <shout/shout.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment