summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynaldo H. Verdejo Pinochet <reynaldo@sisa.samsung.com>2013-11-05 14:29:12 -0300
committerReynaldo H. Verdejo Pinochet <reynaldo@sisa.samsung.com>2013-11-05 14:37:32 -0300
commitdaee744959c9cb32108eed708df53fba434c8ad1 (patch)
tree2bef9baf112825a37927f4258bfa192a3b72355c
parentd30256648348fc53ac30bed0900ce578f0eb4f86 (diff)
Add missing buildsystem hooks for libxml2
-rw-r--r--configure.ac4
-rw-r--r--gst-streaming-server/Makefile.am12
2 files changed, 12 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 4cb9a0b..704debb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -238,6 +238,10 @@ PKG_CHECK_MODULES(OPENSSL, openssl, HAVE_OPENSSL=yes, HAVE_OPENSSL=no)
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
+PKG_CHECK_MODULES(LIBXML2, libxml-2.0, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
+AC_SUBST(LIBXML2_CFLAGS)
+AC_SUBST(LIBXML2_LIBS)
+
AM_CONDITIONAL(ENABLE_STATIC_LIB, [false])
GST_ALL_LDFLAGS="-no-undefined"
diff --git a/gst-streaming-server/Makefile.am b/gst-streaming-server/Makefile.am
index 441b32c..50807e3 100644
--- a/gst-streaming-server/Makefile.am
+++ b/gst-streaming-server/Makefile.am
@@ -15,13 +15,15 @@ libgss_@GST_API_VERSION@_la_CFLAGS = \
$(SOUP_CFLAGS) \
$(GST_RTSP_SERVER_CFLAGS) \
$(JSON_GLIB_CFLAGS) \
- $(OPENSSL_CFLAGS)
+ $(OPENSSL_CFLAGS) \
+ $(LIBXML2_CFLAGS)
libgss_@GST_API_VERSION@_la_LIBADD = \
$(GST_RTSP_SERVER_LIBS) \
$(GST_LIBS) \
$(SOUP_LIBS) \
$(JSON_GLIB_LIBS) \
- $(OPENSSL_LIBS)
+ $(OPENSSL_LIBS) \
+ $(LIBXML2_LIBS)
libgss_@GST_API_VERSION@_la_LDFLAGS = \
$(GST_LT_LDFLAGS) \
-export-symbols-regex 'gss_'
@@ -70,13 +72,15 @@ libgss_la_CFLAGS = \
$(SOUP_CFLAGS) \
$(GST_RTSP_SERVER_CFLAGS) \
$(JSON_GLIB_CFLAGS) \
- $(OPENSSL_CFLAGS)
+ $(OPENSSL_CFLAGS) \
+ $(LIBXML2_CFLAGS)
libgss_la_LIBS = \
$(GST_RTSP_SERVER_LIBS) \
$(GST_LIBS) \
$(SOUP_LIBS) \
$(JSON_GLIB_LIBS) \
- $(OPENSSL_LIBS)
+ $(OPENSSL_LIBS) \
+ $(LIBXML2_LIBS)
libgss_la_SOURCES = $(sources)
gss_include_HEADERS = \