|
Lucio Andrés Illanes Albornoz |
5637a6 |
diff -ru toilet.orig/configure toilet/configure
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
--- toilet.orig/configure 2017-09-03 18:16:41.831887603 +0200
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
+++ toilet/configure 2017-09-03 18:22:18.302580756 +0200
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
@@ -4412,81 +4412,6 @@
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-pkg_failed=no
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for CACA" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-$as_echo_n "checking for CACA... " >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-if test -n "$CACA_CFLAGS"; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_cv_CACA_CFLAGS="$CACA_CFLAGS"
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- elif test -n "$PKG_CONFIG"; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- if test -n "$PKG_CONFIG" && \
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta18\""; } >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta18") 2>&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- ac_status=$?
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- test $ac_status = 0; }; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_cv_CACA_CFLAGS=`$PKG_CONFIG --cflags "caca >= 0.99.beta18" 2>/dev/null`
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- test "x$?" != "x0" && pkg_failed=yes
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_failed=yes
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_failed=untried
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-if test -n "$CACA_LIBS"; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_cv_CACA_LIBS="$CACA_LIBS"
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- elif test -n "$PKG_CONFIG"; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- if test -n "$PKG_CONFIG" && \
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"caca >= 0.99.beta18\""; } >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- ($PKG_CONFIG --exists --print-errors "caca >= 0.99.beta18") 2>&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- ac_status=$?
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- test $ac_status = 0; }; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_cv_CACA_LIBS=`$PKG_CONFIG --libs "caca >= 0.99.beta18" 2>/dev/null`
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- test "x$?" != "x0" && pkg_failed=yes
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_failed=yes
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- pkg_failed=untried
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-if test $pkg_failed = yes; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-$as_echo "no" >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- _pkg_short_errors_supported=yes
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- _pkg_short_errors_supported=no
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- if test $_pkg_short_errors_supported = yes; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- CACA_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "caca >= 0.99.beta18" 2>&1`
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- CACA_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "caca >= 0.99.beta18" 2>&1`
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- # Put the nasty error message in config.log where it belongs
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- echo "$CACA_PKG_ERRORS" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-$as_echo "no" >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- as_fn_error $? "you need libcaca version 0.99.beta18 or later" "$LINENO" 5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-elif test $pkg_failed = untried; then
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-$as_echo "no" >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-$as_echo "no" >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- as_fn_error $? "you need libcaca version 0.99.beta18 or later" "$LINENO" 5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-else
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- CACA_CFLAGS=$pkg_cv_CACA_CFLAGS
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- CACA_LIBS=$pkg_cv_CACA_LIBS
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-$as_echo "yes" >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
- :
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-fi
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for release date" >&5
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
$as_echo_n "checking for release date... " >&6; }
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
tmp="${stamp%-*}"
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
diff -ru toilet.orig/Makefile.in toilet/Makefile.in
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
--- toilet.orig/Makefile.in 2017-09-03 18:16:42.175886270 +0200
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
+++ toilet/Makefile.in 2017-09-03 18:29:29.600903132 +0200
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
@@ -310,7 +310,7 @@
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
top_build_prefix = @top_build_prefix@
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
top_builddir = @top_builddir@
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
top_srcdir = @top_srcdir@
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
-SUBDIRS = src tools fonts doc test
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
+SUBDIRS = src tools fonts test
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
DIST_SUBDIRS = $(SUBDIRS)
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
EXTRA_DIST = bootstrap
|
|
Lucio Andrés Illanes Albornoz |
5637a6 |
CACA2TLF = $(top_builddir)/tools/caca2tlf
|