diff options
| author | Rob Austein <sra@hactrn.net> | 2012-04-15 04:42:40 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2012-04-15 04:42:40 +0000 |
| commit | fd695c2371824c1952510bab9fbe0e05b52b9e9d (patch) | |
| tree | 60b9836b9d24055d900be3335856ec4e0091cec2 /configure.ac | |
| parent | b5eb637d68bd8387cfff7cb06945f6654d1192db (diff) | |
| parent | f4d381b2ead3a3fab4b7b0c73cdc8d3a6b4cb12d (diff) | |
Merge branches/tk161 to trunk.
svn path=/trunk/; revision=4415
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 03fe8c4d..b1508796 100644 --- a/configure.ac +++ b/configure.ac @@ -394,19 +394,13 @@ fi if test $build_django = yes then - # the user that the apache process is running as - if test "x$WEBUSER" = "x"; then - for u in apache www-data www; do - if $GREP $u /etc/passwd >/dev/null 2>&1; then - WEBUSER=$u - break - fi - done - if test "x$WEBUSER" = "x"; then - AC_MSG_ERROR([Could not determine which user the apache process runs as. Please specify WEBUSER=<USERNAME>.]) - fi + AC_MSG_CHECKING([if running under virtualenv]) + if test x$VIRTUAL_ENV != x; then + AC_SUBST(VIRTUAL_ENV, [$VIRTUAL_ENV]) + AC_MSG_RESULT([$VIRTUAL_ENV]) + else + AC_MSG_RESULT(no) fi - AC_SUBST(WEBUSER) # source: http://blog.leosoto.com/2008/04/django-secretkey-generation.html AC_SUBST(SECRET_KEY, `$PYTHON -c 'import random; print "".join([random.choice("abcdefghijklmnopqrstuvwxyz0123456789!@#$%^&*(-_=+)") for i in range(50)])'`) |