From: Wilfried Goesgens <dothebart@citadel.org>
Date: Tue, 26 Mar 2013 19:13:26 +0000 (+0100)
Subject: Infrastructure: if we don't find the ical headers during boostrap, abort.
X-Git-Tag: v8.20~70
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=6033cfa796415a09ad28f112963cc9f686801e05

Infrastructure: if we don't find the ical headers during boostrap, abort.
---

diff --git a/webcit/bootstrap b/webcit/bootstrap
index 2c1f5941b..9f9d712af 100755
--- a/webcit/bootstrap
+++ b/webcit/bootstrap
@@ -6,31 +6,32 @@
 # Remove any vestiges of pre-6.05 build environments
 rm -f .libs modules *.so *.lo *.la 2>/dev/null
 
-./scripts/get_ical_data.sh
+if ./scripts/get_ical_data.sh; then
 
-echo ... running aclocal ...
-aclocal
-
-echo ... running autoconf ...
-autoconf
+    echo ... running aclocal ...
+    aclocal
+    
+    echo ... running autoconf ...
+    autoconf
 
 # If your autoconf version changes, the autom4te.cache stuff will mess you up.
 # Get rid of it.
-echo ... removing autoheader cache files ...
-rm -rf autom4te*.cache
-
-echo ... running autoheader ...
-autoheader
-
-echo ... mk_module_init.sh ...
-./scripts/mk_module_init.sh
-
-
-echo
-echo This script has been tested with autoconf 2.53 and
-echo automake 1.5. Other versions may work, but I recommend the latest
-echo compatible versions of these.
-echo
-echo Also note that autoconf and automake should be configured
-echo with the same prefix.
-echo
+    echo ... removing autoheader cache files ...
+    rm -rf autom4te*.cache
+    
+    echo ... running autoheader ...
+    autoheader
+    
+    echo ... mk_module_init.sh ...
+    ./scripts/mk_module_init.sh
+
+
+    echo
+    echo This script has been tested with autoconf 2.53 and
+    echo automake 1.5. Other versions may work, but I recommend the latest
+    echo compatible versions of these.
+    echo
+    echo Also note that autoconf and automake should be configured
+    echo with the same prefix.
+    echo
+fi
diff --git a/webcit/scripts/get_ical_data.sh b/webcit/scripts/get_ical_data.sh
index 96426673e..3f80db31b 100755
--- a/webcit/scripts/get_ical_data.sh
+++ b/webcit/scripts/get_ical_data.sh
@@ -4,6 +4,11 @@ if test -f /usr/include/libical/ical.h; then
     ICAL=/usr/include/libical/ical.h
 fi
 
+if test ! -f ${ICAL}; then 
+    echo "failed to locate libical headers - please install the libical development packages or heardes"
+    exit 500
+fi
+
 ICALTYPES="icalproperty_kind"\
 " icalcomponent_kind"\
 " icalrequeststatus"\