* 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

diff --git a/ChangeLog b/ChangeLog
index 2515381f0457a4319adbfa55fecf8bb23dc1cae7..0db787fb45e740b7d4664d6c730e237d2cfdd464 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2007-01-03  Wade Berrier  <wberrier@novell.com>
+
+       * 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  <miguel@novell.com>
 
        * configure.in (darwin.CPPFLAGS): Temporary workaround for the bug

diff --git a/scripts/mono-find-provides.in b/scripts/mono-find-provides.in
index f7ee80ea4cb2218f5f124cc950a37aca5b3ebb56..de468c27e685d0c96086dd1f0aadab8c38e75d74 100644 (file)
--- 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 c2b8832f95674a575135d95cc768ae4528ebcacf..5c9edddf391a71f0ab36d68eeb9dfc65cbd015db 100644 (file)
--- 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