From: Gregor Jasny Date: Wed, 27 Jun 2012 08:07:04 +0000 (-0700) Subject: libv4l: Compile wrappers only if shared libraries are enabled/available X-Git-Tag: v4l-utils-0.9.1~135 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=299b8cef273b1a97de5fb8973bd1145c99aa9a96;p=platform%2Fupstream%2Fv4l-utils.git libv4l: Compile wrappers only if shared libraries are enabled/available Signed-off-by: Gregor Jasny --- diff --git a/configure.ac b/configure.ac index 5c06452..282e3a9 100644 --- a/configure.ac +++ b/configure.ac @@ -211,6 +211,7 @@ 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]) AM_CONDITIONAL([WITH_QV4L2], [test ${qt_pkgconfig} = true -a x$with_qv4l2 = xyes]) +AM_CONDITIONAL([WITH_V4L_WRAPPERS], [test x$with_libv4l = xyes -a x$enable_shared = 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"])]) diff --git a/lib/libv4l1/Makefile.am b/lib/libv4l1/Makefile.am index fb31a9c..6c5095c 100644 --- a/lib/libv4l1/Makefile.am +++ b/lib/libv4l1/Makefile.am @@ -1,8 +1,10 @@ if WITH_LIBV4L lib_LTLIBRARIES = libv4l1.la include_HEADERS = ../include/libv4l1.h ../include/libv4l1-videodev.h -libv4l1priv_LTLIBRARIES = v4l1compat.la pkgconfig_DATA = libv4l1.pc +if WITH_V4L_WRAPPERS +libv4l1priv_LTLIBRARIES = v4l1compat.la +endif else noinst_LTLIBRARIES = libv4l1.la endif diff --git a/lib/libv4l2/Makefile.am b/lib/libv4l2/Makefile.am index 434580f..64ae853 100644 --- a/lib/libv4l2/Makefile.am +++ b/lib/libv4l2/Makefile.am @@ -1,8 +1,10 @@ if WITH_LIBV4L lib_LTLIBRARIES = libv4l2.la include_HEADERS = ../include/libv4l2.h ../include/libv4l-plugin.h -libv4l2priv_LTLIBRARIES = v4l2convert.la pkgconfig_DATA = libv4l2.pc +if WITH_V4L_WRAPPERS +libv4l2priv_LTLIBRARIES = v4l2convert.la +endif else noinst_LTLIBRARIES = libv4l2.la endif