From 57e5c7f5d760de6a4b06511fe3826eca58bcb999 Mon Sep 17 00:00:00 2001 From: Wade Berrier Date: Wed, 3 Jan 2007 23:35:00 +0000 Subject: [PATCH] * scripts/mono-find-provides.in: * scripts/mono-find-requires.in: error out if monodis isn't functioning properly. Otherwise when building rpms, the provides/requires isn't generated correctly if monodis isn't present. Fixes: bnc #227362 svn path=/trunk/mono/; revision=70445 --- ChangeLog | 10 ++++++++++ scripts/mono-find-provides.in | 7 +++++-- scripts/mono-find-requires.in | 7 +++++-- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2515381f045..0db787fb45e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2007-01-03 Wade Berrier + + * scripts/mono-find-provides.in: + * scripts/mono-find-requires.in: error out if monodis isn't + functioning properly. Otherwise when building rpms, + the provides/requires isn't generated correctly if monodis + isn't present. + + Fixes: bnc #227362 + 2007-01-01 Miguel de Icaza * configure.in (darwin.CPPFLAGS): Temporary workaround for the bug diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in index f7ee80ea4cb..de468c27e68 100644 --- a/scripts/mono-find-provides.in +++ b/scripts/mono-find-provides.in @@ -27,8 +27,11 @@ exec_prefix=$d/.. libdir=$prefix/@reloc_libdir@ bindir=$d -[ -x $bindir/monodis ] || exit 0; -[ -f $libdir/libmono.so ] || exit 0; +# Bail out if monodis or libmono is missing +if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then + echo "monodis missing or unusable, exiting..." + exit 1 +fi # set LD_LIBRARY_PATH to ensure that libmono.so is found diff --git a/scripts/mono-find-requires.in b/scripts/mono-find-requires.in index c2b8832f956..5c9edddf391 100644 --- a/scripts/mono-find-requires.in +++ b/scripts/mono-find-requires.in @@ -22,8 +22,11 @@ exec_prefix=$d/.. libdir=$prefix/@reloc_libdir@ bindir=$d -[ -x $bindir/monodis ] || exit 0; -[ -f $libdir/libmono.so ] || exit 0; +# Bail out if monodis or libmono is missing +if [ ! -x $bindir/monodis ] || [ ! -f $libdir/libmono.so ] ; then + echo "monodis missing or unusable, exiting..." + exit 1 +fi # set LD_LIBRARY_PATH to ensure that libmono.so is found -- 2.25.1