libdvdcss-cvs BSD/OS portability patch

[Steven M. Schultz]

Hi!

 	I noticed this problem some time ago and I see that it is
 	still present in the CVS version I checked out a few minutes ago.
 
 	The problem is that if a local copy of "libdvd" is installed then
 	libdvdcss fails to use it and this results in undefined symbols.
 
 	What I have done (and I have verified that libdvdcss builds correctly
 	with and without a local "-ldvd") is define a new automake 
 	setting which is used to include -ldvd if a local installed library
 	is present.

	Just 3 (autoconf/automake) files need small changes, the patch is
	included below.

	Cheers,
	Steven Schultz

----------------------------cut here----------------------
--- ./configure.ac.dist	Thu Dec 19 07:44:30 2002
+++ ./configure.ac	Mon Jan 27 16:51:57 2003
@@ -92,11 +92,12 @@
     LINUX_DVD_STRUCT=1
   ])
   dnl
-  dnl BSDI: dvd.h
+  dnl BSDI: dvd.h - may require -ldvd IF a local copy of libdvd is installed
   dnl
   AC_EGREP_HEADER(dvd_struct,dvd.h,[
     AC_DEFINE(DVD_STRUCT_IN_DVD_H, 1,
               Define if <dvd.h> defines DVD_STRUCT.)
+    SYS_BSDI_LIBDVD=1
     LINUX_DVD_STRUCT=1
   ],[
     dnl
@@ -178,6 +179,7 @@
 CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DDVDCSS_DIST ${CFLAGS}"
 
 AM_CONDITIONAL(SYS_BSDI, test "x$SYS_BSDI" = "x1")
+AM_CONDITIONAL(SYS_BSDI_LIBDVD, test "x$SYS_BSDI_LIBDVD" = "x1")
 AM_CONDITIONAL(SYS_MSVC, test "x$SYS_MSVC" = "x1")
 
 AC_OUTPUT([Makefile src/Makefile src/dvdcss/Makefile test/Makefile debian/Makefile doc/Makefile])
--- ./src/Makefile.am.dist	Fri Oct 11 03:03:48 2002
+++ ./src/Makefile.am	Mon Jan 27 17:04:41 2003
@@ -21,6 +21,9 @@
 
 if SYS_BSDI
 bsdi_sources = $(bsdi_extras)
+endif
+
+if SYS_BSDI_LIBDVD
 bsdi_libadd = -ldvd
 endif
 
--- ./test/Makefile.am.dist	Tue Jul 16 15:47:40 2002
+++ ./test/Makefile.am	Mon Jan 27 16:53:19 2003
@@ -1,8 +1,12 @@
 
 noinst_PROGRAMS = csstest #dvd_region
 
+if SYS_BSDI_LIBDVD
+bsdi_libadd = -ldvd
+endif
+
 csstest_SOURCES = csstest.c
-csstest_LDADD = $(top_builddir)/src/libdvdcss.la
+csstest_LDADD = $(top_builddir)/src/libdvdcss.la $(bsdi_libadd)
 csstest_CFLAGS = -I$(top_srcdir)/src
 
 #dvd_region_SOURCES = dvd_region.c
-- 
This is the libdvdcss-devel mailing-list, see http://developers.videolan.org/
To unsubscribe, please read http://developers.videolan.org/lists.html
If you are in trouble, please contact <postmaster at videolan.org>