configure.in | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
New commits: commit 6c1b61b0292359304863cd6e593b8f5d7a2cb94a Author: Michael Stahl <mst...@redhat.com> Date: Tue Sep 18 18:16:38 2012 +0200 configure: test if tput(1) exists before calling it Change-Id: I63576b42187fb0cbf3fc867487e9530fd11319d5 diff --git a/configure.in b/configure.in index eafb07b..7f9ec01 100644 --- a/configure.in +++ b/configure.in @@ -56,7 +56,7 @@ add_warning() if test "$have_WARNINGS" = "no" ; then echo "*************************************" >> warn have_WARNINGS="yes" - if test $(tput colors) -ge 8 ; then + if which tput >/dev/null 2>/dev/null && test `tput colors` -ge 8; then dnl <esc> as actual byte (U+1b), [ escaped using quadrigraph @<:@ COLORWARN='*@<:@1;33;40m WARNING @<:@0m:' else commit 970b56c40c0c66125d4dfe6d7708c3535551cd4a Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Tue Sep 18 16:15:15 2012 +0200 mark configure's warning with some color Change-Id: I7e225fc5ce353316cb689dc3bca8f606273e8796 diff --git a/configure.in b/configure.in index 28f7fb0..eafb07b 100644 --- a/configure.in +++ b/configure.in @@ -56,8 +56,14 @@ add_warning() if test "$have_WARNINGS" = "no" ; then echo "*************************************" >> warn have_WARNINGS="yes" + if test $(tput colors) -ge 8 ; then + dnl <esc> as actual byte (U+1b), [ escaped using quadrigraph @<:@ + COLORWARN='*@<:@1;33;40m WARNING @<:@0m:' + else + COLORWARN="* WARNING :" + fi fi - echo "* WARNING : $@" >> warn + echo "$COLORWARN $@" >> warn } if test -n "$SOLARENV" ; then commit 78051aaa688cc330a0cc053eecc7eef24a195c49 Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com> Date: Tue Sep 18 15:22:59 2012 +0200 be consistent with configure's default and switch wrt gtk3 also record the system-cairo stuff as a proper warning, so that people have a chance to see it. Change-Id: Ic59bed91edbe92a642851ccef570c9dca94672f0 diff --git a/configure.in b/configure.in index f8a4a45..28f7fb0 100644 --- a/configure.in +++ b/configure.in @@ -812,7 +812,7 @@ AC_ARG_ENABLE(gtk, ,enable_gtk=yes) AC_ARG_ENABLE(gtk3, - AS_HELP_STRING([--disable-gtk3], + AS_HELP_STRING([--enable-gtk3], [Determines whether to use Gtk+ 3.0 vclplug on platforms where Gtk+ 3.0 is available.]), ,enable_gtk3=no) @@ -9195,7 +9195,8 @@ GTK3_LIBS="" ENABLE_GTK3="" if test "x$enable_gtk3" = "xyes"; then if test "$with_system_cairo" != yes; then - echo "System cairo required for gtk3 support, please use --with-system-cairo" + AC_MSG_WARN([System cairo required for gtk3 support, please use --with-system-cairo]) + add_warning "System cairo required for gtk3 support, please use --with-system-cairo" fi PKG_CHECK_MODULES(GTK3, gtk+-3.0 >= 3.2 gtk+-unix-print-3.0 gmodule-no-export-2.0 cairo, ENABLE_GTK3="TRUE", ENABLE_GTK3="") if test "x$ENABLE_GTK3" = "xTRUE"; then _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits