shithub: opusfile

Download patch

ref: 428b6bc5e13be46d8a9f219a93f0af928c0aa8f4
parent: 5e3c66ce81e8bb667374dab8141c6c3351b82c69
author: Ron <[email protected]>
date: Mon May 13 09:12:23 EDT 2013 

Autoconf and pkg-config support for libopusurl


--- a/Makefile.am
+++ b/Makefile.am
@@ -9,33 +9,48 @@
 
 lib_LTLIBRARIES = libopusfile.la
 libopusfile_la_SOURCES = \
-	src/http.c src/info.c \
+	src/info.c \
 	src/internal.c src/internal.h \
 	src/opusfile.c src/stream.c
 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_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_WIN32
-libopusfile_la_SOURCES += src/wincerts.c
-libopusfile_la_LIBADD += -lws2_32 -lcrypt32
-endif
-endif
+libopusurl_la_SOURCES += src/wincerts.c
+libopusurl_la_LIBADD += -lws2_32 -lcrypt32
+endif
 
-noinst_PROGRAMS = examples/opusfile_example examples/seeking_example
-
+else
 examples_opusfile_example_LDADD = libopusfile.la
 examples_seeking_example_LDADD = libopusfile.la
+endif
 
+noinst_PROGRAMS = examples/opusfile_example examples/seeking_example
+
 debug:
 	$(MAKE) CFLAGS="${CFLAGS} -O0 -ggdb -DOP_ENABLE_ASSERTIONS" all
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = opusfile.pc
-
 EXTRA_DIST = \
  opusfile.pc.in \
+ opusurl.pc.in \
  opusfile-uninstalled.pc.in \
+ opusurl-uninstalled.pc.in \
  doc/Doxyfile.in \
  doc/git-version.sh \
  doc/opus_logo.svg \
--- a/configure.ac
+++ b/configure.ac
@@ -76,13 +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 ${openssl}])
+PKG_CHECK_MODULES([DEPS], [ogg >= 1.3 opus >= 1.0.1])
 
 AC_ARG_ENABLE([fixed-point],
   AS_HELP_STRING([--enable-fixed-point], [Enable fixed-point calculation]),,
@@ -132,7 +131,9 @@
 AC_OUTPUT([
   Makefile
   opusfile.pc
+  opusurl.pc
   opusfile-uninstalled.pc
+  opusurl-uninstalled.pc
   doc/Doxyfile
 ])
 
--- a/opusfile-uninstalled.pc.in
+++ b/opusfile-uninstalled.pc.in
@@ -8,7 +8,7 @@
 Name: opusfile uninstalled
 Description: High-level Opus decoding library (not installed)
 Version: @VERSION@
-Requires: ogg >= 1.3 opus >= 1.0.1 @openssl@
+Requires.private: ogg >= 1.3 opus >= 1.0.1
 Conflicts:
 Libs: ${libdir}/libopusfile.la @lrintf_lib@
 Cflags: -I${includedir}
--- a/opusfile.pc.in
+++ b/opusfile.pc.in
@@ -8,7 +8,7 @@
 Name: opusfile
 Description: High-level Opus decoding library
 Version: @VERSION@
-Requires.private: ogg >= 1.3 opus >= 1.0.1 @openssl@
+Requires.private: ogg >= 1.3 opus >= 1.0.1
 Conflicts:
 Libs: -L${libdir} -lopusfile
 Libs.private: @lrintf_lib@
--- /dev/null
+++ b/opusurl-uninstalled.pc.in
@@ -1,0 +1,14 @@
+# opusurl uninstalled pkg-config file
+
+prefix=
+exec_prefix=
+libdir=${pcfiledir}/.libs
+includedir=${pcfiledir}/@top_srcdir@/include
+
+Name: opusfile uninstalled
+Description: High-level Opus decoding library, HTTP support (not installed)
+Version: @VERSION@
+Requires: opusfile
+Conflicts:
+Libs: ${libdir}/libopusurl.la
+Cflags: -I${includedir}
--- /dev/null
+++ b/opusurl.pc.in
@@ -1,0 +1,14 @@
+# opusurl installed pkg-config file
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: opusurl
+Description: High-level Opus decoding library, HTTP support
+Version: @VERSION@
+Requires: opusfile
+Requires.private: openssl
+Conflicts:
+Libs: -L${libdir} -lopusurl