libdvbv5: Add configure option to fall back to static build

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>

diff --git a/configure.ac b/configure.ac
index ad33e3b1354f6fd034169231bee0f29711959c8f..98fad38253ff369aad97c8c7e0e6fb153d6ffe3c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -32,6 +32,7 @@ AC_CONFIG_FILES([Makefile
        lib/libv4lconvert/libv4lconvert.pc
        lib/libv4l1/libv4l1.pc
        lib/libv4l2/libv4l2.pc
+       lib/libdvbv5/libdvbv5.pc
 ])
 
 AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 -Wno-portability]) # 1.10 is needed for target_LIBTOOLFLAGS
@@ -153,6 +154,15 @@ AC_DEFINE_DIR([LIBV4LCONVERT_PRIV_DIR], [libv4lconvertprivdir], [libv4lconvert p
 
 # options
 
+AC_ARG_ENABLE(libdvbv5,
+  [  --disable-libdvbv5      disable dynamic libdvbv5 compilation],
+  [case "${enableval}" in
+     yes | no ) with_liblibdvbv5="${enableval}" ;;
+     *) AC_MSG_ERROR(bad value ${enableval} for --disable-libdvbv5) ;;
+   esac],
+  [with_libdvbv5="yes"]
+)
+
 AC_ARG_ENABLE(libv4l,
   [  --disable-libv4l        disable dynamic libv4l compilation],
   [case "${enableval}" in
@@ -171,10 +181,12 @@ AC_ARG_ENABLE(v4l-utils,
   [with_v4lutils="yes"]
 )
 
+AM_CONDITIONAL([WITH_LIBDVBV5], [test x$with_libdvbv5 = xyes])
 AM_CONDITIONAL([WITH_LIBV4L], [test x$with_libv4l = xyes])
 AM_CONDITIONAL([WITH_V4LUTILS], [test x$with_v4lutils = xyes])
 
 # append -static to libtool compile and link command to enforce static libs
+AS_IF([test x$with_libdvbv5 != xyes], [AC_SUBST([ENFORCE_LIBDVBV5_STATIC], ["-static"])])
 AS_IF([test x$with_libv4l != xyes], [AC_SUBST([ENFORCE_LIBV4L_STATIC], ["-static"])])
 
 # misc

diff --git a/lib/libdvbv5/Makefile.am b/lib/libdvbv5/Makefile.am
index 0a9431150e5683b112d8a3c2b4bff0f33b139cb3..67db06aa22b677d663812ac1b20ac15c507004a8 100644 (file)
--- a/lib/libdvbv5/Makefile.am
+++ b/lib/libdvbv5/Makefile.am
@@ -1,4 +1,12 @@
+if WITH_LIBDVBV5
 lib_LTLIBRARIES = libdvbv5.la
+include_HEADERS = ../include/dvb-demux.h ../include/dvb-v5-std.h \
+  ../include/dvb-file.h ../include/dvb-frontend.h ../include/dvb-fe.h \
+  ../include/libsat.h ../include/libscan.h
+pkgconfig_DATA = libdvbv5.pc
+else
+noinst_LTLIBRARIES = libdvbv5.la
+endif
 
 libdvbv5_la_SOURCES = \
   dvb-demux.c ../include/dvb-demux.h \
@@ -13,8 +21,8 @@ libdvbv5_la_SOURCES = \
   libsat.c ../include/libsat.h \
   libscan.c ../include/libscan.h \
   parse_string.c parse_string.h
-#libdvbv5_la_CPPFLAGS = -fvisibility=hidden
-#libdvbv5_la_LDFLAGS = -version-info 0 -lpthread
+libdvbv5_la_CPPFLAGS = $(ENFORCE_LIBDVBV5_STATIC)
+libdvbv5_la_LDFLAGS = -version-info 0 $(ENFORCE_LIBDVBV5_STATIC)
 
 EXTRA_DIST = README gen_dvb_structs.pl
 

diff --git a/lib/libdvbv5/libdvbv5.pc.in b/lib/libdvbv5/libdvbv5.pc.in
new file mode 100644 (file)
index 0000000..7e3c4f5
--- /dev/null
+++ b/lib/libdvbv5/libdvbv5.pc.in
@@ -0,0 +1,10 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+includedir=@includedir@
+libdir=@libdir@
+
+Name: libdvbv5
+Description: DVBv5 utility library
+Version: @PACKAGE_VERSION@
+Libs: -L${libdir} -ldvbv5
+Cflags: -I${includedir}