Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
Opusfile
Commits
13488656
Commit
13488656
authored
May 13, 2013
by
Ron
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Always build libopusurl
If --disable-http is used it will just only have file URL support.
parent
4e06a90e
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
15 additions
and
20 deletions
+15
-20
Makefile.am
Makefile.am
+9
-16
configure.ac
configure.ac
+2
-0
opusurl-uninstalled.pc.in
opusurl-uninstalled.pc.in
+2
-2
opusurl.pc.in
opusurl.pc.in
+2
-2
No files found.
Makefile.am
View file @
13488656
...
...
@@ -7,7 +7,7 @@ dist_doc_DATA = COPYING AUTHORS README.txt
opusincludedir
=
${includedir}
/opus
opusinclude_HEADERS
=
include/opusfile.h
lib_LTLIBRARIES
=
libopusfile.la
lib_LTLIBRARIES
=
libopusfile.la
libopusurl.la
libopusfile_la_SOURCES
=
\
src/info.c
\
src/internal.c src/internal.h
\
...
...
@@ -16,33 +16,26 @@ libopusfile_la_LIBADD = $(DEPS_LIBS)
libopusfile_la_LDFLAGS
=
-no-undefined
\
-version-info
@OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfig_DATA
=
opusfile.pc
if
OP_ENABLE_HTTP
lib_LTLIBRARIES
+=
libopusurl.la
libopusurl_la_SOURCES
=
src/http.c
libopusurl_la_SOURCES
=
src/http.c src/internal.c src/internal.h
libopusurl_la_LIBADD
=
libopusfile.la
$(URL_DEPS_LIBS)
libopusurl_la_LDFLAGS
=
-no-undefined
\
-version-info
@OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@
pkgconfig_DATA
+=
opusurl.pc
examples_opusfile_example_LDADD
=
libopusurl.la libopusfile.la
examples_seeking_example_LDADD
=
libopusurl.la libopusfile.la
if
OP_ENABLE_HTTP
if
OP_WIN32
libopusurl_la_SOURCES
+=
src/wincerts.c
libopusurl_la_LIBADD
+=
-lws2_32
-lcrypt32
endif
else
examples_opusfile_example_LDADD
=
libopusfile.la
examples_seeking_example_LDADD
=
libopusfile.la
endif
noinst_PROGRAMS
=
examples/opusfile_example examples/seeking_example
examples_opusfile_example_LDADD
=
libopusurl.la libopusfile.la
examples_seeking_example_LDADD
=
libopusurl.la libopusfile.la
pkgconfigdir
=
$(libdir)
/pkgconfig
pkgconfig_DATA
=
opusfile.pc opusurl.pc
debug
:
$(MAKE)
CFLAGS
=
"
${CFLAGS}
-O0 -ggdb -DOP_ENABLE_ASSERTIONS"
all
...
...
configure.ac
View file @
13488656
...
...
@@ -76,10 +76,12 @@ AM_COND_IF(OP_WIN32,
)
AS_IF([test "x$enable_http" != "xno"], [
openssl="openssl"
AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support])
PKG_CHECK_MODULES([URL_DEPS], [openssl])
])
AM_CONDITIONAL(OP_ENABLE_HTTP, [test "x$enable_http" != "xno"])
AC_SUBST([openssl])
PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
...
...
opusurl-uninstalled.pc.in
View file @
13488656
...
...
@@ -6,9 +6,9 @@ libdir=${pcfiledir}/.libs
includedir=${pcfiledir}/@top_srcdir@/include
Name: opusfile uninstalled
Description: High-level Opus decoding library,
HTTP
support (not installed)
Description: High-level Opus decoding library,
URL
support (not installed)
Version: @VERSION@
Requires: opusfile
Requires.private: @openssl@
Conflicts:
Libs: ${libdir}/libopusurl.la
Cflags: -I${includedir}
opusurl.pc.in
View file @
13488656
...
...
@@ -6,9 +6,9 @@ libdir=@libdir@
includedir=@includedir@
Name: opusurl
Description: High-level Opus decoding library,
HTTP
support
Description: High-level Opus decoding library,
URL
support
Version: @VERSION@
Requires: opusfile
Requires.private: openssl
Requires.private:
@
openssl
@
Conflicts:
Libs: -L${libdir} -lopusurl
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment