Browse Source

Changed oder of checks and added version hint for compass version.

pull/101/head
Simon Eisenmann 11 years ago
parent
commit
8534f4f681
  1. 2
      README.md
  2. 25
      configure.ac

2
README.md

@ -80,8 +80,8 @@ The latest version of Spreed WebRTC can be found on GitHub: @@ -80,8 +80,8 @@ The latest version of Spreed WebRTC can be found on GitHub:
- [NodeJS](http://nodejs.org/) >= 0.10.0
- [JSHint](http://www.jshint.com/) >= 2.0.0
- [Compass](http://compass-style.org/) >= 1.0.0
- [Sass](http://sass-lang.com/) >= 3.3.0
- [Compass](http://compass-style.org/)
- [autoprefixer](https://www.npmjs.org/package/autoprefixer) 1.1
- [Babel](http://babel.pocoo.org/)
- [po2json](https://github.com/mikeedwards/po2json)

25
configure.ac

@ -71,9 +71,6 @@ if test x"${JSHINT}" != x"" ; then @@ -71,9 +71,6 @@ if test x"${JSHINT}" != x"" ; then
fi
AC_SUBST(JSHINT)
AC_PATH_PROGS([JS_BEAUTIFY],[js-beautify])
AC_SUBST(JS_BEAUTIFY)
AC_PATH_PROGS([PYTHON],[python2 python])
if test x"${PYTHON}" != x"" ; then
AC_MSG_CHECKING([for version of python2])
@ -110,6 +107,16 @@ fi @@ -110,6 +107,16 @@ fi
AC_SUBST(NODEJS)
AC_SUBST(NODEJS_SUPPORT_STYLES)
AC_PATH_PROGS([COMPASS],[compass])
if test x"${COMPASS}" == x"" ; then
AC_MSG_WARN([Please install compass before trying to build styles.])
else
AC_MSG_CHECKING([for version of compass])
COMPASS_VERSION=`$COMPASS --version | $AWK 'NR==1' | $SED 's/^Compass //' | $SED 's/ .*//'`
AC_MSG_RESULT([$COMPASS_VERSION])
fi
AC_SUBST(COMPASS)
AC_PATH_PROGS([SASS],[sass])
if test x"${SASS}" == x"" ; then
AC_MSG_WARN([Please install sass before trying to build styles.])
@ -118,21 +125,11 @@ else @@ -118,21 +125,11 @@ else
SASS_VERSION=`$SASS --version | $SED 's/^Sass //' | $SED 's/ .*//'`
AC_MSG_RESULT([$SASS_VERSION])
AX_COMPARE_VERSION([$SASS_VERSION], [lt], [$SASS_VERSION_MIN],
[AC_MSG_WARN([Please install sass $SASS_VERSION_MIN or newer before trying to build styles (found sass $SASS_VERSION).])
[AC_MSG_WARN([Please install compass with sass $SASS_VERSION_MIN or newer before trying to build styles (found sass $SASS_VERSION).])
SASS_SUPPORT_STYLES=no],[SASS_SUPPORT_STYLES=yes])
fi
AC_SUBST(SASS)
AC_PATH_PROGS([COMPASS],[compass])
if test x"${COMPASS}" == x"" ; then
AC_MSG_WARN([Please install compass before trying to build styles.])
else
AC_MSG_CHECKING([for version of compass])
COMPASS_VERSION=`$COMPASS --version | $AWK 'NR==1' | $SED 's/^Compass //' | $SED 's/ .*//'`
AC_MSG_RESULT([$COMPASS_VERSION])
fi
AC_SUBST(COMPASS)
if test x"${SASS}" != x"" ; then
AC_MSG_CHECKING([for compass support in sass])
tempfile=`mktemp -t XXXXXXblah`

Loading…
Cancel
Save