Commit 13488656 authored by Ron's avatar Ron

Always build libopusurl

If --disable-http is used it will just only have file URL support.
parent 4e06a90e
...@@ -7,7 +7,7 @@ dist_doc_DATA = COPYING AUTHORS README.txt ...@@ -7,7 +7,7 @@ dist_doc_DATA = COPYING AUTHORS README.txt
opusincludedir = ${includedir}/opus opusincludedir = ${includedir}/opus
opusinclude_HEADERS = include/opusfile.h opusinclude_HEADERS = include/opusfile.h
lib_LTLIBRARIES = libopusfile.la lib_LTLIBRARIES = libopusfile.la libopusurl.la
libopusfile_la_SOURCES = \ libopusfile_la_SOURCES = \
src/info.c \ src/info.c \
src/internal.c src/internal.h \ src/internal.c src/internal.h \
...@@ -16,33 +16,26 @@ libopusfile_la_LIBADD = $(DEPS_LIBS) ...@@ -16,33 +16,26 @@ libopusfile_la_LIBADD = $(DEPS_LIBS)
libopusfile_la_LDFLAGS = -no-undefined \ libopusfile_la_LDFLAGS = -no-undefined \
-version-info @OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@ -version-info @OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@
pkgconfigdir = $(libdir)/pkgconfig libopusurl_la_SOURCES = src/http.c src/internal.c src/internal.h
pkgconfig_DATA = opusfile.pc
if OP_ENABLE_HTTP
lib_LTLIBRARIES += libopusurl.la
libopusurl_la_SOURCES = src/http.c
libopusurl_la_LIBADD = libopusfile.la $(URL_DEPS_LIBS) libopusurl_la_LIBADD = libopusfile.la $(URL_DEPS_LIBS)
libopusurl_la_LDFLAGS = -no-undefined \ libopusurl_la_LDFLAGS = -no-undefined \
-version-info @OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@ -version-info @OP_LT_CURRENT@:@OP_LT_REVISION@:@OP_LT_AGE@
pkgconfig_DATA += opusurl.pc if OP_ENABLE_HTTP
examples_opusfile_example_LDADD = libopusurl.la libopusfile.la
examples_seeking_example_LDADD = libopusurl.la libopusfile.la
if OP_WIN32 if OP_WIN32
libopusurl_la_SOURCES += src/wincerts.c libopusurl_la_SOURCES += src/wincerts.c
libopusurl_la_LIBADD += -lws2_32 -lcrypt32 libopusurl_la_LIBADD += -lws2_32 -lcrypt32
endif endif
else
examples_opusfile_example_LDADD = libopusfile.la
examples_seeking_example_LDADD = libopusfile.la
endif endif
noinst_PROGRAMS = examples/opusfile_example examples/seeking_example 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: debug:
$(MAKE) CFLAGS="${CFLAGS} -O0 -ggdb -DOP_ENABLE_ASSERTIONS" all $(MAKE) CFLAGS="${CFLAGS} -O0 -ggdb -DOP_ENABLE_ASSERTIONS" all
......
...@@ -76,10 +76,12 @@ AM_COND_IF(OP_WIN32, ...@@ -76,10 +76,12 @@ AM_COND_IF(OP_WIN32,
) )
AS_IF([test "x$enable_http" != "xno"], [ AS_IF([test "x$enable_http" != "xno"], [
openssl="openssl"
AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support]) AC_DEFINE([OP_ENABLE_HTTP], [1], [Enable HTTP support])
PKG_CHECK_MODULES([URL_DEPS], [openssl]) PKG_CHECK_MODULES([URL_DEPS], [openssl])
]) ])
AM_CONDITIONAL(OP_ENABLE_HTTP, [test "x$enable_http" != "xno"]) AM_CONDITIONAL(OP_ENABLE_HTTP, [test "x$enable_http" != "xno"])
AC_SUBST([openssl])
PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1]) PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
......
...@@ -6,9 +6,9 @@ libdir=${pcfiledir}/.libs ...@@ -6,9 +6,9 @@ libdir=${pcfiledir}/.libs
includedir=${pcfiledir}/@top_srcdir@/include includedir=${pcfiledir}/@top_srcdir@/include
Name: opusfile uninstalled 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@ Version: @VERSION@
Requires: opusfile Requires: opusfile
Requires.private: @openssl@
Conflicts: Conflicts:
Libs: ${libdir}/libopusurl.la Libs: ${libdir}/libopusurl.la
Cflags: -I${includedir}
...@@ -6,9 +6,9 @@ libdir=@libdir@ ...@@ -6,9 +6,9 @@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: opusurl Name: opusurl
Description: High-level Opus decoding library, HTTP support Description: High-level Opus decoding library, URL support
Version: @VERSION@ Version: @VERSION@
Requires: opusfile Requires: opusfile
Requires.private: openssl Requires.private: @openssl@
Conflicts: Conflicts:
Libs: -L${libdir} -lopusurl Libs: -L${libdir} -lopusurl
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