shithub: opusfile

Download patch

ref: 134886562f5fdfca6cc464757d0e49fd8f14341a
parent: 4e06a90ef61ad34d9812fb4578a4c640f868ad00
author: Ron <[email protected]>
date: Mon May 13 13:32:05 EDT 2013 

Always build libopusurl

If --disable-http is used it will just only have file URL support.


--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 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,32 +16,25 @@
 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
--- a/configure.ac
+++ b/configure.ac
@@ -76,10 +76,12 @@
 )
 
 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])
 
--- a/opusurl-uninstalled.pc.in
+++ b/opusurl-uninstalled.pc.in
@@ -6,9 +6,9 @@
 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}
--- a/opusurl.pc.in
+++ b/opusurl.pc.in
@@ -6,9 +6,9 @@
 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