[libdv-dev] Update to pkg-config dependencies.

[Daniel K. <ko...@ta...>]

Moi!

libdv's pkg-config info still lists the 0.9.0 dependencies on glib and
gtk. These days, only the apps, but not the lib itself, depend on them.
Furthermore, libdv (usually) depends on libpopt. Including this
dependency in libdv.pc is a bit hairy, since libpopt doesn't use
pkg-config itself. Therefore, we can only make a best guess to the
necessary additions. Suggested patch below (against today's CVS).

Regards,

Daniel.

--[snip]--

Index: configure.ac
===================================================================
RCS file: /cvsroot/libdv/libdv/configure.ac,v
retrieving revision 1.6
diff -u -r1.6 configure.ac
--- configure.ac	26 May 2002 21:02:42 -0000	1.6
+++ configure.ac	18 Jun 2002 11:27:15 -0000
@@ -152,6 +152,8 @@
 
 REQUIRES='glib >= 1.2.4 gtk+ >= 1.2.4'
 PKG_CHECK_MODULES(GTK,$REQUIRES)
+dnl Libs above are required for the apps, but not for the lib itself.
+REQUIRES=''
 
 dnl pass-thru to .pc files
 AC_SUBST(REQUIRES)
@@ -196,14 +198,21 @@
 
 dnl Don't bother with popt on non-gcc build, because we make heavy use of 
 dnl gcc struct initialization extension in our popt code.  (Could be fixed)
+REQUIRES_NOPKGCONFIG=""
 if test "$GCC" = "yes"; then
-      AC_CHECK_LIB(popt, poptGetContext,,
+      AC_CHECK_LIB(popt, poptGetContext,
+      [
+        LIBS="-lpopt ${LIBS}"
+        AC_DEFINE(HAVE_LIBPOPT, 1, [Define if you have the 'popt' library])
+        REQUIRES_NOPKGCONFIG="-lpopt"
+      ],
       [
 	AC_MSG_WARN(playdv needs the popt package for command line parsing.
  		    The source archive for popt is available at:  
 			ftp://ftp.redhat.com/pub/redhat/code/popt)
       ])
 fi
+AC_SUBST(REQUIRES_NOPKGCONFIG)
 
 dnl Checks for header files.
 AC_PATH_X
Index: libdv.pc.in
===================================================================
RCS file: /cvsroot/libdv/libdv/libdv.pc.in,v
retrieving revision 1.1
diff -u -r1.1 libdv.pc.in
--- libdv.pc.in	24 Jun 2001 17:57:46 -0000	1.1
+++ libdv.pc.in	18 Jun 2002 11:27:15 -0000
@@ -7,5 +7,5 @@
 Description: DV software codec
 Requires: @REQUIRES@
 Version: @VERSION@
-Libs: -L${libdir} -ldv
+Libs: -L${libdir} -ldv @REQUIRES_NOPKGCONFIG@
 Cflags: -I${includedir}