aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Elkins <melkins@tislabs.com>2011-11-23 19:36:25 +0000
committerMichael Elkins <melkins@tislabs.com>2011-11-23 19:36:25 +0000
commit6782f3a960713d68f76a8150119cce6b52aaca87 (patch)
tree7d3db2f3d04c36b67cbebe506728bc1764b7cd3c
parentd77217b8a46682154e45f9cd72b3ce83958ed465 (diff)
give the user explanatory feedback about why django is required when configure can't find it installed. closes #150.
svn path=/trunk/; revision=4094
-rwxr-xr-xconfigure8
-rw-r--r--configure.ac4
2 files changed, 6 insertions, 6 deletions
diff --git a/configure b/configure
index ea354ba3..e2db7fc6 100755
--- a/configure
+++ b/configure
@@ -4814,14 +4814,14 @@ case $enable_django in
yes) build_django=yes
if test $have_django = no
then
- { { $as_echo "$as_me:$LINENO: error: You don't appear to have Django installed" >&5
-$as_echo "$as_me: error: You don't appear to have Django installed" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: You don't appear to have Django installed. Django is required for the RPKI portal gui. If you do not wish to install the gui, please specify --disable-django as an argument to this configure script." >&5
+$as_echo "$as_me: error: You don't appear to have Django installed. Django is required for the RPKI portal gui. If you do not wish to install the gui, please specify --disable-django as an argument to this configure script." >&2;}
{ (exit 1); exit 1; }; }
fi
if test $django_recent = no
then
- { { $as_echo "$as_me:$LINENO: error: The portal gui requires Django 1.3 or higher" >&5
-$as_echo "$as_me: error: The portal gui requires Django 1.3 or higher" >&2;}
+ { { $as_echo "$as_me:$LINENO: error: The portal gui requires Django 1.2 or higher" >&5
+$as_echo "$as_me: error: The portal gui requires Django 1.2 or higher" >&2;}
{ (exit 1); exit 1; }; }
fi
;;
diff --git a/configure.ac b/configure.ac
index 6451b807..03fe8c4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -286,11 +286,11 @@ case $enable_django in
yes) build_django=yes
if test $have_django = no
then
- AC_MSG_ERROR([You don't appear to have Django installed])
+ AC_MSG_ERROR([You don't appear to have Django installed. Django is required for the RPKI portal gui. If you do not wish to install the gui, please specify --disable-django as an argument to this configure script.])
fi
if test $django_recent = no
then
- AC_MSG_ERROR([The portal gui requires Django 1.3 or higher])
+ AC_MSG_ERROR([The portal gui requires Django 1.2 or higher])
fi
;;
no) build_django=no