summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2002-06-06 21:50:02 +0000
committerDaniel Caujolle-Bert <f1rmb@users.sourceforge.net>2002-06-06 21:50:02 +0000
commit04a9452c716e88e5b9793816705e6bab28e3f254 (patch)
treeb005a06ec440304823ba64dd48dc225d5c7225de
parent42c703ca796342ec3d0fcda9a75623cbdab8b82f (diff)
downloadxine-lib-04a9452c716e88e5b9793816705e6bab28e3f254.tar.gz
xine-lib-04a9452c716e88e5b9793816705e6bab28e3f254.tar.bz2
Fix vidix/dha deps. Add BUILD_ARGS envvar handling for configure stage.
CVS patchset: 2026 CVS date: 2002/06/06 21:50:02
-rw-r--r--misc/xine-lib.spec.in8
1 files changed, 6 insertions, 2 deletions
diff --git a/misc/xine-lib.spec.in b/misc/xine-lib.spec.in
index e2f9cbf61..955c87b66 100644
--- a/misc/xine-lib.spec.in
+++ b/misc/xine-lib.spec.in
@@ -166,6 +166,7 @@ fi
#
# currently we do not use %%configure as it seems to cause trouble with
# certain automake produced configure scripts - depending on automake version.
+# Use BUILD_ARGS envvar to pass extra parameters to configure (like --enable-dha-mod/etc...)
#
./configure --build=%{_target_platform} --prefix=%{_prefix} \
--exec-prefix=%{_exec_prefix} --bindir=%{_bindir} \
@@ -174,7 +175,7 @@ fi
--libdir=%{_libdir} --libexecdir=%{_libexecdir} \
--localstatedir=%{_localstatedir} \
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
- --infodir=%{_infodir}
+ --infodir=%{_infodir} $BUILD_ARGS
make
%install
@@ -193,7 +194,8 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/xine-config
%{_libdir}/libxine*.so.*
%{_libdir}/xine/plugins/xineplug*.*
-%{_libdir}/xine/plugins/vidix/*_vid.*s
+@HAVE_LINUX_TRUE@@BUILD_DHA_KMOD_TRUE@/lib/modules/%(sh -c 'uname -r')/misc/dhahelper.o
+@HAVE_VIDIX_TRUE@%{_libdir}/xine/plugins/vidix/*_vid.*
%{_datadir}/xine/skins/*
%{_datadir}/xine/fonts/*
%{_mandir}/man1/*
@@ -212,6 +214,8 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man3/*
%changelog
+* Thu Jun 06 2002 Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
+- ability to pass args to configure. Fix vidix/dhahelper inclusion.
* Mon May 27 2002 Matthias Dahl <matthew2k@web.de>
- added passing of build parameter to configure
* Sun May 26 2002 Matthias Dahl <matthew2k@web.de>