libdvdcss-1.2.4 BSD/OS portability patch

[Steven M. Schultz]

Greetings -

	I noticed this problem with libdvdcss-1.2.3 and I see that it is
	still present in 1.2.4

	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.

	Cheers,
	Steven Schultz
	sms at 2bsd.com

----------------------cut here--------------------
--- ./configure.ac.dist	Thu Nov 14 06:54:22 2002
+++ ./configure.ac	Fri Nov 15 09:12:12 2002
@@ -81,11 +81,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
@@ -141,6 +142,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	Fri Nov 15 09:14:36 2002
@@ -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	Fri Nov 15 09:13:17 2002
@@ -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://www.videolan.org/libdvdcss/
To unsubscribe, please read http://www.videolan.org/lists.html
If you are in trouble, please contact <postmaster at videolan.org>