From 81b60830e8aa59b2d7fddeb48c678ba9df7e13c3 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Thu, 27 Sep 2001 21:31:03 +0000
Subject: Add desktop stuff from patches by Miguel Freitas
 <miguel@cetuc.puc-rio.br> Fixed xine.m4 installation from Andrew Meredith
 <andrew@anvil.org>

CVS patchset: 705
CVS date: 2001/09/27 21:31:03
---
 configure.in          | 7 +++++++
 m4/xine.m4            | 1 +
 misc/xine-config.in   | 7 +++++++
 misc/xine-lib.spec.in | 5 ++++-
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 74aaef329..08a756319 100644
--- a/configure.in
+++ b/configure.in
@@ -597,10 +597,17 @@ eval XINE_SKINPATH="$XINE_SKINDIR"
 AC_DEFINE_UNQUOTED(XINE_SKINDIR,"$XINE_SKINPATH")
 AC_SUBST(XINE_SKINPATH)
 
+
 AC_SUBST(XINE_PLUGINDIR)
 AC_SUBST(XINE_DEMUXDIR)
 AC_SUBST(XINE_SKINDIR)
 
+
+dnl Where desktops icons will/should be installed.
+eval XINE_DESKTOPPATH="${datadir}/xine/desktop"
+AC_SUBST(XINE_DESKTOPPATH)
+
+
 dnl
 dnl Some informations about xine-lib compilation
 dnl
diff --git a/m4/xine.m4 b/m4/xine.m4
index a1eb838d5..f891d5a30 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -71,6 +71,7 @@ AC_ARG_ENABLE(xinetest,
       xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \
              sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
       xine_skin_dir=`$XINE_CONFIG $xine_config_args --skindir`
+      xine_desktop_dir=`$XINE_CONFIG $xine_config_args --desktopdir`
       xine_plugin_dir=`$XINE_CONFIG $xine_config_args --plugindir`
       dnl    if test "x$enable_xinetest" = "xyes" ; then
       ac_save_CFLAGS="$CFLAGS"
diff --git a/misc/xine-config.in b/misc/xine-config.in
index 8879e9fe6..5cc1c4c45 100644
--- a/misc/xine-config.in
+++ b/misc/xine-config.in
@@ -18,6 +18,7 @@ Options:
 	[--cflags]
 	[--plugindir]
 	[--skindir]
+	[--desktopdir]
 EOF
 	exit $1
 }
@@ -64,6 +65,9 @@ while test $# -gt 0; do
     --skindir)
       echo_skindir=yes
       ;;
+    --desktopdir)
+      echo_desktopdir=yes
+      ;;
     *)
       usage 1 1>&2
       ;;
@@ -92,3 +96,6 @@ fi
 if test "$echo_skindir" = "yes"; then
       echo "@XINE_SKINPATH@"
 fi      
+if test "$echo_desktopdir" = "yes"; then
+      echo "@XINE_DESKTOPPATH@"
+fi
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index f8fec37ec..ac6789bf1 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -186,7 +186,7 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/man/man3/vo_frame_t.3*
 %{prefix}/include/xine/*.h
 %{prefix}/include/xine.h
-%{prefix}/share/aclocal/xine.m4
+@INSTALL_M4_TRUE@@ACLOCAL_DIR@/xine.m4
 # input plugins
 %{prefix}/lib/xine/plugins/xineplug_inp_dvd.la
 %{prefix}/lib/xine/plugins/xineplug_inp_dvd.so
@@ -304,6 +304,9 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/share/doc/xine/README.dxr3
 
 %changelog
+* Thu Sep 27 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
+- Add desktop stuff from patches by Miguel Freitas <miguel@cetuc.puc-rio.br>
+- Fixed xine.m4 installation from Andrew Meredith <andrew@anvil.org>
 * Fri Sep 21 2001 Matthias Dahl <matthew2k@web.de>
 - added two missing files (xine-config man page and xine.m4)
 * Sun Sep 16 2001 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
-- 
cgit v1.2.3