diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-04-14 15:19:39 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-04-14 15:19:39 +0200 |
| commit | f1925da5c80d4170425f6efb6ad68a2909074057 (patch) | |
| tree | 6a35ba66925e128f101fcdc823b59092023ba652 | |
| parent | 0be7d364939aafd85edd8a50cc4beb4c181c1407 (diff) | |
| download | xine-lib-f1925da5c80d4170425f6efb6ad68a2909074057.tar.gz xine-lib-f1925da5c80d4170425f6efb6ad68a2909074057.tar.bz2 | |
Make sure to add libxdg-basedir to Requires.private when using external version.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | misc/libxine.pc.in | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 2a92ade01..8b80cb252 100644 --- a/configure.ac +++ b/configure.ac @@ -236,12 +236,14 @@ AC_ARG_WITH([external-libxdg-basedir], if test x"$with_external_libxdg_basedir" = x"yes"; then PKG_CHECK_MODULES([XDG_BASEDIR], [libxdg-basedir >= 0.1.3]) + XDG_BASEDIR_REQUIRES="libxdg-basedir" else XDG_BASEDIR_CPPFLAGS='-I$(top_srcdir)/contrib/libxdg-basedir' XDG_BASEDIR_LIBS='$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la' XDG_BASEDIR_DEPS='$(top_builddir)/contrib/libxdg-basedir/libxdg-basedir.la' fi +AC_SUBST([XDG_BASEDIR_REQUIRES]) AC_SUBST([XDG_BASEDIR_CPPFLAGS]) AC_SUBST([XDG_BASEDIR_LIBS]) AC_SUBST([XDG_BASEDIR_DEPS]) diff --git a/misc/libxine.pc.in b/misc/libxine.pc.in index 754acc5ca..1b9afeac6 100644 --- a/misc/libxine.pc.in +++ b/misc/libxine.pc.in @@ -21,7 +21,7 @@ xine_list=${bindir}/xine-list-@XINE_SERIES@ Name: libxine Description: The xine engine library Version: @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@@XINE_PATCH@ -Requires: +Requires.private: @XDG_BASEDIR_REQUIRES@ Libs: -L${libdir} -lxine Libs.private: @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ Cflags: -I${includedir} |